From 6b1438fffb54fa72fc265b93541a010d11057065 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 30 Nov 2024 21:14:10 -0600 Subject: [PATCH 01/73] Updates --- backend/pom.xml | 2 +- backend/src/main/resources/application.properties | 11 ++++++----- frontend/src/environments/environment.ts | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 34593e5..abf0fbe 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -43,7 +43,7 @@ mysql mysql-connector-java - runtime + 8.0.29 org.projectlombok diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 1673d2f..de7f98e 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,17 +6,16 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://roundhouse.proxy.rlwy.net:58778/railway +spring.datasource.url=jdbc:mysql://localhost:3306/mydb spring.datasource.username=root -spring.datasource.password=-HbF5dh1Ag6HFHFHd5hE226dHHAc1E-e +spring.datasource.password=root -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect spring.data.rest.base-path=/api -#allowed.origins=https://localhost:4200 +allowed.origins=http://localhost:4200 -allowed.origins=https://luv2shop-ecommerce.netlify.app +#allowed.origins=https://luv2shop-ecommerce.netlify.app spring.data.rest.detection-strategy=ANNOTATED @@ -69,5 +68,7 @@ spring.security.ignored=/** # Configure the path matching strategy for Spring MVC spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER +spring.jpa.hibernate.ddl-auto=update + diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 24fbb66..93c4335 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiUrl: 'https://localhost:8443/api', + apiUrl: 'http://localhost:8443/api', stripePublishableKey: 'pk_test_51NaiSfJ7CqAb5XkluTiXqbDsuJ6IMsWiZgTPCmmKaouA5D3UJGXpXZcFNFM1os4yTZonDreg6w9EUMkk2eagZAE600dy8Thabh', }; From 71e0b2102daf1c29db97408a77e217d45c8c0e24 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 30 Nov 2024 22:23:24 -0600 Subject: [PATCH 02/73] db --- backend/src/main/resources/application.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index de7f98e..c9be456 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/mydb +spring.datasource.url=jdbc:mysql://mysql:3306/mydb spring.datasource.username=root spring.datasource.password=root @@ -21,8 +21,7 @@ spring.data.rest.detection-strategy=ANNOTATED okta.oauth2.client-id=0oac1xv78jEJHLiLn5d7 okta.oauth2.issuer=https://dev-68343085.okta.com/oauth2/default - -##### + qwed # # HTTPS configuration # From 1bd2c53380b1132565331ec74d3ec07dae777912 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 30 Nov 2024 23:35:27 -0600 Subject: [PATCH 03/73] db1 --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index c9be456..5174a75 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql:3306/mydb +spring.datasource.url=jdbc:mysql://172.30.229.156:3306/mydb spring.datasource.username=root spring.datasource.password=root From 3f98c55f14a097e3023183870917834916ce1251 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 1 Dec 2024 00:55:27 -0600 Subject: [PATCH 04/73] db2 --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 5174a75..c9be456 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.229.156:3306/mydb +spring.datasource.url=jdbc:mysql://mysql:3306/mydb spring.datasource.username=root spring.datasource.password=root From 74376c52a4df3ba4544ff6fb9c9bef6336dca2f9 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 1 Dec 2024 16:55:58 -0600 Subject: [PATCH 05/73] dbprop1 --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index c9be456..93ff455 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql:3306/mydb +spring.datasource.url=jdbc:mysql://mysql:3306/mydb?useSSL=false spring.datasource.username=root spring.datasource.password=root From 8249d125ce836a9f54232550e61fa5ff4ba7dc53 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 1 Dec 2024 17:07:26 -0600 Subject: [PATCH 06/73] dbprop2 --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 93ff455..b8b24c6 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql:3306/mydb?useSSL=false +spring.datasource.url=jdbc:mysql://172.30.50.17:3306/mydb?useSSL=false spring.datasource.username=root spring.datasource.password=root From a56107bdf2ccb68b8115bec5e818d87c8efa5333 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 1 Dec 2024 17:30:30 -0600 Subject: [PATCH 07/73] dbprop3 --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index b8b24c6..a174e6e 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.50.17:3306/mydb?useSSL=false +spring.datasource.url=jdbc:mysql://172.30.50.17:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 8270355a1b91246b7ab4f891718e2e232f1e1aff Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 11:06:05 -0600 Subject: [PATCH 08/73] Updatesi --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index a174e6e..d1477e8 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.50.17:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://172.30.232.157:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From f5a9cbf61941afdfd2ad080321124f5f17672ee1 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 11:27:00 -0600 Subject: [PATCH 09/73] Updatesj --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index d1477e8..1e881a5 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.232.157:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysql-dasarisindhuja92-dev.apps.sandbox-m3.1530.p1.openshiftapps.com:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From d0b59b96b3d62d0d8c1bcc0245cfae52df4a24bd Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 11:38:30 -0600 Subject: [PATCH 10/73] Updatesk --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 1e881a5..9b21e70 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql-dasarisindhuja92-dev.apps.sandbox-m3.1530.p1.openshiftapps.com:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysql.dasarisindhuja92-dev.svc.cluster.local:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 413d3dbf04610e382dd0ef432628fadae775d9b3 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 13:12:03 -0600 Subject: [PATCH 11/73] Updatesk --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 9b21e70..b1f6491 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql.dasarisindhuja92-dev.svc.cluster.local:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://172.30.232.157:3306/mydb?autoReconnect=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 2141ad0d19715f9facfa3b1e39b088e18396dc29 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 14:12:07 -0600 Subject: [PATCH 12/73] Updatesl --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index b1f6491..025b414 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.232.157:3306/mydb?autoReconnect=true&useSSL=false +spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?autoReconnect=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 87b20c04a9699f1a2deca417983bb68fb5529ce7 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 14:27:43 -0600 Subject: [PATCH 13/73] Updatesl --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 025b414..9195828 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?autoReconnect=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysql:3306/mydb?autoReconnect=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 6e09fcbee795cecc526047ce09239a5175b6226f Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 14:38:35 -0600 Subject: [PATCH 14/73] Updatesm --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 9195828..a996901 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql:3306/mydb?autoReconnect=true&useSSL=false +spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?useSSL=false spring.datasource.username=root spring.datasource.password=root From 90f723d655164a328fd7c945c3f61840e1e02781 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 14:54:13 -0600 Subject: [PATCH 15/73] Updatesn --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index a996901..6bc8262 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?useSSL=false +spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From cacbae6f8f56fb3967b7c6772b3e99037dfe5561 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 18:40:18 -0600 Subject: [PATCH 16/73] test --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 6bc8262..11f52db 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://10.128.12.46:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysql:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 0fd183f3c16da104db9508613ceea9f108a23c16 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 2 Dec 2024 19:21:06 -0600 Subject: [PATCH 17/73] test --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 11f52db..e9ab697 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysql:3306/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://172.30.232.157:30036/mydb?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 5d7de63d20764c5b745fa0760a756de902fa924c Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Thu, 5 Dec 2024 15:54:06 -0600 Subject: [PATCH 18/73] testing --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index e9ab697..f099b13 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://172.30.232.157:30036/mydb?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysqltestingfinal:3306/mysql?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From 6230292974dea6b215bee9644bc373cf6f536269 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 14 Dec 2024 14:36:20 -0600 Subject: [PATCH 19/73] prop --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index f099b13..b561e9b 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,7 +6,7 @@ # ##### spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://mysqltestingfinal:3306/mysql?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.url=jdbc:mysql://mysqlservice:3306/mysql?allowPublicKeyRetrieval=true&useSSL=false spring.datasource.username=root spring.datasource.password=root From e8e444a5682a5c500c12a4d11ac722dd46ff05c4 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 14 Dec 2024 14:58:50 -0600 Subject: [PATCH 20/73] ui --- frontend/src/environments/environment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 93c4335..b9da965 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiUrl: 'http://localhost:8443/api', + apiUrl: 'https://https://backend-k-a-nagaraju1-dev.apps.rm1.0a51.p1.openshiftapps.com/api', stripePublishableKey: 'pk_test_51NaiSfJ7CqAb5XkluTiXqbDsuJ6IMsWiZgTPCmmKaouA5D3UJGXpXZcFNFM1os4yTZonDreg6w9EUMkk2eagZAE600dy8Thabh', }; From b4932e87c7efa48987eb1f499fc8ca73faae21af Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 13:22:04 -0600 Subject: [PATCH 21/73] prop --- frontend/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/package.json b/frontend/package.json index 7ccd2eb..56ebf7e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,7 +23,9 @@ "@okta/okta-angular": "^3.2.2", "@okta/okta-auth-js": "^5.9.1", "@okta/okta-signin-widget": "^6.3.2", + "@popperjs/core": "^2.11.8", "bootstrap": "^5.2.0", + "popper.js": "^1.16.1", "rxjs": "~7.5.0", "stripe": "^10.2.0", "tslib": "^2.3.0", From c130690cd23222275633732f8b6ed935dde58a81 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 13:35:10 -0600 Subject: [PATCH 22/73] prop1 --- frontend/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 56ebf7e..7b8a905 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,10 +3,9 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --o --ssl=true --ssl-key=./ssl-localhost/localhost.key --ssl-cert=./ssl-localhost/localhost.crt", + "start": "ng serve", "build": "ng build", - "watch": "ng build --watch --configuration development", - "test": "ng test" + "test": "ng test" }, "private": true, "dependencies": { From 694bc2bba03b6b21f9679fb5aa91142ce99bb3a0 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 13:43:24 -0600 Subject: [PATCH 23/73] test --- frontend/package.json | 2 +- frontend/tsconfig.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 7b8a905..675fb79 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build", + "build": "ng build --prod", "test": "ng test" }, "private": true, diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 2f915b2..54839b0 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -26,6 +26,7 @@ "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, "strictInputAccessModifiers": true, - "strictTemplates": true + "strictTemplates": true, + "enableIvy": false } } From cb5520bfa749cb510e5050b257d9690bb9c69323 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 13:47:50 -0600 Subject: [PATCH 24/73] test23 --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 675fb79..11881ad 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build --prod", + "build": "ng build --configuration production", "test": "ng test" }, "private": true, From 5c37eb6580bdce7a6c27be8f56631f988b0c5e8d Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 13:59:26 -0600 Subject: [PATCH 25/73] test232 --- frontend/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 54839b0..c45b224 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -27,6 +27,7 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true, - "enableIvy": false + "enableIvy": false, + "compilationMode": "partial" } } From 776e052fffac91abdbce5d2d7d648b550daef2e8 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 15:42:56 -0600 Subject: [PATCH 26/73] prop2 --- frontend/package.json | 3 ++- frontend/tsconfig.json | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 11881ad..a16e873 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,8 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build --configuration production", + "build": "ng build", + "watch": "ng build --watch --configuration development", "test": "ng test" }, "private": true, diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index c45b224..687d07d 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -27,7 +27,6 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true, - "enableIvy": false, - "compilationMode": "partial" + } } From ea09291e3885910a209abd47c3b417c2b7472787 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 16 Dec 2024 16:34:59 -0600 Subject: [PATCH 27/73] prop1 --- frontend/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index a16e873..412a600 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,8 +4,8 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build", - "watch": "ng build --watch --configuration development", + "build": "ng serve", + "watch": "ng serve --watch --configuration development", "test": "ng test" }, "private": true, From 12a16728b5a28897bf07eb1751c7e6278867bcc8 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 17:26:56 -0600 Subject: [PATCH 28/73] propup --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 412a600..966f5cf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng serve", + "build": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --ssl", "watch": "ng serve --watch --configuration development", "test": "ng test" }, From 92875bddf0c46c04879d59ae578382dbdb5ef6d7 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 17:59:32 -0600 Subject: [PATCH 29/73] upgrade --- frontend/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 966f5cf..878699d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --ssl", + "build": "ng build", "watch": "ng serve --watch --configuration development", "test": "ng test" }, @@ -32,10 +32,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.1.0", - "@angular/cli": "~14.1.0", - "@angular/compiler-cli": "^14.1.0", - "@angular/localize": "^14.1.0", + "@angular-devkit/build-angular": "^18.2.12", + "@angular/cli": "~18.2.12", + "@angular/compiler-cli": "^18.2.12", + "@angular/localize": "^18.2.12", "@types/jasmine": "~4.0.0", "jasmine-core": "~4.2.0", "karma": "~6.4.0", @@ -43,6 +43,6 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", - "typescript": "~4.7.2" + "typescript": "~5.4.0" } } From b9fbd8ad32ef74f432cb63d40f84687bd695a154 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 18:34:40 -0600 Subject: [PATCH 30/73] upgradean --- frontend/package.json | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 878699d..aede035 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,14 +10,14 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.1.0", - "@angular/common": "^14.1.0", - "@angular/compiler": "^14.1.0", - "@angular/core": "^14.1.0", - "@angular/forms": "^14.1.0", - "@angular/platform-browser": "^14.1.0", - "@angular/platform-browser-dynamic": "^14.1.0", - "@angular/router": "^14.1.0", + "@angular/animations": "18.0.0", + "@angular/common": "18.0.0", + "@angular/compiler": "18.0.0", + "@angular/core": "18.0.0", + "@angular/forms": "18.0.0", + "@angular/platform-browser": "18.0.0", + "@angular/platform-browser-dynamic": "18.0.0", + "@angular/router": "18.0.0", "@fortawesome/fontawesome-free": "^6.1.1", "@ng-bootstrap/ng-bootstrap": "^13.0.0", "@okta/okta-angular": "^3.2.2", @@ -26,23 +26,25 @@ "@popperjs/core": "^2.11.8", "bootstrap": "^5.2.0", "popper.js": "^1.16.1", - "rxjs": "~7.5.0", + "rxjs": "^7.4.0", "stripe": "^10.2.0", "tslib": "^2.3.0", - "zone.js": "~0.11.4" + "zone.js": "~0.14.2" + "@rx-angular/cdk": "18.0.0", + "@rx-angular/template": "18.0.0", }, "devDependencies": { - "@angular-devkit/build-angular": "^18.2.12", - "@angular/cli": "~18.2.12", - "@angular/compiler-cli": "^18.2.12", + "@angular-devkit/build-angular": "^18.0.1", + "@angular/cli": "^18.0.1", + "@angular/compiler-cli": "18.0.0", "@angular/localize": "^18.2.12", - "@types/jasmine": "~4.0.0", - "jasmine-core": "~4.2.0", - "karma": "~6.4.0", + "@types/jasmine": "~4.3.0", + "jasmine-core": "~4.5.0", + "karma": "~6.4.1", "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.2.0", - "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "~2.0.0", - "typescript": "~5.4.0" + "karma-coverage": "~2.2.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "~2.0.0", + "typescript": "~5.4.5" } } From 3295c55825be8969711e1061144402f416ff09ba Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 18:38:29 -0600 Subject: [PATCH 31/73] upgradeano --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index aede035..f447573 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,7 +31,7 @@ "tslib": "^2.3.0", "zone.js": "~0.14.2" "@rx-angular/cdk": "18.0.0", - "@rx-angular/template": "18.0.0", + "@rx-angular/template": "18.0.0" }, "devDependencies": { "@angular-devkit/build-angular": "^18.0.1", From 27c4f5e70f3e32ba44a500c2050959de2d2a5a2a Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 18:40:32 -0600 Subject: [PATCH 32/73] upgradeano --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index f447573..492cad5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "rxjs": "^7.4.0", "stripe": "^10.2.0", "tslib": "^2.3.0", - "zone.js": "~0.14.2" + "zone.js": "~0.14.2", "@rx-angular/cdk": "18.0.0", "@rx-angular/template": "18.0.0" }, From 2fa0ef4ed2e6b0dddd4ae1d3f147feba280de9c6 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 19:31:28 -0600 Subject: [PATCH 33/73] upgradeanp --- frontend/package.json | 52 +++++++++---------- frontend/src/environments/environment.prod.ts | 2 +- frontend/src/environments/environment.ts | 2 +- frontend/tsconfig.json | 2 +- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 492cad5..758bb52 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,46 +5,42 @@ "ng": "ng", "start": "ng serve", "build": "ng build", - "watch": "ng serve --watch --configuration development", - "test": "ng test" + "watch": "ng build --watch --configuration development", + "test": "ng test" }, "private": true, "dependencies": { - "@angular/animations": "18.0.0", - "@angular/common": "18.0.0", - "@angular/compiler": "18.0.0", - "@angular/core": "18.0.0", - "@angular/forms": "18.0.0", - "@angular/platform-browser": "18.0.0", - "@angular/platform-browser-dynamic": "18.0.0", - "@angular/router": "18.0.0", + "@angular/animations": "^14.1.0", + "@angular/common": "^14.1.0", + "@angular/compiler": "^14.1.0", + "@angular/core": "^14.1.0", + "@angular/forms": "^14.1.0", + "@angular/platform-browser": "^14.1.0", + "@angular/platform-browser-dynamic": "^14.1.0", + "@angular/router": "^14.1.0", "@fortawesome/fontawesome-free": "^6.1.1", "@ng-bootstrap/ng-bootstrap": "^13.0.0", "@okta/okta-angular": "^3.2.2", "@okta/okta-auth-js": "^5.9.1", "@okta/okta-signin-widget": "^6.3.2", - "@popperjs/core": "^2.11.8", "bootstrap": "^5.2.0", - "popper.js": "^1.16.1", - "rxjs": "^7.4.0", + "rxjs": "~7.5.0", "stripe": "^10.2.0", "tslib": "^2.3.0", - "zone.js": "~0.14.2", - "@rx-angular/cdk": "18.0.0", - "@rx-angular/template": "18.0.0" + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^18.0.1", - "@angular/cli": "^18.0.1", - "@angular/compiler-cli": "18.0.0", - "@angular/localize": "^18.2.12", - "@types/jasmine": "~4.3.0", - "jasmine-core": "~4.5.0", - "karma": "~6.4.1", + "@angular-devkit/build-angular": "^14.1.0", + "@angular/cli": "~14.1.0", + "@angular/compiler-cli": "^14.1.0", + "@angular/localize": "^14.1.0", + "@types/jasmine": "~4.0.0", + "jasmine-core": "~4.2.0", + "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.2.0", - "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "~2.0.0", - "typescript": "~5.4.5" + "karma-coverage": "~2.2.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "~2.0.0", + "typescript": "~4.7.2" } -} +} \ No newline at end of file diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index 21d943a..f4219bb 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiUrl: 'https://luv2shop-backend.onrender.com/api', + apiUrl: 'https://backend-k-a-nagaraju1-dev.apps.rm1.0a51.p1.openshiftapps.com/api', stripePublishableKey: 'pk_test_51NaiSfJ7CqAb5XkluTiXqbDsuJ6IMsWiZgTPCmmKaouA5D3UJGXpXZcFNFM1os4yTZonDreg6w9EUMkk2eagZAE600dy8Thabh', }; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index b9da965..030f402 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiUrl: 'https://https://backend-k-a-nagaraju1-dev.apps.rm1.0a51.p1.openshiftapps.com/api', + apiUrl: 'https://backend-k-a-nagaraju1-dev.apps.rm1.0a51.p1.openshiftapps.com/api', stripePublishableKey: 'pk_test_51NaiSfJ7CqAb5XkluTiXqbDsuJ6IMsWiZgTPCmmKaouA5D3UJGXpXZcFNFM1os4yTZonDreg6w9EUMkk2eagZAE600dy8Thabh', }; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 687d07d..3519899 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -26,7 +26,7 @@ "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, "strictInputAccessModifiers": true, - "strictTemplates": true, + "strictTemplates": true } } From b48cf1efe4c41f2078b8c23ecdb35b90a9e7bd09 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 19:37:30 -0600 Subject: [PATCH 34/73] testdocker --- frontend/docker.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 frontend/docker.txt diff --git a/frontend/docker.txt b/frontend/docker.txt new file mode 100644 index 0000000..700ccd9 --- /dev/null +++ b/frontend/docker.txt @@ -0,0 +1,11 @@ +FROM node:14.20.0-alpine as build + +WORKDIR /app + +COPY . + +RUN npm install -g @angular/cli + +RUN npm run build + +CMD ["ng", "serve", "--host", "0.0.0.0"] \ No newline at end of file From 07d1b29de6c85df6f9e15f452c3759cbe1ae18be Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 19:45:18 -0600 Subject: [PATCH 35/73] test --- frontend/docker.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/docker.txt b/frontend/docker.txt index 700ccd9..50559ce 100644 --- a/frontend/docker.txt +++ b/frontend/docker.txt @@ -1,6 +1,6 @@ FROM node:14.20.0-alpine as build -WORKDIR /app +WORKDIR /frontend COPY . @@ -8,4 +8,5 @@ RUN npm install -g @angular/cli RUN npm run build -CMD ["ng", "serve", "--host", "0.0.0.0"] \ No newline at end of file +CMD ["ng", "serve", "--host", "0.0.0.0"] + From df32fbcd5478ea3cb74761f57571e9f5a5dc6ebc Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 19:52:19 -0600 Subject: [PATCH 36/73] test --- frontend/{docker.txt => Dockerfile.dockerfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frontend/{docker.txt => Dockerfile.dockerfile} (100%) diff --git a/frontend/docker.txt b/frontend/Dockerfile.dockerfile similarity index 100% rename from frontend/docker.txt rename to frontend/Dockerfile.dockerfile From 50ad61b57c97053477e0fb90240e7f3ae49b3bd4 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Tue, 17 Dec 2024 20:02:22 -0600 Subject: [PATCH 37/73] test --- frontend/Dockerfile.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 50559ce..18ad3cf 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -2,10 +2,12 @@ FROM node:14.20.0-alpine as build WORKDIR /frontend -COPY . +COPY package*.json ./ RUN npm install -g @angular/cli +COPY . . + RUN npm run build CMD ["ng", "serve", "--host", "0.0.0.0"] From 782642e56477d28d6f0295881e05b43a223a943b Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Wed, 18 Dec 2024 00:43:30 -0600 Subject: [PATCH 38/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 18ad3cf..9c6d739 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ WORKDIR /frontend COPY package*.json ./ -RUN npm install -g @angular/cli +RUN npm install COPY . . From 92ed7c1d3b4f077c6453fc7be9c0cbcceab6f414 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Wed, 18 Dec 2024 01:07:16 -0600 Subject: [PATCH 39/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 9c6d739..b0ba144 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ WORKDIR /frontend COPY package*.json ./ -RUN npm install +RUN npm install -g @angular/cli@14.0.6 COPY . . From 25e59daa5e3bf6bbffb9d4a9c7552ef96fc1ed4d Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Wed, 18 Dec 2024 01:16:57 -0600 Subject: [PATCH 40/73] test --- frontend/Dockerfile.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index b0ba144..21c5fe9 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,9 @@ WORKDIR /frontend COPY package*.json ./ -RUN npm install -g @angular/cli@14.0.6 +RUN npm install + +RUN npm install -g @angular/cli@16.2.6 COPY . . From a3f996e2e9c43834927d7571e38c7499471e655e Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Fri, 20 Dec 2024 12:51:01 -0600 Subject: [PATCH 41/73] test --- frontend/Dockerfile.dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 21c5fe9..8ac045e 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,6 +1,8 @@ FROM node:14.20.0-alpine as build -WORKDIR /frontend +USER node + +WORKDIR /app COPY package*.json ./ @@ -8,9 +10,9 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -COPY . . +COPY --chown==node:node . . RUN npm run build -CMD ["ng", "serve", "--host", "0.0.0.0"] +CMD ["ng", "serve"] From 972d0e7a74fcb7aff32a545ae96510141e6f7ab0 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Fri, 20 Dec 2024 12:59:24 -0600 Subject: [PATCH 42/73] test --- frontend/Dockerfile.dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 8ac045e..7fa8265 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,16 +1,20 @@ FROM node:14.20.0-alpine as build -USER node + WORKDIR /app +RUN chmod 777 . + COPY package*.json ./ RUN npm install RUN npm install -g @angular/cli@16.2.6 -COPY --chown==node:node . . +COPY . . + +RUN chmod 777 node_modules RUN npm run build From 619b9c4b1f944f08c9a252f8634cce4588c75505 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 21 Dec 2024 14:06:18 -0600 Subject: [PATCH 43/73] test --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 7fa8265..43da94e 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -2,7 +2,7 @@ FROM node:14.20.0-alpine as build -WORKDIR /app +WORKDIR ./app RUN chmod 777 . @@ -14,7 +14,7 @@ RUN npm install -g @angular/cli@16.2.6 COPY . . -RUN chmod 777 node_modules +RUN chmod -R 777 node_modules RUN npm run build From e11217c8a14690c91efdc9416432bf8d881bd611 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 21 Dec 2024 17:08:53 -0600 Subject: [PATCH 44/73] test --- frontend/Dockerfile.dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 43da94e..ba1d68f 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -2,9 +2,9 @@ FROM node:14.20.0-alpine as build -WORKDIR ./app +WORKDIR /app -RUN chmod 777 . +RUN chmod -R 777 /app COPY package*.json ./ @@ -14,7 +14,10 @@ RUN npm install -g @angular/cli@16.2.6 COPY . . -RUN chmod -R 777 node_modules +RUN chmod -R 777 /node_modules +RUN chmod -R 777 /app +RUN chmod 777 -R ./ + RUN npm run build From 573802e9358e4df1cbdcef0a4691b9efb3afca36 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sat, 21 Dec 2024 17:20:56 -0600 Subject: [PATCH 45/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index ba1d68f..c1a71d5 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,6 +1,6 @@ FROM node:14.20.0-alpine as build - +USER root WORKDIR /app From bd05cd26822221aba339a5314318007faaf8a85b Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 22 Dec 2024 12:48:31 -0600 Subject: [PATCH 46/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index c1a71d5..ef2e5c8 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -14,7 +14,7 @@ RUN npm install -g @angular/cli@16.2.6 COPY . . -RUN chmod -R 777 /node_modules +RUN chmod -R 777 node_modules RUN chmod -R 777 /app RUN chmod 777 -R ./ From 4315fcbf0a422c6a270f460afe06ea6b1bf47240 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 22 Dec 2024 14:26:30 -0600 Subject: [PATCH 47/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index ef2e5c8..3a67c42 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,6 +1,6 @@ FROM node:14.20.0-alpine as build -USER root +USER node WORKDIR /app From 48af574f0182e9f5b3f8cd4c5fea6a21fc61368d Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 22 Dec 2024 14:39:19 -0600 Subject: [PATCH 48/73] test --- frontend/Dockerfile.dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 3a67c42..80ae441 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -12,7 +12,8 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -COPY . . +COPY . /app + RUN chmod -R 777 node_modules RUN chmod -R 777 /app From 453c88a2d7256a3353ceb082a952306290fa1ad0 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 22 Dec 2024 14:45:41 -0600 Subject: [PATCH 49/73] test --- frontend/Dockerfile.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 80ae441..f01c395 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -5,6 +5,7 @@ USER node WORKDIR /app RUN chmod -R 777 /app +RUN chmod -R 777 node_modules COPY package*.json ./ From cbd323290f62e404d6aee2926b5426fbf26c8d18 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Sun, 22 Dec 2024 14:47:56 -0600 Subject: [PATCH 50/73] test --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index f01c395..ca03706 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,11 +1,11 @@ FROM node:14.20.0-alpine as build -USER node + WORKDIR /app RUN chmod -R 777 /app -RUN chmod -R 777 node_modules + COPY package*.json ./ From 5598b6e640c8123c308aca290c3b46c844d5e2f7 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 13:03:12 -0600 Subject: [PATCH 51/73] test --- frontend/Dockerfile.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index ca03706..5d220dd 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,10 +4,10 @@ FROM node:14.20.0-alpine as build WORKDIR /app -RUN chmod -R 777 /app +RUN chmod -R 777 / -COPY package*.json ./ +COPY . . RUN npm install @@ -17,8 +17,8 @@ COPY . /app RUN chmod -R 777 node_modules -RUN chmod -R 777 /app -RUN chmod 777 -R ./ + +RUN chmod -R 777 / RUN npm run build From 32b29ec8caeb977dc68330ef070d5e7935aadc75 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 13:07:10 -0600 Subject: [PATCH 52/73] test --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 5d220dd..f2dde0d 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ FROM node:14.20.0-alpine as build WORKDIR /app -RUN chmod -R 777 / +RUN chmod -R 777 /app COPY . . From f9b6e13766be64fce2b80a8d90b206ee00ab95ba Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 13:19:07 -0600 Subject: [PATCH 53/73] test --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index f2dde0d..81e04b8 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -7,7 +7,7 @@ WORKDIR /app RUN chmod -R 777 /app -COPY . . +COPY package*.json ./ RUN npm install @@ -18,7 +18,7 @@ COPY . /app RUN chmod -R 777 node_modules -RUN chmod -R 777 / +RUN chmod -R 777 /app/* RUN npm run build From 5516c499e8c5bffd1e51206063fa9c61caa4eef8 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 16:00:06 -0600 Subject: [PATCH 54/73] testupdate --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 81e04b8..2ebf636 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,6 +1,6 @@ FROM node:14.20.0-alpine as build - +user root WORKDIR /app @@ -20,7 +20,7 @@ RUN chmod -R 777 node_modules RUN chmod -R 777 /app/* - +RUN chmod -R 777 /app/.angular/cache/14.2.3/bable-webpack/* RUN npm run build CMD ["ng", "serve"] From 8b144045cd836d58a34b675a200e128df9afeb79 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 16:00:44 -0600 Subject: [PATCH 55/73] testupdate --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 2ebf636..cdb735e 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,6 +1,6 @@ FROM node:14.20.0-alpine as build -user root +USER root WORKDIR /app From 6c26a200b66e5b2c152c6ec9cf80ee61d0d68f88 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 16:08:14 -0600 Subject: [PATCH 56/73] testupdate --- frontend/Dockerfile.dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index cdb735e..13af1de 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -16,12 +16,14 @@ RUN npm install -g @angular/cli@16.2.6 COPY . /app + + + +RUN npm run build RUN chmod -R 777 node_modules RUN chmod -R 777 /app/* - RUN chmod -R 777 /app/.angular/cache/14.2.3/bable-webpack/* -RUN npm run build CMD ["ng", "serve"] From 133bed06cbe54113b9e6461bee2e59e16aacc85d Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 17:25:23 -0600 Subject: [PATCH 57/73] update --- frontend/Dockerfile.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 13af1de..9054c79 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -23,7 +23,6 @@ RUN npm run build RUN chmod -R 777 node_modules RUN chmod -R 777 /app/* -RUN chmod -R 777 /app/.angular/cache/14.2.3/bable-webpack/* CMD ["ng", "serve"] From 9e1b91f0f20fb34db47ca28147a97397ac1cd1e7 Mon Sep 17 00:00:00 2001 From: Anantha Naga Date: Mon, 23 Dec 2024 22:00:55 -0600 Subject: [PATCH 58/73] test --- frontend/Dockerfile.dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 9054c79..f1e2a04 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -13,6 +13,8 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 +RUN mkdir -p /app/.angular && chmod -R 777 /app/.angular + COPY . /app @@ -24,5 +26,6 @@ RUN chmod -R 777 node_modules RUN chmod -R 777 /app/* + CMD ["ng", "serve"] From 1bd9043ce98044ec6960cb436477f0406e754b02 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:09:06 -0600 Subject: [PATCH 59/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index f1e2a04..ef84ed2 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -13,7 +13,7 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chmod -R 777 /app/.angular +RUN mkdir -p /app/.angular && chmod -R 777 /app/.angular/* COPY . /app From abeb1f3273d852253536b95f51a9d9dfa6759a42 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:28:54 -0600 Subject: [PATCH 60/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index ef84ed2..90d0903 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,10 +1,10 @@ FROM node:14.20.0-alpine as build -USER root +USER node WORKDIR /app -RUN chmod -R 777 /app +RUN chmod -R node:node 777 /app COPY package*.json ./ @@ -13,7 +13,7 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chmod -R 777 /app/.angular/* +RUN mkdir -p /app/.angular && chmod node:node -R 777 /app/.angular/* COPY . /app @@ -22,9 +22,9 @@ COPY . /app RUN npm run build -RUN chmod -R 777 node_modules +RUN chmod node:node -R 777 node_modules -RUN chmod -R 777 /app/* +RUN chmod node:node -R 777 /app/* CMD ["ng", "serve"] From 6b41bbd38ad1014919e8770a274891e0ec53df8d Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:39:12 -0600 Subject: [PATCH 61/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 90d0903..fcb1fa0 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ USER node WORKDIR /app -RUN chmod -R node:node 777 /app +RUN chmod -R node:root 777 /app COPY package*.json ./ @@ -13,7 +13,7 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chmod node:node -R 777 /app/.angular/* +RUN mkdir -p /app/.angular && chmod node:root -R 777 /app/.angular/* COPY . /app @@ -22,9 +22,9 @@ COPY . /app RUN npm run build -RUN chmod node:node -R 777 node_modules +RUN chmod node:root -R 777 node_modules -RUN chmod node:node -R 777 /app/* +RUN chmod node:root -R 777 /app/* CMD ["ng", "serve"] From 8249d11495c7138cf006b7449bc9846bf9b381b4 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:41:29 -0600 Subject: [PATCH 62/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index fcb1fa0..f6ca3d8 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ USER node WORKDIR /app -RUN chmod -R node:root 777 /app +RUN chown -R node:root 777 /app COPY package*.json ./ @@ -13,7 +13,7 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chmod node:root -R 777 /app/.angular/* +RUN mkdir -p /app/.angular && chown node:root -R 777 /app/.angular/* COPY . /app @@ -22,9 +22,9 @@ COPY . /app RUN npm run build -RUN chmod node:root -R 777 node_modules +RUN chown node:root -R 777 node_modules -RUN chmod node:root -R 777 /app/* +RUN chown node:root -R 777 /app/* CMD ["ng", "serve"] From 2d95c4d65de6e012494c6d4c88f16ef9555dbcd4 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:45:19 -0600 Subject: [PATCH 63/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index f6ca3d8..a3c88a8 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -4,7 +4,7 @@ USER node WORKDIR /app -RUN chown -R node:root 777 /app +RUN chown -R node:root /app COPY package*.json ./ @@ -13,7 +13,7 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chown node:root -R 777 /app/.angular/* +RUN mkdir -p /app/.angular && chown node:root -R /app/.angular/* COPY . /app @@ -22,9 +22,9 @@ COPY . /app RUN npm run build -RUN chown node:root -R 777 node_modules +RUN chown node:root -R node_modules -RUN chown node:root -R 777 /app/* +RUN chown node:root -R /app/* CMD ["ng", "serve"] From 466e35684b06d2acc0b0fe483bf996fbae668494 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:56:17 -0600 Subject: [PATCH 64/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index a3c88a8..3a5a8e6 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -13,19 +13,17 @@ RUN npm install RUN npm install -g @angular/cli@16.2.6 -RUN mkdir -p /app/.angular && chown node:root -R /app/.angular/* -COPY . /app +### STAGE 2: Run ### +FROM nginxinc/nginx-unprivileged +#### copy nginx conf +COPY ./config/nginx.conf /etc/nginx/conf.d/default.conf +#### copy artifact build from the 'build environment' +COPY --from=build /usr/src/app/dist/vitorspace/browser /usr/share/nginx/html - -RUN npm run build -RUN chown node:root -R node_modules - -RUN chown node:root -R /app/* - - -CMD ["ng", "serve"] +#### don't know what this is, but seems cool and techy +CMD ["nginx", "-g", "daemon off;"] From ea2d12ed142f02d397a3e70b43da35e29ad49f40 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:58:19 -0600 Subject: [PATCH 65/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 3a5a8e6..6ee97e5 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,10 +1,10 @@ FROM node:14.20.0-alpine as build -USER node + WORKDIR /app -RUN chown -R node:root /app +RUN chown -R 777 /app COPY package*.json ./ From afa99a57a7e35d5c1448c076e12a431cba65d77e Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 01:01:28 -0600 Subject: [PATCH 66/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 6ee97e5..e036f0d 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -2,9 +2,9 @@ FROM node:14.20.0-alpine as build -WORKDIR /app +WORKDIR /usr/src/app -RUN chown -R 777 /app +RUN chown -R 777 /usr/src/app COPY package*.json ./ From 944913602a2922f3f38a6bc154f800b11b741d04 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 01:03:30 -0600 Subject: [PATCH 67/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index e036f0d..289ccdc 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -9,11 +9,15 @@ RUN chown -R 777 /usr/src/app COPY package*.json ./ -RUN npm install + RUN npm install -g @angular/cli@16.2.6 +RUN npm install + +COPY . . +RUN npm run build ### STAGE 2: Run ### FROM nginxinc/nginx-unprivileged From 698f8a351010b9763464270c43b4ecfe5640b71d Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 08:34:01 -0600 Subject: [PATCH 68/73] Create nginx.conf --- frontend/nginx.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 frontend/nginx.conf diff --git a/frontend/nginx.conf b/frontend/nginx.conf new file mode 100644 index 0000000..2b7a475 --- /dev/null +++ b/frontend/nginx.conf @@ -0,0 +1,21 @@ +server { + listen 0.0.0.0:8080; + listen [::]:8080; + default_type application/octet-stream; + + gzip on; + gzip_comp_level 6; + gzip_vary on; + gzip_min_length 1000; + gzip_proxied any; + gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; + gzip_buffers 16 8k; + gunzip on; + client_max_body_size 256M; + + root /usr/share/nginx/html; + + location / { + try_files $uri $uri/ /index.html =404; + } +} From d6580ec07ba7a75767de572ee05abc432d2a6430 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 09:38:48 -0600 Subject: [PATCH 69/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 289ccdc..40656b6 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -23,7 +23,7 @@ RUN npm run build FROM nginxinc/nginx-unprivileged #### copy nginx conf -COPY ./config/nginx.conf /etc/nginx/conf.d/default.conf +COPY ./nginx.conf /etc/nginx/conf.d/default.conf #### copy artifact build from the 'build environment' COPY --from=build /usr/src/app/dist/vitorspace/browser /usr/share/nginx/html From 9b6318935b5305d3421b63937de061b0b4b31a2d Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:54:25 -0600 Subject: [PATCH 70/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 40656b6..5e85d7a 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -26,7 +26,7 @@ FROM nginxinc/nginx-unprivileged COPY ./nginx.conf /etc/nginx/conf.d/default.conf #### copy artifact build from the 'build environment' -COPY --from=build /usr/src/app/dist/vitorspace/browser /usr/share/nginx/html +COPY --from=build /usr/src/app/dist/angular-ecommerce /usr/share/nginx/html #### don't know what this is, but seems cool and techy CMD ["nginx", "-g", "daemon off;"] From a0ed543ad83edc034175e4d2779d061bc0a7c10b Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Mon, 10 Feb 2025 11:15:40 -0600 Subject: [PATCH 71/73] Update Dockerfile.dockerfile --- frontend/Dockerfile.dockerfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/frontend/Dockerfile.dockerfile b/frontend/Dockerfile.dockerfile index 5e85d7a..3ace796 100644 --- a/frontend/Dockerfile.dockerfile +++ b/frontend/Dockerfile.dockerfile @@ -1,16 +1,14 @@ FROM node:14.20.0-alpine as build +WORKDIR /app -WORKDIR /usr/src/app - -RUN chown -R 777 /usr/src/app COPY package*.json ./ - +# Install Angular CLI RUN npm install -g @angular/cli@16.2.6 RUN npm install @@ -20,14 +18,13 @@ COPY . . RUN npm run build ### STAGE 2: Run ### -FROM nginxinc/nginx-unprivileged +FROM nginx:alpine + -#### copy nginx conf -COPY ./nginx.conf /etc/nginx/conf.d/default.conf #### copy artifact build from the 'build environment' -COPY --from=build /usr/src/app/dist/angular-ecommerce /usr/share/nginx/html +COPY --from=build /app/dist/angular-ecommerce /usr/share/nginx/html -#### don't know what this is, but seems cool and techy -CMD ["nginx", "-g", "daemon off;"] +EXPOSE 80 +CMD["nginx", "-g","daemon off;"]] From 8f373004797fb0ae4a2948325425b9398e908234 Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Mon, 10 Feb 2025 11:16:47 -0600 Subject: [PATCH 72/73] Update Dockerfile --- backend/Dockerfile | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 1e80c45..3c04ce5 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,16 +1,22 @@ # # Build stage # -FROM maven:3.6.0-jdk-11-slim AS build -COPY src /home/app/src -COPY pom.xml /home/app -RUN mvn -f /home/app/pom.xml clean package +FROM maven:3.8.4-openjdk-11 AS build +WORKDIR /app -# -# Package stage -# -FROM openjdk:11-jre-slim -COPY --from=build /home/app/target/spring-boot-ecommerce-0.0.1-SNAPSHOT.jar /usr/local/lib/spring-boot-ecommerce.jar -EXPOSE 8443 -ENTRYPOINT ["java","-jar","/usr/local/lib/spring-boot-ecommerce.jar"] +COPY pom.xml ./ + + + +COPY src ./src + + + + + +COPY target/*.jar app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java","-jar","app.jar"] From 669b463307ef03bc38d89f542e4ccff46b573e1f Mon Sep 17 00:00:00 2001 From: dasarisindhuja92 <60621395+dasarisindhuja92@users.noreply.github.com> Date: Mon, 10 Feb 2025 11:18:03 -0600 Subject: [PATCH 73/73] Update application.properties --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index b561e9b..7341652 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -68,6 +68,6 @@ spring.security.ignored=/** spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER spring.jpa.hibernate.ddl-auto=update - +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect