Merge branch 'up-depends' into github-footer

* installed tailwind

* updated menu - tailwind

* removed old style

* updated container size for navigation

* updated footer style - tailwind

* updated header style - tailwind

* updated colors

* updated about section - tailwind

* updated experiences style - tailwind

* WIP

* improved responsiveness

* updated favorite projects

* updated buttons

* updated projects view

* updated footer style

* updated about view

* updated project view

* updated style for contact form

* updated mail contact

* final style update

* fixed buttons

* fix scroll button

* added autoscroll for contact form

* updated paths in project

* empty line added

* unnecessary comment removed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kamilcraft.com",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -8,27 +8,27 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.1.1",
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-brands-svg-icons": "^6.1.1",
+    "@fortawesome/free-brands-svg-icons": "^6.2.0",
-    "@fortawesome/free-regular-svg-icons": "^6.1.1",
+    "@fortawesome/free-regular-svg-icons": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^6.1.1",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "^3.0.1",
-    "core-js": "^3.8.3",
+    "core-js": "^3.25.0",
-    "marked": "^4.0.18",
+    "marked": "^4.1.0",
-    "vue": "^3.2.37",
+    "vue": "^3.2.38",
     "vue-meta": "^2.4.0",
-    "vue-router": "^4.1.2",
+    "vue-router": "^4.1.5",
     "vuex": "^4.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.16",
+    "@babel/core": "^7.18.13",
-    "@babel/eslint-parser": "^7.12.16",
+    "@babel/eslint-parser": "^7.18.9",
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "autoprefixer": "^10.4.7",
     "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^8.0.3",
+    "eslint-plugin-vue": "^8.7.1",
     "postcss": "^8.4.14",
     "sass": "^1.53.0",
     "sass-loader": "^13.0.2",

src/App.vue

@@ -1,16 +1,16 @@
 <template>
+  <SiteHeader />
   <main
     rel="main"
   >
-    <SiteHeader />
     <RouterView />
-    <FooterComponent />
   </main>
+  <FooterComponent />
 </template>
 
 <script setup>
-import SiteHeader from './components/SiteHeader'
+import SiteHeader from '@/components/SiteHeader'
-import FooterComponent from './components/FooterComponent'
+import FooterComponent from '@/components/FooterComponent'
 </script>
 
 <style lang="scss">

src/components/FooterComponent.vue

@@ -20,8 +20,8 @@
               class="mr-1"
               :icon="['fab', link.icon]"
             />
-            <span class="hidden md:inline-block">{{ link.title }}</span>
+            <span class="hidden lg:inline-block">{{ link.title }}</span>
-            <span class="hidden sm:inline-block md:hidden">{{ link.shortcut }}</span>
+            <span class="hidden sm:inline-block lg:hidden">{{ link.shortcut }}</span>
           </a>
         </li>
       </ul>
@@ -42,6 +42,12 @@ const socialLinks = [
     icon: 'facebook',
     title: 'Znajdź mnie na Facebooku',
     shortcut: 'Facebook'
+  },
+  {
+    link: 'https://github.com/kamilniemczycki/kamilcraft.com',
+    icon: 'github',
+    title: 'Kod na GitHub',
+    shortcut: 'GitHub'
   }
 ]
 </script>

src/components/SelectedProjects.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="max-w-screen-xl mx-auto px-6 xl:px-2 py-10">
+  <section
+    id="projects"
+    class="max-w-screen-xl mx-auto px-6 xl:px-2 py-10"
+  >
     <slot />
     <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-5">
       <div
@@ -49,14 +52,14 @@
         </div>
       </div>
     </div>
-  </div>
+  </section>
 </template>
 
 <script setup>
 import { defineProps, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useStore } from 'vuex'
