From 114d6e698f6e67429169cb4e52516dafbfe69fc7 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 11 Jul 2024 18:29:12 -0700 Subject: [PATCH] done --- .github/workflows/deploy-prod.yml | 5 +- src/app/@shell/ft/web-shell.module.ts | 155 +++++++++--------- .../@shell/ui/header/header.component.html | 8 +- .../mobile-header.component.html | 2 +- src/app/@shell/ui/sider/sider.component.html | 12 +- .../member-about/member-about.component.html | 8 +- .../discover/pages/discover/discover.page.ts | 2 +- .../member/pages/activity/activity.page.html | 9 +- .../pages/member/pages/member/member.page.ts | 10 +- src/assets/static-home/index.html | 32 ++-- 10 files changed, 121 insertions(+), 122 deletions(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 1234fea..dfaecbf 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -1,8 +1,9 @@ name: Action | Auto deploy "production" to soonaverse.com on: - release: - types: [published] + push: + branches: + - switch_to_downtime_mode jobs: publish: diff --git a/src/app/@shell/ft/web-shell.module.ts b/src/app/@shell/ft/web-shell.module.ts index 2bbed26..d9d6549 100644 --- a/src/app/@shell/ft/web-shell.module.ts +++ b/src/app/@shell/ft/web-shell.module.ts @@ -14,93 +14,98 @@ const APP_ROUTES: Routes = [ loadChildren: async () => (await import('@components/auth/auth.module')).AuthModule, canLoad: [], }, - { +{ path: ROUTER_UTILS.config.base.home, - redirectTo: ROUTER_UTILS.config.discover.root, - pathMatch: 'full', - }, - { - path: ROUTER_UTILS.config.base.dashboard, - loadChildren: async () => (await import('@pages/dashboard/dashboard.module')).DashboardModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.discover.root, loadChildren: async () => (await import('@pages/discover/discover.module')).DiscoverModule, - canLoad: [], - }, + canActivate: [() => { + // Hack to force homepage. + window.location.href = 'https://soonaverse.com/home/'; + }], + // redirectTo: ROUTER_UTILS.config.discover.root, + // pathMatch: 'full', + }, + // { + // path: ROUTER_UTILS.config.base.dashboard, + // loadChildren: async () => (await import('@pages/dashboard/dashboard.module')).DashboardModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.discover.root, + // loadChildren: async () => (await import('@pages/discover/discover.module')).DiscoverModule, + // canLoad: [], + // }, { path: ROUTER_UTILS.config.member.root, loadChildren: async () => (await import('@pages/member/member.module')).MemberModule, canLoad: [], }, - { - path: ROUTER_UTILS.config.space.root, - loadChildren: async () => (await import('@pages/space/space.module')).SpaceModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.proposal.root, - loadChildren: async () => (await import('@pages/proposal/proposal.module')).ProposalModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.award.root, - loadChildren: async () => (await import('@pages/award/award.module')).AwardModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.market.root, - loadChildren: async () => (await import('@pages/market/market.module')).MarketModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.swap.root, - loadChildren: async () => (await import('@pages/swap/swap.module')).SwapModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.soonStaking.root, - loadChildren: async () => - (await import('@pages/soon-staking/soon-staking.module')).SoonStakingModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.farming.farming, - loadChildren: async () => (await import('@pages/pool/pool.module')).PoolModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.collection.root, - loadChildren: async () => - (await import('@pages/collection/collection.module')).CollectionModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.nft.root, - loadChildren: async () => (await import('@pages/nft/nft.module')).NFTModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.token.root, - loadChildren: async () => (await import('@pages/token/token.module')).TokenModule, - canLoad: [], - }, - { - path: ROUTER_UTILS.config.tokens.root, - loadChildren: async () => (await import('@pages/tokens/tokens.module')).TokensModule, - canLoad: [], - }, + // { + // path: ROUTER_UTILS.config.space.root, + // loadChildren: async () => (await import('@pages/space/space.module')).SpaceModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.proposal.root, + // loadChildren: async () => (await import('@pages/proposal/proposal.module')).ProposalModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.award.root, + // loadChildren: async () => (await import('@pages/award/award.module')).AwardModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.market.root, + // loadChildren: async () => (await import('@pages/market/market.module')).MarketModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.swap.root, + // loadChildren: async () => (await import('@pages/swap/swap.module')).SwapModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.soonStaking.root, + // loadChildren: async () => + // (await import('@pages/soon-staking/soon-staking.module')).SoonStakingModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.farming.farming, + // loadChildren: async () => (await import('@pages/pool/pool.module')).PoolModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.collection.root, + // loadChildren: async () => + // (await import('@pages/collection/collection.module')).CollectionModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.nft.root, + // loadChildren: async () => (await import('@pages/nft/nft.module')).NFTModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.token.root, + // loadChildren: async () => (await import('@pages/token/token.module')).TokenModule, + // canLoad: [], + // }, + // { + // path: ROUTER_UTILS.config.tokens.root, + // loadChildren: async () => (await import('@pages/tokens/tokens.module')).TokensModule, + // canLoad: [], + // }, { path: '**', loadChildren: async () => (await import('@shell/ui/not-found/not-found.module')).NotFoundModule, component: NotFoundPage, }, - { - path: ROUTER_UTILS.config.base.home, - loadChildren: async () => (await import('@pages/market/market.module')).MarketModule, - canLoad: [], - }, + // { + // path: ROUTER_UTILS.config.base.home, + // loadChildren: async () => (await import('@pages/market/market.module')).MarketModule, + // canLoad: [], + // }, ]; @NgModule({ diff --git a/src/app/@shell/ui/header/header.component.html b/src/app/@shell/ui/header/header.component.html index 9098d2c..c29207d 100644 --- a/src/app/@shell/ui/header/header.component.html +++ b/src/app/@shell/ui/header/header.component.html @@ -48,7 +48,7 @@ nz-button nzType="default" nzShape="circle" - class="relative inline-flex items-center justify-center border-0 wen-header-button ml-0 mr-2" + class="relative inline-flex items-center justify-center ml-0 mr-2 border-0 wen-header-button" (click)="handleOpenCartModal()" > @@ -96,7 +96,7 @@ Discover - + --> @@ -187,7 +187,7 @@ nz-button nzType="default" nzShape="circle" - class="relative inline-flex items-center justify-center border-0 wen-header-button ml-0 mr-1" + class="relative inline-flex items-center justify-center ml-0 mr-1 border-0 wen-header-button" (click)="handleOpenCartModal()" > diff --git a/src/app/@shell/ui/mobile-header/mobile-header.component.html b/src/app/@shell/ui/mobile-header/mobile-header.component.html index 7888260..c17bbf4 100644 --- a/src/app/@shell/ui/mobile-header/mobile-header.component.html +++ b/src/app/@shell/ui/mobile-header/mobile-header.component.html @@ -51,7 +51,7 @@ nz-button nzType="default" nzShape="circle" - class="relative inline-flex items-center justify-center border-0 wen-header-button ml-0 mr-2" + class="relative inline-flex items-center justify-center ml-0 mr-2 border-0 wen-header-button" (click)="handleOpenCartModal()" > diff --git a/src/app/@shell/ui/sider/sider.component.html b/src/app/@shell/ui/sider/sider.component.html index 8c0229d..8aa0962 100644 --- a/src/app/@shell/ui/sider/sider.component.html +++ b/src/app/@shell/ui/sider/sider.component.html @@ -9,11 +9,11 @@ -
+ -
    -
+ -->
@@ -39,7 +39,7 @@ - +
diff --git a/src/app/components/member/components/member-about/member-about.component.html b/src/app/components/member/components/member-about/member-about.component.html index d47093f..4122857 100644 --- a/src/app/components/member/components/member-about/member-about.component.html +++ b/src/app/components/member/components/member-about/member-about.component.html @@ -15,7 +15,7 @@

@{{ (data.member$ | async)?.name || ((data.member$ | async)?.uid | truncate : [12]) }}

- + --> [entity]="(data.member$ | async)?.uid" > -
+
diff --git a/src/app/pages/discover/pages/discover/discover.page.ts b/src/app/pages/discover/pages/discover/discover.page.ts index b1f6144..04ded0e 100644 --- a/src/app/pages/discover/pages/discover/discover.page.ts +++ b/src/app/pages/discover/pages/discover/discover.page.ts @@ -24,10 +24,10 @@ export const discoverSections: TabSection[] = [ }) export class DiscoverPage implements OnDestroy, OnInit { constructor(public filter: FilterService, public deviceService: DeviceService) { - // none; } public ngOnInit(): void { + window.location.href = 'https://soonaverse.com/home/'; this.deviceService.viewWithSearch$.next(true); } diff --git a/src/app/pages/member/pages/activity/activity.page.html b/src/app/pages/member/pages/activity/activity.page.html index 81e510e..9657602 100644 --- a/src/app/pages/member/pages/activity/activity.page.html +++ b/src/app/pages/member/pages/activity/activity.page.html @@ -1,6 +1,7 @@
-
@@ -165,9 +166,9 @@ >

No Favourites yet.

-
+
--> -
- + -->
diff --git a/src/app/pages/member/pages/member/member.page.ts b/src/app/pages/member/pages/member/member.page.ts index 0cd4943..84c046b 100644 --- a/src/app/pages/member/pages/member/member.page.ts +++ b/src/app/pages/member/pages/member/member.page.ts @@ -57,11 +57,11 @@ export class MemberPage implements OnInit, OnDestroy { if (params?.memberId) { this.listenMember(params.memberId); this.sections = [ - { route: 'badges', label: $localize`Reputation` }, - { route: 'awards', label: $localize`Awards` }, - { route: 'spaces', label: $localize`Spaces` }, - { route: 'tokens', label: $localize`Tokens` }, - { route: 'nfts', label: $localize`NFTs` }, + // { route: 'badges', label: $localize`Reputation` }, + // { route: 'awards', label: $localize`Awards` }, + // { route: 'spaces', label: $localize`Spaces` }, + // { route: 'tokens', label: $localize`Tokens` }, + // { route: 'nfts', label: $localize`NFTs` }, ]; this.checkLoggedInTabs(); this.cd.markForCheck(); diff --git a/src/assets/static-home/index.html b/src/assets/static-home/index.html index 5236ebe..b131f59 100644 --- a/src/assets/static-home/index.html +++ b/src/assets/static-home/index.html @@ -39,13 +39,13 @@ class="image-11" />
- NFT Marketplace - Token Exchange - Launchpad - NFT Marketplace + Token Exchange + Launchpad + Documentation - Discover + Discover
@@ -60,23 +60,22 @@ />
- NFT Marketplace - Token Exchange - Launchpad + Launchpad Documentation
- Discover + Discover
The unique features of the IOTA and Shimmer networks allow the Soonaverse to provide certain services like voting as well as NFT minting and trading free of charge.

- Explore Now + Explore Now
directly on IOTA or Shimmer will have marketplaces where they are traded without requiring a transfer to a smart contract chain.

- Start Trading + Start Trading
@@ -625,7 +624,6 @@

benefit all users.

Learn More @@ -692,7 +690,7 @@

- @@ -703,12 +701,6 @@

class="link footer" >Terms - Investors