Skip to content

Commit

Permalink
Merge branch 'master' into bug/deduplicate-only-signal-instances-with…
Browse files Browse the repository at this point in the history
…-cases
  • Loading branch information
metroid-samus authored Nov 27, 2023
2 parents 33e6388 + e858e78 commit 3635fc5
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 78 deletions.
6 changes: 3 additions & 3 deletions requirements-base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aiocache==0.12.2
# via -r requirements-base.in
aiofiles==23.2.1
# via -r requirements-base.in
aiohttp==3.9.0
aiohttp==3.9.1
# via -r requirements-base.in
aiosignal==1.3.1
# via aiohttp
Expand Down Expand Up @@ -381,7 +381,7 @@ scipy==1.11.2
# via statsmodels
sentry-asgi==0.2.0
# via -r requirements-base.in
sentry-sdk==1.37.0
sentry-sdk==1.37.1
# via
# -r requirements-base.in
# sentry-asgi
Expand All @@ -401,7 +401,7 @@ six==1.16.0
# python-dateutil
# sqlalchemy-filters
# validators
slack-bolt==1.18.0
slack-bolt==1.18.1
# via -r requirements-base.in
slack-sdk==3.26.0
# via
Expand Down
138 changes: 69 additions & 69 deletions src/dispatch/static/dispatch/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions src/dispatch/static/dispatch/src/components/AppToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@
<v-spacer />
<v-toolbar-items>
<v-btn icon variant="text" @click="toggleDarkTheme">
<v-icon
:icon="
$vuetify.theme.current.dark ? 'mdi-white-balance-sunny' : 'mdi-moon-waxing-crescent'
"
/>
<v-icon :icon="dark_theme ? 'mdi-white-balance-sunny' : 'mdi-moon-waxing-crescent'" />
<v-tooltip activator="parent" location="bottom">
Dark Mode {{ $vuetify.theme.current.dark ? "Off" : "On" }}
Dark Mode {{ dark_theme ? "Off" : "On" }}
</v-tooltip>
</v-btn>
<v-btn icon variant="text">
Expand Down Expand Up @@ -158,6 +154,7 @@ export default {
data: () => ({
organizations: [],
query: "",
dark_theme: false,
}),
setup() {
return { formatHash }
Expand Down Expand Up @@ -205,6 +202,7 @@ export default {
toggleDarkTheme() {
this.$vuetify.theme.global.name = this.$vuetify.theme.global.current.dark ? "light" : "dark"
localStorage.setItem("dark_theme", this.$vuetify.theme.global.current.dark.toString())
this.dark_theme = !this.dark_theme
},
switchOrganizations(slug) {
this.$router.push({ params: { organization: slug } }).then(() => {
Expand Down Expand Up @@ -233,8 +231,12 @@ export default {
let theme = localStorage.getItem("dark_theme")
if (theme) {
if (theme === "true") {
this.dark_theme = true
if (this.$vuetify.theme.global) this.$vuetify.theme.global.name = "dark"
this.$vuetify.theme.dark = true
} else {
this.dark_theme = false
if (this.$vuetify.theme.global) this.$vuetify.theme.global.name = "light"
this.$vuetify.theme.dark = false
}
}
Expand Down

0 comments on commit 3635fc5

Please sign in to comment.