diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 8bd544d..c55d359 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.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 }}"
\ No newline at end of file
+ TARGET: ${{ env.DEPLOY_TARGET }}
diff --git a/public/.htaccess b/public/.htaccess
index 9d68188..9fded1e 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,20 +1 @@
-#
-# Cache strategy
-#
-
-
- Header set Cache-Control "no-store"
-
-
- Header set Cache-Control "public, max-age=604800, must-revalidate"
-
-
- Header set Cache-Control "public, max-age=600, must-revalidate"
-
-
- Header set Cache-Control "public, max-age=300, must-revalidate"
-
-
-
-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
\ No newline at end of file
diff --git a/public/sw.js b/public/sw.js
index f518ef1..cb28306 100644
--- a/public/sw.js
+++ b/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)),
);
});
diff --git a/src/assets/images/jury/sophie-rubin-hover.jpg b/src/assets/images/jury/sophie-rubin-hover.jpg
new file mode 100644
index 0000000..9f55eaf
Binary files /dev/null and b/src/assets/images/jury/sophie-rubin-hover.jpg differ
diff --git a/src/assets/images/jury/sophie-rubin.jpg b/src/assets/images/jury/sophie-rubin.jpg
new file mode 100644
index 0000000..9a80924
Binary files /dev/null and b/src/assets/images/jury/sophie-rubin.jpg differ
diff --git a/src/components/Category.astro b/src/components/Category.astro
index 1bd8bcc..032eb03 100644
--- a/src/components/Category.astro
+++ b/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
-
- (Bientôt)
)
}
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 009f5f8..1293955 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -38,15 +38,18 @@ const { hideButtons } = Astro.props;
!hideButtons && (
-
diff --git a/src/content/categories/ad-for-good.md b/src/content/categories/ad-for-good.md
index a77dee2..a1ecb1f 100644
--- a/src/content/categories/ad-for-good.md
+++ b/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
---
diff --git a/src/content/categories/affiches-culturelles.md b/src/content/categories/affiches-culturelles.md
index af640c6..508a011 100644
--- a/src/content/categories/affiches-culturelles.md
+++ b/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
---
diff --git a/src/content/categories/affiches-et-annonces.md b/src/content/categories/affiches-et-annonces.md
index 80e5320..e8119fa 100644
--- a/src/content/categories/affiches-et-annonces.md
+++ b/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
---
diff --git a/src/content/categories/branding.md b/src/content/categories/branding.md
index 75b6a92..c69ab37 100644
--- a/src/content/categories/branding.md
+++ b/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
---
diff --git a/src/content/categories/campagne-integree.md b/src/content/categories/campagne-integree.md
index 1d92dd6..cb3a7e4 100644
--- a/src/content/categories/campagne-integree.md
+++ b/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
---
diff --git a/src/content/categories/craft-film.md b/src/content/categories/craft-film.md
index 67b7dbe..b2a1d69 100644
--- a/src/content/categories/craft-film.md
+++ b/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
---
diff --git a/src/content/categories/creative-film.md b/src/content/categories/creative-film.md
index 42e3c3e..0910715 100644
--- a/src/content/categories/creative-film.md
+++ b/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
---
diff --git a/src/content/categories/creative-web.md b/src/content/categories/creative-web.md
index b35f856..84688db 100644
--- a/src/content/categories/creative-web.md
+++ b/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
---
diff --git a/src/content/categories/illustration.md b/src/content/categories/illustration.md
index 864dfbf..afa5117 100644
--- a/src/content/categories/illustration.md
+++ b/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
---
diff --git a/src/content/categories/le-petit.md b/src/content/categories/le-petit.md
index d2fce7a..390591d 100644
--- a/src/content/categories/le-petit.md
+++ b/src/content/categories/le-petit.md
@@ -1,7 +1,6 @@
---
name: "Le Petit"
isNew: false
-registrationLink: "https://inscription.associationgrand.ch/petit"
order: 9
---
diff --git a/src/content/juries/sophie-rubin.md b/src/content/juries/sophie-rubin.md
new file mode 100644
index 0000000..6b8ca56
--- /dev/null
+++ b/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.
diff --git a/src/pages/billetterie-et-inscriptions.astro b/src/pages/billetterie-et-inscriptions.astro
index 0b9eda0..55e7060 100644
--- a/src/pages/billetterie-et-inscriptions.astro
+++ b/src/pages/billetterie-et-inscriptions.astro
@@ -58,8 +58,11 @@ import Layout from 'layouts/Layout.astro';
Portes : 18:00
Entrée : CHF 99.-
- Achetez vos billets
@@ -89,12 +92,14 @@ import Layout from 'layouts/Layout.astro';
Deadline d’inscription : 13 mai 2024
- Une fois inscrit, vous recevrez un lien pour
uploader votre/vos projet(s).
- Inscrire un projet
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 23242d3..8fc2f2a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -47,12 +47,11 @@ import key from '../assets/svgs/key.svg?raw';