-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from G4brym/open-app-on-last-tab
Fix PWA refresh issues and reopen the app on the last opened tab
- Loading branch information
Showing
10 changed files
with
142 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| import { createStore } from "vuex"; | ||
| import axios from "axios"; | ||
| import repo from "@/api"; | ||
| import router from "@/router"; | ||
| import { createStore } from 'vuex' | ||
| import axios from 'axios' | ||
| import repo from '@/api' | ||
| import router from '@/router' | ||
|
|
||
| export default createStore({ | ||
| state: { | ||
| user: { | ||
| username: "[email protected]" | ||
| username: '[email protected]' | ||
| }, | ||
| config: {}, | ||
| activeBucket: null, | ||
| currentFolder: "", | ||
| currentFolder: '', | ||
| files: [], | ||
| folders: [], | ||
| buckets: [], | ||
|
|
@@ -20,164 +20,181 @@ export default createStore({ | |
| mobileSidebar: false, | ||
| serverVersion: null, | ||
| serverVersionInt: 0, | ||
| activeTab: "storage", | ||
| activeTab: 'storage', | ||
| serverUrl: null, | ||
| loginMethod: null, | ||
| loginMethod: null | ||
| }, | ||
| getters: {}, | ||
| mutations: { | ||
| setServerUrl(state, serverUrl) { | ||
| state.serverUrl = serverUrl; | ||
| setServerUrl (state, serverUrl) { | ||
| state.serverUrl = serverUrl | ||
| }, | ||
| loadObjects(state, payload) { | ||
| state.files = payload.files; | ||
| state.folders = payload.folders; | ||
| loadObjects (state, payload) { | ||
| state.files = payload.files | ||
| state.folders = payload.folders | ||
| }, | ||
| toggleMobileSidebar(state, payload) { | ||
| toggleMobileSidebar (state, payload) { | ||
| if (payload !== true && payload !== false) { | ||
| state.mobileSidebar = !state.mobileSidebar; | ||
| state.mobileSidebar = !state.mobileSidebar | ||
| } else { | ||
| state.mobileSidebar = payload; | ||
| state.mobileSidebar = payload | ||
| } | ||
| }, | ||
| changeBucket(state, payload) { | ||
| state.activeBucket = payload; | ||
| if (this.state.activeTab === "email") { | ||
| state.currentFolder = "inbox"; | ||
| changeBucket (state, payload) { | ||
| state.activeBucket = payload | ||
| if (this.state.activeTab === 'email') { | ||
| state.currentFolder = 'inbox' | ||
| } else { | ||
| state.currentFolder = ""; | ||
| state.currentFolder = '' | ||
| } | ||
| }, | ||
| changeTab(state, payload) { | ||
| changeTab (state, payload) { | ||
| if (payload === state.activeTab) { | ||
| return; | ||
| return | ||
| } | ||
|
|
||
| state.activeTab = payload; | ||
| state.currentFolder = ""; | ||
| state.activeTab = payload | ||
| state.currentFolder = '' | ||
|
|
||
| // state.files = [] | ||
| // state.folders = [] | ||
| }, | ||
| goTo(state, folder) { | ||
| state.currentFolder = folder; | ||
| goTo (state, folder) { | ||
| state.currentFolder = folder | ||
| }, | ||
| loadUserDisks(state, data) { | ||
| state.buckets = data.buckets; | ||
| loadUserDisks (state, data) { | ||
| state.buckets = data.buckets | ||
|
|
||
| if ((state.activeBucket === null && data.buckets.length > 0) || router.currentRoute.value.href.startsWith('/auth')) { | ||
| const targetView = (location.pathname.startsWith('/email')) ? 'email-home' : 'storage-home' | ||
|
|
||
| router.push({ name: targetView, params: { bucket: data.buckets[0].name } }); | ||
| const lastOpenTab = localStorage.getItem('lastOpenTab') | ||
| if (lastOpenTab && location.pathname === '/') { | ||
| router.push(JSON.parse(lastOpenTab)) | ||
| return | ||
| } | ||
|
|
||
| router.push({ name: targetView, params: { bucket: data.buckets[0].name } }) | ||
| } | ||
| }, | ||
| loadServerConfigs(state, data) { | ||
| state.user = data.user; | ||
| state.config = data.config; | ||
| state.serverVersion = data.version; | ||
| state.serverVersionInt = parseInt(data.version.replace("v", "").replaceAll(".", "")); | ||
| loadServerConfigs (state, data) { | ||
| state.user = data.user | ||
| state.config = data.config | ||
| state.serverVersion = data.version | ||
| state.serverVersionInt = parseInt(data.version.replace('v', '').replaceAll('.', '')) | ||
| }, | ||
| changeToastMessage(state, { message, spin }) { | ||
| state.toastMessage = message; | ||
| state.toastSpin = spin || false; | ||
| changeToastMessage (state, { message, spin }) { | ||
| state.toastMessage = message | ||
| state.toastSpin = spin || false | ||
| }, | ||
| addUploadingFiles(state, filenames) { | ||
| addUploadingFiles (state, filenames) { | ||
| for (const filename of filenames) { | ||
| state.uploadingFiles[filename] = {}; | ||
| state.uploadingFiles[filename] = {} | ||
| } | ||
| }, | ||
| clearUploadingFiles(state) { | ||
| state.uploadingFiles = {}; | ||
| clearUploadingFiles (state) { | ||
| state.uploadingFiles = {} | ||
| }, | ||
| setUploadProgress(state, { filename, progress }) { | ||
| setUploadProgress (state, { filename, progress }) { | ||
| if (state.uploadingFiles[filename] === undefined) { | ||
| return; | ||
| return | ||
| } | ||
|
|
||
| state.uploadingFiles[filename].progress = Math.ceil(progress); | ||
| state.uploadingFiles[filename].progress = Math.ceil(progress) | ||
| } | ||
| }, | ||
| actions: { | ||
| makeToast(context, { message, timeout, spin }) { | ||
| context.commit("changeToastMessage", { | ||
| makeToast (context, { message, timeout, spin }) { | ||
| context.commit('changeToastMessage', { | ||
| message, spin | ||
| }); | ||
| }) | ||
|
|
||
| if (timeout !== null && timeout !== undefined) { | ||
| setTimeout(() => { | ||
| context.commit("changeToastMessage", { | ||
| context.commit('changeToastMessage', { | ||
| message: null, spin: false | ||
| }); | ||
| }, timeout); | ||
| }) | ||
| }, timeout) | ||
| } | ||
| }, | ||
| async navigate(context, folder) { | ||
| if (folder === "/") { | ||
| folder = ""; | ||
| async navigate (context, folder) { | ||
| if (folder === '/') { | ||
| folder = '' | ||
| } | ||
| context.commit("goTo", folder); | ||
| await context.dispatch("refreshObjects"); | ||
| context.commit('goTo', folder) | ||
| await context.dispatch('refreshObjects') | ||
| }, | ||
| navigateToHash(context, folder) { | ||
| folder = decodeURIComponent(escape(atob(folder))); | ||
| context.dispatch("navigate", folder); | ||
| navigateToHash (context, folder) { | ||
| folder = decodeURIComponent(escape(atob(folder))) | ||
| context.dispatch('navigate', folder) | ||
| }, | ||
| addUploadingFiles(context, filenames) { | ||
| context.commit("addUploadingFiles", filenames); | ||
| addUploadingFiles (context, filenames) { | ||
| context.commit('addUploadingFiles', filenames) | ||
| }, | ||
| clearUploadingFiles(context, filenames) { | ||
| context.commit("clearUploadingFiles"); | ||
| clearUploadingFiles (context, filenames) { | ||
| context.commit('clearUploadingFiles') | ||
| }, | ||
| setUploadProgress(context, { filename, progress }) { | ||
| context.commit("setUploadProgress", { filename, progress }); | ||
| setUploadProgress (context, { filename, progress }) { | ||
| context.commit('setUploadProgress', { filename, progress }) | ||
| }, | ||
| loadUserDisks({ commit }) { | ||
| axios.get("/api/buckets").then((response) => { | ||
| commit("loadUserDisks", response.data); | ||
| }); | ||
| loadUserDisks ({ commit }) { | ||
| axios.get('/api/buckets').then((response) => { | ||
| commit('loadUserDisks', response.data) | ||
| }) | ||
| }, | ||
| async tryLogin(context, data) { | ||
| async tryLogin (context, data) { | ||
| const token = 'Basic ' + btoa(data.username + ':' + data.password) | ||
| let result | ||
|
|
||
| try { | ||
| result = await axios.get('/api/server/config', { | ||
| headers: { | ||
| Authorization: token | ||
| }, | ||
| validateStatus: function (status) { | ||
| return status >= 200 && status < 300 | ||
| } | ||
| }) | ||
| } catch (e) {} | ||
| } catch (e) { | ||
| console.log(e) | ||
| if (e.response.status === 302) { | ||
| const nextUrl = e.response.headers.Location | ||
| if (nextUrl) { | ||
| window.location.replace(nextUrl) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (result?.status === 200) { | ||
| axios.defaults.headers.common.Authorization = token | ||
| localStorage.setItem('basicAuth', token) | ||
|
|
||
| context.state.loginMethod = "basic" | ||
| context.commit("loadServerConfigs", result.data); | ||
| context.state.loginMethod = 'basic' | ||
| context.commit('loadServerConfigs', result.data) | ||
| context.dispatch('loadUserDisks') | ||
| } else { | ||
| return 'Invalid username or password' | ||
| } | ||
| }, | ||
| async checkBasicAuthStorage(context) { | ||
| async checkBasicAuthStorage (context) { | ||
| const token = localStorage.getItem('basicAuth') | ||
| if (token) { | ||
| axios.defaults.headers.common.Authorization = token | ||
| context.state.loginMethod = "basic" | ||
| context.state.loginMethod = 'basic' | ||
| } | ||
| }, | ||
| loadServerConfigs({ commit }) { | ||
| axios.get("/api/server/config").then((response) => { | ||
| commit("loadServerConfigs", response.data); | ||
| }).catch(function(error) { | ||
| loadServerConfigs ({ commit }) { | ||
| axios.get('/api/server/config').then((response) => { | ||
| commit('loadServerConfigs', response.data) | ||
| }).catch(function (error) { | ||
| if (error.response?.status === 401) { | ||
| router.push({ name: "login"}); | ||
| router.push({ name: 'login' }) | ||
| } | ||
| }); | ||
| }) | ||
| }, | ||
| async refreshObjects({ commit }) { | ||
| await commit("loadObjects", await repo.listObjects()); | ||
| async refreshObjects ({ commit }) { | ||
| await commit('loadObjects', await repo.listObjects()) | ||
| } | ||
| }, | ||
| modules: {} | ||
| }); | ||
| }) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.