Merge pull request #5 from antistatique/main-2024

Merge main

.github/workflows/gh-pages.yml

@@ -36,11 +36,12 @@ jobs:
         run: yarn build
 
       - name: Deploy to Server
-        uses: easingthemes/ssh-deploy@v3
+        uses: easingthemes/ssh-deploy@main
         env:
           SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_SSH_KEY }}
           SSH_CMD_ARGS: "-o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=ssh-rsa"
+          ARGS: "-avz --delete"
           SOURCE: "dist/"
           REMOTE_HOST: "ig7dp.ftp.infomaniak.com"
           REMOTE_USER: "ig7dp_antistatique"
-          TARGET: "${{ env.DEPLOY_TARGET }}"
+          TARGET: ${{ env.DEPLOY_TARGET }}

public/.htaccess

@@ -1,20 +1 @@
-#
-# Cache strategy
-#
-<IfModule mod_headers.c>
-    <FilesMatch "sw\.js$">
-      Header set Cache-Control "no-store"
-    </FilesMatch>
-    <FilesMatch "\.(css)$">
-        Header set Cache-Control "public, max-age=604800, must-revalidate"
-    </FilesMatch>
-    <FilesMatch "\.(webp|jpg|jpeg|png|gif|svg)$">
-        Header set Cache-Control "public, max-age=600, must-revalidate"
-    </FilesMatch>
-    <FilesMatch "\.(html)$">
-        Header set Cache-Control "public, max-age=300, must-revalidate"
-    </FilesMatch>
-</IfModule>
-
-SetOutputFilter DEFLATE
-AddOutputFilterByType DEFLATE "application/atom+xml" "application/javascript" "application/json" "application/ld+json" "application/manifest+json" "application/rdf+xml" "application/rss+xml" "application/schema+json" "application/vnd.geo+json" "application/vnd.ms-fontobject" "application/x-font-ttf" "application/x-javascript" "application/x-web-app-manifest+json" "application/xhtml+xml" "application/xml" "font/eot" "font/opentype" "image/bmp" "image/svg+xml" "image/vnd.microsoft.icon" "image/x-icon" "text/cache-manifest" "text/css" "text/html" "text/javascript" "text/plain" "text/vcard" "text/vnd.rim.location.xloc" "text/vtt" "text/x-component" "text/x-cross-domain-policy" "text/xml"
+ErrorDocument 404 /404.html

public/sw.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const version = '20240215';
+const version = '20240220';
 const staticCacheName = version + 'static';
-const pagesCacheName = 'pages';
+const pagesCacheName = version + 'pages';
 const imagesCacheName = 'images';
 const maxPages = 50; // Maximum number of pages to cache
 const maxImages = 100; // Maximum number of images to cache
@@ -36,7 +36,6 @@ function cacheClients() {
     })
     .then(() => {
       caches.open(pagesCacheName).then((pagesCache) => {
-        console.log(pagesCache);
         return pagesCache.addAll(pages);
       });
     });
@@ -47,7 +46,8 @@ async function clearOldCaches() {
   return caches.keys().then((keys) => {
     return Promise.all(
       keys
-        .filter((key) => !cacheList.includes(key))
+        // @TODO: optimize cache
+        // .filter((key) => !cacheList.includes(key))
         .map((key) => caches.delete(key)),
     );
   });

src/components/Category.astro

@@ -59,11 +59,8 @@ const { Content } = await category.render();
             target="_blank"
             scheme="dark"
             classes="max-w-72"
-            disabled
           >
             Inscrire un projet
-            <br />
-            (Bientôt)
           </Button>
         )
       }

src/components/Footer.astro

