Resources
-Here are some links to help you get started:
- - - - -Next Steps
-What do you want to do next with your app?
- - - -ng generate component xyz-
ng add @angular/material-
ng add @angular/pwa-
ng add _____-
ng test-
ng build --prod-
diff --git a/.gitignore b/.gitignore index 86d943a..c76c8f6 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ speed-measure-plugin*.json # misc /.sass-cache +/.scss-cache /connect.lock /coverage /libpeerconnection.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7347d2b..2a9b56b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,12 +2,25 @@ stages: - build - deploy -build-job: +develop-build-job: stage: build tags: - build - node script: + - echo "Install dependencies..." + - npm install + - npm run build + only: + - develop + +master-build-job: + stage: build + tags: + - build + - node + script: + - echo "Install dependencies..." - npm install - npm run build --prod artifacts: diff --git a/angular.json b/angular.json index 5807a3e..6202743 100644 --- a/angular.json +++ b/angular.json @@ -7,7 +7,7 @@ "projectType": "application", "schematics": { "@schematics/angular:component": { - "style": "sass" + "style": "scss" } }, "root": "", @@ -28,7 +28,7 @@ "src/assets" ], "styles": [ - "src/styles.sass" + "src/styles.scss" ], "scripts": [] }, @@ -91,7 +91,7 @@ "src/assets" ], "styles": [ - "src/styles.sass" + "src/styles.scss" ], "scripts": [] } diff --git a/package-lock.json b/package-lock.json index e6b78ff..a2c0d71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,6 +3,10 @@ "version": "0.0.0", "lockfileVersion": 2, "requires": true, +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "packages": { "": { "name": "inkletblot-com", @@ -157,6 +161,7 @@ "node": ">= 10.13.0", "npm": "^6.11.0 || ^7.5.6", "yarn": ">= 1.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next", @@ -191,6 +196,8 @@ "tslint": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { @@ -246,10 +253,13 @@ "node": ">= 10.13.0", "npm": "^6.11.0 || ^7.5.6", "yarn": ">= 1.13.0" +<<<<<<< HEAD }, "peerDependencies": { "webpack": "^4.6.0", "webpack-dev-server": "^3.1.4" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { @@ -346,9 +356,12 @@ "integrity": "sha512-i+H5vC2/NUqZwGeoDHpLDn81R3prQGwT1AajMqFw9D3U6VX6G5EfYmn1zLvu8nL2r4cYMsSQ/LKnKl2jnQX0sQ==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/core": "11.2.7" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/cli": { @@ -396,10 +409,13 @@ "integrity": "sha512-+bz/0TYzl/CiQCS1L2iwC7uiV+d+PnhvCs6scu66YKnBK2gSKxdypZZ3UZNbWDyYonAYmghEt+xHvKVpZgzhbw==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/core": "11.2.7", "rxjs": "^6.5.3" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/compiler": { @@ -440,10 +456,13 @@ }, "engines": { "node": ">=10.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/compiler": "11.2.7", "typescript": ">=4.0 <4.2" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/compiler-cli/node_modules/semver": { @@ -470,10 +489,13 @@ "integrity": "sha512-d/d8mPh90eEs01eWzR2sNOD6aVsv69DCeYWDdNqABe+AnrE/xmNvggeAOMcREEwQB9e6liJgmHbMLktVaMhqyg==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "rxjs": "^6.5.3", "zone.js": "^0.10.2 || ^0.11.3" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/forms": { @@ -482,12 +504,15 @@ "integrity": "sha512-MhNRZ0Su0z9Lof5wxJbaslIdEbG1C39RJ/xyeIm6+vZ5eCXnC3DqPuD4UIoWCgDQXFZW2pjdIePpLLYZnRNGRg==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/common": "11.2.7", "@angular/core": "11.2.7", "@angular/platform-browser": "11.2.7", "rxjs": "^6.5.3" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/platform-browser": { @@ -496,6 +521,7 @@ "integrity": "sha512-b2n8WX4CuNQg4L9t4URqXNoJCdvLqZlDjTW0ClngOGBUMIh2bD4ripJA+1RfkWzpEs+zQM0JKNTmVoXn/Zo1bg==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/animations": "11.2.7", @@ -506,6 +532,8 @@ "@angular/animations": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/platform-browser-dynamic": { @@ -514,12 +542,15 @@ "integrity": "sha512-gVYcqvoj4IIeiVSxv5+83tkYFRgVYtaLrMY9ClVVw3WZDb61qfv2FStYAJbzBfJOLtYoyTB0t30z3db9kwxzBA==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/common": "11.2.7", "@angular/compiler": "11.2.7", "@angular/core": "11.2.7", "@angular/platform-browser": "11.2.7" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@angular/router": { @@ -528,12 +559,15 @@ "integrity": "sha512-Uf+DYpusYo/TMRz9NK3LS1cVuFnbbbSQYwIJNY7v9YX1aFdDBKVVOQJGfs3CTVv44J1VVoJsLWfbIJw2pGUIuQ==", "dependencies": { "tslib": "^2.0.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/common": "11.2.7", "@angular/core": "11.2.7", "@angular/platform-browser": "11.2.7", "rxjs": "^6.5.3" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/code-frame": { @@ -575,10 +609,13 @@ }, "engines": { "node": ">=6.9.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/babel" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/core/node_modules/semver": { @@ -648,9 +685,12 @@ "@babel/helper-validator-option": "^7.12.17", "browserslist": "^4.14.5", "semver": "^6.3.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -673,9 +713,12 @@ "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/helper-replace-supers": "^7.13.0", "@babel/helper-split-export-declaration": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/helper-create-regexp-features-plugin": { @@ -686,9 +729,12 @@ "dependencies": { "@babel/helper-annotate-as-pure": "^7.12.13", "regexpu-core": "^4.7.1" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/helper-explode-assignable-expression": { @@ -940,9 +986,12 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-remap-async-to-generator": "^7.13.0", "@babel/plugin-syntax-async-generators": "^7.8.4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-class-properties": { @@ -953,9 +1002,12 @@ "dependencies": { "@babel/helper-create-class-features-plugin": "^7.13.0", "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-dynamic-import": { @@ -966,9 +1018,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-dynamic-import": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-export-namespace-from": { @@ -979,9 +1034,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.12.13", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-json-strings": { @@ -992,9 +1050,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-json-strings": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-logical-assignment-operators": { @@ -1005,9 +1066,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { @@ -1018,9 +1082,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-numeric-separator": { @@ -1031,9 +1098,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.12.13", "@babel/plugin-syntax-numeric-separator": "^7.10.4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-object-rest-spread": { @@ -1047,9 +1117,12 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-transform-parameters": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-optional-catch-binding": { @@ -1060,9 +1133,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-optional-chaining": { @@ -1074,9 +1150,12 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", "@babel/plugin-syntax-optional-chaining": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-private-methods": { @@ -1087,9 +1166,12 @@ "dependencies": { "@babel/helper-create-class-features-plugin": "^7.13.0", "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-proposal-unicode-property-regex": { @@ -1103,9 +1185,12 @@ }, "engines": { "node": ">=4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-async-generators": { @@ -1115,9 +1200,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-class-properties": { @@ -1127,9 +1215,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-dynamic-import": { @@ -1139,9 +1230,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-export-namespace-from": { @@ -1151,9 +1245,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-json-strings": { @@ -1163,9 +1260,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { @@ -1175,9 +1275,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { @@ -1187,9 +1290,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-numeric-separator": { @@ -1199,9 +1305,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-object-rest-spread": { @@ -1211,9 +1320,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-optional-catch-binding": { @@ -1223,9 +1335,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-optional-chaining": { @@ -1235,9 +1350,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-syntax-top-level-await": { @@ -1247,9 +1365,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-arrow-functions": { @@ -1259,9 +1380,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-async-to-generator": { @@ -1273,9 +1397,12 @@ "@babel/helper-module-imports": "^7.12.1", "@babel/helper-plugin-utils": "^7.10.4", "@babel/helper-remap-async-to-generator": "^7.12.1" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { @@ -1285,9 +1412,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-block-scoping": { @@ -1297,9 +1427,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-classes": { @@ -1315,9 +1448,12 @@ "@babel/helper-replace-supers": "^7.13.0", "@babel/helper-split-export-declaration": "^7.12.13", "globals": "^11.1.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-computed-properties": { @@ -1327,9 +1463,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-destructuring": { @@ -1339,9 +1478,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-dotall-regex": { @@ -1352,9 +1494,12 @@ "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.12.13", "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-duplicate-keys": { @@ -1364,9 +1509,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { @@ -1377,9 +1525,12 @@ "dependencies": { "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13", "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-for-of": { @@ -1389,9 +1540,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-function-name": { @@ -1402,9 +1556,12 @@ "dependencies": { "@babel/helper-function-name": "^7.12.13", "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-literals": { @@ -1414,9 +1571,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-member-expression-literals": { @@ -1426,9 +1586,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-modules-amd": { @@ -1440,9 +1603,12 @@ "@babel/helper-module-transforms": "^7.13.0", "@babel/helper-plugin-utils": "^7.13.0", "babel-plugin-dynamic-import-node": "^2.3.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-modules-commonjs": { @@ -1455,9 +1621,12 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-simple-access": "^7.12.13", "babel-plugin-dynamic-import-node": "^2.3.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-modules-systemjs": { @@ -1471,9 +1640,12 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-validator-identifier": "^7.12.11", "babel-plugin-dynamic-import-node": "^2.3.3" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-modules-umd": { @@ -1484,9 +1656,12 @@ "dependencies": { "@babel/helper-module-transforms": "^7.13.0", "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { @@ -1496,9 +1671,12 @@ "dev": true, "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-new-target": { @@ -1508,9 +1686,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-object-super": { @@ -1521,9 +1702,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.12.13", "@babel/helper-replace-supers": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-parameters": { @@ -1533,9 +1717,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-property-literals": { @@ -1545,9 +1732,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-regenerator": { @@ -1557,9 +1747,12 @@ "dev": true, "dependencies": { "regenerator-transform": "^0.14.2" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-reserved-words": { @@ -1569,9 +1762,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-runtime": { @@ -1583,9 +1779,12 @@ "@babel/helper-module-imports": "^7.12.5", "@babel/helper-plugin-utils": "^7.10.4", "semver": "^5.5.1" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { @@ -1604,9 +1803,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-spread": { @@ -1617,9 +1819,12 @@ "dependencies": { "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-sticky-regex": { @@ -1629,9 +1834,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-template-literals": { @@ -1641,9 +1849,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-typeof-symbol": { @@ -1653,9 +1864,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-unicode-escapes": { @@ -1665,9 +1879,12 @@ "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/plugin-transform-unicode-regex": { @@ -1678,9 +1895,12 @@ "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.12.13", "@babel/helper-plugin-utils": "^7.12.13" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/preset-env": { @@ -1755,9 +1975,12 @@ "@babel/types": "^7.12.11", "core-js-compat": "^3.8.0", "semver": "^5.5.0" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/preset-env/node_modules/semver": { @@ -1780,9 +2003,12 @@ "@babel/plugin-transform-dotall-regex": "^7.4.4", "@babel/types": "^7.4.4", "esutils": "^2.0.2" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0-0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@babel/runtime": { @@ -1897,11 +2123,14 @@ "node": ">= 10.13.0", "npm": "^6.11.0 || ^7.5.6", "yarn": ">= 1.13.0" +<<<<<<< HEAD }, "peerDependencies": { "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next", "typescript": "~4.0.0 || ~4.1.0", "webpack": "^4.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/@nodelib/fs.scandir": { @@ -2518,29 +2747,40 @@ "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" +<<<<<<< HEAD }, "funding": { "type": "github", "url": "https://github.com/sponsors/epoberezkin" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ajv-errors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", +<<<<<<< HEAD "dev": true, "peerDependencies": { "ajv": ">=5.0.0" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", +<<<<<<< HEAD "dev": true, "peerDependencies": { "ajv": "^6.9.1" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/alphanum-sort": { "version": "1.0.2", @@ -2567,9 +2807,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ansi-html": { @@ -2906,6 +3149,7 @@ }, "engines": { "node": "^10 || ^12 || >=14" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -2913,6 +3157,8 @@ }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/aws-sign2": { @@ -2952,10 +3198,13 @@ }, "engines": { "node": ">= 8.9" +<<<<<<< HEAD }, "peerDependencies": { "@babel/core": "^7.0.0", "webpack": ">=2" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/babel-loader/node_modules/json5": { @@ -3042,6 +3291,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -3057,6 +3307,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/base64id": { "version": "2.0.0", @@ -3300,6 +3553,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -3315,6 +3569,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/browserify-zlib": { "version": "0.2.0", @@ -3342,10 +3599,13 @@ }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/browserstack": { @@ -3396,6 +3656,7 @@ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, +<<<<<<< HEAD "funding": [ { "type": "github", @@ -3410,6 +3671,8 @@ "url": "https://feross.org/support" } ], +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -3519,9 +3782,12 @@ "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/caller-callsite": { @@ -3564,9 +3830,12 @@ "dev": true, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/caniuse-api": { @@ -3684,9 +3953,12 @@ "dev": true, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "peerDependencies": { "webpack": ">=4.0.1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/class-utils": { @@ -3815,9 +4087,12 @@ "dev": true, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/cli-width": { @@ -3898,8 +4173,11 @@ "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==", "dev": true, "dependencies": { +<<<<<<< HEAD "@angular/compiler": "9.0.0", "@angular/core": "9.0.0", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "app-root-path": "^3.0.0", "aria-query": "^3.0.0", "axobject-query": "2.0.2", @@ -3912,11 +4190,14 @@ "sprintf-js": "^1.1.2", "tslib": "^1.10.0", "zone.js": "~0.10.3" +<<<<<<< HEAD }, "peerDependencies": { "@angular/compiler": ">=2.3.1 <12.0.0 || ^11.0.0-next || ^11.1.0-next || ^11.2.0-next", "@angular/core": ">=2.3.1 <12.0.0 || ^11.0.0-next || ^11.1.0-next || ^11.2.0-next", "tslint": "^5.0.0 || ^6.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/codelyzer/node_modules/source-map": { @@ -4319,6 +4600,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -4326,6 +4608,8 @@ }, "peerDependencies": { "webpack": "^4.37.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/copy-webpack-plugin/node_modules/schema-utils": { @@ -4340,10 +4624,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/copy-webpack-plugin/node_modules/source-map": { @@ -4370,11 +4657,15 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz", "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==", "dev": true, +<<<<<<< HEAD "hasInstallScript": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" } +======= + "hasInstallScript": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/core-js-compat": { "version": "3.10.0", @@ -4384,10 +4675,13 @@ "dependencies": { "browserslist": "^4.16.3", "semver": "7.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/core-js-compat/node_modules/semver": { @@ -4499,9 +4793,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/critters/node_modules/chalk": { @@ -4515,9 +4812,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/critters/node_modules/color-convert": { @@ -4651,10 +4951,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/css-declaration-sorter/node_modules/source-map": { @@ -4699,6 +5002,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -4706,6 +5010,8 @@ }, "peerDependencies": { "webpack": "^4.27.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/css-loader/node_modules/schema-utils": { @@ -4720,10 +5026,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/css-parse": { @@ -4826,9 +5135,12 @@ "dev": true, "engines": { "node": ">= 6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/fb55" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/css/node_modules/source-map": { @@ -4929,10 +5241,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/cssnano-preset-default/node_modules/source-map": { @@ -4998,10 +5313,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/cssnano-util-raw-cache/node_modules/source-map": { @@ -5046,10 +5364,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/cssnano/node_modules/source-map": { @@ -5172,11 +5493,14 @@ }, "engines": { "node": ">=6.0" +<<<<<<< HEAD }, "peerDependenciesMeta": { "supports-color": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/decamelize": { @@ -5209,9 +5533,12 @@ "object-is": "^1.0.1", "object-keys": "^1.1.1", "regexp.prototype.flags": "^1.2.0" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/default-gateway": { @@ -5470,6 +5797,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -5477,6 +5805,9 @@ "url": "https://github.com/sponsors/fb55" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/domain-browser": { "version": "1.2.0", @@ -5704,10 +6035,14 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", +<<<<<<< HEAD "dev": true, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/env-paths": { "version": "2.2.1", @@ -5770,9 +6105,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/es-to-primitive": { @@ -5787,9 +6125,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/es5-ext": { @@ -6390,9 +6731,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/file-loader": { @@ -6406,6 +6750,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -6413,6 +6758,8 @@ }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/file-loader/node_modules/schema-utils": { @@ -6427,10 +6774,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/file-uri-to-path": { @@ -6497,9 +6847,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/avajs/find-cache-dir?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/find-up": { @@ -6560,6 +6913,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", "dev": true, +<<<<<<< HEAD "funding": [ { "type": "individual", @@ -6573,6 +6927,10 @@ "debug": { "optional": true } +======= + "engines": { + "node": ">=4.0" +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/for-in": { @@ -6750,7 +7108,10 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, +<<<<<<< HEAD "hasInstallScript": true, +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "optional": true, "os": [ "darwin" @@ -6855,9 +7216,12 @@ "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/get-stream": { @@ -6905,9 +7269,12 @@ }, "engines": { "node": "*" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/isaacs" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/glob-parent": { @@ -6946,9 +7313,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/graceful-fs": { @@ -6976,7 +7346,10 @@ "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", +<<<<<<< HEAD "deprecated": "this library is no longer supported", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "dependencies": { "ajv": "^6.12.3", @@ -7023,10 +7396,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", +<<<<<<< HEAD "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/has-flag": { "version": "3.0.0", @@ -7044,9 +7421,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/has-unicode": { @@ -7136,6 +7516,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -7151,6 +7532,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/hash.js": { "version": "1.1.7", @@ -7532,15 +7916,19 @@ "dev": true, "engines": { "node": "^10 || ^12 || >= 14" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -7556,6 +7944,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/iferr": { "version": "0.1.5", @@ -7664,9 +8055,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/import-local/node_modules/p-locate": { @@ -7791,9 +8185,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/inquirer/node_modules/chalk": { @@ -7807,9 +8204,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/inquirer/node_modules/color-convert": { @@ -7919,9 +8319,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-arrayish": { @@ -7934,10 +8337,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", +<<<<<<< HEAD "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -7961,9 +8368,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-buffer": { @@ -7979,9 +8389,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-color-stop": { @@ -8005,9 +8418,12 @@ "dev": true, "dependencies": { "has": "^1.0.3" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-data-descriptor": { @@ -8029,9 +8445,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-descriptor": { @@ -8067,9 +8486,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-extendable": { @@ -8136,9 +8558,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-number": { @@ -8157,9 +8582,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-obj": { @@ -8227,9 +8655,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-resolvable": { @@ -8254,9 +8685,12 @@ "dev": true, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-svg": { @@ -8281,9 +8715,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-typedarray": { @@ -8299,9 +8736,12 @@ "dev": true, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/is-what": { @@ -8344,9 +8784,12 @@ "dev": true, "engines": { "node": ">= 8.0.0" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/gjtorikian/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/isexe": { @@ -8652,7 +9095,11 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, +<<<<<<< HEAD "optionalDependencies": { +======= + "dependencies": { +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "graceful-fs": "^4.1.6" } }, @@ -8789,21 +9236,28 @@ }, "engines": { "node": ">= 10" +<<<<<<< HEAD }, "peerDependencies": { "karma": "*" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/karma-jasmine-html-reporter": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz", "integrity": "sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q==", +<<<<<<< HEAD "dev": true, "peerDependencies": { "jasmine-core": ">=3.5", "karma": ">=0.9", "karma-jasmine": ">=1.1" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/karma-source-map-support": { "version": "1.4.0", @@ -8866,6 +9320,11 @@ "dev": true, "dependencies": { "copy-anything": "^2.0.1", +<<<<<<< HEAD +======= + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "parse-node-version": "^1.0.1", "tslib": "^1.10.0" }, @@ -8876,8 +9335,11 @@ "node": ">=6" }, "optionalDependencies": { +<<<<<<< HEAD "errno": "^0.1.1", "graceful-fs": "^4.1.2", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "image-size": "~0.5.0", "make-dir": "^2.1.0", "mime": "^1.4.1", @@ -8897,6 +9359,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -8905,6 +9368,8 @@ "peerDependencies": { "less": "^3.5.0 || ^4.0.0", "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/less-loader/node_modules/schema-utils": { @@ -8919,10 +9384,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/less/node_modules/make-dir": { @@ -9096,9 +9564,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/log-symbols/node_modules/ansi-styles": { @@ -9111,9 +9582,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/log-symbols/node_modules/chalk": { @@ -9127,9 +9601,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/log-symbols/node_modules/color-convert": { @@ -9194,10 +9671,13 @@ "dev": true, "engines": { "node": ">= 0.6.0" +<<<<<<< HEAD }, "funding": { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/loglevel" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/lru-cache": { @@ -9231,9 +9711,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/make-dir/node_modules/semver": { @@ -9520,6 +10003,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -9527,6 +10011,8 @@ }, "peerDependencies": { "webpack": "^4.4.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { @@ -9541,10 +10027,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/mini-css-extract-plugin/node_modules/source-map": { @@ -10313,10 +10802,14 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", +<<<<<<< HEAD "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/object-is": { "version": "1.1.5", @@ -10329,9 +10822,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/object-keys": { @@ -10368,9 +10864,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/object.getownpropertydescriptors": { @@ -10385,9 +10884,12 @@ }, "engines": { "node": ">= 0.8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/object.pick": { @@ -10415,9 +10917,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/obuf": { @@ -10466,9 +10971,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/open": { @@ -10482,9 +10990,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/opn": { @@ -10525,9 +11036,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ora/node_modules/ansi-styles": { @@ -10540,9 +11054,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ora/node_modules/chalk": { @@ -10556,9 +11073,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ora/node_modules/color-convert": { @@ -10643,9 +11163,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/p-locate": { @@ -10670,9 +11193,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/p-map": { @@ -10685,9 +11211,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/p-retry": { @@ -10997,9 +11526,12 @@ "dev": true, "engines": { "node": ">=8.6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/pify": { @@ -11112,10 +11644,13 @@ }, "engines": { "node": "^10 || ^12 || >=14" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-calc": { @@ -11141,10 +11676,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-calc/node_modules/source-map": { @@ -11196,10 +11734,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-colormin/node_modules/postcss-value-parser": { @@ -11254,10 +11795,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-convert-values/node_modules/postcss-value-parser": { @@ -11311,10 +11855,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-discard-comments/node_modules/source-map": { @@ -11362,10 +11909,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-discard-duplicates/node_modules/source-map": { @@ -11413,10 +11963,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-discard-empty/node_modules/source-map": { @@ -11464,10 +12017,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-discard-overridden/node_modules/source-map": { @@ -11503,9 +12059,12 @@ }, "engines": { "node": ">=10.0.0" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-loader": { @@ -11522,6 +12081,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -11530,6 +12090,8 @@ "peerDependencies": { "postcss": "^7.0.0 || ^8.0.1", "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-loader/node_modules/cosmiconfig": { @@ -11559,9 +12121,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-loader/node_modules/parse-json": { @@ -11577,9 +12142,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-loader/node_modules/resolve-from": { @@ -11603,10 +12171,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-merge-longhand": { @@ -11636,10 +12207,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": { @@ -11698,10 +12272,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": { @@ -11764,10 +12341,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": { @@ -11824,10 +12404,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": { @@ -11886,10 +12469,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-minify-params/node_modules/postcss-value-parser": { @@ -11946,10 +12532,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": { @@ -11994,9 +12583,12 @@ "dev": true, "engines": { "node": "^10 || ^12 || >= 14" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-modules-local-by-default": { @@ -12011,9 +12603,12 @@ }, "engines": { "node": "^10 || ^12 || >= 14" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-modules-scope": { @@ -12026,9 +12621,12 @@ }, "engines": { "node": "^10 || ^12 || >= 14" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-modules-values": { @@ -12041,9 +12639,12 @@ }, "engines": { "node": "^10 || ^12 || >= 14" +<<<<<<< HEAD }, "peerDependencies": { "postcss": "^8.1.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-charset": { @@ -12070,10 +12671,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-charset/node_modules/source-map": { @@ -12123,10 +12727,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": { @@ -12183,10 +12790,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": { @@ -12243,10 +12853,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": { @@ -12302,10 +12915,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": { @@ -12361,10 +12977,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": { @@ -12420,10 +13039,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": { @@ -12480,10 +13102,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": { @@ -12538,10 +13163,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": { @@ -12597,10 +13225,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": { @@ -12657,10 +13288,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-reduce-initial/node_modules/source-map": { @@ -12711,10 +13345,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": { @@ -12786,10 +13423,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-svgo/node_modules/postcss-value-parser": { @@ -12845,10 +13485,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/postcss-unique-selectors/node_modules/source-map": { @@ -12894,9 +13537,12 @@ "dev": true, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/process": { @@ -13128,9 +13774,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/protractor/node_modules/wrap-ansi/node_modules/strip-ansi": { @@ -13327,6 +13976,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -13342,6 +13992,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/randombytes": { "version": "2.1.0", @@ -13397,6 +14050,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -13404,6 +14058,8 @@ }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/raw-loader/node_modules/schema-utils": { @@ -13418,10 +14074,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/read-cache": { @@ -13538,9 +14197,12 @@ }, "engines": { "node": ">= 0.4" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/regexpu-core": { @@ -13615,7 +14277,10 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", +<<<<<<< HEAD "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -13690,9 +14355,12 @@ "dependencies": { "is-core-module": "^2.1.0", "path-parse": "^1.0.6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/resolve-cwd": { @@ -13720,7 +14388,10 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", +<<<<<<< HEAD "deprecated": "https://github.com/lydell/resolve-url#deprecated", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true }, "node_modules/resolve-url-loader": { @@ -13948,9 +14619,12 @@ }, "bin": { "rimraf": "bin.js" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/isaacs" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ripemd160": { @@ -13992,6 +14666,7 @@ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, +<<<<<<< HEAD "funding": [ { "type": "github", @@ -14006,6 +14681,8 @@ "url": "https://feross.org/support" } ], +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dependencies": { "queue-microtask": "^1.2.2" } @@ -14085,6 +14762,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -14106,6 +14784,8 @@ "sass": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/sass-loader/node_modules/schema-utils": { @@ -14120,10 +14800,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/saucelabs": { @@ -14190,10 +14873,13 @@ }, "engines": { "node": ">= 8.9.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/select-hose": { @@ -14942,6 +15628,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -14949,6 +15636,8 @@ }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/source-map-loader/node_modules/iconv-lite": { @@ -14975,10 +15664,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/source-map-loader/node_modules/source-map": { @@ -15071,9 +15763,12 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "peerDependencies": { "webpack": "^1 || ^2 || ^3 || ^4 || ^5" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/speed-measure-webpack-plugin/node_modules/ansi-styles": { @@ -15086,9 +15781,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/speed-measure-webpack-plugin/node_modules/chalk": { @@ -15102,9 +15800,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/speed-measure-webpack-plugin/node_modules/color-convert": { @@ -15180,11 +15881,14 @@ "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" }, +<<<<<<< HEAD "bin": { "sshpk-conv": "bin/sshpk-conv", "sshpk-sign": "bin/sshpk-sign", "sshpk-verify": "bin/sshpk-verify" }, +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "engines": { "node": ">=0.10.0" } @@ -15449,6 +16153,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +<<<<<<< HEAD "dev": true, "funding": [ { @@ -15464,6 +16169,9 @@ "url": "https://feross.org/support" } ] +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/string-width": { "version": "4.2.2", @@ -15487,9 +16195,12 @@ "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/string.prototype.trimstart": { @@ -15500,9 +16211,12 @@ "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/strip-ansi": { @@ -15537,6 +16251,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -15544,6 +16259,8 @@ }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/style-loader/node_modules/schema-utils": { @@ -15558,10 +16275,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/stylehacks": { @@ -15590,10 +16310,13 @@ }, "engines": { "node": ">=6.0.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/postcss/" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/stylehacks/node_modules/postcss-selector-parser": { @@ -15667,6 +16390,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -15675,6 +16399,8 @@ "peerDependencies": { "stylus": ">=0.52.4", "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/stylus-loader/node_modules/schema-utils": { @@ -15689,10 +16415,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/stylus/node_modules/debug": { @@ -15840,6 +16569,7 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -15847,6 +16577,8 @@ }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { @@ -15861,10 +16593,13 @@ }, "engines": { "node": ">= 10.13.0" +<<<<<<< HEAD }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/terser-webpack-plugin/node_modules/source-map": { @@ -16082,9 +16817,12 @@ }, "engines": { "node": ">=4.2.0" +<<<<<<< HEAD }, "peerDependencies": { "typescript": ">=2.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/ts-pnp": { @@ -16094,11 +16832,14 @@ "dev": true, "engines": { "node": ">=6" +<<<<<<< HEAD }, "peerDependenciesMeta": { "typescript": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/tslib": { @@ -16110,7 +16851,10 @@ "version": "6.1.3", "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz", "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", +<<<<<<< HEAD "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "dependencies": { "@babel/code-frame": "^7.0.0", @@ -16132,9 +16876,12 @@ }, "engines": { "node": ">=4.8.0" +<<<<<<< HEAD }, "peerDependencies": { "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 4.0.0-dev" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/tslint/node_modules/mkdirp": { @@ -16171,9 +16918,12 @@ "dev": true, "dependencies": { "tslib": "^1.8.1" +<<<<<<< HEAD }, "peerDependencies": { "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/tsutils/node_modules/tslib": { @@ -16219,9 +16969,12 @@ "dev": true, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/type-is": { @@ -16261,6 +17014,7 @@ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.26.tgz", "integrity": "sha512-VwIvGlFNmpKbjzRt51jpbbFTrKIEgGHxIwA8Y69K1Bqc6bTIV7TaGGABOkghSFQWsLmcRB4drGvpfv9z2szqoQ==", "dev": true, +<<<<<<< HEAD "funding": [ { "type": "opencollective", @@ -16271,6 +17025,8 @@ "url": "https://paypal.me/faisalman" } ], +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "engines": { "node": "*" } @@ -16285,9 +17041,12 @@ "has-bigints": "^1.0.1", "has-symbols": "^1.0.2", "which-boxed-primitive": "^1.0.2" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/unicode-canonical-property-names-ecmascript": { @@ -16499,7 +17258,10 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", +<<<<<<< HEAD "deprecated": "Please see https://github.com/lydell/urix#deprecated", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true }, "node_modules/url": { @@ -16562,9 +17324,12 @@ "es-abstract": "^1.17.2", "has-symbols": "^1.0.1", "object.getownpropertydescriptors": "^2.1.0" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/util/node_modules/inherits": { @@ -16613,11 +17378,15 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", +<<<<<<< HEAD "dev": true, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" } +======= + "dev": true +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) }, "node_modules/verror": { "version": "1.10.0", @@ -16654,11 +17423,18 @@ "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "dependencies": { +<<<<<<< HEAD +======= + "chokidar": "^3.4.1", +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "graceful-fs": "^4.1.2", "neo-async": "^2.5.0" }, "optionalDependencies": { +<<<<<<< HEAD "chokidar": "^3.4.1", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "watchpack-chokidar2": "^2.0.1" } }, @@ -16745,13 +17521,20 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", +<<<<<<< HEAD "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "optional": true, "dependencies": { "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", +<<<<<<< HEAD +======= + "fsevents": "^1.2.7", +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -16760,9 +17543,12 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", "upath": "^1.1.1" +<<<<<<< HEAD }, "optionalDependencies": { "fsevents": "^1.2.7" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/watchpack-chokidar2/node_modules/fill-range": { @@ -16798,7 +17584,10 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", +<<<<<<< HEAD "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "hasInstallScript": true, "optional": true, @@ -17139,6 +17928,7 @@ }, "engines": { "node": ">=6.11.5" +<<<<<<< HEAD }, "funding": { "type": "opencollective", @@ -17151,6 +17941,8 @@ "webpack-command": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack-dev-middleware": { @@ -17167,9 +17959,12 @@ }, "engines": { "node": ">= 6" +<<<<<<< HEAD }, "peerDependencies": { "webpack": "^4.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack-dev-middleware/node_modules/mkdirp": { @@ -17229,6 +18024,7 @@ }, "engines": { "node": ">= 6.11.5" +<<<<<<< HEAD }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" @@ -17237,6 +18033,8 @@ "webpack-cli": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack-dev-server/node_modules/ansi-regex": { @@ -17337,7 +18135,10 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", +<<<<<<< HEAD "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "dependencies": { "anymatch": "^2.0.0", @@ -17464,7 +18265,10 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", +<<<<<<< HEAD "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.", +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dev": true, "hasInstallScript": true, "optional": true, @@ -17660,9 +18464,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack-dev-server/node_modules/p-locate": { @@ -17994,6 +18801,7 @@ }, "engines": { "node": ">=4" +<<<<<<< HEAD }, "peerDependencies": { "html-webpack-plugin": ">= 2.21.0 < 5", @@ -18003,6 +18811,8 @@ "html-webpack-plugin": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack-subresource-integrity/node_modules/source-map": { @@ -18315,9 +19125,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack/node_modules/p-locate": { @@ -18492,9 +19305,12 @@ }, "engines": { "node": ">= 6.9.0" +<<<<<<< HEAD }, "peerDependencies": { "webpack": "^4.0.0" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/webpack/node_modules/to-regex-range": { @@ -18584,9 +19400,12 @@ "is-number-object": "^1.0.4", "is-string": "^1.0.5", "is-symbol": "^1.0.3" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/ljharb" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/which-module": { @@ -18669,9 +19488,12 @@ "dev": true, "dependencies": { "loader-utils": "^1.1.0" +<<<<<<< HEAD }, "peerDependencies": { "webpack": ">= 4" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/worker-plugin/node_modules/json5": { @@ -18712,9 +19534,12 @@ }, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { @@ -18727,9 +19552,12 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/wrap-ansi/node_modules/color-convert": { @@ -18763,6 +19591,7 @@ "dev": true, "engines": { "node": ">=8.3.0" +<<<<<<< HEAD }, "peerDependencies": { "bufferutil": "^4.0.1", @@ -18775,6 +19604,8 @@ "utf-8-validate": { "optional": true } +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/xml2js": { @@ -18875,9 +19706,12 @@ "dev": true, "engines": { "node": ">=10" +<<<<<<< HEAD }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) } }, "node_modules/zone.js": { @@ -18889,6 +19723,11 @@ } } }, +<<<<<<< HEAD +======= +>>>>>>> f43538f (added base app and started scaffolding of inklets things, plan inklets gallery (for posterity), home page, projects page (eg my configs and suckless builds etc)) +======= +>>>>>>> 16764b8 (added basic page scaffolding and added links. scaffoled pages for projects and home) "dependencies": { "@angular-devkit/architect": { "version": "0.1102.6", @@ -20944,15 +21783,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true, - "requires": {} + "dev": true }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "alphanum-sort": { "version": "1.0.2", @@ -21892,8 +22729,7 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz", "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==", - "dev": true, - "requires": {} + "dev": true }, "class-utils": { "version": "0.3.6", @@ -25082,8 +25918,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} + "dev": true }, "ieee754": { "version": "1.2.1", @@ -26059,8 +26894,7 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz", "integrity": "sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q==", - "dev": true, - "requires": {} + "dev": true }, "karma-source-map-support": { "version": "1.4.0", @@ -28535,8 +29369,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -33925,8 +34758,7 @@ "version": "7.4.4", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", - "dev": true, - "requires": {} + "dev": true }, "xml2js": { "version": "0.4.23", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0297262..65dc93b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,18 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { HomeComponent } from './home/home.component'; +import { LinksComponent } from './links/links.component'; +import { PetComponent } from './pet/pet.component'; +import { ProjectsComponent } from './projects/projects.component'; +import { Pages } from './shared/models/pages.model'; -const routes: Routes = []; +const routes: Routes = [ + { path: Pages.HOME, component: HomeComponent }, + { path: Pages.PROJECTS, component: ProjectsComponent }, + // { path: AppRoutes.CORE, loadChildren: () => import('./galler/gallery.module').then((m) => m.GalleryModule) }, // for future use + { path: Pages.LINKS, component: LinksComponent }, + { path: Pages.PET, component: PetComponent }, + { path: '**', redirectTo: Pages.HOME, pathMatch: 'full' }]; @NgModule({ imports: [RouterModule.forRoot(routes)], diff --git a/src/app/app.component.html b/src/app/app.component.html index 12938ab..6d0dd13 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,520 +1,11 @@ - - - - - - - - +
Here are some links to help you get started:
- - - - -What do you want to do next with your app?
- - - -ng generate component xyz-
ng add @angular/material-
ng add @angular/pwa-
ng add _____-
ng test-
ng build --prod-
Everything on this site is free for all possible public use.
\ No newline at end of file diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss new file mode 100644 index 0000000..8a5f3bf --- /dev/null +++ b/src/app/footer/footer.component.scss @@ -0,0 +1,11 @@ +@use 'src/app/shared/styles/_variables.color' as colors; + +:host { + padding: 0 20px 0 20px; + margin: 10px 0 10px 0; + display: flex; + flex-direction: column; + align-items: center; + font-size: 9pt; + color: #FAFAFA; +} \ No newline at end of file diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts new file mode 100644 index 0000000..a3c4af9 --- /dev/null +++ b/src/app/footer/footer.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixturehome works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
+home works!
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss new file mode 100644 index 0000000..7bfa459 --- /dev/null +++ b/src/app/home/home.component.scss @@ -0,0 +1,10 @@ +@use 'src/app/shared/styles/_variables.color' as colors; + +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow-y: auto; + padding: 0 20px 0 20px; + margin: 0 140px 10px 140px; +} \ No newline at end of file diff --git a/src/app/home/home.component.spec.ts b/src/app/home/home.component.spec.ts new file mode 100644 index 0000000..2c5a172 --- /dev/null +++ b/src/app/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixturepet
diff --git a/src/app/pet/pet.component.scss b/src/app/pet/pet.component.scss new file mode 100644 index 0000000..7bfa459 --- /dev/null +++ b/src/app/pet/pet.component.scss @@ -0,0 +1,10 @@ +@use 'src/app/shared/styles/_variables.color' as colors; + +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow-y: auto; + padding: 0 20px 0 20px; + margin: 0 140px 10px 140px; +} \ No newline at end of file diff --git a/src/app/pet/pet.component.spec.ts b/src/app/pet/pet.component.spec.ts new file mode 100644 index 0000000..19e711d --- /dev/null +++ b/src/app/pet/pet.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PetComponent } from './pet.component'; + +describe('PetComponent', () => { + let component: PetComponent; + let fixture: ComponentFixtureprojects works!
diff --git a/src/app/projects/projects.component.scss b/src/app/projects/projects.component.scss new file mode 100644 index 0000000..7bfa459 --- /dev/null +++ b/src/app/projects/projects.component.scss @@ -0,0 +1,10 @@ +@use 'src/app/shared/styles/_variables.color' as colors; + +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow-y: auto; + padding: 0 20px 0 20px; + margin: 0 140px 10px 140px; +} \ No newline at end of file diff --git a/src/app/projects/projects.component.spec.ts b/src/app/projects/projects.component.spec.ts new file mode 100644 index 0000000..e974a84 --- /dev/null +++ b/src/app/projects/projects.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProjectsComponent } from './projects.component'; + +describe('ProjectsComponent', () => { + let component: ProjectsComponent; + let fixture: ComponentFixture