Merge remote-tracking branch 'origin/main' into onrender

fleizean · Apr 20, 2024 · 2d31f3a · 2d31f3a
2 parents 88fc27f + b56e9ed
commit 2d31f3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,7 +2,7 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "onrender" ]
 
 jobs:
 

diff --git a/indianpong/pong/templates/404.html b/indianpong/pong/templates/404.html
@@ -5,7 +5,7 @@
 
 {% block app %}
 <div class="HeaderArea" id="HeaderArea">
-    <div class="big-text">{{context.notFoundHeaderText}}</div>
+    <div class="big-text">404 ERROR</div>
     <div class="small-text">{{context.notFoundSubHeaderText}}</div>
     <div class="gohome-button-container">
         <a onclick="swapApp('/')"><button class="gohome-button" type="button">

diff --git a/indianpong/static/js/navigation.js b/indianpong/static/js/navigation.js
@@ -32,7 +32,9 @@ function updateApp(path) {
     .then(response => response.text())
     .then(html => {
       document.body.innerHTML = html;
-      pageHandler(path);
+      if (!html.includes('<div class="big-text">404 ERROR</div>')) {
+          pageHandler(path);
+      }
       hideLoadingScreen();
     })
     .catch(error => console.error(error));
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Docker Build and Push @@
     on:
       push:
-        branches: [ "main" ]
+        branches: [ "onrender" ]
     jobs:
@@ Expand Down @@