diff options
| author | Henry Jameson <me@hjkos.com> | 2022-07-31 12:35:48 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-07-31 12:35:48 +0300 |
| commit | fddb531ed20b31c44e6911418e7bbb884836c40a (patch) | |
| tree | 37a8f9aea2002e893d605d64f8941ff1520059b6 /src/boot | |
| parent | 0cbfcb99a9ffaf771adbe37320bba157019f65ff (diff) | |
--fix
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/after_store.js | 4 | ||||
| -rw-r--r-- | src/boot/routes.js | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 894a68e1..23b68e83 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -156,7 +156,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { copyInstanceOption('hideSitename') copyInstanceOption('sidebarRight') - return store.dispatch('setTheme', config['theme']) + return store.dispatch('setTheme', config.theme) } const getTOS = async ({ store }) => { @@ -197,7 +197,7 @@ const getStickers = async ({ store }) => { const stickers = (await Promise.all( Object.entries(values).map(async ([name, path]) => { const resPack = await window.fetch(path + 'pack.json') - var meta = {} + let meta = {} if (resPack.ok) { meta = await resPack.json() } diff --git a/src/boot/routes.js b/src/boot/routes.js index 726476a8..c8194d5f 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -31,7 +31,8 @@ export default (store) => { } let routes = [ - { name: 'root', + { + name: 'root', path: '/', redirect: _to => { return (store.state.users.currentUser @@ -45,12 +46,14 @@ export default (store) => { { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline }, { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline }, { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, - { name: 'remote-user-profile-acct', + { + name: 'remote-user-profile-acct', path: '/remote-users/:_(@)?:username([^/@]+)@:hostname([^/@]+)', component: RemoteUserResolver, beforeEnter: validateAuthenticatedRoute }, - { name: 'remote-user-profile', + { + name: 'remote-user-profile', path: '/remote-users/:hostname/:username', component: RemoteUserResolver, beforeEnter: validateAuthenticatedRoute |