From 908b1e4becbca81f4b3a397cee57058211fbf52c Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Tue, 1 Aug 2023 18:13:45 +0200 Subject: [PATCH] - wip --- .env.example | 3 ++ app/Http/Resources/FullCVResource.php | 2 + docker-compose.yml | 2 +- resources/js/Pages/CV/Edit.vue | 9 +++- resources/js/Pages/CV/Index.vue | 2 +- resources/js/Pages/CV/Show.vue | 29 ++++++++--- vite.config.js | 71 ++++++++++++++------------- 7 files changed, 75 insertions(+), 43 deletions(-) diff --git a/.env.example b/.env.example index c7a9d97..68cdeff 100644 --- a/.env.example +++ b/.env.example @@ -14,3 +14,6 @@ DB_PASSWORD=password EXTERNAL_WEBSERVER_PORT=80 CURRENT_UID=1000 XDG_CONFIG_HOME=/tmp + +VITE_CV_APP_URL=https://cv.kamilcraft.com +VITE_PORT=3001 diff --git a/app/Http/Resources/FullCVResource.php b/app/Http/Resources/FullCVResource.php index 99187bf..53b1791 100644 --- a/app/Http/Resources/FullCVResource.php +++ b/app/Http/Resources/FullCVResource.php @@ -24,6 +24,8 @@ class FullCVResource extends JsonResource 'mission' => explode(PHP_EOL, $this->mission ?? '', 5), 'rodo' => $this->rodo, 'position' => $this->position, + 'created' => $this->created_at->format('d-m-Y H:i:s'), + 'updated' => $this->updated_at->format('d-m-Y H:i:s'), ]; } } diff --git a/docker-compose.yml b/docker-compose.yml index b458682..4477eae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: entrypoint: [ 'npm' ] ports: - '3000:3000' - - '3001:3001' + - '${VITE_PORT:-3001}:${VITE_PORT:-3001}' volumes: - .:/application networks: diff --git a/resources/js/Pages/CV/Edit.vue b/resources/js/Pages/CV/Edit.vue index e00d84c..8c03c99 100644 --- a/resources/js/Pages/CV/Edit.vue +++ b/resources/js/Pages/CV/Edit.vue @@ -119,7 +119,14 @@ function updateCV() { v-model="form.rodo" :error="form.errors.rodo" /> - +
+ Anuluj + +
diff --git a/resources/js/Pages/CV/Index.vue b/resources/js/Pages/CV/Index.vue index 3824e76..2a01cb0 100644 --- a/resources/js/Pages/CV/Index.vue +++ b/resources/js/Pages/CV/Index.vue @@ -39,7 +39,7 @@ function copySlug(slug) { >
- +
diff --git a/resources/js/Pages/CV/Show.vue b/resources/js/Pages/CV/Show.vue index c72e25b..c3bc1bf 100644 --- a/resources/js/Pages/CV/Show.vue +++ b/resources/js/Pages/CV/Show.vue @@ -9,6 +9,8 @@ defineProps({ required: true, }, }); + +const CV_URL = import.meta.env.VITE_CV_APP_URL;