diff --git a/angular.json b/angular.json index dd66c8e..0c1cd14 100644 --- a/angular.json +++ b/angular.json @@ -27,6 +27,9 @@ "node_modules/datatables.net-dt/css/jquery.dataTables.css" ], "scripts": [ + "src/assets/common-assets/common/jquery.js", + "src/assets/common-assets/common/uikit.min.js", + "src/assets/common-assets/common/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js", "node_modules/datatables.net/js/jquery.dataTables.js" ] @@ -104,8 +107,10 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "scripts": [ - "node_modules/jquery/dist/jquery.js", - "node_modules/datatables.net/js/jquery.dataTables.js" + "src/assets/common-assets/common/jquery.js", + "src/assets/common-assets/common/uikit.min.js", + "src/assets/common-assets/common/uikit-icons.min.js", + "node_modules/jquery/dist/jquery.js" ], "styles": [ "src/styles.css", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8aac17a..ba0a059 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -32,17 +32,29 @@ const routes: Routes = [ data: {hasAdminMenu: true} }, { - path: 'admin/:stakeholder/users', - loadChildren: './users/users.module#UsersModule', - resolve: {envSpecific: EnvironmentSpecificResolver} + + path: 'admin/:stakeholder/general', + loadChildren: './manageStakeholder/manageStakeholder.module#ManageStakeholderModule', + resolve: {envSpecific: EnvironmentSpecificResolver}, + data: {hasAdminMenu: true} }, { - path: 'admin/:stakeholder', + path: 'admin/:stakeholder/users', + loadChildren: './users/users.module#UsersModule', + resolve: {envSpecific: EnvironmentSpecificResolver}, + data: {hasAdminMenu: true} + }, + { + path: 'admin/:stakeholder', loadChildren: './stakeholder/stakeholder.module#StakeholderModule', resolve: {envSpecific: EnvironmentSpecificResolver}, }, { - path: 'admin/:stakeholder/:topic', + path: 'admin/:stakeholder/indicators/:topic', + loadChildren: './topic/topic.module#TopicModule', + resolve: {envSpecific: EnvironmentSpecificResolver}, + }, + { path: 'admin/:stakeholder/indicators', loadChildren: './topic/topic.module#TopicModule', resolve: {envSpecific: EnvironmentSpecificResolver}, }, diff --git a/src/app/app.component.html b/src/app/app.component.html index ca494ab..04dd017 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,13 +1,14 @@