-import BaseButton from './buttons/BaseButton'
+import BaseButton from '@/components/buttons/BaseButton'
 import { marked } from 'marked'
 
 defineProps({
@@ -89,7 +92,7 @@ function markdownToText (project) {
 </script>
 
 <style lang="scss" scoped>
-@import "scss/media";
+@import 'scss/media';
 
 .grid-project {
   animation: load-project 2s forwards;
@@ -126,6 +129,10 @@ function markdownToText (project) {
 
         .btn {
           display: flex;
+
+          &:hover {
+            background-color: rgba(255, 255, 255, .9);
+          }
         }
       }
     }

src/components/SiteHeader.vue

@@ -27,7 +27,7 @@
 import { computed } from 'vue'
 import { useStore } from 'vuex'
 import { useRoute } from 'vue-router'
-import Navigation from './NavigationHeader'
+import Navigation from '@/components/NavigationHeader'
 
 const store = useStore()
 const route = useRoute()

src/components/buttons/BaseButton.vue

@@ -33,7 +33,7 @@ defineProps({
 </script>
 
 <style lang="scss">
-@import "../../../scss/btn";
+@import 'scss/btn';
 
 .btn {
   @include button($has-icon: true);

src/components/buttons/GhostButton.vue

@@ -25,7 +25,7 @@ defineProps({
 </script>
 
 <style lang="scss" scoped>
-@import "../../../scss/btn";
+@import 'scss/btn';
 
 .btn {
   @include ghost-button();

src/components/sections/AboutSection.vue

@@ -21,7 +21,7 @@
               has-icon
               icon="portrait"
               is-reverse
-              @click="scrollTo('.selected-projects')"
+              @click="scrollTo('#projects')"
             >
               Wybrane projekty
             </BaseButton>
@@ -49,7 +49,7 @@
 </template>
 
 <script setup>
-import BaseButton from '../buttons/BaseButton'
+import BaseButton from '@/components/buttons/BaseButton'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()

src/components/sections/FavoriteProjects.vue

@@ -24,8 +24,8 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import Projects from '../SelectedProjects'
+import Projects from '@/components/SelectedProjects'
-import GhostButton from '../buttons/GhostButton'
+import GhostButton from '@/components/buttons/GhostButton'
 
 const router = useRouter()
 

src/components/sections/contacts/MailContact.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="contact_container w-full bg-neutral-100 rounded-md border border-gray-200 md:max-w-[500px] p-2 shadow">
+  <div
+    id="contact-form"
+    class="contact_container w-full bg-neutral-100 rounded-md border border-gray-200 md:max-w-[500px] p-2 shadow"
+  >
     <header class="mb-1.5">
       <h3 class="text-xl">
         Formularz kontaktowy
@@ -100,7 +103,7 @@
 </template>
 
 <script setup>
-import BaseButton from '../../buttons/BaseButton'
+import BaseButton from '@/components/buttons/BaseButton'
 import { ref, reactive, watch, computed } from 'vue'
 
 function emailValidate (mailObj) {
@@ -204,6 +207,14 @@ function formSubmit(event) {
       buttonDisabled.value = false
     })
   }
+
+  scrollTo('#contact-form')
+}
+
+function scrollTo(id) {
+  document.querySelector(id).scrollIntoView({
+    behavior: 'smooth'
+  })
 }
 </script>
 

src/main.js

@@ -1,7 +1,7 @@
 import { createApp } from 'vue'
-import App from './App.vue'
+import App from '@/App.vue'
-import router from './router'
+import router from '@/router'
-import { store } from './store'
+import { store } from '@/store'
 // import VueMeta from 'vue-meta'
 
 import '../scss/default.scss'

src/router/index.js

@@ -1,10 +1,10 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import Home from '../views/HomeView'
+import Home from '@/views/HomeView'
-import About from '../views/AboutView'
+import About from '@/views/AboutView'
-import Projects from '../views/ProjectsView'
+import Projects from '@/views/ProjectsView'
-import Project from '../views/ProjectView'
+import Project from '@/views/ProjectView'
-import Contact from '../views/ContactView'
+import Contact from '@/views/ContactView'
-import NotFound from '../views/NotFound'
+import NotFound from '@/views/NotFound'
 
 const mainTitle = 'kamilcraft.com'
 
@@ -77,21 +77,6 @@ const router = createRouter({
       return { left: 0, top: 0 }
     }
   }
-  /*scrollBehavior (to, from, savedPosition) {
-    if (savedPosition) {
-      return savedPosition
-    } else if (to.hash) {
-      return new Promise(resolve => {
-        setTimeout(() => {
-          resolve({
-            selector: to.hash
-          }, 1000)
-        })
-      })
-    } else {
-      return { x: 0, y: 0 }
-    }
-  }*/
 })
 
 const title = ' :: ' + mainTitle

src/views/ContactView.vue

@@ -1,9 +1,7 @@
 <template>
-  <section class="px-3 py-6">
+  <section class="flex flex-col px-3 py-6 md:flex-row items-start justify-center mx-auto gap-5">
-    <div class="flex flex-col md:flex-row items-start justify-center mx-auto gap-5">
+    <MailContact />
-      <MailContact />
+    <OtherContact />
-      <OtherContact />
-    </div>
   </section>
 </template>
 
@@ -11,8 +9,8 @@
 import { onMounted } from 'vue'
 import { useRoute } from 'vue-router'
 import { useStore } from 'vuex'
-import MailContact from '../components/sections/contacts/MailContact'
+import MailContact from '@/components/sections/contacts/MailContact'
-import OtherContact from '../components/sections/contacts/OtherContact'
+import OtherContact from '@/components/sections/contacts/OtherContact'
 
 const route = useRoute()
 const store = useStore()

src/views/HomeView.vue

@@ -10,9 +10,9 @@
 import { onMounted, onUnmounted } from 'vue'
 import { useStore } from 'vuex'
 import { useRoute } from 'vue-router'
-import About from '../components/sections/AboutSection'
+import About from '@/components/sections/AboutSection'
-import ExperiencesSection from '../components/sections/ExperiencesSection'
+import ExperiencesSection from '@/components/sections/ExperiencesSection'
-import FavoriteProjects from '../components/sections/FavoriteProjects'
+import FavoriteProjects from '@/components/sections/FavoriteProjects'
 
 const store = useStore()
 const route = useRoute()

src/views/ProjectsView.vue

@@ -28,7 +28,7 @@
 <script setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useStore } from 'vuex'
-import SelectedProjects from '../components/SelectedProjects'
+import SelectedProjects from '@/components/SelectedProjects'
 
 const store = useStore()
 

vue.config.js

@@ -1,6 +1,14 @@
+const path = require("path")
 const { defineConfig } = require('@vue/cli-service')
 
 module.exports = defineConfig({
   publicPath: '/',
-  transpileDependencies: true
+  transpileDependencies: true,
+  configureWebpack: {
+    resolve: {
+      alias: {
+        '@': path.resolve(__dirname, 'src/'),
+      }
+    }
+  },
 })