Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam committed Jul 12, 2024
1 parent f7951e1 commit 114d6e6
Show file tree
Hide file tree
Showing 10 changed files with 121 additions and 122 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Action | Auto deploy "production" to soonaverse.com

on:
release:
types: [published]
push:
branches:
- switch_to_downtime_mode

jobs:
publish:
Expand Down
155 changes: 80 additions & 75 deletions src/app/@shell/ft/web-shell.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
8 changes: 4 additions & 4 deletions src/app/@shell/ui/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
>
<nz-badge *ngIf="cartItemCount > 0" [nzCount]="cartItemCount">
Expand Down Expand Up @@ -96,7 +96,7 @@
<wen-icon-rocket></wen-icon-rocket><span i18n>Discover</span>
</button>

<button
<!-- <button
nz-button
nz-dropdown
nzTrigger="click"
Expand All @@ -109,7 +109,7 @@
class="flex items-center gap-2 pr-2"
>
<span i18n>Create new </span><wen-icon-angle-down></wen-icon-angle-down>
</button>
</button> -->

<nz-dropdown-menu #createMenu="nzDropdownMenu">
<wen-menu>
Expand Down Expand Up @@ -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()"
>
<nz-badge *ngIf="cartItemCount > 0" [nzCount]="cartItemCount">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
>
<nz-badge *ngIf="cartItemCount > 0" [nzCount]="cartItemCount">
Expand Down
12 changes: 6 additions & 6 deletions src/app/@shell/ui/sider/sider.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</svg>
</a>

<div *ngIf="(deviceService.isDesktop$ | async) && (deviceService.isNotBreakHeight$ | async)">
<!-- <div *ngIf="(deviceService.isDesktop$ | async) && (deviceService.isNotBreakHeight$ | async)">
<wen-navigation [items]="(auth.desktopMenuItems$ | async) || []"></wen-navigation>
</div>
</div> -->

<ul
<!-- <ul
nz-menu
*ngIf="(deviceService.isDesktop$ | async) && (deviceService.isBreakHeight$ | async)"
[nzMode]="'vertical'"
Expand All @@ -29,7 +29,7 @@
<ng-template #menu>
<wen-icon-menu></wen-icon-menu>
</ng-template>
</ul>
</ul> -->
</div>

<div class="sticky bottom-0 flex flex-col items-center px-3 shrink">
Expand All @@ -39,7 +39,7 @@
<ng-template #options>
<wen-network-status class="mb-6"></wen-network-status>
<!-- <wen-language-change class="mb-6"></wen-language-change> -->
<a class="block mb-5" href="https://docs.soonaverse.com/" target="_blank">
<!-- <a class="block mb-5" target="_blank">
<i
nz-icon
nzType="info-circle"
Expand All @@ -48,7 +48,7 @@
nzTooltipTitle="See Docs"
class="text-xl cursor-pointer"
></i>
</a>
</a> -->
<wen-theme-switch class="mb-5"></wen-theme-switch>
</ng-template>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h3 class="max-w-full mx-4 text-left break-words whitespace-pre-wrap">
@{{ (data.member$ | async)?.name || ((data.member$ | async)?.uid | truncate : [12]) }}
</h3>
<div *ngIf="(data.member$ | async)?.uid === (loggedInMember | async)?.uid">
<button
<!-- <button
nz-button
nzSize="default"
nzShape="circle"
Expand All @@ -24,7 +24,7 @@ <h3 class="max-w-full mx-4 text-left break-words whitespace-pre-wrap">
class="ml-4 text-center text-current"
>
<span nz-icon nzType="edit" class="text-white"></span>
</button>
</button> -->
<wen-member-edit-drawer
[isDesktop]="(deviceService.isDesktop$ | async) === true"
*ngIf="(drawerVisible$ | async) || false"
Expand Down Expand Up @@ -114,7 +114,7 @@ <h4 class="flex items-center justify-between">
[entity]="(data.member$ | async)?.uid"
></wen-audit-one-widget>

<div class="mt-10 text-left">
<!-- <div class="mt-10 text-left">
<h4 class="flex items-center justify-between">
<span i18n>Recently joined spaces</span>
<a
Expand Down Expand Up @@ -155,5 +155,5 @@ <h4 class="flex items-center justify-between">
<span i18n>No Contribution Yet.</span>
</article>
</div>
</div>
</div> -->
</div>
2 changes: 1 addition & 1 deletion src/app/pages/discover/pages/discover/discover.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
9 changes: 5 additions & 4 deletions src/app/pages/member/pages/activity/activity.page.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="space-y-12">
<div class="space-y-4">
<div
All functions disabled except transactional history and ability to validate address.
<!-- <div
class="flex flex-col space-y-4 xl:space-y-0 xl:space-x-4 xl:flex-row"
*ngIf="((data.member$ | async)?.uid === (loggedInMember$ | async)?.uid)"
>
Expand Down Expand Up @@ -165,9 +166,9 @@
></wen-token-trading-pairs-table>
<p *ngIf="!tokenFavourites?.length">No Favourites yet.</p>
</nz-card>
</div>
</div> -->

<nz-card
<!-- <nz-card
i18n-nzTitle
nzTitle="Profile Options"
class="overflow-hidden"
Expand Down Expand Up @@ -231,7 +232,7 @@
</div>
</div>
</nz-list>
</ng-template>
</ng-template> -->
</div>
</div>

Expand Down
10 changes: 5 additions & 5 deletions src/app/pages/member/pages/member/member.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit 114d6e6

Please sign in to comment.