Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aeec53f
Merge branch 'stage'
AugustHA-Iterator Aug 28, 2024
ce61ff5
updated versions to 15
AugustHA-Iterator Aug 28, 2024
4202cc3
updated one more package
AugustHA-Iterator Aug 28, 2024
fc6ed44
moved back to make ng do it
AugustHA-Iterator Aug 28, 2024
8706353
moved back
AugustHA-Iterator Aug 28, 2024
e63b31e
updated packagelock
AugustHA-Iterator Aug 28, 2024
7faf089
updated with ng
AugustHA-Iterator Aug 28, 2024
3edc287
removed overrides
AugustHA-Iterator Aug 28, 2024
311ed59
updated packages
AugustHA-Iterator Aug 28, 2024
31846ba
fixes for styling v15
AugustHA-Iterator Aug 28, 2024
08272b4
IOT-1525: Update package-json
AugustHA-Iterator Aug 29, 2024
aa78340
IOT-1525: Update package-json with ng update @angular/core@16 @angula…
AugustHA-Iterator Aug 29, 2024
e0c0c35
IOT-1525: updated to angular 16
AugustHA-Iterator Aug 29, 2024
fb7f30b
IOT-1525: Updated typescript and zone because ng update.
AugustHA-Iterator Aug 29, 2024
3a71aa2
IOT-1525: Updated with ng update @angular/core@17 @angular/cli@17
AugustHA-Iterator Aug 29, 2024
9150f67
IOT-1525: Application styling fixed.
AugustHA-Iterator Aug 29, 2024
2a428d1
IOT:1525: Angular changes primarily styling.
AugustHA-Iterator Sep 3, 2024
bf18c63
last styling changes.
AugustHA-Iterator Sep 3, 2024
a42c2ec
last angular styling changes.
AugustHA-Iterator Sep 4, 2024
253c02c
updated dockerfile
AugustHA-Iterator Sep 4, 2024
9b4636a
Added mat-divider to tab-nav-bars.
AugustHA-Iterator Sep 4, 2024
14b77c1
PR changes.
AugustHA-Iterator Sep 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
# base image
FROM node:16-alpine as DEV
FROM node:18-alpine as DEV

# removed this for now
# install chrome for protractor tests
Expand All @@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
# install and cache app dependencies
COPY package.json /app/package.json
RUN npm install
RUN npm install -g @angular/cli@14.2.3
RUN npm install -g @angular/cli@17.3.8

# add app
COPY . /app
Expand Down
7 changes: 3 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "OS2IoT-frontend:build"
"buildTarget": "OS2IoT-frontend:build"
},
"configurations": {
"production": {
"browserTarget": "OS2IoT-frontend:build:production"
"buildTarget": "OS2IoT-frontend:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "OS2IoT-frontend:build"
"buildTarget": "OS2IoT-frontend:build"
}
},
"test": {
Expand Down Expand Up @@ -112,7 +112,6 @@
}
}
},
"defaultProject": "OS2IoT-frontend",
"cli": {
"analytics": "5e34252a-5088-421b-bb34-6ef89cd9f167"
}
Expand Down
Loading