j3d1/toolshed
1
0
Fork 0
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity

feat: Implement WebcamFileSource for life webcam capture #12

Open
busti wants to merge 51 commits from busti/proto/frontend into jedi/proto/frontend
pull from: busti/proto/frontend
merge into: j3d1:jedi/proto/frontend
Conversation 0 Commits 51 Files changed 122 +3 -9
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 49a063f2a7 - Show all commits

2
frontend/src/router.js
View file

@ -34,7 +34,7 @@ const router = createRouter({
routes, // short for `routes: routes` routes, // short for `routes: routes`
}) })
router.beforeEach((to, from) => { router.beforeEach((to/*, from*/) => {
// instead of having to check every route record with // instead of having to check every route record with
// to.matched.some(record => record.meta.requiresAuth) // to.matched.some(record => record.meta.requiresAuth)
if (to.meta.requiresAuth && !store.getters.isLoggedIn) { if (to.meta.requiresAuth && !store.getters.isLoggedIn) {

10
frontend/src/store.js
View file

@ -102,16 +102,10 @@ export default createStore({
body: JSON.stringify({username: username, password: password}), body: JSON.stringify({username: username, password: password}),
credentials: 'omit' credentials: 'omit'
}).then(r => r.json()) }).then(r => r.json())
if (data.token) { if (data.token && data.key) {
commit('setToken', data.token); commit('setToken', data.token);
commit('setUser', username); commit('setUser', username);
const j = await fetch('/auth/keys/', { commit('setKey', data.key);
method: 'GET',
headers: {'Authorization': 'Token ' + data.token},
credentials: 'omit'
}).then(r => r.json())
const k = j.key
commit('setKey', k)
const s = await dispatch('lookupServer', {username}).then(servers => new ServerSet(servers, state.unreachable_neighbors)) const s = await dispatch('lookupServer', {username}).then(servers => new ServerSet(servers, state.unreachable_neighbors))
commit('setHomeServers', s) commit('setHomeServers', s)
return true; return true;