Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Variables #195

Merged
merged 5 commits into from
Oct 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/api/db/models/containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/plugins/vuetify.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function theme() {
},
DigitalOcean: {
theme: {
dark: false,
themes: {
light: {
primary: "#008bcf",
Expand All @@ -47,7 +48,6 @@ function theme() {
foreground: "#1E1E1E"
}
},
dark: false,
options: {
customProperties: true,
}
Expand Down