From a0ab6f7f2b0ac08167ae0504a95240db70cd938f Mon Sep 17 00:00:00 2001
From: SelfhostedPro <info@selfhosted.pro>
Date: Thu, 22 Oct 2020 09:26:48 -0700
Subject: [PATCH] fixed default theming

---
 Dockerfile                      | 3 ++-
 backend/requirements.txt        | 4 ++--
 frontend/src/App.vue            | 2 +-
 frontend/src/plugins/vuetify.js | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7afca641..eec2392b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Build Vue
-ARG VUE_APP_THEME=Default
 FROM node:14.5.0-alpine as build-stage
+ARG VUE_APP_THEME=Default
+ENV VUE_APP_THEME=${VUE_APP_THEME}
 WORKDIR /app
 COPY ./frontend/package*.json ./
 RUN npm install
diff --git a/backend/requirements.txt b/backend/requirements.txt
index a6437f01..1c3b4585 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -11,14 +11,14 @@ dnspython==2.0.0
 docker==4.3.0
 email-validator==1.1.1
 fastapi==0.60.2
-fastapi-users==3.0.3
+fastapi-users==3.0.6
 gunicorn==20.0.4
 h11==0.9.0
 httptools==0.1.1
 idna==2.10
 python-jose==3.2.0
 makefun==1.9.2
-passlib==1.7.3
+passlib==1.7.4
 pycparser==2.20
 pydantic==1.6.1
 PyJWT==1.7.1
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 2ae6fc80..efd68c93 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -72,7 +72,7 @@ export default {
 
     if (dark_theme == "false") {
       this.$vuetify.theme.dark = false;
-    } else {
+    } else if (dark_theme == "true"){
       this.$vuetify.theme.dark = true;
     }
     if (theme) {
diff --git a/frontend/src/plugins/vuetify.js b/frontend/src/plugins/vuetify.js
index 84e8c084..f298df83 100644
--- a/frontend/src/plugins/vuetify.js
+++ b/frontend/src/plugins/vuetify.js
@@ -31,6 +31,7 @@ function theme() {
     },
     DigitalOcean: {
       theme: {
+        dark: false,
         themes: {
           light: {
             primary: "#008bcf",
@@ -47,7 +48,6 @@ function theme() {
             foreground: "#1E1E1E"
           }
         },
-        dark: false,
         options: {
           customProperties: true,
         }