css reference

prenagha · Aug 17, 2024 · 5bfa03e · 5bfa03e
1 parent 8165de4
commit 5bfa03e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/02-service.yml b/.github/workflows/02-service.yml
@@ -20,7 +20,7 @@ on:
 jobs:
   build-and-publish:
     runs-on: ubuntu-20.04
-    name: Build and publish Todo App to ECR
+    name: Build App to ECR
     outputs:
       dockerImageTag: ${{ steps.dockerImageTag.outputs.tag }}
     steps:
@@ -74,7 +74,7 @@ jobs:
 
   deploy:
     runs-on: ubuntu-20.04
-    name: Deploy Todo App on ECS
+    name: Deploy App on ECS
     needs: build-and-publish
     timeout-minutes: 15
     if: github.ref == 'refs/heads/main' || contains(github.event.head_commit.message, 'DEPLOY NOW')
@@ -100,7 +100,7 @@ jobs:
         working-directory: cdk
         run: npm install
 
-      - name: Deploy Service stack
+      - name: Deploy Service
         working-directory: cdk
         run: npm run service:deploy -- -c dockerImageTag=${{ needs.build-and-publish.outputs.dockerImageTag }}
 

diff --git a/app/src/main/resources/logback-spring.xml b/app/src/main/resources/logback-spring.xml
@@ -2,9 +2,9 @@
 <configuration>
 
   <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-  <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
 
   <springProfile name="dev">
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
     <root level="INFO">
       <appender-ref ref="CONSOLE"/>
     </root>
@@ -18,8 +18,10 @@
     <root level="INFO">
       <appender-ref ref="JSON"/>
     </root>
-    <logger name="org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler" level="INFO"/>
-    <logger name="org.springframework.web.SimpLogging" level="INFO"/>
-    <logger name="org.springframework.web.socket.config.WebSocketMessageBrokerStats" level="WARN"/>
   </springProfile>
+
+  <logger name="org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler" level="INFO"/>
+  <logger name="org.springframework.web.SimpLogging" level="INFO"/>
+  <logger name="org.springframework.web.socket.config.WebSocketMessageBrokerStats" level="WARN"/>
+
 </configuration>
diff --git a/app/src/main/resources/templates/layout/layout.html b/app/src/main/resources/templates/layout/layout.html
@@ -2,31 +2,34 @@
 <html lang="en"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
       xmlns:th="http://www.thymeleaf.org">
 
 <!--/*@thymesVar id="headline" type="java.lang.String"*/-->
 
 <head>
     <meta charset="UTF-8">
-    <title layout:title-pattern="$CONTENT_TITLE | $LAYOUT_TITLE">
-        Todo Application
-    </title>
+    <title layout:title-pattern="$CONTENT_TITLE | $LAYOUT_TITLE">Todo Application</title>
 
     <meta content="IE=edge" http-equiv="X-UA-Compatible"/>
     <meta content="width=device-width, initial-scale=1" name="viewport"/>
 
-    <link rel="icon" th:href="@{/favicon.svg}">
+    <link rel="icon" th:href="@{/favicon.ico}">
 
     <link rel="stylesheet" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}">
     <link rel="stylesheet" th:href="@{/webjars/font-awesome/css/all.css}">
-    <link rel="stylesheet" th:href="@{/styles.css}">
+    <link rel="stylesheet" th:href="@{/css/styles.css}">
 
     <script th:src="@{/webjars/jquery/jquery.min.js}"></script>
     <script th:src="@{/webjars/popper.js/umd/popper.min.js}"></script>
     <script th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
+
+    <script th:src="@{/webjars/sockjs-client/sockjs.min.js}" sec:authorize="isAuthenticated()"></script>
+    <script th:src="@{/webjars/stomp-websocket/stomp.min.js}" sec:authorize="isAuthenticated()"></script>
+    <script th:src="@{/js/todo-updates.js}" sec:authorize="isAuthenticated()"></script>
 </head>
 <body>
-<div>
+<div class="min-vh-100 d-flex flex-column justify-content-between">
     <div th:replace="~{fragments/header :: header}"></div>
 
     <div th:replace="~{fragments/toast :: toast}"></div>
@@ -39,6 +42,10 @@ <h1 th:text="${headline}" class="title text-center"></h1>
 
     <div th:replace="~{fragments/modals :: confirmDeletionModal}"></div>
     <div th:replace="~{fragments/footer :: footer}"></div>
+
+    <script sec:authorize="isAuthenticated()">
+        // connectToWebSocketEndpoint('[[${#authentication.principal.attributes.email}]]');
+    </script>
 </div>
 </body>
-</html>
+</html>