Changeset 6fa3d09 for src/main/resources

Timestamp:

01/05/22 21:51:57 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

a64f926

Parents:

b8dc761

Message:

part 3

Location:

src/main/resources/templates

Files:

• album.html (modified) (1 diff)
• login.html (modified) (1 diff)
• post.html (modified) (1 diff)

src/main/resources/templates/album.html

@@ -55 +55 @@
                             <h4 th:text="${post.title}" style="height: 60px"></h4>
                             <p class="card-text text-truncate" style="height: 45px" th:text="${post.description}"></p>
-                            <span th:if="${post.riskFactor < 101}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor}"></small></span>
-                            <span th:unless="${post.riskFactor < 101}" style="color: black; margin-left: 62%;">Chance: unavailable</span>
+                            <span th:if="${post.riskFactor == 100}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor+'+'}"></small></span>
+                            <span th:if="${post.riskFactor < 100}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor}"></small></span>
+                            <span th:if="${post.riskFactor == 101}" style="color: black; margin-left: 46%;">Chance: too early to calculate</span>
+                            <span th:if="${post.riskFactor == 102}" style="color: black; margin-left: 61%;">Donation completed!</span>
                             <div class="d-flex justify-content-between align-items-center">
                                 <div class="btn-group">

src/main/resources/templates/login.html

@@ -27 +27 @@
         <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
     </form>
-    <a th:href="@{/oauth2/authorization/google}" class="btn btn-primary">Continue with google</a>
-    <a th:href="@{/oauth2/authorization/facebook}" class="btn btn-primary">Continue with facebook</a>
+    <a th:href="@{/oauth2/authorization/google}" class="btn btn-warning" style="width:200px; margin-top:20px;">Continue with Google</a>
+    <a th:href="@{/oauth2/authorization/facebook}" class="btn btn-info"style="width:200px; margin-top:20px;">Continue with Facebook</a>
     <p th:if="${param.error != null}" class="text-danger">Incorrect username or password</p>
     <p th:if="${successValidation}" class="text-success">Account validated</p>

src/main/resources/templates/post.html

@@ -53 +53 @@
             <h5>Date due:</h5>
             <p th:text="${post.dateDue}"></p>
+            <h5>Chance:</h5>
+            <p th:if="${post.riskFactor<100}" th:text="${post.riskFactor}"></p>
+            <p th:if="${post.riskFactor==100}" th:text="${post.riskFactor+'+'}"></p>
+            <p th:if="${post.riskFactor==101}">too early to calculate</p>
+            <p th:if="${post.riskFactor==102}">Donation completed!</p>
             <h5>Bank account:</h5>
             <p th:text="${post.bankAccount}"></p>