diff --git a/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel-routing.module.ts b/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel-routing.module.ts index 861f5c68d7..9dae6205b9 100644 --- a/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel-routing.module.ts +++ b/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel-routing.module.ts @@ -50,17 +50,11 @@ const routes = [ }, { path: 'forms', - component: CommunityFormsAndSurveysComponent, - children: [ - { - path: '', - component: CommunityFormsListComponent, - }, - { - path: 'surveys', - component: CommunitySurveysComponent, - }, - ], + component: CommunityFormsListComponent, + }, + { + path: 'surveys', + component: CommunitySurveysComponent, }, { path: 'edit', diff --git a/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel.module.ts b/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel.module.ts index 265e2ccc5c..0a5b1db2f1 100644 --- a/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel.module.ts +++ b/apps/commudle-admin/src/app/feature-modules/community-control-panel/community-control-panel.module.ts @@ -58,6 +58,7 @@ import { CommunityChannelsModule } from 'apps/commudle-admin/src/app/feature-mod import { AdminCommunityHackathonComponent } from './components/admin-community-hackathon/admin-community-hackathon.component'; import { CommunityPaymentLogsComponent } from 'apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-payments/community-payment-logs/community-payment-logs.component'; import { CommunityBankDetailsComponent } from 'apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-payments/community-bank-details/community-bank-details.component'; +import { SidebarComponent } from 'apps/shared-components/sidebar/sidebar.component'; @NgModule({ declarations: [ @@ -103,6 +104,9 @@ import { CommunityBankDetailsComponent } from 'apps/commudle-admin/src/app/featu AppSharedComponentsModule, CommunityChannelsModule, + //standalone + SidebarComponent, + // Nebular NbCardModule, NbInputModule, diff --git a/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/admin-community-hackathon/admin-community-hackathon.component.scss b/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/admin-community-hackathon/admin-community-hackathon.component.scss index ad65ef93a7..ba8bd2d48c 100644 --- a/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/admin-community-hackathon/admin-community-hackathon.component.scss +++ b/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/admin-community-hackathon/admin-community-hackathon.component.scss @@ -1,3 +1,3 @@ .hackathons { - @apply com-m-4; + @apply com-m-6; } diff --git a/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-control-panel/community-control-panel.component.html b/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-control-panel/community-control-panel.component.html index 164118a5e4..f262b1556d 100644 --- a/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-control-panel/community-control-panel.component.html +++ b/apps/commudle-admin/src/app/feature-modules/community-control-panel/components/community-control-panel/community-control-panel.component.html @@ -1,198 +1,322 @@ -