Merge pull request #9 from FRC-1721/feat/more_variables

FRC-1721 · Jan 22, 2025 · 751c130 · 751c130
2 parents 9b4f4da + 4a52900
commit 751c130
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -1,11 +1,6 @@
 name: ProjectHUD CI
 
-on:
-  push:
-    branches:
-      - "*"
-    tags:
-      - "*"
+on: push
 
 env:
   REGISTRY: ghcr.io

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .db
 __pycache__
 .env
+node_modules/
diff --git a/README.md b/README.md
@@ -28,6 +28,8 @@ services:
       GITHUB_TOKEN: YOUR_TOKEN
       GITHUB_REPOS: YOUR,REPOS
       USERNAME_MAP: username:realname,
+      REFRESH_DURATION: 25 # Optional
+      API_REFRESH_DURATION: 200 # Optional
 ```
 
 ## Example setup with openbox autostart

diff --git a/app/routes/index.py b/app/routes/index.py
@@ -1,8 +1,11 @@
+import os
 from flask import Blueprint, render_template
 
 index_bp = Blueprint("main", __name__)
 
 
 @index_bp.route("/")
 def index():
-    return render_template("index.html")
+    return render_template(
+        "index.html", refresh_duration=int(os.getenv("REFRESH_DURATION", 25))
+    )
diff --git a/app/routes/screens.py b/app/routes/screens.py
@@ -35,7 +35,7 @@ def test_screen():
         </style>
     </head>
     <body>
-        <h1>Please Wait! Version {os.getenv('GIT_COMMIT', 'Unknown')}</h1>
+        <h1>ProjectHUD Starting! Version {os.getenv('GIT_COMMIT', 'Unknown')}</h1>
     </body>
     </html>
     """

diff --git a/app/services/github_service.py b/app/services/github_service.py
@@ -1,5 +1,7 @@
+import os
 import time
 import threading
+
 from datetime import datetime
 
 from github import Github
@@ -33,7 +35,7 @@ def fetch_data(self):
             print("Updated github data.")
             self.last_updated = datetime.now()
 
-            time.sleep(120)
+            time.sleep(int(os.getenv("API_REFRESH_DURATION", 200)))
 
     def get_mapped_username(self, username):
         return self.username_mapping.get(username, username)
@@ -54,9 +56,12 @@ def update_general_data(self):
                         "name": milestone.title,
                         "progress": (
                             (
-                                milestone.closed_issues
-                                / (milestone.closed_issues + milestone.open_issues)
-                                * 100
+                                round(
+                                    milestone.closed_issues
+                                    / (milestone.closed_issues + milestone.open_issues)
+                                    * 100,
+                                    2,
+                                )
                             )
                             if (milestone.closed_issues + milestone.open_issues) > 0
                             else 0

diff --git a/app/static/scripts/autorefresh.js b/app/static/scripts/autorefresh.js
@@ -1,15 +1,12 @@
 document.addEventListener('DOMContentLoaded', () => {
-    // Configurable refresh duration (in seconds)
-    const REFRESH_DURATION = 25;
-
     // HTML items
     const iframe = document.getElementById("board-iframe");
     const refreshIndicator = document.getElementById('refresh-indicator');
 
     let screens = [];
     let currentScreenIndex = 0;
     let initialVersion = null;
-    let countdown = REFRESH_DURATION;
+    let countdown = REFRESH_DURATION; // Use the dynamic variable
 
     async function fetchScreens() {
         try {
@@ -42,7 +39,7 @@ document.addEventListener('DOMContentLoaded', () => {
     function updateCountdown() {
         refreshIndicator.innerText = `Changing in ${countdown}s`;
         if (countdown <= 0) {
-            countdown = REFRESH_DURATION;
+            countdown = REFRESH_DURATION; // Reset countdown
             fetchScreens(); // Fetch screens and check for updates
             cycleScreens(); // Cycle to the next screen
         } else {

diff --git a/app/templates/index.html b/app/templates/index.html
@@ -6,6 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Project HUD</title>
     <link rel="stylesheet" href="/static/styles/base.css">
+
+    <script>
+        const REFRESH_DURATION = {{ refresh_duration }};
+    </script>
     <script src="/static/scripts/autorefresh.js" defer></script>
 </head>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ def test_screen(): @@
             </style>
         </head>
         <body>
-            <h1>Please Wait! Version {os.getenv('GIT_COMMIT', 'Unknown')}</h1>
+            <h1>ProjectHUD Starting! Version {os.getenv('GIT_COMMIT', 'Unknown')}</h1>
         </body>
         </html>
         """
@@ Expand Down @@