Merge pull request #195 from SelfhostedPro/variables

Variables
SelfhostedPro · Oct 22, 2020 · 3cbfb45 · 3cbfb45
2 parents 6525b41 + e344ebd
commit 3cbfb45
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
 # Build Vue
 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
@@ -11,7 +13,6 @@ FROM lsiobase/alpine:3.12 as deploy-stage
 # MAINTANER Your Name "[email protected]"
 
 # Set Variables
-ENV FLASK_CONFIG=production
 ENV PYTHONIOENCODING=UTF-8
 
 WORKDIR /api

diff --git a/README.md b/README.md
@@ -15,9 +15,9 @@ Currently only linux has been verified as working but we are open to the idea of
 
 **Keep in mind, this is an alpha so the risk of data loss is real and it may not be stable**
 
-Installation documentation can be found [here](https://ycht.tech/Installation/yacht/).
+Installation documentation can be found [here](https://yacht.sh/Installation/yacht/).
 
-Check out the getting started guide if this is the first time you've used Yacht: https://ycht.tech/Installation/gettingstarted/
+Check out the getting started guide if this is the first time you've used Yacht: https://yacht.sh/Installation/gettingstarted/
 
 ## Features So Far:
 * Vuetify UI Framework

diff --git a/backend/api/db/models/containers.py b/backend/api/db/models/containers.py
@@ -78,4 +78,4 @@ class TemplateVariables(Base):
     variable = Column(String(255),
                       nullable=False, unique=True, index=True)
     replacement = Column(String(255),
-                         nullable=False, unique=True, index=True)
+                         nullable=False, unique=False, index=True)
diff --git 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
@@ -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
@@ -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,
         }