some changes

fix show git hash button show active page change formatting
HerrErde · Dec 23, 2023 · e3a5f27 · e3a5f27
1 parent 06fc457
commit e3a5f27
Show file tree

Hide file tree

Showing 14 changed files with 159 additions and 249 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,6 @@
 name: Build Docker Image
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - 'v*'

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,13 @@
 FROM php:8.0-apache
 
-COPY / /var/www/html/
+RUN apt-get update && apt-get install -y git
+
+WORKDIR /var/www/html/
+
+COPY . /var/www/html/
 
 COPY php.ini /etc/php/5.6/apache2/php.ini
 
-WORKDIR /
+RUN chown -R www-data:www-data /var/www/html
 
 EXPOSE 80
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -1,5 +1,5 @@
 ::-webkit-scrollbar {
-  width: 12px;
+  width: 13px;
   background-color: #f5f5f5;
 }
 ::-webkit-scrollbar-track {
@@ -245,12 +245,18 @@ input[type='checkbox'].item {
   text-decoration: underline;
 }
 .btn-primary {
-  background-color: #5865f2;
+  background-color: #3c45a3;
 }
 .btn-primary:hover {
-  background-color: #4752c4;
+  background-color: #2e3194;
+}
+.btn-secondary {
+  background-color: #5865f2;
+}
+.btn-secondary:hover {
+  background-color: #4c53a3;
 }
-.btn-primary.disabled {
+.btn.disabled {
   background-color: #686d73;
   cursor: not-allowed;
 }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   web:
-    image: ghcr.io/herrerde/subway_gen
+    image: ghcr.io/herrerde/subway_gen:latest
     container_name: subway_gen
     restart: unless-stopped
     ports:

diff --git a/generator/toprun.php b/generator/toprun.php
@@ -50,9 +50,8 @@
       </div>
       <div class="btn btn-success download" style="display: inline-block">
         <i class="fa-solid fa-download"></i>
-        <a onclick="download2Json('textarea2', 'user_stats.json')"
-          >User Stats</a
-        >
+        <a onclick="download2Json('textarea2', 'user_stats.json')">
+        User Stats</a>
       </div>
     </form>
 

diff --git a/index.php b/index.php
@@ -12,7 +12,10 @@
       <img src="/assets/img/subwaysurf-matrix.png" />
     </header>
     <?php require "require/info.php"; ?>
-    <?php require "require/buttons.php"; ?>
+    <?php 
+      $activePage = basename(__FILE__, '.php');
+      require "require/buttons.php";
+    ?>
     <?php require "require/footer.php"; ?>
   </body>
 </html>
diff --git a/page/boards.php b/page/boards.php
diff --git a/page/toprun.php b/page/toprun.php
@@ -3,8 +3,11 @@
 
   <head>
     <title>Generate your Highscore</title>
-    <?php require "../require/connect.php"; ?>
-    <?php require "../require/buttons.php"; ?>
+    <?php
+      $activePage = basename(__FILE__, '.php');
+      require "../require/connect.php";
+      require "../require/buttons.php";
+    ?>
   </head>
 
   <body>
@@ -15,35 +18,35 @@
 
   <form method="get" action="../generator/toprun.php">
       <fieldset>
-        <legend>Game data</legend>
-          <div>
-            <label>Highscore:</label><br>
-            <input type="number" name="highscore" required min="0"
-              max="9223372036854775807">
-            <span class="required">*</span><br>
-          </div>
-          <div>
-            <label for="userstats">Stats Score:</label>
-            <label class="switch">
-              <input type="checkbox" id="userstats">
-              <span class="slider"></span>
-            </label>
-          </div>
-
-          <div>
-            <label for="userstatsAmount">Stats Score Amount:</label>
-            <input
-              type="number"
-              name="userstatsAmount"
-              id="userstatsAmount"
-              min="0"
-              max="2147483647"
-              required
-              disabled
-           >
-            <span class="required">*</span>
-          </div>
+        <div>
+          <legend>Game data</legend>
+            <div>
+              <label>Highscore:</label><br>
+              <input type="number" name="highscore" required min="0"
+                max="9223372036854775807">
+              <span class="required">*</span><br>
+            </div>
+            <div>
+              <label for="userstats">Stats Score:</label>
+              <label class="switch">
+                <input type="checkbox" id="userstats">
+                <span class="slider"></span>
+              </label>
+            </div>
 
+            <div>
+              <label for="userstatsAmount">Stats Score Amount:</label>
+              <input
+                type="number"
+                name="userstatsAmount"
+                id="userstatsAmount"
+                min="0"
+                max="2147483647"
+                required
+                disabled>
+              <span class="required">*</span>
+            </div>
+        </div>
           <script>
             const userstats = document.getElementById('userstats');
             const userstatsAmount =

diff --git a/page/upgrades.php b/page/upgrades.php
@@ -2,8 +2,11 @@
 <html lang="en">
   <head>
     <title>Generate your Upgrades</title>
-    <?php require "../require/connect.php"; ?>
-    <?php require "../require/buttons.php"; ?>
+    <?php
+      $activePage = basename(__FILE__, '.php');
+      require "../require/connect.php";
+      require "../require/buttons.php";
+    ?>
   </head>
 
   <body>
@@ -52,8 +55,7 @@
             min="0"
             max="100"
             required
-            disabled
-         >
+            disabled>
           <span class="required">*</span>
         </div>
 
@@ -84,8 +86,7 @@
             min="0"
             max="100"
             required
-            disabled
-         >
+            disabled>
           <span class="required">*</span>
         </div>