Skip to content

Commit 6198c50

Browse files
Feature/permissions (#650)
* wip * new api tied in to data services with no build errors * admin wip * added admin role and admin groups * wip * scenario template membership working. wip for scenario memberships * wip * admin working * home app displaying correctly * conditional display added, but getting some strange behavior * reworked scenario and template permissions * cleaned up views and scenario list * added membership signalr and fixed css * Add missing document markings * add additional conditional displays * fixed content developer permissions for scenarios and templates --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 14f785d commit 6198c50

File tree

198 files changed

+12166
-4926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+12166
-4926
lines changed

angular.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "src/tsconfig.app.json",
2121
"assets": ["src/favicon.ico", "src/assets"],
22-
"styles": ["src/styles/styles.scss"],
22+
"styles": [
23+
"src/styles/styles.scss",
24+
"./node_modules/bootstrap/scss/bootstrap-utilities.scss"
25+
],
26+
"stylePreprocessorOptions": {
27+
"includePaths": ["src/styles", "./node_modules/bootstrap/scss"]
28+
},
2329
"scripts": [],
2430
"vendorChunk": true,
2531
"extractLicenses": false,

package-lock.json

Lines changed: 99 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
"@datorama/akita": "^8.0.0",
3131
"@datorama/akita-ng-router-store": "^8.0.0",
3232
"@datorama/akita-ngdevtools": "^7.0.0",
33+
"@fortawesome/fontawesome-free": "^6.7.2",
3334
"@mdi/font": "^7.2.96",
3435
"@microsoft/signalr": "^8.0.7",
3536
"ajv": "^8.6.2",
37+
"bootstrap": "^5.3.3",
38+
"bootstrap-scss": "^5.2.2",
3639
"core-js": "^3.30.1",
3740
"eslint": "^8.37.0",
3841
"ini": "^4.0.0",

src/app/app-routing.module.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { ComnAuthGuardService } from '@cmusei/crucible-common';
88
import { AdminContainerComponent } from './components/admin/admin-container/admin-container.component';
99
import { HomeAppComponent } from './components/home-app/home-app.component';
1010
import { ManualTasksPageComponent } from './components/manual-tasks-page/manual-tasks-page.component';
11+
import { ScenarioTemplateMembershipsPageComponent } from './components/scenario-templates/scenario-template-memberships/scenario-template-memberships-page/scenario-template-memberships-page.component';
1112

1213
export const ROUTES: Routes = [
1314
{
@@ -30,6 +31,12 @@ export const ROUTES: Routes = [
3031
component: ManualTasksPageComponent,
3132
canActivate: [ComnAuthGuardService],
3233
},
34+
{
35+
path: 'scenariotemplates/:id/memberships',
36+
component: ScenarioTemplateMembershipsPageComponent,
37+
pathMatch: 'full',
38+
canActivate: [ComnAuthGuardService],
39+
},
3340
];
3441

3542
@NgModule({

0 commit comments

Comments
 (0)