Merge branch 'main' into tedheng

2025-07-23 16:25:49 +00:00 · 2023-09-05 18:15:39 +08:00 · 2023-09-05 18:15:39 +08:00 · fa820498b1
commit fa820498b1
parent 5b38105a35 60e152f3f6
8 changed files with 27 additions and 1 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,24 @@
+name: Build and Test
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Run tests with Maven
+      run: mvn -B test --file pom.xml
--- a/src/.DS_Store
+++ b/src/.DS_Store
--- a/src/main/.DS_Store
+++ b/src/main/.DS_Store
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@ -25,3 +25,4 @@ logging.level.org.springframework=INFO
 spring.web.resources.cache.cachecontrol.max-age=12h

 server.port=8081
+
--- a/src/main/resources/static/resources/images/error.jpg
+++ b/src/main/resources/static/resources/images/error.jpg
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@ -3,7 +3,7 @@
 <html xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'error')}">

  <body>
-    <img src="../static/resources/images/pets.png" th:src="@{/resources/images/pets.png}"/>
+    <img src="../static/resources/images/error.jpg" th:src="@{/resources/images/error.jpg}"/>
    <h2>Something happened...</h2>
    <p th:text="${message}">Exception message</p>
  </body>
--- a/src/main/resources/templates/vets/vetList.html
+++ b/src/main/resources/templates/vets/vetList.html
@ -6,6 +6,7 @@
 <body>

 <h2>Veterinarians</h2>
+<h2>Operated by Kean</h2>

 <table id="vets" class="table table-striped">
  <thead>