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

wip #1

Merged
merged 27 commits into from
Nov 11, 2023
Prev Previous commit
Next Next commit
wip
  • Loading branch information
louislam committed Nov 10, 2023
commit 06307956caae07cea9391f5480d771bd80d181be
9 changes: 9 additions & 0 deletions extra/templates/mariadb/compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: "3.8"
services:
mariadb:
image: mariadb:latest
restart: unless-stopped
ports:
- 3306:3306
environment:
- MARIADB_ROOT_PASSWORD=123456
19 changes: 8 additions & 11 deletions frontend/src/components/settings/General.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div v-show="false">
<div>
<form class="my-4" autocomplete="off" @submit.prevent="saveGeneral">
<!-- Client side Timezone -->
<div class="mb-4">
<div v-if="false" class="mb-4">
<label for="timezone" class="form-label">
{{ $t("Display Timezone") }}
</label>
Expand All @@ -21,7 +21,7 @@
</div>

<!-- Server Timezone -->
<div class="mb-4">
<div v-if="false" class="mb-4">
<label for="timezone" class="form-label">
{{ $t("Server Timezone") }}
</label>
Expand Down Expand Up @@ -49,6 +49,9 @@
class="form-control"
placeholder="localhost"
/>
<button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryHostname">
{{ $t("Auto Get") }}
</button>
</div>

<div class="form-text"></div>
Expand Down Expand Up @@ -102,14 +105,8 @@ export default {
this.saveSettings();
},
/** Get the base URL of the application */
autoGetPrimaryBaseURL() {
this.settings.primaryBaseURL = location.protocol + "//" + location.host;
},

testChrome() {
this.$root.getSocket().emit("testChrome", this.settings.chromeExecutable, (res) => {
this.$root.toastRes(res);
});
autoGetPrimaryHostname() {
this.settings.primaryHostname = location.hostname;
},
},
};
Expand Down