Atmos4 · Atmos4 · Feb 25, 2025 · Feb 24, 2025
diff --git a/app/components/user_card.php b/app/components/user_card.php
@@ -10,21 +10,19 @@ function UserCard($user, $image = null, $subtitle = null, $actions = null, $user
             <img src="<?= $user->getPicture() ?>">
         <?php endif; ?>
 
-        <?php if ($user_link): ?>
-            <?php $user_link() ?>
-        <?php else: ?>
+        <?php if ($user_link):
+            $user_link();
+        else: ?>
             <a href="/licencies?user=<?= $user->id ?>" <?= UserModal::props($user->id) ?>>
                 <?= "$user->first_name $user->last_name" ?>
             </a>
         <?php endif; ?>
 
         <!-- subtitle block -->
-        <?php if ($subtitle): ?>
-            <?php $subtitle($user); ?>
-        <?php endif; ?>
+        <?php $subtitle && $subtitle($user) ?>
 
         <!-- Actions block -->
-        <?php if (isset($actions)): ?>
+        <?php if ($actions): ?>
             <nav>
                 <ul>
                     <li>

diff --git a/app/management/club_new.php b/app/management/club_new.php
@@ -1,4 +1,5 @@
 <?php
+restrict_management();
 managementPage("New club");
 
 $v = new Validator(["direct_login" => true]);

diff --git a/app/management/club_view.php b/app/management/club_view.php
@@ -1,10 +1,12 @@
 <?php
-managementPage("View club");
+restrict_management();
 $slug = Router::getParameter("slug", pattern: '/[\w-]+/');
 DB::setupForClub($slug);
 $s = ClubManagementService::create($slug) ?? force_404("club not found");
 $club = $s->getClub();
 
+managementPage("Club - $club->name");
+
 $backupService = new BackupService(dbPath: $s->db->sqlitePath);
 
 $v_backup = new Validator(action: "create_backup");
@@ -25,7 +27,7 @@
 
 $v = new Validator($club->toForm());
 $color = $v->select("color")->options(array_column(ThemeColor::cases(), 'value', 'name'))->label("Couleur de thème");
-$name = $v->text("name")->label("Name");
+$name = $v->text("name")->label("Name")->required();
 
 if ($v->valid()) {
     $r = $s->updateClub($club, $name->value, $color->value);
@@ -66,9 +68,6 @@
     <sl-tab-panel name="general">
         <form method="post">
             <?= $v ?>
-            <?php if (!$club->name): ?>
-                <article class="notice error">Please fill in the club name</article>
-            <?php endif ?>
             <?= $name ?>
             <label for="color">Couleurs disponibles</label>
             <div class="color-picker">
@@ -113,4 +112,22 @@
         <form hx-post="/mgmt/view/<?= $slug ?>/backups" hx-trigger="load,submit" hx-target="this">
         </form>
     </sl-tab-panel>
-</sl-tab-group>
+</sl-tab-group>
+
+<style>
+    .color-dot {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        aspect-ratio: 1 / 1;
+        width: 40px;
+        border-radius: 50%;
+    }
+
+    .color-picker {
+        display: flex;
+        gap: 5px;
+        flex-wrap: wrap;
+        padding: 0 0 1rem;
+    }
+</style>
diff --git a/app/management/clubs_list.php b/app/management/clubs_list.php
@@ -2,6 +2,7 @@
 if (!ClubManagementService::isLoggedIn()) {
     redirect("/mgmt/login");
 }
+restrict_management();
 managementPage("Clubs");
 /* Workaround to handle the case where a club is selected, so that the color works in layout.php */
 if ($club_slug = ClubManagementService::getSelectedClubSlug()) {

diff --git a/app/management/mg_login.php b/app/management/mg_login.php
@@ -1,5 +1,5 @@
 <?php
-managementPage("MGMT - login", false);
+managementPage("MGMT - login");
 
 $v = new Validator;
 $password = $v->password("mgmt_pw")->required();

diff --git a/app/services/ClubManagementService.php b/app/services/ClubManagementService.php
@@ -36,7 +36,7 @@ static function clubExists($slug)
         return file_exists(club_data_path($slug));
     }
 
-    public function getClub()
+    public function getClub(): Club
     {
         $results = $this->db->em()->createQuery("SELECT c FROM Club c")->getResult();
         if (!$results) {

diff --git a/app/template/layout.php b/app/template/layout.php
@@ -1,5 +1,6 @@
 <?php
-$page = Page::getInstance(); ?>
+$page = Page::getInstance();
+$clubColor = array_key_exists("selected_club", $_SESSION) ? ClubManagementService::create()->getClubColor($_SESSION["selected_club"] ?? null) : null; ?>
 <!doctype html>
 <html lang="en">
 
@@ -22,7 +23,6 @@
     <link rel="stylesheet" href="/assets/css/theme-toggle.css">
 
     <!-- Pico.css -->
-    <?php $clubColor = array_key_exists("selected_club", $_SESSION) ? ClubManagementService::create()->getClubColor($_SESSION["selected_club"] ?? null) : null; ?>
     <?php if ($clubColor != null): ?>
         <link rel="stylesheet" href="/assets/css/pico.<?= $clubColor ?>.min.css">
     <?php else: ?>

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -720,31 +720,6 @@ sl-tab-group {
   --sl-color-primary-600: var(--pico-primary);
 }
 
-.color-dot {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  aspect-ratio: 1 / 1;
-  border-radius: 50%;
-}
-.color-picker {
-  grid-gap: var(--pico-block-spacing-horizontal);
-  display: grid;
-  grid-template-columns: repeat(5, 1fr);
-  overflow: hidden;
-  border-top-right-radius: var(--pico-border-radius);
-  border-top-left-radius: var(--pico-border-radius);
-  margin-bottom: var(--pico-block-spacing-vertical);
-}
-
-@media (min-width: 768px) {
-  .color-picker {
-    grid-gap: calc(var(--pico-block-spacing-horizontal) * 0.5);
-    grid-template-columns: repeat(10, 1fr);
-    margin-bottom: var(--pico-block-spacing-vertical);
-  }
-}
-
 .tag {
   display: inline-flex;
   align-items: center;

diff --git a/engine/helpers.php b/engine/helpers.php
@@ -164,7 +164,6 @@ function page(string $title)
 
 function managementPage(string $title, $restrict = true)
 {
-    $restrict && restrict_management();
     return page($title)->disableNav()->boost();
 }
 

diff --git a/engine/validation/fields/UploadField.php b/engine/validation/fields/UploadField.php
@@ -53,32 +53,8 @@ class UploadField extends Field
             'application/vnd.ms-powerpoint.addin.macroEnabled.12',
             'application/vnd.openxmlformats-officedocument.presentationml.slide',
             'application/vnd.oasis.opendocument.presentation',
-        ]
-    ];
-    /** @var array<array> */
-    public static array $IMAGE_MIME = [
-        'image' => [
-            'image/webp',
-            'image/tiff',
-            'image/png',
-            'image/jpeg',
-            'image/gif',
-            'image/x-ms-bmp',
-            'image/x-bmp',
-            'image/x-portable-bitmap',
-            'image/vnd.adobe.photoshop',
-            'image/x-eps',
-            'application/postscript',
-            'application/dicom',
-            'application/pcx',
-            'application/x-pcx',
-            'image/pcx',
-            'image/x-pc-paintbrush',
-            'image/x-pcx',
-            'zz-application/zz-winassoc-pcx',
-            'image/jp2',
-            'image/heif'
-        ]
+        ],
+        'zip' => ['application/zip'],
     ];
     function set_type(): void
     {
@@ -155,6 +131,7 @@ function mime(array $mimes): static
             $this->allowed_mime = $mimes;
             // Allow certain file formats
             $finfo = new finfo(FILEINFO_MIME_TYPE);
+            logger()->debug("finfo", ["info" => $finfo->file($_FILES[$this->key]['tmp_name'])]);
             // Flatten the array
             $flatArray = array_reduce($this->allowed_mime, 'array_merge', []);
             if (

diff --git a/routes.php b/routes.php
@@ -111,7 +111,7 @@
 Router::add('/licencies/$user_id', __DIR__ . '/app/pages/users/user_view_modal.php');
 Router::add('/licencies/$user_id/desactiver', __DIR__ . '/app/pages/users/user_deactivation_confirm.php');
 Router::add('/licencies/$user_id/supprimer', __DIR__ . '/app/pages/users/user_delete_confirm.php');
-Router::add('/licencies/$user_id/creer-famille', __DIR__ . '/app/pages/users/family_create.php');
+Router::add('/licencies/$user_id/creer-famille', __DIR__ . '/app/pages/users/family/family_create.php');
 Router::add('/licencies/$user_id/debug', __DIR__ . '/app/pages/users/user_debug.php');
 // Familles
 Router::add('/familles', __DIR__ . '/app/pages/users/family/family_list.php');
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,7 +164,6 @@ function page(string $title) @@
     function managementPage(string $title, $restrict = true)
     {
-        $restrict && restrict_management();
         return page($title)->disableNav()->boost();
     }
@@ Expand Down @@