Skip to content
This repository has been archived by the owner on Feb 10, 2023. It is now read-only.

Commit

Permalink
Fix blinking bug & Dashboard button bug
Browse files Browse the repository at this point in the history
  • Loading branch information
albertusdev committed Dec 6, 2020
1 parent 8dd83d6 commit 804c315
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"svelte-icons": "^2.1.0",
"svelte-loading-spinners": "^0.1.1",
"svelte-notifications": "^0.9.9",
"svelte-spa-router": "^3.0.5"
"svelte-spa-router": "^3.1.0"
},
"husky": {
"hooks": {
Expand Down
10 changes: 1 addition & 9 deletions src/app/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@
'/dashboard': wrap({
component: Dashboard,
conditions: [authGuard],
loadingComponent: FullScreenLoadingIndicator,
loadingParams: {
loadingText: 'Loading...',
},
}),
'/apply': wrap({
component: Apply,
Expand Down Expand Up @@ -391,7 +387,6 @@
/* TODO(adalberht): Refactor main to different component */
main {
display: flex;
width: 100vw;
height: 100vh;
text-align: center;
Expand All @@ -406,9 +401,6 @@
{:else if $shouldShowUnauthorizedPage}
<Unauthorized />
{:else}
<Router
{routes}
restoreScrollState={true}
on:conditionsFailed={onConditionsFailed} />
<Router {routes} on:conditionsFailed={onConditionsFailed} />
{/if}
</main>
4 changes: 2 additions & 2 deletions src/app/components/StickyNavbar.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script>
import { fade, slide } from 'svelte/transition'
import ThemeToggler from '../ThemeToggler.svelte'
import { handleLogin, handleLogout, redirectTo } from '../utils'
import { handleLogin, handleLogout } from '../utils'
import { isLoggedIn, isMobileScreen } from '../stores'
import MetricsLogo from './MetricsLogo.svelte'
import IcClose from 'svelte-icons/fa/FaTimes.svelte'
Expand All @@ -20,7 +20,7 @@
$: isLanding = $location === `/`
function redirectToDashboard() {
redirectTo('/dashboard?force_login=true')
window.location.href = '#/dashboard?force_login=true'
}
</script>

Expand Down

0 comments on commit 804c315

Please sign in to comment.