Merge branch 'master' into develop

EGA-archive · Jun 6, 2024 · baf0075 · baf0075
2 parents 5f02454 + a788560
commit baf0075
Show file tree

Hide file tree

Showing 58 changed files with 9,207 additions and 3,985 deletions.
diff --git a/frontend/.env b/frontend/.env
@@ -1,2 +1,3 @@
 REACT_APP_CLIENT_ID='9db950db-31d8-4966-9f35-e8222d2fdcf6'
-REACT_APP_CLIENT_SECRET='a385b9af-bc1f-4d23-bc10-a03e9b75ef54c85ebbb1-f15c-49ed-9728-894e56894b1b'
+REACT_APP_CLIENT_SECRET='3fcedd8c-06cf-48a6-812e-d7c63154ec729c4f1734-4a67-4d17-a9a9-b3a7694f9063'
+REACT_APP_KEYCLOAK_CLIENT_SECRET='WGahOcaJcbQ2srhBsNH56NhhDxH5M51f'
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -12,6 +12,6 @@ COPY yarn.lock .
 COPY public ./public
 COPY src ./src
 
-
 RUN yarn install --production
 
+
diff --git a/frontend/README.md b/frontend/README.md
@@ -1,4 +1,4 @@
-## Deploy
+# Getting Started with Create React App
 
 Use the deployment for all the containers for beacon to also deploy the UI [Deployment](../deploy/README.md). You will find it running in http://localhost:3000
 
@@ -32,3 +32,4 @@ Finally, please include the URL of your User interface to the file beacon/_ main
 
 
 Note that in the frontend folder you will find a file called .gitignore with the list of all files that need to be ignored.
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,6 @@ COPY yarn.lock .
		COPY public ./public
		COPY src ./src


		RUN yarn install --production