diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b599d6..02e6db8 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/src/app.d.ts b/src/app.d.ts index c5cf1e4..00428b2 100644 --- a/src/app.d.ts +++ b/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; diff --git a/src/app.scss b/src/app.scss index 62cbf97..fffcc47 100644 --- a/src/app.scss +++ b/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); diff --git a/src/lib/assets/partenaires/amex.png b/src/lib/assets/partenaires/amex.png new file mode 100644 index 0000000..8bff3d8 Binary files /dev/null and b/src/lib/assets/partenaires/amex.png differ diff --git a/src/lib/assets/partenaires/assnat.png b/src/lib/assets/partenaires/assnat.png new file mode 100644 index 0000000..d1676a4 Binary files /dev/null and b/src/lib/assets/partenaires/assnat.png differ diff --git a/src/lib/assets/partenaires/batteriesexpert.png b/src/lib/assets/partenaires/batteriesexpert.png deleted file mode 100644 index c08f737..0000000 Binary files a/src/lib/assets/partenaires/batteriesexpert.png and /dev/null differ diff --git a/src/lib/assets/partenaires/belleripe.jpeg b/src/lib/assets/partenaires/belleripe.jpeg new file mode 100644 index 0000000..f47c649 Binary files /dev/null and b/src/lib/assets/partenaires/belleripe.jpeg differ diff --git a/src/lib/assets/partenaires/fermeforestiere.jpeg b/src/lib/assets/partenaires/fermeforestiere.jpeg new file mode 100644 index 0000000..edf5a8d Binary files /dev/null and b/src/lib/assets/partenaires/fermeforestiere.jpeg differ diff --git a/src/lib/assets/partenaires/festo.png b/src/lib/assets/partenaires/festo.png new file mode 100644 index 0000000..33c9a76 Binary files /dev/null and b/src/lib/assets/partenaires/festo.png differ diff --git a/src/lib/assets/partenaires/fruitdor.jpeg b/src/lib/assets/partenaires/fruitdor.jpeg new file mode 100644 index 0000000..102712c Binary files /dev/null and b/src/lib/assets/partenaires/fruitdor.jpeg differ diff --git a/src/lib/assets/partenaires/fusee.jpg b/src/lib/assets/partenaires/fusee.jpg new file mode 100644 index 0000000..f4a24b8 Binary files /dev/null and b/src/lib/assets/partenaires/fusee.jpg differ diff --git a/src/lib/assets/partenaires/jit.png b/src/lib/assets/partenaires/jit.png deleted file mode 100644 index 49fe091..0000000 Binary files a/src/lib/assets/partenaires/jit.png and /dev/null differ diff --git a/src/lib/assets/partenaires/lumicom.png b/src/lib/assets/partenaires/lumicom.png new file mode 100644 index 0000000..99b5413 Binary files /dev/null and b/src/lib/assets/partenaires/lumicom.png differ diff --git a/src/lib/assets/partenaires/manoir.png b/src/lib/assets/partenaires/manoir.png deleted file mode 100644 index 385ba60..0000000 Binary files a/src/lib/assets/partenaires/manoir.png and /dev/null differ diff --git a/src/lib/assets/partenaires/mcwane.jpeg b/src/lib/assets/partenaires/mcwane.jpeg new file mode 100644 index 0000000..11a5d99 Binary files /dev/null and b/src/lib/assets/partenaires/mcwane.jpeg differ diff --git a/src/lib/assets/partenaires/metalpless.jpg b/src/lib/assets/partenaires/metalpless.jpg new file mode 100644 index 0000000..2ee4e9d Binary files /dev/null and b/src/lib/assets/partenaires/metalpless.jpg differ diff --git a/src/lib/assets/partenaires/primewood.png b/src/lib/assets/partenaires/primewood.png deleted file mode 100644 index af6f77d..0000000 Binary files a/src/lib/assets/partenaires/primewood.png and /dev/null differ diff --git a/src/lib/assets/partenaires/rtaschereau.jpg b/src/lib/assets/partenaires/rtaschereau.jpg new file mode 100644 index 0000000..c411005 Binary files /dev/null and b/src/lib/assets/partenaires/rtaschereau.jpg differ diff --git a/src/routes/partenaires/+page.svelte b/src/routes/partenaires/+page.svelte index c0c1e47..05e0397 100644 --- a/src/routes/partenaires/+page.svelte +++ b/src/routes/partenaires/+page.svelte @@ -1,77 +1,95 @@
Platine
- Fondation J Armand Bombardier + Assemblée Nationale + Hydro Québec
Or
+ Amex Atocas de l'érable - Hydro Québec - Jit Laser - Machinex + Belle-Ripe + Boisdaction + Fondation J Armand Bombardier + Festo + McWane Canada + Metal Pless USNR + Ville de Plessisville
Argent
- Primewood - Batteries Expert - Boisdaction Carbotech + Ferme Forestière R Marcoux Festival du boeuf + Fruit d'or + Lumicom + Machinex MRC de l'érable + Richard Taschereau Robovic - Ville de Plessisville + Rotisserie Fusée
Bronze
Home Dépot - Manoir du Lac William Vexco