From cd66fd6ffad3f3539e0520ed5763ebffa1cf4557 Mon Sep 17 00:00:00 2001
From: Kamil Niemczycki <contact@kamilcraft.com>
Date: Mon, 10 Jul 2023 13:31:50 +0200
Subject: [PATCH] - refactor

---
 .env.deployment                               |  4 +++
 .env.example                                  |  2 ++
 src/components/Body.vue                       | 26 ++++++++++++-------
 src/components/{ => Body}/Education.vue       |  0
 src/components/{ => Body}/MajorAchivments.vue |  0
 src/components/Header.vue                     |  4 +--
 src/components/{ => Header}/ContactList.vue   |  0
 src/components/{ => Header}/Mission.vue       |  0
 src/components/{ => Side}/Certificates.vue    |  0
 src/components/Side/Links.vue                 | 15 +++++++++++
 src/components/{ => Side}/Skills.vue          |  2 +-
 .../Links.vue => composables/Links.js}        | 14 +---------
 src/composables/Skills.js                     |  6 ++++-
 13 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 .env.deployment
 rename src/components/{ => Body}/Education.vue (100%)
 rename src/components/{ => Body}/MajorAchivments.vue (100%)
 rename src/components/{ => Header}/ContactList.vue (100%)
 rename src/components/{ => Header}/Mission.vue (100%)
 rename src/components/{ => Side}/Certificates.vue (100%)
 create mode 100644 src/components/Side/Links.vue
 rename src/components/{ => Side}/Skills.vue (97%)
 rename src/{components/Links.vue => composables/Links.js} (56%)

diff --git a/.env.deployment b/.env.deployment
new file mode 100644
index 0000000..e6529c9
--- /dev/null
+++ b/.env.deployment
@@ -0,0 +1,4 @@
+VITE_APP_NAME="Kamil Niemczycki CV"
+VITE_CV_URL="https://cv.kamilcraft.com"
+VITE_API_URL="https://api.kamilcraft.com"
+VITE_SOURCE_CODE="https://github.com/kamilniemczycki/kamilcraft-cv"
diff --git a/.env.example b/.env.example
index b438fe2..2fea494 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,4 @@
 VITE_APP_NAME="Kamil Niemczycki CV"
+VITE_CV_URL="http://localhost:5173"
 VITE_API_URL="http://localhost"
+VITE_SOURCE_CODE="https://github.com/kamilniemczycki"
diff --git a/src/components/Body.vue b/src/components/Body.vue
index 3abcf9b..53e78b7 100644
--- a/src/components/Body.vue
+++ b/src/components/Body.vue
@@ -1,10 +1,10 @@
 <script setup>
 import { defineProps, computed, ref } from 'vue';
