Merge branch 'beta' into 'main'

2024 partenaires

See merge request pls5618/website!15

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 default:
+  image: node:latest
   tags:
-    - website
+    - node
 
 stages:
   - build
@@ -12,14 +13,15 @@ build:
     paths:
       - build/
   script:
-    - echo "Build"
     - npm install
     - npm run build
 
 deploy-beta:
   stage: deploy
+  before_script:
+    - apt-get update
+    - apt-get install ncftp
   script:
-    - echo "Deploy to beta server"
     - ncftpput -R -u "$ftp_user" -p "$ftp_pass" pls5618.com beta_site build/*
   environment:
     name: beta
@@ -29,8 +31,10 @@ deploy-beta:
 
 deploy:
   stage: deploy
+  before_script:
+    - apt-get update
+    - apt-get install ncftp
   script:
-    - echo "Deploy to server"
     - ncftpput -R -u "$ftp_user" -p "$ftp_pass" pls5618.com . build/*
   environment:
     name: website

src/app.d.ts

@@ -14,6 +14,14 @@ declare global {
 			const out: string;
 			export default out;
 		}
+		declare module '*.jpeg?height=600&width=600&fit=contain&background=transparent&webp' {
+			const out: string;
+			export default out;
+		}
+		declare module '*.jpg?height=600&width=600&fit=contain&background=transparent&webp' {
+			const out: string;
+			export default out;
+		}
 		declare module '*.png?width=1100&fit=contain&background=transparent&webp' {
 			const out: string;
 			export default out;

src/app.scss

@@ -16,6 +16,7 @@
 	--muted-border-color: #c99a2c;
 	--card-sectionning-background-color: #189ad6;
 	--card-background-color: hsl(199, 80%, 55%);
+	--partenaires-background: hsl(199, 30.6%, 93.41%);
 	--color: white;
 	--border-width: 2px;
 	--active-link-color: #0a1425;
@@ -27,6 +28,7 @@
 		--background-color: #0a1425;
 		--card-sectionning-background-color: #243043;
 		--card-background-color: #0c192e;
+		--partenaires-background: hsl(217, 34%, 87%);
 		--card-border-color: #c99a2c;
 		--active-link-color: #189ad6;
 		--primary-focus: rgba(201, 154, 44, 0.3);

src/routes/partenaires/+page.svelte

@@ -1,77 +1,95 @@
 <script lang="ts">
-	import primewood from '$lib/assets/partenaires/primewood.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import amex from '$lib/assets/partenaires/amex.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import machinex from '$lib/assets/partenaires/machinex.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import assnat from '$lib/assets/partenaires/assnat.png?width=1100&fit=contain&background=transparent&webp';
 	import atocas from '$lib/assets/partenaires/atocas.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import usnr from '$lib/assets/partenaires/usnr.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import belleripe from '$lib/assets/partenaires/belleripe.jpeg?height=600&width=600&fit=contain&background=transparent&webp';
 	import boisdaction from '$lib/assets/partenaires/boisdaction.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import jit from '$lib/assets/partenaires/jit.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import bombardier from '$lib/assets/partenaires/bombardier.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import batteriesexpert from '$lib/assets/partenaires/batteriesexpert.png?height=600&width=600&fit=contain&background=transparent&webp';
 	import carbotech from '$lib/assets/partenaires/carbotech.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import fermeforestiere from '$lib/assets/partenaires/fermeforestiere.jpeg?height=600&width=600&fit=contain&background=transparent&webp';
 	import festivalduboeuf from '$lib/assets/partenaires/festivalduboeuf.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import festo from '$lib/assets/partenaires/festo.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import fruitdor from '$lib/assets/partenaires/fruitdor.jpeg?height=600&width=600&fit=contain&background=transparent&webp';
+	import fusee from '$lib/assets/partenaires/fusee.jpg?height=600&width=600&fit=contain&background=transparent&webp';
+	import homedepot from '$lib/assets/partenaires/homedepot.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import hydroquebec from '$lib/assets/partenaires/hydroquebec.png?width=1100&fit=contain&background=transparent&webp';
+	import lumicom from '$lib/assets/partenaires/lumicom.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import machinex from '$lib/assets/partenaires/machinex.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import mcwane from '$lib/assets/partenaires/mcwane.jpeg?height=600&width=600&fit=contain&background=transparent&webp';
+	import metalpless from '$lib/assets/partenaires/metalpless.jpg?height=600&width=600&fit=contain&background=transparent&webp';
 	import mrc from '$lib/assets/partenaires/mrc.png?height=600&width=600&fit=contain&background=transparent&webp';
 	import robovic from '$lib/assets/partenaires/robovic.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import ville from '$lib/assets/partenaires/ville.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import rtaschereau from '$lib/assets/partenaires/rtaschereau.jpg?height=600&width=600&fit=contain&background=transparent&webp';
-	import homedepot from '$lib/assets/partenaires/homedepot.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import usnr from '$lib/assets/partenaires/usnr.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import manoir from '$lib/assets/partenaires/manoir.png?height=600&width=600&fit=contain&background=transparent&webp';
-	import bombardier from '$lib/assets/partenaires/bombardier.png?width=1100&fit=contain&background=transparent&webp';
-	import hydroquebec from '$lib/assets/partenaires/hydroquebec.png?height=600&width=600&fit=contain&background=transparent&webp';
 	import vexco from '$lib/assets/partenaires/vexco.png?height=600&width=600&fit=contain&background=transparent&webp';
+	import ville from '$lib/assets/partenaires/ville.png?height=600&width=600&fit=contain&background=transparent&webp';
 </script>
 
 <div class="container">
 	<article>
 		<header>Platine</header>
 		<div class="partenaires" id="platine">
-			<img src={bombardier} alt="Fondation J Armand Bombardier" />
+			<img
+				src={assnat}
+				alt="Assemblée Nationale"
+				style="padding-inline: 2rem; padding-bottom: 2rem"
+			/>
+			<img src={hydroquebec} alt="Hydro Québec" />
 		</div>
 	</article>
 	<article>
 		<header>Or</header>
 		<div class="partenaires" id="or">
+			<img src={amex} alt="Amex" />
 			<img src={atocas} alt="Atocas de l'érable" />
-			<img src={hydroquebec} alt="Hydro Québec" />
+			<img src={belleripe} alt="Belle-Ripe" />
-			<img src={jit} alt="Jit Laser" />
+			<img src={boisdaction} alt="Boisdaction" />
-			<img src={machinex} alt="Machinex" />
+			<img src={bombardier} alt="Fondation J Armand Bombardier" />
+			<img src={festo} alt="Festo" />
+			<img src={mcwane} alt="McWane Canada" />
+			<img src={metalpless} alt="Metal Pless" />
 			<img src={usnr} alt="USNR" />
+			<img src={ville} alt="Ville de Plessisville" />
 		</div>
 	</article>
 	<article>
 		<header>Argent</header>
 		<div class="partenaires" id="argent">
-			<img src={primewood} alt="Primewood" />
-			<img src={batteriesexpert} alt="Batteries Expert" />
-			<img src={boisdaction} alt="Boisdaction" />
 			<img src={carbotech} alt="Carbotech" />
+			<img src={fermeforestiere} alt="Ferme Forestière R Marcoux" />
 			<img src={festivalduboeuf} alt="Festival du boeuf" />
+			<img src={fruitdor} alt="Fruit d'or" />
+			<img src={lumicom} alt="Lumicom" />
+			<img src={machinex} alt="Machinex" />
 			<img src={mrc} alt="MRC de l'érable" />
+			<img src={rtaschereau} alt="Richard Taschereau" />
 			<img src={robovic} alt="Robovic" />
-			<img src={ville} alt="Ville de Plessisville" />
+			<img src={fusee} alt="Rotisserie Fusée" />
 		</div>
 	</article>
 	<article>
 		<header>Bronze</header>
 		<div class="partenaires" id="bronze">
 			<img src={homedepot} alt="Home Dépot" />
-			<img src={manoir} alt="Manoir du Lac William" />
 			<img src={vexco} alt="Vexco" />
 		</div>
 	</article>
 </div>
 
 <style lang="scss">
+	article {
+		background-color: white;
+		// background-color: var(--partenaires-background);
+		border-radius: calc(var(--border-radius) + 3px) calc(var(--border-radius) + 3px)
+			var(--border-radius) var(--border-radius);
+	}
+
 	.partenaires {
 		display: grid;
-		column-gap: 20px;
+		gap: 1.5rem;
-		row-gap: 20px;
 		align-items: stretch;
 		justify-items: stretch;
 
-		img {
-			object-fit: contain;
-			filter: drop-shadow(1px 1px 1px white) drop-shadow(-1px 1px 1px white)
-				drop-shadow(1px -1px 1px white) drop-shadow(-1px -1px 1px white);
-		}
-
 		&#platine {
 			grid-template-columns: repeat(1, 1fr);
 		}