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.

Sign up for GitHub

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

Theming #186

Merged
merged 2 commits into from
Oct 20, 2020
Merged

Theming #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7248302
Added console logs
SelfhostedPro Oct 20, 2020
78f7c32
fixed ports not being added if network_mode is set
SelfhostedPro Oct 20, 2020
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
2 changes: 0 additions & 2 deletions backend/api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ def conv2dict(name, value):
# '53/tcp': ('0.0.0.0', 53),
# }
def conv_ports2data(data, network, network_mode):
if network == "host" or network_mode == "host":
return None
ports = {}
for d in data:
cport = d.cport
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/applications/ApplicationDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ export default {
this.readAppStats(appName);
},
readAppLogs(appName) {
console.log("Starting connection to Logs");
var proto = "";
if (location.protocol == "http:") {
proto = "ws://";
Expand All @@ -160,7 +159,6 @@ export default {
// this.connection.close("Leaving page or refreshing", 1001);
},
readAppStats(appName) {
console.log("Starting connection to Stats");
var sproto = "";
if (location.protocol == "http:") {
sproto = "ws://";
Expand Down
26 changes: 12 additions & 14 deletions frontend/src/components/applications/ApplicationsForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
<v-btn
color="secondary"
@click="deployStep -= 1"
class="mx-2 float-right"
class="mx-2 float-right primary--text"
>
Back
</v-btn>
Expand Down Expand Up @@ -337,7 +337,7 @@
<v-btn
color="secondary"
@click="deployStep -= 1"
class="mx-2 float-right"
class="mx-2 float-right primary--text"
>
Back
</v-btn>
Expand Down Expand Up @@ -423,29 +423,29 @@
<v-btn
color="secondary"
@click="deployStep -= 1"
class="mx-2 float-right"
class="mx-2 float-right primary--text"
>
Back
</v-btn>
</ValidationObserver>
</v-stepper-content>
</v-stepper-items>
</v-stepper>
<v-card color="secondary" class="mt-5">
<v-card color="primary" class="mt-5">
<v-card-title>
Advanced
</v-card-title>
<v-expansion-panels flat accordion multiple focusable>
<v-expansion-panel>
<v-expansion-panel-header color="#303030">
<v-expansion-panel-header color="secondary">
<v-row no-gutters>
<v-col cols="2">Devices</v-col>
<v-col cols="4" class="text--secondary">
(Passthrough Devices)
</v-col>
</v-row>
</v-expansion-panel-header>
<v-expansion-panel-content color="#303030">
<v-expansion-panel-content color="secondary">
<form>
<transition-group
name="slide"
Expand Down Expand Up @@ -505,15 +505,15 @@
</v-expansion-panel-content>
</v-expansion-panel>
<v-expansion-panel>
<v-expansion-panel-header color="#303030">
<v-expansion-panel-header color="secondary">
<v-row no-gutters>
<v-col cols="2">Labels</v-col>
<v-col cols="4" class="text--secondary">
(Container Labels)
</v-col>
</v-row>
</v-expansion-panel-header>
<v-expansion-panel-content color="#303030">
<v-expansion-panel-content color="secondary">
<form>
<transition-group
name="slide"
Expand Down Expand Up @@ -572,13 +572,13 @@
</v-expansion-panel-content>
</v-expansion-panel>
<v-expansion-panel>
<v-expansion-panel-header color="#303030">
<v-expansion-panel-header color="secondary">
<v-row no-gutters>
<v-col cols="2">Sysctls</v-col>
<v-col cols="4" class="text--secondary"> (Kernel Options) </v-col>
</v-row>
</v-expansion-panel-header>
<v-expansion-panel-content color="#303030">
<v-expansion-panel-content color="secondary">
<form>
<transition-group
name="slide"
Expand Down Expand Up @@ -638,15 +638,15 @@
</v-expansion-panel-content>
</v-expansion-panel>
<v-expansion-panel>
<v-expansion-panel-header color="#303030">
<v-expansion-panel-header color="secondary">
<v-row no-gutters>
<v-col cols="2">Capabilities</v-col>
<v-col cols="4" class="text--secondary">
(Special Permissions/Capabilities)
</v-col>
</v-row></v-expansion-panel-header
>
<v-expansion-panel-content color="#303030">
<v-expansion-panel-content color="secondary">
<form>
<v-select
v-model="form['cap_add']"
Expand Down Expand Up @@ -831,8 +831,6 @@ export default {
console.error(error, error.response);
this.setErr(error);
}
} else {
console.log("No app selected");
}
}
},
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/resources/images/ImageDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ export default {
created() {
const imageid = this.$route.params.imageid;
this.readImage(imageid);
console.log(this.image);
}
};
</script>
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/resources/images/ImageList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ export default {
},
submit() {
const data = this.form;
console.log("methods");
console.log(data);
this.writeImage(data);
}
},
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/resources/volumes/VolumeList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,6 @@ export default {
},
submit() {
const data = this.form;
console.log("methods");
console.log(data);
this.writeVolume(data);
}
},
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/components/serverSettings/Prune.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,8 @@ export default {
responseType: "text/json"
})
.then(response => {
console.log(response.data);
let action = Object.keys(response.data)[0];
console.log(action);
if (response.data[action] != null) {
console.log(response.data[action].length);
var deletedNumber = response.data[action].length;
} else {
deletedNumber = "0";
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/serverSettings/ServerUpdate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export default {
})
.then(response => {
this.isLoading = false;
console.log(response);
this.updatable = response.data;
})
.catch(err => {
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/components/serverSettings/Theme.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ export default {
}
},
methods: {
backgroundColor(dark) {
console.log(dark);
},
setTheme(){
console.log(this.$vuetify.theme.themes)
localStorage.setItem("dark_theme", this.$vuetify.theme.dark.toString());
localStorage.setItem("theme", JSON.stringify(this.$vuetify.theme.themes))
},
Expand Down
1 change: 0 additions & 1 deletion frontend/src/store/modules/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ const actions = {
commit("setAction", "");
});
},

readApp({ commit }, Name) {
const url = `/api/apps/${Name}`;
commit("setLoading", true);
Expand Down
15 changes: 0 additions & 15 deletions frontend/src/store/modules/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,6 @@ const actions = {
});
});
},
// [AUTH_REFRESH]: ({ commit }) => {
// return new Promise((resolve) => {
// commit(AUTH_REQUEST);
// const url = "/api/auth/refresh";
// axios
// .post(url, {}, { xsrfCookieName: "csrf_refresh_token", xsrfHeaderName: "X-CSRF-TOKEN", withCredentials: true })
// .then((resp) => {
// resolve(resp);
// })
// .catch((error) => {
// console.log(error);
// commit(AUTH_CLEAR);
// });
// });
// },
[AUTH_CHANGE_PASS]: ({ commit }, credentials) => {
return new Promise((resolve, reject) => {
commit(AUTH_REQUEST);
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/store/modules/images.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ const actions = {
writeImage({ commit }, payload) {
commit("setLoading", true);
const url = "/api/resources/images/";
console.log("store");
console.log(payload);
axios
.post(url, payload)
.then(response => {
Expand All @@ -92,7 +90,6 @@ const actions = {
.get(url)
.then(response => {
const image = response.data;
console.log(response.data);
commit("setImage", image);
})
.catch(err => {
Expand Down
1 change: 0 additions & 1 deletion frontend/src/store/modules/networks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ const actions = {
.get(url)
.then(response => {
const network = response.data;
console.log(network);
commit("setNetwork", network);
})
.catch(err => {
Expand Down
1 change: 0 additions & 1 deletion frontend/src/store/modules/snackbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const state = {

const mutations = {
setErr(state, err) {
console.log(err);
state.content = err.response.statusText + ": " + err.response.data.detail;
state.bottom = true;
state.btnColor = "white";
Expand Down
14 changes: 0 additions & 14 deletions frontend/src/store/modules/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,6 @@ const actions = {
});
});
},
// readApp({ commit }, id) {
// commit("setLoading", true);
// const url = `/api/templates/app/${id}`;
// axios
// .get(url)
// .then((response) => {
// const app = response.data;
// console.log(response)
// commit("setApp", app);
// })
// .finally(() => {
// commit("setLoading", false);
// });
// },
readTemplateVariables({ commit }) {
commit("setLoading", true);
const url = "/api/settings/variables";
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/store/modules/volumes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ const actions = {
.get(url)
.then(response => {
const volume = response.data;
console.log(volume);
commit("setVolume", volume);
})
.catch(err => {
Expand All @@ -91,8 +90,6 @@ const actions = {
writeVolume({ commit }, payload) {
commit("setLoading", true);
const url = "/api/resources/volumes/";
console.log("store");
console.log(payload);
axios
.post(url, payload)
.then(response => {
Expand All @@ -114,7 +111,6 @@ const actions = {
.get(url)
.then(response => {
const volume = response.data;
console.log(response.data);
commit("setVolume", volume);
})
.catch(err => {
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/views/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export default {
},
methods: {
readAppStats() {
console.log("Starting connection to Websocket");
let url = "/api/users/me";
axios.get(url, { withCredentials: true }).catch(err => {
localStorage.removeItem("username");
Expand All @@ -95,7 +94,6 @@ export default {
} else {
proto = "wss://";
}
console.log(location.protocol);
this.statConnection = new WebSocket(
`${proto}${location.hostname}:${location.port}/api/apps/stats`
);
Expand Down Expand Up @@ -130,7 +128,6 @@ export default {
};
},
refresh() {
console.log(this.stats);
this.closeStats();
this.readAppStats();
},
Expand Down