feat: Improve Attendance control (#5)

rinchen-org · Nov 9, 2023 · 9cd9595 · 9cd9595
1 parent 38e2a77
commit 9cd9595
Show file tree

Hide file tree

Showing 54 changed files with 1,557 additions and 251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 db.sqlite
-event/.htpasswd
+src/.htpasswd
 vendor/
 .env*
 .phpunit.cache/

diff --git a/.makim.yaml b/.makim.yaml
@@ -5,7 +5,7 @@ groups:
       runserver:
         help: Run the server application
         run: |
-          cd event
+          cd src
           # echo "HOST_ADDRESS=http://localhost:8081" > .env
           php -S localhost:8081
 
@@ -15,4 +15,7 @@ groups:
           ./vendor/bin/phpunit tests/SettingsTest.php
           ./vendor/bin/phpunit tests/PersonTest.php
           ./vendor/bin/phpunit tests/SubscriptionTest.php
+          ./vendor/bin/phpunit tests/EventTest.php
+          ./vendor/bin/phpunit tests/EventSessionTest.php
+          ./vendor/bin/phpunit tests/AttendanceTest.php
           # ./vendor/bin/phpunit tests/EmailTest.php
diff --git a/event/attendance_list.php b/event/attendance_list.php
diff --git a/event/attendance_log_manual.php b/event/attendance_log_manual.php
diff --git a/event/index.php b/event/index.php
diff --git a/event/migrations/all.php b/event/migrations/all.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
   level: 6
   paths:
-    - event
+    - src
     - tests
   treatPhpDocTypesAsCertain: false
diff --git a/event/.htaccess → src/.htaccess b/event/.htaccess → src/.htaccess
diff --git a/src/attendance_log.php b/src/attendance_log.php
@@ -0,0 +1,5 @@
+<?php
+// Redirect to templates/index.php
+header("Location: templates/attendance/log.php");
+exit; // Make sure to exit after the redirection
+?>
diff --git a/event/generate_qr.php → src/generate_qr.php b/event/generate_qr.php → src/generate_qr.php
@@ -1,7 +1,10 @@
 <?php
+include __DIR__ . "/lib/settings.php";
 include __DIR__ . "/lib/qr.php";
+
+global $BASE_URL;
 ?>
-<link rel="stylesheet" href="./static/style.css">
+<link rel="stylesheet" href="<?php echo $BASE_URL; ?>/static/style.css">
 <?php
 
 $fullname = $_GET['fullname'];

diff --git a/src/index.php b/src/index.php
@@ -0,0 +1,5 @@
+<?php
+// Redirect to templates/index.php
+header("Location: templates/index.php");
+exit; // Make sure to exit after the redirection
+?>
diff --git a/event/lib/attendance.php → src/lib/attendance-old.php b/event/lib/attendance.php → src/lib/attendance-old.php