jfmonty2/creddy
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 12 Wiki Activity

fix circular imports from routing

Browse Source
This commit is contained in:
Joseph Montanaro 2023-04-26 13:05:51 -07:00
parent 35271049dd
commit 12d9d733a5
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/App.svelte
View File

@ -3,19 +3,17 @@ import { emit, listen } from '@tauri-apps/api/event';
import { invoke } from '@tauri-apps/api/tauri'; import { invoke } from '@tauri-apps/api/tauri';
import { appState } from './lib/state.js'; import { appState } from './lib/state.js';
import { navigate, currentView } from './lib/routing.js'; import { views, currentView, navigate } from './lib/routing.js';
$views = import.meta.glob('./views/*.svelte', {eager: true});
navigate('Home');
invoke('get_config').then(config => $appState.config = config); invoke('get_config').then(config => $appState.config = config);
listen('credentials-request', (tauriEvent) => { listen('credentials-request', (tauriEvent) => {
$appState.pendingRequests.put(tauriEvent.payload); $appState.pendingRequests.put(tauriEvent.payload);
}); });
// can't set this in routing.js directly for some reason
if (!$currentView) {
navigate('Home');
}
</script> </script>

12
src/lib/routing.js
View File

@ -1,14 +1,10 @@
import { writable } from 'svelte/store'; import { writable, get } from 'svelte/store';
const VIEWS = import.meta.glob('../views/*.svelte', {eager: true}); export let views = writable();
export let currentView = writable(); export let currentView = writable();
export function navigate(viewName) { export function navigate(viewName) {
let view = VIEWS[`../views/${viewName}.svelte`].default; let v = get(views)[`./views/${viewName}.svelte`].default;
currentView.set(view); currentView.set(v)
}
export function getView(viewName) {
return VIEWS[`../views/${viewName}.svelte`].default;
} }

2
src/ui/Link.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { navigate, currentView } from '../lib/routing.js'; import { navigate } from '../lib/routing.js';
export let target; export let target;
export let hotkey = null; export let hotkey = null;