-import Education from '../components/Education.vue';
-import MajorAchivments from '../components/MajorAchivments.vue';
-import Skills from '../components/Skills.vue';
-import Certificates from '../components/Certificates.vue';
-import Links from '../components/Links.vue';
+import Education from './Body/Education.vue';
+import MajorAchivments from './Body/MajorAchivments.vue';
+import Skills from './Side/Skills.vue';
+import Certificates from './Side/Certificates.vue';
+import Links from './Side/Links.vue';
 
 const props = defineProps({
     token: {
@@ -21,11 +21,14 @@ const props = defineProps({
     },
 });
 
+const sourceCode = import.meta.env.VITE_SOURCE_CODE;
+
 const qrCodeLink = computed(() => {
+    const url = import.meta.env.VITE_CV_URL;
     if(props.token) {
-        return `https://cv.kamilcraft.com/show/${props.token}`;
+        return `${url}/show/${props.token}`;
     }
-    return 'https://cv.kamilcraft.com';
+    return url;
 });
 </script>
 
@@ -55,8 +58,8 @@ const qrCodeLink = computed(() => {
         <div class="relative print:w-1/3 print:flex-shrink-1 md:w-1/3 md:flex-shrink-1 bg-[#fff0e9]">
             <Skills />
             <Certificates />
-            <Links />
-            <div class="hidden print:block print:absolute bottom-5 right-0 w-full">
+            <Links class="pb-8 md:pb-0" />
+            <div class="hidden print:block print:absolute bottom-7 right-0 w-full">
                 <a :href="qrCodeLink" title="Link do CV w wersji przeglądarkowej" target="_blink">
                     <QRCode
                         render-as="svg"
@@ -66,7 +69,10 @@ const qrCodeLink = computed(() => {
                         level="L"
                         background="transparent" />
                 </a>
-                <div class="text-center">Wersja online</div>
+                <div class="text-center">CV w wersji online</div>
+            </div>
+            <div class="absolute bottom-1.5 right-0 w-full px-5 text-right md:text-center text-xs">
+                <a :href="sourceCode" target="_blank"><FontAwesomeIcon class="mr-1" :icon="['fab', 'github']"/>Kod źródłowy CV</a>
             </div>
         </div>
     </div>
diff --git a/src/components/Education.vue b/src/components/Body/Education.vue
similarity index 100%
rename from src/components/Education.vue
rename to src/components/Body/Education.vue
diff --git a/src/components/MajorAchivments.vue b/src/components/Body/MajorAchivments.vue
similarity index 100%
rename from src/components/MajorAchivments.vue
rename to src/components/Body/MajorAchivments.vue
diff --git a/src/components/Header.vue b/src/components/Header.vue
index e714998..cb5e18a 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,8 +1,8 @@
 <script setup>
 import { defineProps } from 'vue';
 import { useRoute } from 'vue-router';
-import Mission from '../components/Mission.vue';
-import ContactList from './ContactList.vue';
+import Mission from './Header/Mission.vue';
+import ContactList from './Header/ContactList.vue';
 
 defineProps({
     loading: {
diff --git a/src/components/ContactList.vue b/src/components/Header/ContactList.vue
similarity index 100%
rename from src/components/ContactList.vue
rename to src/components/Header/ContactList.vue
diff --git a/src/components/Mission.vue b/src/components/Header/Mission.vue
similarity index 100%
rename from src/components/Mission.vue
rename to src/components/Header/Mission.vue
diff --git a/src/components/Certificates.vue b/src/components/Side/Certificates.vue
similarity index 100%
rename from src/components/Certificates.vue
rename to src/components/Side/Certificates.vue
diff --git a/src/components/Side/Links.vue b/src/components/Side/Links.vue
new file mode 100644
index 0000000..5e3ac78
--- /dev/null
+++ b/src/components/Side/Links.vue
@@ -0,0 +1,15 @@
+<script setup>
+import links from '../../composables/Links';
+</script>
+
+<template>
+    <div class="px-4 py-3">
+        <h2 class="text-xl text-[#E57D4C] pb-2">Znajdziesz mnie</h2>
+        <ul class="flex flex-col gap-1">
+            <li v-for="link in links" :key="link.slug"><a :href="link.url"
+                    :title="link.title"
+                    target="_blink"
+                ><FontAwesomeIcon class="w-6" :icon="link.faIcon" />{{ link.text }}</a></li>
+        </ul>
+    </div>
+</template>
diff --git a/src/components/Skills.vue b/src/components/Side/Skills.vue
similarity index 97%
rename from src/components/Skills.vue
rename to src/components/Side/Skills.vue
index 416f21a..bb2c000 100644
--- a/src/components/Skills.vue
+++ b/src/components/Side/Skills.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from 'vue';
-import { skills as importSkills, otherSkills as importOtherSkills } from '../composables/Skills.js';
+import { skills as importSkills, otherSkills as importOtherSkills } from '../../composables/Skills.js';
 
 const skills = ref(importSkills);
 const otherSkills = ref(importOtherSkills);
diff --git a/src/components/Links.vue b/src/composables/Links.js
similarity index 56%
rename from src/components/Links.vue
rename to src/composables/Links.js
index 39768ce..7cdc771 100644
--- a/src/components/Links.vue
+++ b/src/composables/Links.js
@@ -1,4 +1,3 @@
-<script setup>
 const links = [
     {
         slug: 'kamilcraft',
@@ -22,16 +21,5 @@ const links = [
         text: '/kamilniemczycki',
     },
 ];
-</script>
 
-<template>
-    <div class="px-4 py-3">
-        <h2 class="text-xl text-[#E57D4C] pb-2">Znajdziesz mnie</h2>
-        <ul class="flex flex-col gap-1">
-            <li v-for="link in links" :key="link.slug"><a :href="link.url"
-                    :title="link.title"
-                    target="_blink"
-                ><FontAwesomeIcon class="w-6" :icon="link.faIcon" />{{ link.text }}</a></li>
-        </ul>
-    </div>
-</template>
\ No newline at end of file
+export default links;
diff --git a/src/composables/Skills.js b/src/composables/Skills.js
index 3205d52..33b54be 100644
--- a/src/composables/Skills.js
+++ b/src/composables/Skills.js
@@ -52,6 +52,9 @@ const skills = [
 const otherSkills = [
     'Composer',
     'GitHub',
+    'VSC',
+    'PhpStorm',
+    'WebStorm',
     'Node.js',
     'NPM',
     'Sqlite',
@@ -59,7 +62,8 @@ const otherSkills = [
     'Docker',
     'WSL',
     'LXC/LXD',
-    'i więcej?',
+    'REST',
+    'i więcej...',
 ];
 
 export {