Skip to content

Commit

Permalink
fix: update naming
Browse files Browse the repository at this point in the history
  • Loading branch information
evavirseda committed Jan 4, 2024
1 parent f59e885 commit 0705215
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 51 deletions.
7 changes: 3 additions & 4 deletions packages/desktop/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
} from '@desktop/routers'
import { downloadNextNftInQueue, nftDownloadQueue } from '@core/nfts'
import features from '@features/features'
import { OnboardingRouterView } from '@views/onboarding'
import AccountRouter from '@views/account/AccountRouter.svelte'
import { OnboardingRouterView, ImplicitAccountCreationRouterView } from '@views'
appStage.set(AppStage[process.env.STAGE.toUpperCase()] ?? AppStage.ALPHA)
Expand Down Expand Up @@ -195,8 +194,8 @@
<LoginRouter />
{:else if $appRoute === AppRoute.Onboarding}
<OnboardingRouterView />
{:else if $appRoute === AppRoute.Account}
<AccountRouter />
{:else if $appRoute === AppRoute.ImplicitAccountCreation}
<ImplicitAccountCreationRouterView />
{/if}
{#if settings}
<Settings handleClose={onCloseSettingsClick} />
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/features/analytics.features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const analyticsFeatures: IAnalyticsFeatures = {
strongholdMigration: {
enabled: true,
},
accountRoute: {
implicitAccountCreationRoute: {
enabled: true,
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ export interface IAnalyticsFeatures extends IFeatureFlag {
loginRoute: IFeatureFlag
dashboardRoute: IFeatureFlag
strongholdMigration: IFeatureFlag
accountRoute: IFeatureFlag
implicitAccountCreationRoute: IFeatureFlag
}
6 changes: 3 additions & 3 deletions packages/desktop/lib/routers/actions/initialiseRouters.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
AccountRouter,
accountRouter,
ImplicitAccountCreationRouter,
implicitAccountCreationRouter,
appRouter,
AppRouter,
collectiblesRouter,
Expand Down Expand Up @@ -32,7 +32,7 @@ export function initialiseOnboardingRouters(): void {
function initialiseBaseRouters(): void {
appRouter.set(new AppRouter())
dashboardRouter.set(new DashboardRouter())
accountRouter.set(new AccountRouter())
implicitAccountCreationRouter.set(new ImplicitAccountCreationRouter())
settingsRouter.set(new SettingsRouter())
collectiblesRouter.set(new CollectiblesRouter())
governanceRouter.set(new GovernanceRouter())
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop/lib/routers/utils/getRouterForAppContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { get } from 'svelte/store'

import { AppContext } from '@core/app/enums'
import { IRouter } from '@core/router/interfaces'
import { accountRouter, dashboardRouter, settingsRouter } from '@core/router/routers'
import { implicitAccountCreationRouter, dashboardRouter, settingsRouter } from '@core/router/routers'
import { loginRouter } from '@core/router/subrouters'
import { onboardingRouter } from '@views/onboarding'

Expand All @@ -16,8 +16,8 @@ export function getRouterForAppContext(context: AppContext): IRouter {
return get(onboardingRouter)
case AppContext.Settings:
return get(settingsRouter)
case AppContext.Account:
return get(accountRouter)
case AppContext.ImplicitAccountCreation:
return get(implicitAccountCreationRouter)
default:
return undefined
}
Expand Down
17 changes: 0 additions & 17 deletions packages/desktop/views/account/AccountRouter.svelte

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<script lang="ts">
import { Platform } from '@core/app'
import { ImplicitAccountCreationRoute, implicitAccountCreationRoute } from '@core/router'
import features from '@features/features'
import { Transition } from 'shared/components'
$: if (features.analytics.implicitAccountCreationRoute.enabled && $implicitAccountCreationRoute)
Platform.trackEvent('account-route', { route: $implicitAccountCreationRoute })
</script>

{#if $implicitAccountCreationRoute === ImplicitAccountCreationRoute.Activate}
<Transition>
<div class="flex w-full h-full p-12">
<h1 class="text-white">ACCOUNT ROUTE</h1>
</div>
</Transition>
{/if}
1 change: 1 addition & 0 deletions packages/desktop/views/implicit-account-creation/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as ImplicitAccountCreationRouterView } from './ImplicitAccountCreationRouterView.svelte'
2 changes: 2 additions & 0 deletions packages/desktop/views/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ export { default as Splash } from './Splash.svelte'
export * from './dashboard'
export * from './login'
export * from './update-stronghold'
export * from './onboarding'
export * from './implicit-account-creation'
2 changes: 1 addition & 1 deletion packages/shared/lib/core/app/enums/app-context.enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ export enum AppContext {
Dashboard = 'dashboard',
Settings = 'settings',
Onboarding = 'wallet',
Account = 'account',
ImplicitAccountCreation = 'implicitAccountCreation',
}
3 changes: 0 additions & 3 deletions packages/shared/lib/core/router/enums/account-route.enum.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/shared/lib/core/router/enums/app-route.enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ export enum AppRoute {
Dashboard = 'dashboard',
Login = 'login',
Onboarding = 'onboarding',
Account = 'account',
ImplicitAccountCreation = 'implicitAccountCreation',
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export enum ImplicitAccountCreationRoute {
Activate = 'activate',
}
2 changes: 1 addition & 1 deletion packages/shared/lib/core/router/enums/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * from './onboarding'
export * from './settings'

export * from './account-route.enum'
export * from './implicit-account-creation-route.enum'
export * from './app-route.enum'
export * from './collectibles-route.enum'
export * from './dashboard-route.enum'
Expand Down
13 changes: 0 additions & 13 deletions packages/shared/lib/core/router/routers/account-router.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/shared/lib/core/router/routers/app-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ export class AppRouter extends Router<AppRoute> {
} else if (hasImplicitAccount) {
nextRoute = AppRoute.Dashboard
} else {
nextRoute = AppRoute.Account
nextRoute = AppRoute.ImplicitAccountCreation
}
break
}
case AppRoute.Account: {
case AppRoute.ImplicitAccountCreation: {
nextRoute = AppRoute.Dashboard
break
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { writable } from 'svelte/store'
import { Router } from '../classes'
import { ImplicitAccountCreationRoute } from '../enums'

export const implicitAccountCreationRouter = writable<ImplicitAccountCreationRouter>(null)
export const implicitAccountCreationRoute = writable<ImplicitAccountCreationRoute>(null)

export class ImplicitAccountCreationRouter extends Router<ImplicitAccountCreationRoute> {
constructor() {
super(ImplicitAccountCreationRoute.Activate, implicitAccountCreationRoute)
}
}
2 changes: 1 addition & 1 deletion packages/shared/lib/core/router/routers/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './account-router'
export * from './implicit-account-creation-router'
export * from './app-router'
export * from './collectibles-router'
export * from './dashboard-router'
Expand Down

0 comments on commit 0705215

Please sign in to comment.