From 2a297e1dca78808353702aa9134358a408f2eca2 Mon Sep 17 00:00:00 2001
From: Ayush Mukherjee <me@ayushm.com>
Date: Thu, 27 May 2021 21:11:40 +0530
Subject: [PATCH] part 3

---
 package-lock.json   | 14 +++++++-------
 package.json        |  7 ++++---
 src/App.vue         |  6 +++---
 src/router/index.js |  2 +-
 src/views/Home.vue  |  2 +-
 vite.config.js      |  1 +
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14054d1..a220f0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "axios": "^0.19.2",
         "core-js": "^3.6.5",
         "vue": "^2.6.11",
-        "vue-router": "^3.2.0"
+        "vue-router": "^3.5.1"
       },
       "devDependencies": {
         "sass": "^1.26.5",
@@ -2465,9 +2465,9 @@
       "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
     },
     "node_modules/vue-router": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
+      "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw=="
     },
     "node_modules/vue-template-compiler": {
       "version": "2.6.11",
@@ -4562,9 +4562,9 @@
       "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
     },
     "vue-router": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
+      "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw=="
     },
     "vue-template-compiler": {
       "version": "2.6.11",
diff --git a/package.json b/package.json
index 329a613..51dc681 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "dev": "vite",
+    "build": "vite build",
+    "serve": "vite preview"
   },
   "dependencies": {
     "axios": "^0.19.2",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
-    "vue-router": "^3.2.0"
+    "vue-router": "^3.5.1"
   },
   "devDependencies": {
     "sass": "^1.26.5",
diff --git a/src/App.vue b/src/App.vue
index b50eff9..9d1b5b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import Header from '@/components/Header'
-import Footer from '@/components/Footer'
+import Header from '@/components/Header.vue'
+import Footer from '@/components/Footer.vue'
 
 export default {
   name: 'App',
@@ -21,4 +21,4 @@ export default {
 
 <style lang="scss">
 @import 'scss/main';
-</style>
\ No newline at end of file
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 650f97a..96bd7ac 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,7 @@ Vue.use(VueRouter)
 
 const router = new VueRouter({
   mode: 'history',
-  base: process.env.BASE_URL,
+  base: '/',
   routes,
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index d91e57e..4ab96d4 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -182,7 +182,7 @@ export default {
     	    }
 	      }, {
     	    headers: {
-	          'Cockpit-Token': process.env.VUE_APP_CMS_TOKEN
+	          'Cockpit-Token': import.meta.VITE_APP_CMS_TOKEN
         	}
     	  })
 	      .then(() => {
diff --git a/vite.config.js b/vite.config.js
index 3bf8c86..6d01a16 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,5 +1,6 @@
 import { defineConfig } from 'vite'
 import { createVuePlugin } from 'vite-plugin-vue2'
+import path from 'path'
 
 export default defineConfig({
   plugins: [