Skip to content

Commit c893d7e

Browse files
committed
Feat/a13 upgrade minds#2937
Squashed commit of the following: commit 55ea269 Author: Ben Hayward <[email protected]> Date: Tue Feb 22 11:50:09 2022 +0000 Package update commit de40418 Author: Ben Hayward <[email protected]> Date: Mon Feb 21 13:46:55 2022 +0000 Update web3 modal package commit 70e0293 Merge: a353076 19f1a75 Author: Ben Hayward <[email protected]> Date: Fri Feb 18 15:49:17 2022 +0000 Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben commit a353076 Merge: e38671f ccbb250 Author: Ben Hayward <[email protected]> Date: Mon Feb 14 17:32:32 2022 +0000 Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben commit e38671f Author: Ben Hayward <[email protected]> Date: Mon Feb 14 15:31:12 2022 +0000 Make serve message more verbose commit a67d7b8 Author: Ben Hayward <[email protected]> Date: Mon Feb 14 14:36:53 2022 +0000 remove testing comments commit 6c6f8f9 Author: Ben Hayward <[email protected]> Date: Mon Feb 14 14:27:54 2022 +0000 Remove test todo commit 4bc2bdb Author: Ben Hayward <[email protected]> Date: Fri Feb 11 14:38:19 2022 +0000 Update to ignore cache files commit 4994039 Author: Ben Hayward <[email protected]> Date: Fri Feb 11 14:16:30 2022 +0000 Fix test randomly crashing out commit 192d1cf Author: Ben Hayward <[email protected]> Date: Fri Feb 11 13:31:39 2022 +0000 Missing build commit 0d0419b Author: Ben Hayward <[email protected]> Date: Fri Feb 11 13:25:21 2022 +0000 Update package lock for conflict commit 45b3bcd Merge: 16808c5 546681c Author: Ben Hayward <[email protected]> Date: Fri Feb 11 13:12:24 2022 +0000 Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben commit 16808c5 Author: Ben Hayward <[email protected]> Date: Fri Feb 11 12:58:53 2022 +0000 Fix css issue with old sidebar nav "& >" -> ">" commit 9a533c8 Author: Ben Hayward <[email protected]> Date: Fri Feb 11 12:58:28 2022 +0000 Add raw-loader as a module commit ffeec84 Author: Ben Hayward <[email protected]> Date: Fri Feb 11 11:34:05 2022 +0000 Fix invalid weight property (font-weight) commit 4d91eca Author: Ben Hayward <[email protected]> Date: Thu Feb 10 19:17:49 2022 +0000 Fix failing spec tests commit 754865b Author: Ben Hayward <[email protected]> Date: Wed Feb 9 16:14:09 2022 +0000 We have npm install working without forcing commit 71773ff Author: Ben Hayward <[email protected]> Date: Mon Feb 7 11:52:02 2022 +0000 Set deployUrl commit fc60fab Author: Ben Hayward <[email protected]> Date: Mon Feb 7 11:43:35 2022 +0000 A13 upgrade building commit b6169a0 Author: Ben Hayward <[email protected]> Date: Mon Feb 7 11:01:35 2022 +0000 Package lock update commit 04eee65 Author: Ben Hayward <[email protected]> Date: Mon Feb 7 11:00:00 2022 +0000 Gitignore update
1 parent 6a3137f commit c893d7e

File tree

21 files changed

+23778
-30464
lines changed

21 files changed

+23778
-30464
lines changed

.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/.angular/cache
2+
cache
3+
cache_directory
14
# Ignore front end plugins
25
#app/src/plugins
36
#app/templates/plugins
@@ -43,4 +46,5 @@ cypress/videos
4346
!.gitattributes
4447
!.gitkeep
4548
!/.nvmrc
46-
!/.husky
49+
!/.husky
50+
cypress-tests

angular.json

+8-15
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@
143143
"replace": "src/environments/environment.ts",
144144
"with": "src/environments/environment.hmr.ts"
145145
}
146-
]
146+
],
147+
"deployUrl": "http://localhost:4200/"
147148
}
148149
},
149150
"defaultConfiguration": ""
@@ -157,6 +158,12 @@
157158
"production": {
158159
"browserTarget": "minds:build:production"
159160
},
161+
"dev": {
162+
"browserTarget": "minds:build:dev",
163+
"servePath": "/",
164+
"sourceMap": true,
165+
"deployUrl": "http://localhost:4200/"
166+
},
160167
"hmr": {
161168
"hmr": true,
162169
"browserTarget": "minds:build:hmr"
@@ -201,13 +208,6 @@
201208
"preserveSymlinks": true
202209
}
203210
},
204-
"lint": {
205-
"builder": "@angular-devkit/build-angular:tslint",
206-
"options": {
207-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
208-
"exclude": ["**/node_modules/**"]
209-
}
210-
},
211211
"server": {
212212
"builder": "@angular-devkit/build-angular:server",
213213
"options": {
@@ -335,13 +335,6 @@
335335
"protractorConfig": "./protractor.conf.js",
336336
"devServerTarget": "minds:serve"
337337
}
338-
},
339-
"lint": {
340-
"builder": "@angular-devkit/build-angular:tslint",
341-
"options": {
342-
"tsConfig": ["e2e/tsconfig.e2e.json"],
343-
"exclude": ["**/node_modules/**"]
344-
}
345338
}
346339
}
347340
}

0 commit comments

Comments
 (0)