@@ -38,15 +38,18 @@ const { hideButtons } = Astro.props;
     !hideButtons && (
       <div class="md:col-span-8 lg:col-span-6 lg:col-start-2 max-md:mb-10">
         <div class="grid sm:grid-cols-2 gap-5">
-          <Button href="/" disabled>
+          <Button
+            href="https://inscription.associationgrand.ch/grand/"
+            target="_blank"
+          >
             Inscrire un projet
-            <br />
-            (Bientôt)
           </Button>
-          <Button href="/" scheme="core" disabled>
+          <Button
+            href="https://my.weezevent.com/gala-du-grand-2024"
+            target="_blank"
+            scheme="core"
+          >
             Achetez vos billets
-            <br />
-            (Bientôt)
           </Button>
         </div>
       </div>

src/content/categories/ad-for-good.md

@@ -1,7 +1,7 @@
 ---
 name: "Ad For Good"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=AD%20FOR%20GOOD"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Ad%20For%20Good"
 order: 7
 ---
 

src/content/categories/affiches-culturelles.md

@@ -1,7 +1,7 @@
 ---
 name: "Affiches Culturelles"
 isNew: true
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=AFFICHAGE%20CULTUREL"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Affiches%20Culturelles"
 order: 2
 ---
 

src/content/categories/affiches-et-annonces.md

@@ -1,7 +1,7 @@
 ---
 name: "Affiches et Annonces"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=AFFICHAGE%20%26%20ANNONCES"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Affiches%20et%20Annonces"
 order: 3
 ---
 

src/content/categories/branding.md

@@ -1,7 +1,7 @@
 ---
 name: "Branding"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=BRANDING"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Branding"
 order: 5
 ---
 

src/content/categories/campagne-integree.md

@@ -1,7 +1,7 @@
 ---
 name: "Campagne Intégrée / 360"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=CAMPAGNE%20INT%C3%89GR%C3%89E"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Campagne%20Int%C3%A9gr%C3%A9e%20/%20360"
 order: 4
 ---
 

src/content/categories/craft-film.md

@@ -1,7 +1,7 @@
 ---
 name: "Craft Film"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=CRAFT%20FILM"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Craft%20Film"
 order: 1
 ---
 

src/content/categories/creative-film.md

@@ -1,7 +1,7 @@
 ---
 name: "Creative Film"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=CREATIVE%20FILM"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Creative%20Film"
 order: 0
 ---
 

src/content/categories/creative-web.md

@@ -1,7 +1,7 @@
 ---
 name: "Creative Web"
 isNew: true
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=CREATIVE%20WEB"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Creative%20Web"
 order: 6
 ---
 

src/content/categories/illustration.md

@@ -1,7 +1,7 @@
 ---
 name: "Illustration"
 isNew: true
-registrationLink: "https://inscription.associationgrand.ch/grand/?category=ILLUSTRATION"
+registrationLink: "https://inscription.associationgrand.ch/grand/?category=Illustration"
 order: 8
 ---
 

src/content/categories/le-petit.md

@@ -1,7 +1,6 @@
 ---
 name: "Le Petit"
 isNew: false
-registrationLink: "https://inscription.associationgrand.ch/petit"
 order: 9
 ---
 

src/content/juries/sophie-rubin.md

@@ -0,0 +1,10 @@
+---
+name: "Sophie Rubin"
+position: "Co-fondatrice de WePlayDesign"
+background: "jury/sophie-rubin.jpg"
+foreground: "jury/sophie-rubin-hover.jpg"
+link: "https://www.linkedin.com/in/sophie-rubin/"
+---
+Directrice artistique portant un fort intérêt au processus créatif, Sophie aime naviguer entre le graphisme, la typographie, la photographie ou encore le motion design.
+
+Son approche ludique du design, se caractérisant par l’expérimentation, l’exploration, l'innovation et le plaisir, a permis à son travail d’ être régulièrement récompensé et exposé aux quatre coins du monde.

src/pages/billetterie-et-inscriptions.astro

@@ -58,8 +58,11 @@ import Layout from 'layouts/Layout.astro';
             <span> Portes : 18:00 </span>
             <span> Entrée : CHF 99.- </span>
           </p>
-          <Button disabled href="/#" scheme="core" classes="max-lg:col-span-2"
-            >Achetez vos billets<br />(Bientôt)</Button
+          <Button
+            href="https://my.weezevent.com/gala-du-grand-2024"
+            target="_blank"
+            scheme="core"
+            classes="max-lg:col-span-2">Achetez vos billets</Button
           >
         </div>
       </div>
@@ -89,12 +92,14 @@ import Layout from 'layouts/Layout.astro';
             <span class="text-core">Deadline d’inscription : 13 mai 2024</span>
           </p>
           <p class="col-span-2 mb-10 md:mb-16 md:*:block">
-            Une fois inscrit, vous recevrez un lien pour<br
+            Une fois inscrit, vous recevrez un lien pour <br
               class="max-md:hidden"
             />uploader votre/vos projet(s).
           </p>
-          <Button disabled href="/#" classes="max-lg:col-span-2"
-            >Inscrire un projet<br />(Bientôt)</Button
+          <Button
+            href="https://inscription.associationgrand.ch/grand/"
+            target="_blank"
+            classes="max-lg:col-span-2">Inscrire un projet</Button
           >
         </div>
       </div>

src/pages/index.astro

@@ -47,12 +47,11 @@ import key from '../assets/svgs/key.svg?raw';
     </p>
     <!-- please pardon me for this css calc my lord -->
     <Button
-      href="/"
+      href="/billetterie-et-inscriptions"
       scheme="core"
       classes="md:mt-[min(min(50rem,calc(55vw-10rem)),max(26rem,calc(100vh-15.4rem)))] md:row-start-1 md:col-start-2 md:col-span-3 z-20"
-      disabled
     >
-      Billetterie et inscriptions<br />(Bientôt)
+      Billetterie et inscriptions
     </Button>
     <div
       class="col-span-full row-start-1 flex justify-end items-end pr-20 z-10 -mb-20 max-md:hidden pointer-events-none"