@tech4good/angular-schematics 13.8.1 → 17.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/component/index_spec.js +1 -1
- package/src/component/index_spec.js.map +1 -1
- package/src/component/schema.json +4 -1
- package/src/container/index_spec.js +1 -1
- package/src/container/index_spec.js.map +1 -1
- package/src/container/schema.json +4 -1
- package/src/entity/index_spec.js +1 -1
- package/src/entity/index_spec.js.map +1 -1
- package/src/entity/schema.json +4 -1
- package/src/entity-in-example/index_spec.js +1 -1
- package/src/entity-in-example/index_spec.js.map +1 -1
- package/src/entity-in-example/schema.json +4 -1
- package/src/init/files/.github/workflows/angular-github-ci.yml.template +1 -1
- package/src/init/files/angular.json.template +6 -4
- package/src/init/files/package.json.template +33 -34
- package/src/init/files/src/app/core/auth/auth.guard.ts.template +4 -4
- package/src/init/files/src/app/onboarding/consent/consent.component.ts.template +1 -2
- package/src/init/files/tsconfig.json.template +3 -2
- package/src/module/index_spec.js +1 -1
- package/src/module/index_spec.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tech4good/angular-schematics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "17.0.0",
|
|
4
4
|
"description": "A set of schematics for generating modules, containers, components, and entities",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -p tsconfig.json",
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"schematics": "./src/collection.json",
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@angular-devkit/core": "^
|
|
17
|
-
"@angular-devkit/schematics": "^
|
|
18
|
-
"@angular-devkit/schematics-cli": "^
|
|
19
|
-
"@schematics/angular": "^
|
|
16
|
+
"@angular-devkit/core": "^17.3.2",
|
|
17
|
+
"@angular-devkit/schematics": "^17.3.2",
|
|
18
|
+
"@angular-devkit/schematics-cli": "^17.3.2",
|
|
19
|
+
"@schematics/angular": "^17.3.2",
|
|
20
20
|
"typescript": "~4.5.5"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
@@ -16,7 +16,7 @@ const collectionPath = path.join(__dirname, '../collection.json');
|
|
|
16
16
|
describe('component', () => {
|
|
17
17
|
it('works', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
19
|
-
const tree = yield runner.
|
|
19
|
+
const tree = yield runner.runSchematic('component', {}, schematics_1.Tree.empty());
|
|
20
20
|
expect(tree.files).toEqual([]);
|
|
21
21
|
}));
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEtE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -13,7 +13,10 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"format": "path",
|
|
15
15
|
"description": "The path at which to create the component file, relative to the current workspace. Should be organized according to the view hierarchy to the extent possible.",
|
|
16
|
-
"visible": false
|
|
16
|
+
"visible": false,
|
|
17
|
+
"$default": {
|
|
18
|
+
"$source": "workingDirectory"
|
|
19
|
+
}
|
|
17
20
|
},
|
|
18
21
|
"project": {
|
|
19
22
|
"type": "string",
|
|
@@ -16,7 +16,7 @@ const collectionPath = path.join(__dirname, '../collection.json');
|
|
|
16
16
|
describe('container', () => {
|
|
17
17
|
it('works', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
19
|
-
const tree = yield runner.
|
|
19
|
+
const tree = yield runner.runSchematic('container', {}, schematics_1.Tree.empty());
|
|
20
20
|
expect(tree.files).toEqual([]);
|
|
21
21
|
}));
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEtE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -13,7 +13,10 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"format": "path",
|
|
15
15
|
"description": "The path at which to create the container file, relative to the current workspace. Should be organized according to the view hierarchy to the extent possible.",
|
|
16
|
-
"visible": false
|
|
16
|
+
"visible": false,
|
|
17
|
+
"$default": {
|
|
18
|
+
"$source": "workingDirectory"
|
|
19
|
+
}
|
|
17
20
|
},
|
|
18
21
|
"project": {
|
|
19
22
|
"type": "string",
|
package/src/entity/index_spec.js
CHANGED
|
@@ -16,7 +16,7 @@ const collectionPath = path.join(__dirname, '../collection.json');
|
|
|
16
16
|
describe('entity', () => {
|
|
17
17
|
it('works', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
19
|
-
const tree = yield runner.
|
|
19
|
+
const tree = yield runner.runSchematic('entity', {}, schematics_1.Tree.empty());
|
|
20
20
|
expect(tree.files).toEqual([]);
|
|
21
21
|
}));
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEnE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/src/entity/schema.json
CHANGED
|
@@ -13,7 +13,10 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"format": "path",
|
|
15
15
|
"description": "The path at which to create the entity file, relative to the current workspace. Should typically be within /src/app/core/store.",
|
|
16
|
-
"visible": false
|
|
16
|
+
"visible": false,
|
|
17
|
+
"$default": {
|
|
18
|
+
"$source": "workingDirectory"
|
|
19
|
+
}
|
|
17
20
|
},
|
|
18
21
|
"project": {
|
|
19
22
|
"type": "string",
|
|
@@ -16,7 +16,7 @@ const collectionPath = path.join(__dirname, '../collection.json');
|
|
|
16
16
|
describe('entity', () => {
|
|
17
17
|
it('works', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
19
|
-
const tree = yield runner.
|
|
19
|
+
const tree = yield runner.runSchematic('entity', {}, schematics_1.Tree.empty());
|
|
20
20
|
expect(tree.files).toEqual([]);
|
|
21
21
|
}));
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEnE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -13,7 +13,10 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"format": "path",
|
|
15
15
|
"description": "The path at which to create the entity file, relative to the current workspace. Should typically be within /src/app/core/store.",
|
|
16
|
-
"visible": false
|
|
16
|
+
"visible": false,
|
|
17
|
+
"$default": {
|
|
18
|
+
"$source": "workingDirectory"
|
|
19
|
+
}
|
|
17
20
|
},
|
|
18
21
|
"project": {
|
|
19
22
|
"type": "string",
|
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
"path": ".cache",
|
|
8
8
|
"environment": "all"
|
|
9
9
|
},
|
|
10
|
-
"
|
|
10
|
+
"schematicsCollection": [
|
|
11
|
+
"@tech4good/angular-schematics"
|
|
12
|
+
]
|
|
11
13
|
},
|
|
12
14
|
"newProjectRoot": "projects",
|
|
13
15
|
"projects": {
|
|
@@ -83,10 +85,10 @@
|
|
|
83
85
|
"builder": "@angular-devkit/build-angular:dev-server",
|
|
84
86
|
"configurations": {
|
|
85
87
|
"production": {
|
|
86
|
-
"
|
|
88
|
+
"buildTarget": "<%= dasherize(project) %>:build:production"
|
|
87
89
|
},
|
|
88
90
|
"development": {
|
|
89
|
-
"
|
|
91
|
+
"buildTarget": "<%= dasherize(project) %>:build:development"
|
|
90
92
|
}
|
|
91
93
|
},
|
|
92
94
|
"defaultConfiguration": "development"
|
|
@@ -94,7 +96,7 @@
|
|
|
94
96
|
"extract-i18n": {
|
|
95
97
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
|
96
98
|
"options": {
|
|
97
|
-
"
|
|
99
|
+
"buildTarget": "<%= dasherize(project) %>:build"
|
|
98
100
|
}
|
|
99
101
|
},
|
|
100
102
|
"test": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "<%= dasherize(project) %>",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "17.0.0-0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"ng": "ng",
|
|
6
6
|
"start": "ng serve",
|
|
@@ -12,51 +12,50 @@
|
|
|
12
12
|
},
|
|
13
13
|
"private": true,
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@angular/animations": "
|
|
16
|
-
"@angular/cdk": "
|
|
17
|
-
"@angular/common": "
|
|
18
|
-
"@angular/compiler": "
|
|
19
|
-
"@angular/core": "
|
|
20
|
-
"@angular/fire": "
|
|
21
|
-
"@angular/forms": "
|
|
22
|
-
"@angular/material": "^
|
|
23
|
-
"@angular/platform-browser": "
|
|
24
|
-
"@angular/platform-browser-dynamic": "
|
|
25
|
-
"@angular/router": "
|
|
26
|
-
"@ngrx/effects": "
|
|
27
|
-
"@ngrx/entity": "
|
|
28
|
-
"@ngrx/router-store": "
|
|
29
|
-
"@ngrx/store": "
|
|
30
|
-
"@ngrx/store-devtools": "
|
|
31
|
-
"@tech4good/angular-schematics": "^13.8.1",
|
|
15
|
+
"@angular/animations": "17.2.3",
|
|
16
|
+
"@angular/cdk": "17.0.0",
|
|
17
|
+
"@angular/common": "17.2.3",
|
|
18
|
+
"@angular/compiler": "17.2.3",
|
|
19
|
+
"@angular/core": "17.2.3",
|
|
20
|
+
"@angular/fire": "17.0.0",
|
|
21
|
+
"@angular/forms": "17.2.3",
|
|
22
|
+
"@angular/material": "^17.2.1",
|
|
23
|
+
"@angular/platform-browser": "17.2.3",
|
|
24
|
+
"@angular/platform-browser-dynamic": "17.2.3",
|
|
25
|
+
"@angular/router": "17.2.3",
|
|
26
|
+
"@ngrx/effects": "17.1.1",
|
|
27
|
+
"@ngrx/entity": "17.1.1",
|
|
28
|
+
"@ngrx/router-store": "17.1.1",
|
|
29
|
+
"@ngrx/store": "17.1.1",
|
|
30
|
+
"@ngrx/store-devtools": "17.1.1",
|
|
32
31
|
"crypto-es": "^1.2.7",
|
|
33
|
-
"rxjs": "
|
|
32
|
+
"rxjs": "7.8.1",
|
|
34
33
|
"tslib": "^2.3.0",
|
|
35
|
-
"zone.js": "
|
|
34
|
+
"zone.js": "0.14.4"
|
|
36
35
|
},
|
|
37
36
|
"devDependencies": {
|
|
38
|
-
"@angular-devkit/build-angular": "
|
|
39
|
-
"@angular-eslint/builder": "
|
|
40
|
-
"@angular-eslint/eslint-plugin": "
|
|
41
|
-
"@angular-eslint/eslint-plugin-template": "
|
|
42
|
-
"@angular-eslint/schematics": "
|
|
43
|
-
"@angular-eslint/template-parser": "
|
|
44
|
-
"@angular/cli": "
|
|
45
|
-
"@angular/compiler-cli": "
|
|
46
|
-
"@
|
|
37
|
+
"@angular-devkit/build-angular": "17.2.2",
|
|
38
|
+
"@angular-eslint/builder": "17.2.1",
|
|
39
|
+
"@angular-eslint/eslint-plugin": "17.2.1",
|
|
40
|
+
"@angular-eslint/eslint-plugin-template": "17.2.1",
|
|
41
|
+
"@angular-eslint/schematics": "17.2.1",
|
|
42
|
+
"@angular-eslint/template-parser": "17.2.1",
|
|
43
|
+
"@angular/cli": "17.2.2",
|
|
44
|
+
"@angular/compiler-cli": "17.2.3",
|
|
45
|
+
"@tech4good/angular-schematics": "17.0.0",
|
|
47
46
|
"@types/jasmine": "~3.10.0",
|
|
48
47
|
"@types/node": "^12.11.1",
|
|
49
48
|
"@types/estree": "^1.0.0",
|
|
50
|
-
"@typescript-eslint/eslint-plugin": "
|
|
51
|
-
"@typescript-eslint/parser": "
|
|
52
|
-
"eslint": "^8.
|
|
49
|
+
"@typescript-eslint/eslint-plugin": "6.10.0",
|
|
50
|
+
"@typescript-eslint/parser": "6.10.0",
|
|
51
|
+
"eslint": "^8.53.0",
|
|
53
52
|
"eslint-config-google": "^0.14.0",
|
|
54
53
|
"jasmine-core": "~4.0.0",
|
|
55
|
-
"karma": "~6.
|
|
54
|
+
"karma": "~6.4.2",
|
|
56
55
|
"karma-chrome-launcher": "~3.1.0",
|
|
57
56
|
"karma-coverage": "~2.1.0",
|
|
58
57
|
"karma-jasmine": "~4.0.0",
|
|
59
58
|
"karma-jasmine-html-reporter": "~1.7.0",
|
|
60
|
-
"typescript": "~
|
|
59
|
+
"typescript": "~5.3.3"
|
|
61
60
|
}
|
|
62
61
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
|
|
3
3
|
import { of, Observable, forkJoin } from 'rxjs';
|
|
4
4
|
import { combineLatest, tap, filter, switchMap, map, take, pluck, withLatestFrom } from 'rxjs/operators';
|
|
5
5
|
import { select, Store } from '@ngrx/store';
|
|
@@ -12,7 +12,7 @@ import { AuthSelectorsService } from '../store/auth/auth.selectors';
|
|
|
12
12
|
@Injectable({
|
|
13
13
|
providedIn: 'root',
|
|
14
14
|
})
|
|
15
|
-
export class AuthGuard
|
|
15
|
+
export class AuthGuard {
|
|
16
16
|
constructor(
|
|
17
17
|
private db: FirebaseService,
|
|
18
18
|
private store: Store<fromStore.State>,
|
|
@@ -31,14 +31,14 @@ export class AuthGuard implements CanActivate {
|
|
|
31
31
|
// - Admin users are also handled (so that only admin users can go to admin pages, including pages they would
|
|
32
32
|
// typically get rerouted from)
|
|
33
33
|
|
|
34
|
-
// First handle whether users are logged in. If not, go to landing, otherwise
|
|
34
|
+
// First handle whether users are logged in. If not, go to landing, otherwise go to the hompage
|
|
35
35
|
if (!dbUser && (state.url !== '/' && state.url !== '/landing')) {
|
|
36
36
|
this.router.navigate(['/'], { queryParams: next.queryParams });
|
|
37
37
|
return of(false);
|
|
38
38
|
} else if (!dbUser && (state.url === '/' || state.url === '/landing')) {
|
|
39
39
|
return of(true);
|
|
40
40
|
} else if (dbUser && (state.url === '/' || state.url === '/landing')) {
|
|
41
|
-
this.router.navigate(['/
|
|
41
|
+
this.router.navigate(['/home'], { queryParams: next.queryParams });
|
|
42
42
|
return of(false);
|
|
43
43
|
}
|
|
44
44
|
|
|
@@ -90,8 +90,7 @@ export class ConsentComponent implements OnInit, OnDestroy {
|
|
|
90
90
|
}
|
|
91
91
|
|
|
92
92
|
ngOnInit() {
|
|
93
|
-
|
|
94
|
-
this.consentUrl = (this.platform as any).location.origin + '/' + this.location.prepareExternalUrl('consent');
|
|
93
|
+
this.consentUrl = location.origin + '/' + this.location.prepareExternalUrl('consent');
|
|
95
94
|
|
|
96
95
|
// --------------- EVENT HANDLING ----------------------
|
|
97
96
|
|
|
@@ -15,12 +15,13 @@
|
|
|
15
15
|
"experimentalDecorators": true,
|
|
16
16
|
"moduleResolution": "node",
|
|
17
17
|
"importHelpers": true,
|
|
18
|
-
"target": "
|
|
18
|
+
"target": "ES2022",
|
|
19
19
|
"module": "es2020",
|
|
20
20
|
"lib": [
|
|
21
21
|
"es2020",
|
|
22
22
|
"dom"
|
|
23
|
-
]
|
|
23
|
+
],
|
|
24
|
+
"useDefineForClassFields": false
|
|
24
25
|
},
|
|
25
26
|
"angularCompilerOptions": {
|
|
26
27
|
"enableI18nLegacyMessageIdFormat": false,
|
package/src/module/index_spec.js
CHANGED
|
@@ -16,7 +16,7 @@ const collectionPath = path.join(__dirname, '../collection.json');
|
|
|
16
16
|
describe('module', () => {
|
|
17
17
|
it('works', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
18
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
19
|
-
const tree = yield runner.
|
|
19
|
+
const tree = yield runner.runSchematic('module', {}, schematics_1.Tree.empty());
|
|
20
20
|
expect(tree.files).toEqual([]);
|
|
21
21
|
}));
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,6BAA6B;AAG7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAGlE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEnE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|