From 8c6c4a00cc0350cf2f2f0a4c058dff3086df29d1 Mon Sep 17 00:00:00 2001
From: Kevin Thomas <me@kevinthomas.dev>
Date: Tue, 9 Nov 2021 19:14:58 -0800
Subject: [PATCH] Start dockerizing, fix app bar bugs

---
 .dockerignore             |  6 ++++++
 Dockerfile                | 10 ++++++++++
 config/default.json       |  2 +-
 src/components/AppBar.vue |  2 ++
 src/components/appbar.js  |  5 ++++-
 src/router/index.js       |  8 ++++----
 vue.config.js             |  2 +-
 7 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..f10dc7d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+dist
+log
+node_modules
+samples
+sessions
+db.sqlite3
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f9e660d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:14-alpine
+LABEL maintainer="me@kevinthomas.dev"
+WORKDIR /var/noisedash
+COPY package*.json ./
+RUN npm install
+COPY . .
+ENV NODE_ENV production
+RUN npm run build
+EXPOSE 1432
+CMD [ "node", "server/bin/www.js" ]
diff --git a/config/default.json b/config/default.json
index 745e3c3..0545f0d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -1,6 +1,6 @@
 {
   "Server": {
-    "listeningPort": 3000,
+    "listeningPort": 1432,
     "sessionFileStorePath": "sessions",
     "sampleUploadPath": "samples",
     "sessionSecret": "cats",
diff --git a/src/components/AppBar.vue b/src/components/AppBar.vue
index 50c93c7..0df8dbd 100644
--- a/src/components/AppBar.vue
+++ b/src/components/AppBar.vue
@@ -41,6 +41,7 @@
             </v-list-item-title>
           </v-list-item>
           <v-list-item
+            :disabled="!loggedIn"
             @click="logout"
           >
             <v-list-item-icon>
@@ -54,6 +55,7 @@
             <v-switch
               v-model="$vuetify.theme.dark"
               label="Dark Mode"
+              :disabled="!loggedIn"
               @change="toggleDarkMode"
             />
           </v-list-item>
diff --git a/src/components/appbar.js b/src/components/appbar.js
index aa07ee9..188a874 100644
--- a/src/components/appbar.js
+++ b/src/components/appbar.js
@@ -3,7 +3,8 @@ export default {
 
   data: () => ({
     drawyer: false,
-    isAdmin: false
+    isAdmin: false,
+    loggedIn: false
   }),
   methods: {
     home () {
@@ -24,10 +25,12 @@ export default {
         })
     },
     getCurrentUser () {
+      this.loggedIn = false
       this.drawyer = true
       this.$http.get('/users/current')
         .then(response => {
           if (response.status === 200) {
+            this.loggedIn = true
             this.isAdmin = response.data.user.isAdmin
             this.$vuetify.theme.dark = response.data.user.darkMode
           }
diff --git a/src/router/index.js b/src/router/index.js
index 5a2370d..02610fb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,12 +47,12 @@ router.beforeEach((to, from, next) => {
         if (response.status === 200) {
           next()
         } else {
-          next('/login')
+          next('/register')
         }
       })
       .catch((error) => {
         console.error(error.response)
-        next('/login')
+        next('/register')
       })
   } else if (to.name === 'Admin') {
     instance.get('/admin')
@@ -71,14 +71,14 @@ router.beforeEach((to, from, next) => {
     instance.get('/setup')
       .then(response => {
         if (!response.data.setup) {
-          next('/')
+          next('/login')
         } else {
           next()
         }
       })
       .catch((error) => {
         console.error(error.response)
-        next('/')
+        next('/login')
       })
   } else {
     next()
diff --git a/vue.config.js b/vue.config.js
index 0b020c6..861dd31 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,6 +3,6 @@ module.exports = {
     'vuetify'
   ],
   devServer: {
-    proxy: 'http://localhost:3000'
+    proxy: 'http://localhost:1432'
   }
 }