diff --git a/sisvietnamvn_main/docker-compose.yml b/sisvietnamvn_main/docker-compose.yml new file mode 100644 index 00000000..c09fb9a0 --- /dev/null +++ b/sisvietnamvn_main/docker-compose.yml @@ -0,0 +1,49 @@ +# This configuration combines the app and database services for easy execution at the project root +name: sisvietnamvn +services: + oracle: + image: container-registry.oracle.com/database/free:latest + restart: always + ports: + - "1521:1521" + environment: + - ORACLE_PWD=Oracle123! + - ORACLE_PASSWORD=Oracle123! + - ORACLE_PDB=sisvietnam + - ORACLE_DATABASE=sisvietnam + - APP_USER=sisvietnam + - APP_USER_PASSWORD=sisvietnam + volumes: + - ~/oracle-data:/opt/oracle/oradata + networks: + - sisvietnamvn-net + + app: + image: git.victorphan.net/basketballcantho/sisvietnamvn:latest + depends_on: + - oracle + environment: + - _JAVA_OPTIONS=-Xmx512m -Xms256m + - SPRING_PROFILES_ACTIVE=prod,api-docs,secret-samples + - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true + - SPRING_DATASOURCE_URL=jdbc:oracle:thin:@oracle:1521/sisvietnam + - SPRING_DATASOURCE_USERNAME=SYSTEM + - SPRING_DATASOURCE_PASSWORD=Oracle123! + - SPRING_LIQUIBASE_URL=jdbc:oracle:thin:@oracle:1521/sisvietnam + ports: + - "8080:8080" + healthcheck: + test: + [ + 'CMD-SHELL', + 'bash -c ''exec 3<>/dev/tcp/127.0.0.1/8080; printf "GET /management/health HTTP/1.0\r\nHost: localhost\r\n\r\n" >&3; grep -q "\"status\":\"UP\"" <&3''', + ] + interval: 5s + timeout: 5s + retries: 40 + networks: + - sisvietnamvn-net + +networks: + sisvietnamvn-net: + driver: bridge diff --git a/sisvietnamvn_main/src/main/resources/templates/fragments/footer.html b/sisvietnamvn_main/src/main/resources/templates/fragments/footer.html index f9480ccd..4c18c870 100644 --- a/sisvietnamvn_main/src/main/resources/templates/fragments/footer.html +++ b/sisvietnamvn_main/src/main/resources/templates/fragments/footer.html @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/sisvietnamvn_main/src/main/resources/templates/fragments/header.html b/sisvietnamvn_main/src/main/resources/templates/fragments/header.html index 95f8f911..03f69292 100644 --- a/sisvietnamvn_main/src/main/resources/templates/fragments/header.html +++ b/sisvietnamvn_main/src/main/resources/templates/fragments/header.html @@ -1,1076 +1,1096 @@ -
+

The University of Massachusetts Amherst

- +
-
-
- - -
-
- - - - - -
- - - - -
- -
-
- -
-
- - SIS Vietnam - SIS Vietnam - -
- -
-
-
- - - - -
- - - - -
- - - - - - +
+ -
- - -
-
+ +
+
+
+ + + + +
+ + + + +
+ + + + + + + +
+
+ + +
+
-
-
- +
+
+ -
-
- -
+ +
+ + +
- -
- - - + + + + + + + +
+ +
- - -
-
-
+
\ No newline at end of file diff --git a/sisvietnamvn_main/src/main/resources/templates/index.html b/sisvietnamvn_main/src/main/resources/templates/index.html index 8f0855e4..0d35ff63 100644 --- a/sisvietnamvn_main/src/main/resources/templates/index.html +++ b/sisvietnamvn_main/src/main/resources/templates/index.html @@ -64,7 +64,8 @@ font-family: 'Open Sans', Arial, Helvetica, sans-serif !important; } - #block-footerbranding img { + #block-footerbranding, + #l--main-header img { filter: drop-shadow(2px 0px 0 rgba(255, 255, 255, 1)) drop-shadow(0px 2px 0 rgba(255, 255, 255, 1)) drop-shadow(-2px 0px 0 rgba(255, 255, 255, 1)) drop-shadow(0px -2px 0 rgba(255, 255, 255, 1)); transition: filter 0.3s ease, transform 0.3s ease; } @@ -666,7 +667,7 @@
@@ -724,7 +725,7 @@
@@ -782,7 +783,7 @@
@@ -841,7 +842,7 @@