Skip to content

Commit 64c2029

Browse files
sei-dupdykesei-aschlackmansei-tspencer
authored
Version updates to Ng 21 plus dependencies (#661)
* mods to get player.ui compiling and running * updates to ng 21 * fixes npm install version dependency errors * updates all to latest * updates dockerfile to newer version of node * updates dockerfile to newer version of node * updates dockerfile to newer version of node * Fixes nav user menu at top right display issues * Fixes username color in top right nav * Fixes the export modal content alignment * Fixes main page table width * Fixes my views being in a different serif font. Just set a default for the app entirely. * Fixes material table backgounds for light and dark mode * Fixes team name width and copy Id button alignment * Fixes checkboxes that were partially hidden in template list * fixed admin nav list justification * fix admin views icon clipping * update packages * update packages * fixed player icon in mini mode * css fixes * remove unneeded css * fixed subscription names not being visible * fix admin user role select * fixed admin app template expansion panel spacing * fix my views search box * fix admin search boxes * fix more search fields * fix user role dropdown * dont reset search when add/remove user from team * fix add/remove users table * remove topbar color references * fix text color * favicon fix * app-bar mini mode fix * color adjustments * default color * reset to 4c7aa2 * ui fixes * monochrome theme colors * settings back to AppTopBarHex* --------- Co-authored-by: Andrew Schlackman <72105194+sei-aschlackman@users.noreply.github.com> Co-authored-by: sei-tspencer <trspencer@sei.cmu.edu>
1 parent ec6c51c commit 64c2029

File tree

119 files changed

+14545
-26274
lines changed

Some content is hidden

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

119 files changed

+14545
-26274
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
FROM node:16-alpine as builder
1+
FROM node:20-alpine AS builder
22

33
COPY package.json package-lock.json ./
44

55
# Storing node modules on a separate layer will prevent unnecessary npm install at each build
66
RUN npm set progress=false && \
77
npm config set depth 0 && \
8-
npm cache clean --force && \
9-
npm config set unsafe-perm true
8+
npm cache clean --force
109

1110
RUN npm ci && mkdir -p /ng-app/dist && cp -R ./node_modules ./ng-app
1211

1312
WORKDIR /ng-app
1413

1514
COPY . .
1615

17-
RUN $(npm bin)/ng build --resources-output-path=assets/fonts --configuration production
16+
RUN npx ng build --resources-output-path=assets/fonts --configuration production
1817

1918
### Stage 2: Setup ###
2019

angular.json

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"main": "src/main.ts",
1717
"tsConfig": "src/tsconfig.app.json",
1818
"polyfills": "src/polyfills.ts",
19+
"allowedCommonJsDependencies": [
20+
"crypto-js/core.js",
21+
"crypto-js/enc-base64.js",
22+
"crypto-js/enc-utf8.js",
23+
"crypto-js/sha256.js"
24+
],
1925
"assets": [
2026
"src/assets",
2127
{
@@ -26,12 +32,11 @@
2632
],
2733
"styles": [
2834
"src/styles/styles.scss",
29-
"./node_modules/bootstrap/scss/bootstrap-utilities.scss"
35+
"./node_modules/bootstrap/dist/css/bootstrap-utilities.min.css"
3036
],
3137
"stylePreprocessorOptions": {
3238
"includePaths": [
33-
"src/styles",
34-
"./node_modules/bootstrap/scss/bootstrap-utilities.scss"
39+
"src/styles"
3540
]
3641
},
3742
"scripts": []
@@ -78,18 +83,18 @@
7883
},
7984
"configurations": {
8085
"production": {
81-
"browserTarget": "player-ui:build:production"
86+
"buildTarget": "player-ui:build:production"
8287
},
8388
"development": {
84-
"browserTarget": "player-ui:build:development"
89+
"buildTarget": "player-ui:build:development"
8590
}
8691
},
8792
"defaultConfiguration": "development"
8893
},
8994
"extract-i18n": {
9095
"builder": "@angular-devkit/build-angular:extract-i18n",
9196
"options": {
92-
"browserTarget": "player-ui:build"
97+
"buildTarget": "player-ui:build"
9398
}
9499
},
95100
"test": {
@@ -133,10 +138,30 @@
133138
"schematics": {
134139
"@schematics/angular:component": {
135140
"prefix": "app",
136-
"style": "scss"
141+
"style": "scss",
142+
"type": "component"
137143
},
138144
"@schematics/angular:directive": {
139-
"prefix": "app"
145+
"prefix": "app",
146+
"type": "directive"
147+
},
148+
"@schematics/angular:service": {
149+
"type": "service"
150+
},
151+
"@schematics/angular:guard": {
152+
"typeSeparator": "."
153+
},
154+
"@schematics/angular:interceptor": {
155+
"typeSeparator": "."
156+
},
157+
"@schematics/angular:module": {
158+
"typeSeparator": "."
159+
},
160+
"@schematics/angular:pipe": {
161+
"typeSeparator": "."
162+
},
163+
"@schematics/angular:resolver": {
164+
"typeSeparator": "."
140165
}
141166
},
142167
"cli": {

0 commit comments

Comments
 (0)