Merge branch 'main' of https://gitea.staxriver.com/staxriver/padelclub_backend

shop/management/commands/create_initial_shop_data.py

@@ -9,11 +9,11 @@ class Command(BaseCommand):
         # Create colors
         self.stdout.write('Creating colors...')
         colors = [
-            {'name': 'Blanc', 'hex': '#FFFFFF', 'secondary_hex': None, 'ordering': 10},
-            {'name': 'Blanc / Bleu Sport', 'hex': '#FFFFFF', 'secondary_hex': '#112B44', 'ordering': 11},
+            {'name': 'Blanc', 'hex': '#FFFFFF', 'secondary_hex': None, 'ordering': 9},
+            {'name': 'Blanc / Bleu Sport', 'hex': '#FFFFFF', 'secondary_hex': '#112B44', 'ordering': 10},
             {'name': 'Blanc / Gris Clair', 'hex': '#FFFFFF', 'secondary_hex': '#D3D3D3', 'ordering': 12},
             {'name': 'Bleu Sport', 'hex': '#112B44', 'secondary_hex': None, 'ordering': 20},
-            {'name': 'Bleu Sport / Blanc', 'hex': '#112B44', 'secondary_hex': '#FFFFFF', 'ordering': 21},
+            {'name': 'Bleu Sport / Blanc', 'hex': '#112B44', 'secondary_hex': '#FFFFFF', 'ordering': 11},
             {'name': 'Bleu Sport / Bleu Sport Chiné', 'hex': '#112B44', 'secondary_hex': '#16395A', 'ordering': 22},
             {'name': 'Fuchsia', 'hex': '#C1366B', 'secondary_hex': None, 'ordering': 30},
             {'name': 'Corail / Noir', 'hex': '#FF7F50', 'secondary_hex': '#000000', 'ordering': 40},

shop/static/shop/css/shop.css

@@ -541,3 +541,8 @@ v .cart-table {
 .next:hover {
     opacity: 1;
 }
+
+.color-sample.selected {
+    border: 3px solid #90ee90 !important; /* Use your light-green color */
+    transform: scale(1.1); /* Makes the selected color slightly larger */
+}

shop/templates/shop/product_item.html

@@ -137,7 +137,9 @@ function selectColor(productId, colorId, colorName, element) {
 
     // Remove selected class from all colors
     const colorSamples = element.parentElement.querySelectorAll('.color-sample');
-    colorSamples.forEach(sample => sample.classList.remove('selected'));
+    colorSamples.forEach(sample => {
+        sample.classList.remove('selected');
+    });
 
     // Add selected class to clicked color
     element.classList.add('selected');

shop/templatetags/shop_extras.py

@@ -38,7 +38,8 @@ def color_images_url(default_image, color_name, sku):
                 files.sort(key=lambda x: (
                     1 if '-B_' in x else
                     2 if '-S_' in x else
-                    0
+                    0 if '-logo' in x else
+                    1
                 ))
                 return [f'{base_path}{color_folder}/{file}' for file in files]
 
@@ -49,9 +50,10 @@ def color_images_url(default_image, color_name, sku):
                 any(f.lower().endswith(ext) for ext in supported_extensions)]
         if files:
             files.sort(key=lambda x: (
-                1 if '-B_' in x else
-                2 if '-S_' in x else
-                0
+                2 if '-B_' in x else
+                3 if '-S_' in x else
+                0 if '-logo' in x else
+                1
             ))
             return [f'{base_path}{file}' for file in files]
 

tournaments/static/tournaments/css/style.css

@@ -611,7 +611,7 @@ h-margin {
 
 .table-row-5-colums-tournament {
     display: grid;
-    grid-template-columns: 75px 90px 1fr 120px;
+    grid-template-columns: 75px 95px 1fr 120px;
     align-items: center;
     gap: 4px;
 }
@@ -621,7 +621,7 @@ h-margin {
 }
 
 .table-row-5-colums-tournament.header {
-    grid-template-columns: 1fr auto; /* Override to just 2 columns for header */
+    grid-template-columns: 1fr;
     justify-content: space-between;
 }
 
@@ -633,7 +633,27 @@ h-margin {
     text-decoration: underline !important; /* Ensures the link is underlined */
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 64em) {
+    /* Adjust breakpoint as needed */
+    .table-row-5-colums-tournament {
+        grid-template-columns: 80px 100px 1fr 120px;
+        gap: 4px;
+    }
+
+    .small {
+        font-size: 1em;
+    }
+
+    .very-large {
+        font-size: 1.4em;
+    }
+
+    .very-large.club-name {
+        font-size: 1.2em;
+    }
+}
+
+@media screen and (max-width: 40em) {
     /* Adjust breakpoint as needed */
     .table-row-5-colums-tournament {
         grid-template-columns: 60px 70px 1fr 80px;

tournaments/templates/registration/my_tournaments.html

@@ -11,7 +11,7 @@
 {% load tz %}
 
 <div class="grid-x">
-    <div class="cell medium-10 large-5 topblock padding10">
+    <div class="cell medium-12 large-6 topblock padding10">
         <div>
             <div class="table-row-5-colums-tournament header">
                 <label class="title">Vos tournois en cours</label>
@@ -47,7 +47,7 @@
 
     </div>
 
-    <div class="cell large-offset-1 medium-10 large-5 topblock padding10">
+    <div class="cell medium-12 large-6 topblock padding10">
         <div>
 
             <div class="table-row-5-colums-tournament header">

tournaments/templates/tournaments/tournaments.html

@@ -15,7 +15,7 @@
     <div class="grid-x">
 
         {% if live or future %}
-        <div class="cell medium-10 large-5 topblock padding10">
+        <div class="cell medium-12 large-6 topblock padding10">
 
             <div>
 
@@ -73,7 +73,7 @@
         {% endif %}
 
         {% if ended %}
-        <div class="cell large-offset-1 medium-10 large-5 topblock padding10">
+        <div class="cell medium-12 large-6 topblock padding10">
             <div>
 
                 <div class="table-row-5-colums-tournament header">

tournaments/templates/tournaments/tournaments_list.html

@@ -11,7 +11,7 @@
     <div class="grid-x">
 
         {% if tournaments %}
-        <div class="cell medium-10 large-5 topblock padding10">
+        <div class="cell medium-12 large-6 topblock padding10">
 
             <div>