mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-12 16:44:12 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1524 from chakflying/fix/disable-auth-icon

Browse source 
Fix: Handle disabled auth in user dropdown
This commit is contained in:
Louis Lam 2022-04-20 23:50:33 +08:00 committed by GitHub
parent 06f326e49e 07c0801ad5
commit 4e28ad4ac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings/Security.vue
View file

@ -321,6 +321,8 @@ export default {
// Set it to empty if done // Set it to empty if done
this.saveSettings(() => { this.saveSettings(() => {
this.password.currentPassword = ""; this.password.currentPassword = "";
this.$root.username = null;
this.$root.socket.token = "autoLogin";
}, this.password.currentPassword); }, this.password.currentPassword);
}, },

2
src/languages/en.js
View file

@ -462,4 +462,6 @@ export default {
"Footer Text": "Footer Text", "Footer Text": "Footer Text",
"Show Powered By": "Show Powered By", "Show Powered By": "Show Powered By",
"Domain Names": "Domain Names", "Domain Names": "Domain Names",
signedInDisp: "Signed in as {0}",
signedInDispDisabled: "Auth Disabled.",
}; };

13
src/layouts/Layout.vue
View file

@ -38,14 +38,19 @@
<font-awesome-icon icon="angle-down" /> <font-awesome-icon icon="angle-down" />
</div> </div>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><span class="dropdown-item-text">Signed in as <strong>{{ $root.username }}</strong></span></li> <li>
<i18n-t v-if="$root.username != null" tag="span" keypath="signedInDisp" class="dropdown-item-text">
<strong>{{ $root.username }}</strong>
</i18n-t>
<span v-if="$root.username == null" class="dropdown-item-text">{{ $t("signedInDispDisabled") }}</span>
</li>
<li><hr class="dropdown-divider"></li> <li><hr class="dropdown-divider"></li>
<li> <li>
<router-link to="/settings" class="dropdown-item" :class="{ active: $route.path.includes('settings') }"> <router-link to="/settings" class="dropdown-item" :class="{ active: $route.path.includes('settings') }">
<font-awesome-icon icon="cog" /> {{ $t("Settings") }} <font-awesome-icon icon="cog" /> {{ $t("Settings") }}
</router-link> </router-link>
</li> </li>
<li v-if="$root.loggedIn && $root.storage().token !== 'autoLogin'"> <li v-if="$root.loggedIn && $root.socket.token !== 'autoLogin'">
<button class="dropdown-item" @click="$root.logout"> <button class="dropdown-item" @click="$root.logout">
<font-awesome-icon icon="sign-out-alt" /> <font-awesome-icon icon="sign-out-alt" />
{{ $t("Logout") }} {{ $t("Logout") }}
@ -230,8 +235,10 @@ main {
.dropdown-menu { .dropdown-menu {
transition: all 0.2s; transition: all 0.2s;
padding-left: 0; padding-left: 0;
padding-bottom: 0;
margin-top: 8px !important; margin-top: 8px !important;
border-radius: 20px; border-radius: 16px;
overflow: hidden;
.dropdown-divider { .dropdown-divider {
margin: 0; margin: 0;

2
src/mixins/socket.js
View file

@ -103,8 +103,8 @@ export default {
socket.on("autoLogin", (monitorID, data) => { socket.on("autoLogin", (monitorID, data) => {
this.loggedIn = true; this.loggedIn = true;
this.username = "No Auth";
this.storage().token = "autoLogin"; this.storage().token = "autoLogin";
this.socket.token = "autoLogin";
this.allowLoginDialog = false; this.allowLoginDialog = false;
}); });

2
src/pages/Settings.vue
View file

@ -18,7 +18,7 @@
</router-link> </router-link>
<!-- Logout Button --> <!-- Logout Button -->
<a v-if="$root.isMobile && $root.loggedIn && $root.storage().token !== 'autoLogin'" class="logout" @click.prevent="$root.logout"> <a v-if="$root.isMobile && $root.loggedIn && $root.socket.token !== 'autoLogin'" class="logout" @click.prevent="$root.logout">
<div class="menu-item"> <div class="menu-item">
<font-awesome-icon icon="sign-out-alt" /> <font-awesome-icon icon="sign-out-alt" />
{{ $t("Logout") }} {{ $t("Logout") }}