@tech4good/angular-schematics 13.8.1 → 17.0.1
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/.gitignore.template +18 -19
- package/src/init/files/angular.json.template +21 -20
- package/src/init/files/package.json.template +41 -41
- package/src/init/files/src/app/app-routing.module.ts.template +0 -1
- package/src/init/files/src/app/core/auth/auth.guard.ts.template +4 -4
- package/src/init/files/src/app/core/store/app.effects.ts.template +1 -1
- package/src/init/files/src/app/core/store/user/user.effects.ts.template +1 -1
- package/src/init/files/src/app/onboarding/consent/consent.component.html.template +1 -1
- package/src/init/files/src/app/onboarding/consent/consent.component.ts.template +1 -2
- package/src/init/files/src/app/onboarding/waiting/waiting.component.ts.template +6 -4
- package/src/init/files/src/main.ts.template +12 -0
- package/src/init/files/tsconfig.json.template +13 -10
- package/src/init/index.js +0 -1
- package/src/init/index.js.map +1 -1
- 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.1",
|
|
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",
|
|
@@ -1,21 +1,18 @@
|
|
|
1
1
|
# See http://help.github.com/ignore-files/ for more about ignoring files.
|
|
2
|
-
|
|
3
|
-
#
|
|
2
|
+
|
|
3
|
+
# Compiled output
|
|
4
4
|
/dist
|
|
5
5
|
/tmp
|
|
6
|
-
/out-tsc
|
|
7
|
-
|
|
8
|
-
/bazel-out
|
|
6
|
+
/out-tsc
|
|
7
|
+
/bazel-out
|
|
9
8
|
|
|
10
|
-
#
|
|
9
|
+
# Node
|
|
11
10
|
/node_modules
|
|
11
|
+
npm-debug.log
|
|
12
|
+
yarn-error.log
|
|
12
13
|
|
|
13
|
-
#
|
|
14
|
-
|
|
15
|
-
speed-measure-plugin*.json
|
|
16
|
-
|
|
17
|
-
# IDEs and editors
|
|
18
|
-
/.idea
|
|
14
|
+
# IDEs and editors
|
|
15
|
+
.idea/
|
|
19
16
|
.project
|
|
20
17
|
.classpath
|
|
21
18
|
.c9/
|
|
@@ -23,7 +20,11 @@ speed-measure-plugin*.json
|
|
|
23
20
|
.settings/
|
|
24
21
|
*.sublime-workspace
|
|
25
22
|
|
|
26
|
-
#
|
|
23
|
+
# Profiling files
|
|
24
|
+
chrome-profiler-events*.json
|
|
25
|
+
speed-measure-plugin*.json
|
|
26
|
+
|
|
27
|
+
# Visual Studio Code
|
|
27
28
|
.vscode/*
|
|
28
29
|
!.vscode/settings.json
|
|
29
30
|
!.vscode/tasks.json
|
|
@@ -31,21 +32,19 @@ speed-measure-plugin*.json
|
|
|
31
32
|
!.vscode/extensions.json
|
|
32
33
|
.history/*
|
|
33
34
|
|
|
34
|
-
#
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
# Miscellaneous
|
|
36
|
+
/.angular/cache
|
|
37
|
+
.sass-cache/
|
|
37
38
|
/connect.lock
|
|
38
39
|
/coverage
|
|
39
40
|
/libpeerconnection.log
|
|
40
|
-
npm-debug.log
|
|
41
|
-
yarn-error.log
|
|
42
41
|
testem.log
|
|
43
42
|
/typings
|
|
44
43
|
*.swp
|
|
45
44
|
.angular
|
|
46
45
|
.cache
|
|
47
46
|
|
|
48
|
-
# System
|
|
47
|
+
# System files
|
|
49
48
|
.DS_Store
|
|
50
49
|
Thumbs.db
|
|
51
50
|
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
|
3
3
|
"version": 1,
|
|
4
|
+
"newProjectRoot": "projects",
|
|
4
5
|
"cli": {
|
|
6
|
+
"schematicCollections": [
|
|
7
|
+
"@tech4good/angular-schematics"
|
|
8
|
+
],
|
|
5
9
|
"cache": {
|
|
6
10
|
"enabled": true,
|
|
7
11
|
"path": ".cache",
|
|
8
12
|
"environment": "all"
|
|
9
|
-
}
|
|
10
|
-
"defaultCollection": "@tech4good/angular-schematics"
|
|
13
|
+
}
|
|
11
14
|
},
|
|
12
|
-
"newProjectRoot": "projects",
|
|
13
15
|
"projects": {
|
|
14
16
|
"<%= dasherize(project) %>": {
|
|
15
17
|
"projectType": "application",
|
|
@@ -23,12 +25,14 @@
|
|
|
23
25
|
"prefix": "app",
|
|
24
26
|
"architect": {
|
|
25
27
|
"build": {
|
|
26
|
-
"builder": "@angular-devkit/build-angular:
|
|
28
|
+
"builder": "@angular-devkit/build-angular:application",
|
|
27
29
|
"options": {
|
|
28
30
|
"outputPath": "dist/<%= dasherize(project) %>",
|
|
29
31
|
"index": "src/index.html",
|
|
30
|
-
"
|
|
31
|
-
"polyfills":
|
|
32
|
+
"browser": "src/main.ts",
|
|
33
|
+
"polyfills": [
|
|
34
|
+
"zone.js"
|
|
35
|
+
],
|
|
32
36
|
"tsConfig": "tsconfig.app.json",
|
|
33
37
|
"inlineStyleLanguage": "scss",
|
|
34
38
|
"assets": [
|
|
@@ -39,12 +43,12 @@
|
|
|
39
43
|
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
|
|
40
44
|
"src/styles.scss"
|
|
41
45
|
],
|
|
46
|
+
"scripts": [],
|
|
42
47
|
"stylePreprocessorOptions": {
|
|
43
48
|
"includePaths": [
|
|
44
49
|
"src/styles"
|
|
45
50
|
]
|
|
46
|
-
}
|
|
47
|
-
"scripts": []
|
|
51
|
+
}
|
|
48
52
|
},
|
|
49
53
|
"configurations": {
|
|
50
54
|
"production": {
|
|
@@ -69,12 +73,9 @@
|
|
|
69
73
|
"outputHashing": "all"
|
|
70
74
|
},
|
|
71
75
|
"development": {
|
|
72
|
-
"buildOptimizer": false,
|
|
73
76
|
"optimization": false,
|
|
74
|
-
"vendorChunk": true,
|
|
75
77
|
"extractLicenses": false,
|
|
76
|
-
"sourceMap": true
|
|
77
|
-
"namedChunks": true
|
|
78
|
+
"sourceMap": true
|
|
78
79
|
}
|
|
79
80
|
},
|
|
80
81
|
"defaultConfiguration": "production"
|
|
@@ -83,10 +84,10 @@
|
|
|
83
84
|
"builder": "@angular-devkit/build-angular:dev-server",
|
|
84
85
|
"configurations": {
|
|
85
86
|
"production": {
|
|
86
|
-
"
|
|
87
|
+
"buildTarget": "<%= dasherize(project) %>:build:production"
|
|
87
88
|
},
|
|
88
89
|
"development": {
|
|
89
|
-
"
|
|
90
|
+
"buildTarget": "<%= dasherize(project) %>:build:development"
|
|
90
91
|
}
|
|
91
92
|
},
|
|
92
93
|
"defaultConfiguration": "development"
|
|
@@ -94,16 +95,17 @@
|
|
|
94
95
|
"extract-i18n": {
|
|
95
96
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
|
96
97
|
"options": {
|
|
97
|
-
"
|
|
98
|
+
"buildTarget": "<%= dasherize(project) %>:build"
|
|
98
99
|
}
|
|
99
100
|
},
|
|
100
101
|
"test": {
|
|
101
102
|
"builder": "@angular-devkit/build-angular:karma",
|
|
102
103
|
"options": {
|
|
103
|
-
"
|
|
104
|
-
|
|
104
|
+
"polyfills": [
|
|
105
|
+
"zone.js",
|
|
106
|
+
"zone.js/testing"
|
|
107
|
+
],
|
|
105
108
|
"tsConfig": "tsconfig.spec.json",
|
|
106
|
-
"karmaConfig": "karma.conf.js",
|
|
107
109
|
"inlineStyleLanguage": "scss",
|
|
108
110
|
"assets": [
|
|
109
111
|
"src/favicon.ico",
|
|
@@ -127,6 +129,5 @@
|
|
|
127
129
|
}
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
|
-
}
|
|
131
|
-
"defaultProject": "<%= dasherize(project) %>"
|
|
132
|
+
}
|
|
132
133
|
}
|
|
@@ -1,62 +1,62 @@
|
|
|
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",
|
|
7
7
|
"build": "ng build",
|
|
8
8
|
"watch": "ng build --watch --configuration development",
|
|
9
9
|
"test": "ng test",
|
|
10
|
+
"serve:ssr:compass-goals": "node dist/compass-goals/server/server.mjs",
|
|
10
11
|
"lint": "ng lint",
|
|
11
12
|
"lintfix": "ng lint --fix"
|
|
12
13
|
},
|
|
13
14
|
"private": true,
|
|
14
15
|
"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",
|
|
16
|
+
"@angular/animations": "^17.3.0",
|
|
17
|
+
"@angular/cdk": "^17.3.0",
|
|
18
|
+
"@angular/common": "^17.3.0",
|
|
19
|
+
"@angular/compiler": "^17.3.0",
|
|
20
|
+
"@angular/core": "^17.3.0",
|
|
21
|
+
"@angular/fire": "^17.0.0",
|
|
22
|
+
"@angular/forms": "^17.3.0",
|
|
23
|
+
"@angular/material": "^17.2.1",
|
|
24
|
+
"@angular/platform-browser": "^17.3.0",
|
|
25
|
+
"@angular/platform-browser-dynamic": "^17.3.0",
|
|
26
|
+
"@angular/router": "^17.3.0",
|
|
27
|
+
"@ngrx/effects": "^17.1.1",
|
|
28
|
+
"@ngrx/entity": "^17.1.1",
|
|
29
|
+
"@ngrx/router-store": "^17.1.1",
|
|
30
|
+
"@ngrx/store": "^17.1.1",
|
|
31
|
+
"@ngrx/store-devtools": "^17.1.1",
|
|
32
32
|
"crypto-es": "^1.2.7",
|
|
33
|
-
"rxjs": "~7.
|
|
33
|
+
"rxjs": "~7.8.0",
|
|
34
34
|
"tslib": "^2.3.0",
|
|
35
|
-
"zone.js": "~0.
|
|
35
|
+
"zone.js": "~0.14.3"
|
|
36
36
|
},
|
|
37
37
|
"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
|
-
"@
|
|
47
|
-
"@types/jasmine": "~
|
|
48
|
-
"@types/node": "^
|
|
38
|
+
"@angular-devkit/build-angular": "^17.3.2",
|
|
39
|
+
"@angular-eslint/builder": "^17.2.1",
|
|
40
|
+
"@angular-eslint/eslint-plugin": "^17.2.1",
|
|
41
|
+
"@angular-eslint/eslint-plugin-template": "^17.2.1",
|
|
42
|
+
"@angular-eslint/schematics": "^17.2.1",
|
|
43
|
+
"@angular-eslint/template-parser": "^17.2.1",
|
|
44
|
+
"@angular/cli": "^17.3.2",
|
|
45
|
+
"@angular/compiler-cli": "^17.3.0",
|
|
46
|
+
"@tech4good/angular-schematics": "^17.0.1",
|
|
47
|
+
"@types/jasmine": "~5.1.0",
|
|
48
|
+
"@types/node": "^18.18.0",
|
|
49
49
|
"@types/estree": "^1.0.0",
|
|
50
|
-
"@typescript-eslint/eslint-plugin": "
|
|
51
|
-
"@typescript-eslint/parser": "
|
|
52
|
-
"eslint": "^8.
|
|
50
|
+
"@typescript-eslint/eslint-plugin": "6.10.0",
|
|
51
|
+
"@typescript-eslint/parser": "6.10.0",
|
|
52
|
+
"eslint": "^8.53.0",
|
|
53
53
|
"eslint-config-google": "^0.14.0",
|
|
54
|
-
"jasmine-core": "~
|
|
55
|
-
"karma": "~6.
|
|
56
|
-
"karma-chrome-launcher": "~3.
|
|
57
|
-
"karma-coverage": "~2.
|
|
58
|
-
"karma-jasmine": "~
|
|
59
|
-
"karma-jasmine-html-reporter": "~1.
|
|
60
|
-
"typescript": "~4.
|
|
54
|
+
"jasmine-core": "~5.1.0",
|
|
55
|
+
"karma": "~6.4.0",
|
|
56
|
+
"karma-chrome-launcher": "~3.2.0",
|
|
57
|
+
"karma-coverage": "~2.2.0",
|
|
58
|
+
"karma-jasmine": "~5.1.0",
|
|
59
|
+
"karma-jasmine-html-reporter": "~2.1.0",
|
|
60
|
+
"typescript": "~5.4.2"
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -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
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { Router } from '@angular/router';
|
|
3
3
|
import { Action } from '@ngrx/store';
|
|
4
|
-
import { Actions,
|
|
4
|
+
import { Actions, createEffect, ofType } from '@ngrx/effects';
|
|
5
5
|
import { of, Observable, merge } from 'rxjs';
|
|
6
6
|
import { tap, filter, mergeMap, map, first } from 'rxjs/operators';
|
|
7
7
|
import { pipe, forkJoin } from 'rxjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { Action } from '@ngrx/store';
|
|
3
|
-
import { Actions, createEffect,
|
|
3
|
+
import { Actions, createEffect, ofType } from '@ngrx/effects';
|
|
4
4
|
import { EMPTY, of, Observable, throwError, forkJoin, from, pipe, merge } from 'rxjs';
|
|
5
5
|
import { switchMap, flatMap, mergeMap, map, catchError, tap, take } from 'rxjs/operators';
|
|
6
6
|
import { FirebaseService } from '../../firebase/firebase.service';
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
|
|
19
19
|
<p class="substep"><b>Voluntary participation</b>: All participation is voluntary and you may choose to discontinue use of the platform at any time.</p>
|
|
20
20
|
|
|
21
|
-
<p class="substep"><b>Rights and concerns</b>: If you have questions about this research study, please contact {{ investigatorInfo }} or the faculty member supervising this research {{ facultyInfo }}. If you have any questions regarding your rights as a research participant, please contact the University of California Santa Cruz, Office of Research Compliance Administration at 831-459-1473 or orca
|
|
21
|
+
<p class="substep"><b>Rights and concerns</b>: If you have questions about this research study, please contact {{ investigatorInfo }} or the faculty member supervising this research {{ facultyInfo }}. If you have any questions regarding your rights as a research participant, please contact the University of California Santa Cruz, Office of Research Compliance Administration at 831-459-1473 or orca@ucsc.edu.</p>
|
|
22
22
|
|
|
23
23
|
<h2>Information Collection and Use</h2>
|
|
24
24
|
|
|
@@ -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
|
|
|
@@ -62,10 +62,12 @@ export class WaitingComponent implements OnInit, OnDestroy {
|
|
|
62
62
|
// Form variables
|
|
63
63
|
desiredValue = '';
|
|
64
64
|
backgroundOther = '';
|
|
65
|
-
backgroundSelections = this.form.group(
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
backgroundSelections = this.form.group({
|
|
66
|
+
option1: false,
|
|
67
|
+
option2: false,
|
|
68
|
+
option3: false,
|
|
69
|
+
other: false,
|
|
70
|
+
});
|
|
69
71
|
|
|
70
72
|
// --------------- DB ENTITY DATA ----------------------
|
|
71
73
|
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { enableProdMode } from '@angular/core';
|
|
2
|
+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
|
3
|
+
|
|
4
|
+
import { AppModule } from './app/app.module';
|
|
5
|
+
import { environment } from './environments/environment';
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
if (environment.production) {
|
|
9
|
+
enableProdMode();
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
platformBrowserDynamic().bootstrapModule(AppModule);
|
|
@@ -1,24 +1,27 @@
|
|
|
1
1
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
|
2
|
-
{
|
|
3
|
-
"compileOnSave": false,
|
|
2
|
+
{
|
|
3
|
+
"compileOnSave": false,
|
|
4
4
|
"compilerOptions": {
|
|
5
|
-
"baseUrl": "./",
|
|
5
|
+
"baseUrl": "./",
|
|
6
6
|
"outDir": "./dist/out-tsc",
|
|
7
7
|
"forceConsistentCasingInFileNames": true,
|
|
8
8
|
"noImplicitOverride": true,
|
|
9
9
|
"noPropertyAccessFromIndexSignature": true,
|
|
10
|
-
"noImplicitReturns": true,
|
|
10
|
+
"noImplicitReturns": true,
|
|
11
11
|
"noFallthroughCasesInSwitch": true,
|
|
12
|
-
"
|
|
13
|
-
"
|
|
12
|
+
"skipLibCheck": true,
|
|
13
|
+
"esModuleInterop": true,
|
|
14
|
+
"sourceMap": true,
|
|
15
|
+
"declaration": false,
|
|
14
16
|
"downlevelIteration": true,
|
|
15
|
-
"experimentalDecorators": true,
|
|
17
|
+
"experimentalDecorators": true,
|
|
16
18
|
"moduleResolution": "node",
|
|
17
19
|
"importHelpers": true,
|
|
18
|
-
"target": "
|
|
19
|
-
"module": "
|
|
20
|
+
"target": "ES2022",
|
|
21
|
+
"module": "ES2022",
|
|
22
|
+
"useDefineForClassFields": false,
|
|
20
23
|
"lib": [
|
|
21
|
-
"
|
|
24
|
+
"ES2022",
|
|
22
25
|
"dom"
|
|
23
26
|
]
|
|
24
27
|
},
|
package/src/init/index.js
CHANGED
|
@@ -31,7 +31,6 @@ function init(options) {
|
|
|
31
31
|
if (!project) {
|
|
32
32
|
throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
|
|
33
33
|
}
|
|
34
|
-
context.logger.info(`project: ${project}`);
|
|
35
34
|
options.path = (0, workspace_1.buildDefaultPath)(project);
|
|
36
35
|
context.logger.info(`options.path: ${options.path}`);
|
|
37
36
|
//const parsedPath = parseName(options.path as string, options.name);
|
package/src/init/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAIoC;AACpC,oEAAoE;AACpE,qGAAqG;AACrG,qEAAqE;AACrE,gFAAgF;AAChF,qEAAuF;AAEvF,+CAA+C;AAE/C,2EAA2E;AAE3E,SAAgB,IAAI,CAAC,OAAY;IAC/B,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QAErD,wFAAwF;QACxF,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iIAAiI,CAAC,CAAC;YACvJ,OAAO,IAAA,iBAAI,GAAE,CAAC;SACf;QAED,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAiB,CAAC,CAAC;QAElE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,gCAAmB,CAAC,YAAY,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAC;SAC/E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAIoC;AACpC,oEAAoE;AACpE,qGAAqG;AACrG,qEAAqE;AACrE,gFAAgF;AAChF,qEAAuF;AAEvF,+CAA+C;AAE/C,2EAA2E;AAE3E,SAAgB,IAAI,CAAC,OAAY;IAC/B,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QAErD,wFAAwF;QACxF,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iIAAiI,CAAC,CAAC;YACvJ,OAAO,IAAA,iBAAI,GAAE,CAAC;SACf;QAED,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAiB,CAAC,CAAC;QAElE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,gCAAmB,CAAC,YAAY,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAC;SAC/E;QAED,OAAO,CAAC,IAAI,GAAG,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC;QACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAErD,qEAAqE;QACrE,iCAAiC;QACjC,iCAAiC;QAEjC,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;YAC3C,IAAA,2BAAc,kCACT,cAAO,GACP,OAAO,EACV;YACF,wBAAwB;SACzB,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC;SACnD,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AApCD,oBAoCC"}
|
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"}
|