From 950131ee14c93eccb1dd1aedb99c1ae964e4503b Mon Sep 17 00:00:00 2001 From: Alexel Date: Tue, 8 Aug 2023 17:02:00 -0400 Subject: [PATCH 01/19] =?UTF-8?q?migration=20css=20=C3=A0=20header.css=20e?= =?UTF-8?q?t=20menu=20hamburger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/general.css | 18 ------------ public/css/header.css | 49 ++++++++++++++++++++++++++++++++ public/icones/hamburger-menu.svg | 1 + templates/html/header.gohtml | 1 + 4 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 public/css/header.css create mode 100644 public/icones/hamburger-menu.svg diff --git a/public/css/general.css b/public/css/general.css index 8474153..23ea8f6 100644 --- a/public/css/general.css +++ b/public/css/general.css @@ -1,22 +1,4 @@ -.header { - width: 100%; - } -.headerMenu { - font-family: "Poppins"; - font-weight: 400; /*regular*/ - font-size: 1.25rem; /*20px*/ - color: #000; /*Noir pur*/ - display: flex; - flex-flow: row; - justify-content: space-around; - align-items: center; - } - -.headerMenuElement:hover { - border-bottom: 5px #FF563C solid; /*Orange Highlight*/ - cursor: pointer; - } .heading1 { font-family: "Poppins"; diff --git a/public/css/header.css b/public/css/header.css new file mode 100644 index 0000000..b947751 --- /dev/null +++ b/public/css/header.css @@ -0,0 +1,49 @@ +.header { + width: 100%; + } + +.headerMenu { + font-family: "Poppins"; + font-weight: 400; /*regular*/ + font-size: 1.25rem; /*20px*/ + color: #394596; /*Noir pur*/ + display: flex; + flex-flow: row; + justify-content: space-around; + align-items: center; + } + +.headerMenuElement:hover { + border-bottom: 5px #FF563C solid; /*Orange Highlight*/ + cursor: pointer; + } + + /* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ +@media screen and (max-width: 576px) { + .headerMenuElement{ + display: none; + } + .hamburgerMenuIcon{ + display: block; + } + } + + @media screen and (min-width: 576px) { + .headerMenuElement{ + display: none; + } + .hamburgerMenuIcon{ + display: block; + } + } + + /* Les éléments du header s'affichent pour le breakpoint ordinateur */ + @media screen and (min-width: 1024px) { + .headerMenuElement{ + display: block; + } + .hamburgerMenuIcon{ + display: none; + } + } + diff --git a/public/icones/hamburger-menu.svg b/public/icones/hamburger-menu.svg new file mode 100644 index 0000000..795a610 --- /dev/null +++ b/public/icones/hamburger-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/html/header.gohtml b/templates/html/header.gohtml index 178ae4a..7473e88 100644 --- a/templates/html/header.gohtml +++ b/templates/html/header.gohtml @@ -2,6 +2,7 @@
From 1e196708fabd31c42e95c710c909ebe30e9e396f Mon Sep 17 00:00:00 2001 From: Alexel Date: Mon, 14 Aug 2023 17:20:08 -0400 Subject: [PATCH 11/19] ajout wrapper documentation index & vie etudiante --- public/css/general.css | 1 + public/css/header.css | 1 + templates/html/documentation.gohtml | 2 ++ templates/html/index.gohtml | 7 ++++--- templates/html/vie-etudiante.gohtml | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/css/general.css b/public/css/general.css index 96eccb5..ef6abcc 100644 --- a/public/css/general.css +++ b/public/css/general.css @@ -17,6 +17,7 @@ img { body{ margin: 0; + padding-top: 75px; } .wrapper { diff --git a/public/css/header.css b/public/css/header.css index 5192eed..4e8c158 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -4,6 +4,7 @@ width: 100%; top: 0; background-color: #fff; + height: 75px; } .headerWrapper{ diff --git a/templates/html/documentation.gohtml b/templates/html/documentation.gohtml index 2faaa88..9ba8761 100644 --- a/templates/html/documentation.gohtml +++ b/templates/html/documentation.gohtml @@ -8,6 +8,7 @@ {{ template "header-html" }} +

Documentation

{{ range . }} @@ -23,6 +24,7 @@ {{ end }}

+
{{ end }} diff --git a/templates/html/index.gohtml b/templates/html/index.gohtml index d311171..58ec63b 100644 --- a/templates/html/index.gohtml +++ b/templates/html/index.gohtml @@ -9,9 +9,10 @@ {{ template "header-html" }} -

AGECEM

-

Association Générale Étudiante du Cégep Édouard-Montpetit

- +
+

AGECEM

+

Association Générale Étudiante du Cégep Édouard-Montpetit

+
{{ end }} diff --git a/templates/html/vie-etudiante.gohtml b/templates/html/vie-etudiante.gohtml index fd1bb24..6d90023 100644 --- a/templates/html/vie-etudiante.gohtml +++ b/templates/html/vie-etudiante.gohtml @@ -8,7 +8,9 @@ {{ template "header-html" }} +

Vie étudiante

+
{{ end }} From 842af857884653185e1019c32409e6acca496867 Mon Sep 17 00:00:00 2001 From: Alexel Date: Mon, 14 Aug 2023 17:36:49 -0400 Subject: [PATCH 12/19] =?UTF-8?q?Le=20menu=20mobile=20s'affiche=20et=20s'e?= =?UTF-8?q?nl=C3=A8ve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/header.css | 18 ++++++++++++++++++ templates/html/header.gohtml | 18 ++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/public/css/header.css b/public/css/header.css index 4e8c158..fe6473a 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -83,3 +83,21 @@ text-decoration: none; } } + .headerMenuMobile{ + font-family: "Poppins"; + font-weight: 400; /*regular*/ + font-size: 1.25rem; /*20px*/ + color: #000; /*Noir pur*/ + list-style: none; + font-style: none; + display: none; + } + .nav-is-active{ + background-color: #fff; + display: flex; + flex-flow: column; + justify-content: space-between; + position: fixed; + top: 75px; + } + diff --git a/templates/html/header.gohtml b/templates/html/header.gohtml index c9bed6a..4e470f9 100644 --- a/templates/html/header.gohtml +++ b/templates/html/header.gohtml @@ -2,22 +2,28 @@
-
+
-
+ - -
+
From ed8d3d0687f3779efa64142a4d91762d14923f6a Mon Sep 17 00:00:00 2001 From: Alexel Date: Tue, 15 Aug 2023 11:23:56 -0400 Subject: [PATCH 13/19] Menu mobile pas laid + hidden quand desktop --- public/css/header.css | 127 ++++++++++++++++++++--------------- templates/html/header.gohtml | 1 - 2 files changed, 71 insertions(+), 57 deletions(-) diff --git a/public/css/header.css b/public/css/header.css index fe6473a..a0965b9 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -7,24 +7,26 @@ height: 75px; } - .headerWrapper{ - display: flex; - flex-flow: row; - align-items: center; - justify-content: space-between; - padding: 5px; - } +.headerWrapper{ + display: flex; + flex-flow: row; + align-items: center; + justify-content: space-between; + padding: 5px; +} - a{ -color: #000; -text-decoration: none; - } - a:visited{ - color: #000; - text-decoration: none; - } +a{ + color: #000; + text-decoration: none; +} -.headerMenu { +a:visited{ + color: #000; + text-decoration: none; +} + +.headerMenu{ + background-color: #fff; font-family: "Poppins"; font-weight: 400; /*regular*/ font-size: 1.25rem; /*20px*/ @@ -33,45 +35,71 @@ text-decoration: none; font-style: none; display: none; width: 100%; - } +} - .headerMenuElement{ - padding-bottom: 5px; - } +.headerMenuElement{ + padding-bottom: 5px; +} .headerMenuElement:hover { border-bottom: 5px #FF563C solid; /*Orange Highlight*/ cursor: pointer; padding-bottom: 0; - } +} - .headerMenuHamburger{ - fill: #394596; - height: 50px; - width: 50px; - +.headerMenuHamburger{ + fill: #394596; + height: 50px; + width: 50px; + display: block; + cursor: pointer; +} - } +.headerMenuMobile{ + font-family: "Poppins"; + font-weight: 400; /*regular*/ + font-size: 1.25rem; /*20px*/ + color: #000; /*Noir pur*/ + list-style: none; + font-style: none; + display: none; + } + + .nav-is-active{ + background-color: #fff; + font-size: 2rem; /*32px*/ + display: flex; + flex-flow: column; + justify-content: space-around; + align-items: center; + text-align: left; + position: fixed; + top: 75px; + width: 100%; + height: 90%; + margin: 0; +padding-top: 200px; +padding-bottom: 200px; + + } /* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ - - - .headerMenuHamburger{ - display: block; - } - - - @media screen and (min-width: 778px) { - .headerMenu{ +@media screen and (min-width: 778px) { + .headerMenu{ display: none; } .headerMenuHamburger{ display: block; } - } + .nav-is-active{ + font-size: 3rem; /*48px*/ + padding-top: 100px; + padding-bottom: 100px; + } +} /* Les éléments du header s'affichent pour le breakpoint ordinateur */ - @media screen and (min-width: 1140px) { +@media screen and (min-width: 1140px) { .headerMenu{ display: flex; flex-flow: row; @@ -81,23 +109,10 @@ text-decoration: none; .headerMenuHamburger{ display: none; } - } + .nav-is-active{ + display: none; + } +} + - .headerMenuMobile{ - font-family: "Poppins"; - font-weight: 400; /*regular*/ - font-size: 1.25rem; /*20px*/ - color: #000; /*Noir pur*/ - list-style: none; - font-style: none; - display: none; - } - .nav-is-active{ - background-color: #fff; - display: flex; - flex-flow: column; - justify-content: space-between; - position: fixed; - top: 75px; - } diff --git a/templates/html/header.gohtml b/templates/html/header.gohtml index 4e470f9..b75d20e 100644 --- a/templates/html/header.gohtml +++ b/templates/html/header.gohtml @@ -3,7 +3,6 @@ From 689d36f22c0a8f1ad912d67e9435a7023cf306d0 Mon Sep 17 00:00:00 2001 From: Alexel Date: Tue, 15 Aug 2023 12:07:17 -0400 Subject: [PATCH 14/19] Formattage du code --- public/css/fonts.css | 100 ++++++++++++++++++++--------------------- public/css/general.css | 56 +++++++++++------------ public/css/header.css | 84 +++++++++++++++++++--------------- public/js/index.js | 40 ++++++++--------- 4 files changed, 142 insertions(+), 138 deletions(-) diff --git a/public/css/fonts.css b/public/css/fonts.css index 6e3a00d..54afd14 100644 --- a/public/css/fonts.css +++ b/public/css/fonts.css @@ -1,109 +1,109 @@ @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-thin.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-thin.woff') format('woff'), - url('/public/fonts/Poppins/poppins-thin.otf') format('otf'); + url('/public/fonts/Poppins/poppins-thin.woff') format('woff'), + url('/public/fonts/Poppins/poppins-thin.otf') format('otf'); font-weight: 100; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-thin-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-thin-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-thin-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-thin-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-thin-italic.otf') format('otf'); font-weight: 100; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extralight.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-extralight.woff') format('woff'), - url('/public/fonts/Poppins/poppins-extralight.otf') format('otf'); + url('/public/fonts/Poppins/poppins-extralight.woff') format('woff'), + url('/public/fonts/Poppins/poppins-extralight.otf') format('otf'); font-weight: 200; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extralight-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-extralight-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-extralight-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-extralight-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-extralight-italic.otf') format('otf'); font-weight: 200; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-light.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-light.woff') format('woff'), - url('/public/fonts/Poppins/poppins-light.otf') format('otf'); + url('/public/fonts/Poppins/poppins-light.woff') format('woff'), + url('/public/fonts/Poppins/poppins-light.otf') format('otf'); font-weight: 300; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-light-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-light-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-light-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-light-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-light-italic.otf') format('otf'); font-weight: 300; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-regular.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-regular.woff') format('woff'), - url('/public/fonts/Poppins/poppins-regular.otf') format('otf'); + url('/public/fonts/Poppins/poppins-regular.woff') format('woff'), + url('/public/fonts/Poppins/poppins-regular.otf') format('otf'); font-weight: 400; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-regular-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-regular-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-regular-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-regular-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-regular-italic.otf') format('otf'); font-weight: 400; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-medium.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-medium.woff') format('woff'), - url('/public/fonts/Poppins/poppins-medium.otf') format('otf'); + url('/public/fonts/Poppins/poppins-medium.woff') format('woff'), + url('/public/fonts/Poppins/poppins-medium.otf') format('otf'); font-weight: 500; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-medium-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-medium-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-medium-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-medium-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-medium-italic.otf') format('otf'); font-weight: 500; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-semibold.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-semibold.woff') format('woff'), - url('/public/fonts/Poppins/poppins-semibold.otf') format('otf'); + url('/public/fonts/Poppins/poppins-semibold.woff') format('woff'), + url('/public/fonts/Poppins/poppins-semibold.otf') format('otf'); font-weight: 600; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-semibold-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-semibold-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-semibold-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-semibold-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-semibold-italic.otf') format('otf'); font-weight: 600; font-style: italic; @@ -112,8 +112,8 @@ @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-bold.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-bold.woff') format('woff'), - url('/public/fonts/Poppins/poppins-bold.otf') format('otf'); + url('/public/fonts/Poppins/poppins-bold.woff') format('woff'), + url('/public/fonts/Poppins/poppins-bold.otf') format('otf'); font-weight: 700; font-style: normal; @@ -122,8 +122,8 @@ @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-bold-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-bold-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-bold-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-bold-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-bold-italic.otf') format('otf'); font-weight: 700; font-style: italic; @@ -132,8 +132,8 @@ @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extrabold.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-extrabold.woff') format('woff'), - url('/public/fonts/Poppins/poppins-extrabold.otf') format('otf'); + url('/public/fonts/Poppins/poppins-extrabold.woff') format('woff'), + url('/public/fonts/Poppins/poppins-extrabold.otf') format('otf'); font-weight: 800; font-style: normal; @@ -143,26 +143,26 @@ @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extrabold-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-extrabold-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-extrabold-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-extrabold-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-extrabold-italic.otf') format('otf'); font-weight: 800; font-style: italic; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-black.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-black.woff') format('woff'), - url('/public/fonts/Poppins/poppins-black.otf') format('otf'); + url('/public/fonts/Poppins/poppins-black.woff') format('woff'), + url('/public/fonts/Poppins/poppins-black.otf') format('otf'); font-weight: 900; font-style: normal; - } +} @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-black-italic.woff2') format('woff2'), - url('/public/fonts/Poppins/poppins-black-italic.woff') format('woff'), - url('/public/fonts/Poppins/poppins-black-italic.otf') format('otf'); + url('/public/fonts/Poppins/poppins-black-italic.woff') format('woff'), + url('/public/fonts/Poppins/poppins-black-italic.otf') format('otf'); font-weight: 900; font-style: italic; - } +} \ No newline at end of file diff --git a/public/css/general.css b/public/css/general.css index ef6abcc..0f0a8dc 100644 --- a/public/css/general.css +++ b/public/css/general.css @@ -15,7 +15,7 @@ img { max-width: 100%; } -body{ +body { margin: 0; padding-top: 75px; } @@ -28,34 +28,42 @@ body{ .heading1 { font-family: "Poppins"; - font-weight: 600; /*semi-bold*/ - font-size: 3rem; /*48px*/ - color: #394596; /*Bleu AGECEM*/ + font-weight: 600; + /*semi-bold*/ + font-size: 3rem; + /*48px*/ + color: #394596; + /*Bleu AGECEM*/ text-align: center; - } +} .heading2 { font-family: "Poppins"; - font-weight: 300; /*light*/ - font-size: 1rem; /*16px*/ - color: #394596; /*Bleu AGECEM*/ + font-weight: 300; + /*light*/ + font-size: 1rem; + /*16px*/ + color: #394596; + /*Bleu AGECEM*/ text-align: center; } @media screen and (min-width: 768px) { - .wrapper{ + .wrapper { max-width: 768px; width: calc(100% - var(15px)); } .heading1 { - font-size: 4rem; /*64px*/ + font-size: 4rem; + /*64px*/ text-align: center; } .heading2 { - font-size: 1.5rem; /*24px*/ + font-size: 1.5rem; + /*24px*/ text-align: center; } @@ -63,35 +71,21 @@ body{ @media screen and (min-width: 1140px) { - .wrapper{ + .wrapper { max-width: 1140px; width: calc(100% - var(30px)); } .heading1 { - font-size: 4rem; /*64px*/ + font-size: 4rem; + /*64px*/ text-align: center; } .heading2 { - font-size: 1.5rem; /*24px*/ + font-size: 1.5rem; + /*24px*/ text-align: center; } -} - -/*Utilisation du css Layout Grid pour faire le wrapper*/ -.grid-wrapper { - display: grid; - grid-template-columns: auto minmax(375px, 1440px) auto; - grid-column-gap: 30px; -} - -.grid-center { - grid-column: 2/3; -} - - - - - +} \ No newline at end of file diff --git a/public/css/header.css b/public/css/header.css index a0965b9..a6c80c4 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -5,9 +5,9 @@ top: 0; background-color: #fff; height: 75px; - } +} -.headerWrapper{ +.headerWrapper { display: flex; flex-flow: row; align-items: center; @@ -15,39 +15,43 @@ padding: 5px; } -a{ +a { color: #000; text-decoration: none; } -a:visited{ +a:visited { color: #000; - text-decoration: none; + text-decoration: none; } -.headerMenu{ +.headerMenu { background-color: #fff; font-family: "Poppins"; - font-weight: 400; /*regular*/ - font-size: 1.25rem; /*20px*/ - color: #000; /*Noir pur*/ + font-weight: 400; + /*regular*/ + font-size: 1.25rem; + /*20px*/ + color: #000; + /*Noir pur*/ list-style: none; font-style: none; display: none; width: 100%; } -.headerMenuElement{ +.headerMenuElement { padding-bottom: 5px; } .headerMenuElement:hover { - border-bottom: 5px #FF563C solid; /*Orange Highlight*/ + border-bottom: 5px #FF563C solid; + /*Orange Highlight*/ cursor: pointer; padding-bottom: 0; } -.headerMenuHamburger{ +.headerMenuHamburger { fill: #394596; height: 50px; width: 50px; @@ -55,19 +59,23 @@ a:visited{ cursor: pointer; } -.headerMenuMobile{ +.headerMenuMobile { font-family: "Poppins"; - font-weight: 400; /*regular*/ - font-size: 1.25rem; /*20px*/ - color: #000; /*Noir pur*/ + font-weight: 400; + /*regular*/ + font-size: 1.25rem; + /*20px*/ + color: #000; + /*Noir pur*/ list-style: none; font-style: none; display: none; - } +} - .nav-is-active{ +.nav-is-active { background-color: #fff; - font-size: 2rem; /*32px*/ + font-size: 2rem; + /*32px*/ display: flex; flex-flow: column; justify-content: space-around; @@ -78,41 +86,43 @@ a:visited{ width: 100%; height: 90%; margin: 0; -padding-top: 200px; -padding-bottom: 200px; + padding-top: 200px; + padding-bottom: 200px; - } +} - /* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ +/* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ @media screen and (min-width: 778px) { - .headerMenu{ - display: none; + .headerMenu { + display: none; } - .headerMenuHamburger{ + + .headerMenuHamburger { display: block; } - .nav-is-active{ - font-size: 3rem; /*48px*/ + + .nav-is-active { + font-size: 3rem; + /*48px*/ padding-top: 100px; padding-bottom: 100px; } } - /* Les éléments du header s'affichent pour le breakpoint ordinateur */ +/* Les éléments du header s'affichent pour le breakpoint ordinateur */ @media screen and (min-width: 1140px) { - .headerMenu{ + .headerMenu { display: flex; flex-flow: row; justify-content: space-around; - align-items: center; + align-items: center; } - .headerMenuHamburger{ + + .headerMenuHamburger { display: none; } - .nav-is-active{ + + .nav-is-active { display: none; } -} - - - +} \ No newline at end of file diff --git a/public/js/index.js b/public/js/index.js index b47d099..69ebafb 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,23 +1,23 @@ /** Création et exportation de la classe Header */ class Header { - constructor(element) { - this.element = element; - this.html = document.documentElement; + constructor(element) { + this.element = element; + this.html = document.documentElement; - this.init(); - } - - /** - * Méthode d'initialisation - */ - init() { - const toggle = this.element.querySelector('.js-toggle'); - toggle.addEventListener('click', this.onToggleNav.bind(this)); - - } - onToggleNav() { - // Enlever la classe .is-scrolling-down pour éviter les bugs si l'on fait défiler la page jsute après l'ouverture du menu - this.html.classList.toggle('nav-is-active'); - } - - } \ No newline at end of file + this.init(); + } + + /** + * Méthode d'initialisation + */ + init() { + const toggle = this.element.querySelector('.js-toggle'); + toggle.addEventListener('click', this.onToggleNav.bind(this)); + + } + onToggleNav() { + // Enlever la classe .is-scrolling-down pour éviter les bugs si l'on fait défiler la page jsute après l'ouverture du menu + this.html.classList.toggle('nav-is-active'); + } + +} \ No newline at end of file From b118912dbb2ecb9f7e5a181c2042a7fc801d3898 Mon Sep 17 00:00:00 2001 From: Alexel Date: Tue, 15 Aug 2023 14:30:10 -0400 Subject: [PATCH 15/19] formattage du code gohtml et css --- public/css/fonts.css | 7 ----- public/css/general.css | 21 ------------- public/css/header.css | 23 ++------------ public/js/index.js | 23 -------------- templates/html/admin-upload.gohtml | 35 ++++++++++----------- templates/html/admin.gohtml | 28 ++++++++--------- templates/html/documentation.gohtml | 49 ++++++++++++++--------------- templates/html/formulaires.gohtml | 24 +++++++------- templates/html/general.gohtml | 7 +++++ templates/html/header.gohtml | 33 +++++++------------ templates/html/index.gohtml | 32 +++++++++---------- templates/html/vie-etudiante.gohtml | 28 ++++++++--------- 12 files changed, 118 insertions(+), 192 deletions(-) diff --git a/public/css/fonts.css b/public/css/fonts.css index 54afd14..48818ce 100644 --- a/public/css/fonts.css +++ b/public/css/fonts.css @@ -16,7 +16,6 @@ font-style: italic; } - @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extralight.woff2') format('woff2'), @@ -44,7 +43,6 @@ font-style: normal; } - @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-light-italic.woff2') format('woff2'), @@ -106,7 +104,6 @@ url('/public/fonts/Poppins/poppins-semibold-italic.otf') format('otf'); font-weight: 600; font-style: italic; - } @font-face { @@ -116,7 +113,6 @@ url('/public/fonts/Poppins/poppins-bold.otf') format('otf'); font-weight: 700; font-style: normal; - } @font-face { @@ -126,7 +122,6 @@ url('/public/fonts/Poppins/poppins-bold-italic.otf') format('otf'); font-weight: 700; font-style: italic; - } @font-face { @@ -136,10 +131,8 @@ url('/public/fonts/Poppins/poppins-extrabold.otf') format('otf'); font-weight: 800; font-style: normal; - } - @font-face { font-family: "Poppins"; src: url('/public/fonts/Poppins/poppins-extrabold-italic.woff2') format('woff2'), diff --git a/public/css/general.css b/public/css/general.css index 0f0a8dc..e9a4a43 100644 --- a/public/css/general.css +++ b/public/css/general.css @@ -1,6 +1,3 @@ -/* La propriété CSS box-sizing définit la façon dont la hauteur et la largeur totale d'un élément est calculée (avec le modèle de boîte CSS). -// Références: https://developer.mozilla.org/fr/docs/Web/CSS/box-sizing*/ - html { box-sizing: border-box; } @@ -49,7 +46,6 @@ body { } @media screen and (min-width: 768px) { - .wrapper { max-width: 768px; width: calc(100% - var(15px)); @@ -58,34 +54,17 @@ body { .heading1 { font-size: 4rem; /*64px*/ - text-align: center; } .heading2 { font-size: 1.5rem; /*24px*/ - text-align: center; } - } @media screen and (min-width: 1140px) { - .wrapper { max-width: 1140px; width: calc(100% - var(30px)); } - - .heading1 { - font-size: 4rem; - /*64px*/ - text-align: center; - } - - .heading2 { - font-size: 1.5rem; - /*24px*/ - text-align: center; - } - } \ No newline at end of file diff --git a/public/css/header.css b/public/css/header.css index a6c80c4..af97035 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -32,10 +32,7 @@ a:visited { /*regular*/ font-size: 1.25rem; /*20px*/ - color: #000; - /*Noir pur*/ list-style: none; - font-style: none; display: none; width: 100%; } @@ -52,10 +49,8 @@ a:visited { } .headerMenuHamburger { - fill: #394596; height: 50px; width: 50px; - display: block; cursor: pointer; } @@ -63,19 +58,14 @@ a:visited { font-family: "Poppins"; font-weight: 400; /*regular*/ - font-size: 1.25rem; - /*20px*/ - color: #000; - /*Noir pur*/ + font-size: 2rem; + /*32px*/ list-style: none; - font-style: none; display: none; } .nav-is-active { background-color: #fff; - font-size: 2rem; - /*32px*/ display: flex; flex-flow: column; justify-content: space-around; @@ -88,19 +78,10 @@ a:visited { margin: 0; padding-top: 200px; padding-bottom: 200px; - } /* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ @media screen and (min-width: 778px) { - .headerMenu { - display: none; - } - - .headerMenuHamburger { - display: block; - } - .nav-is-active { font-size: 3rem; /*48px*/ diff --git a/public/js/index.js b/public/js/index.js index 69ebafb..e69de29 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,23 +0,0 @@ -/** Création et exportation de la classe Header */ -class Header { - constructor(element) { - this.element = element; - this.html = document.documentElement; - - this.init(); - } - - /** - * Méthode d'initialisation - */ - init() { - const toggle = this.element.querySelector('.js-toggle'); - toggle.addEventListener('click', this.onToggleNav.bind(this)); - - } - onToggleNav() { - // Enlever la classe .is-scrolling-down pour éviter les bugs si l'on fait défiler la page jsute après l'ouverture du menu - this.html.classList.toggle('nav-is-active'); - } - -} \ No newline at end of file diff --git a/templates/html/admin-upload.gohtml b/templates/html/admin-upload.gohtml index 3c145fb..1729ba0 100644 --- a/templates/html/admin-upload.gohtml +++ b/templates/html/admin-upload.gohtml @@ -1,28 +1,27 @@ {{ define "admin-upload-html" }} - - - - - AGECEM - {{ template "general-html" }} - - - {{ template "header-html" }} -

Upload

-
+ + + + + AGECEM + {{ template "general-html" }} + + + {{ template "header-html" }} +

Upload

+ -
Document:

-
-

{{ .Message }}

- - + +

{{ .Message }}

+ + {{ end }} diff --git a/templates/html/admin.gohtml b/templates/html/admin.gohtml index 8308583..edcf8c4 100644 --- a/templates/html/admin.gohtml +++ b/templates/html/admin.gohtml @@ -1,17 +1,17 @@ {{ define "admin-html" }} - - - - - AGECEM - {{ template "general-html" }} - - - {{ template "header-html" }} -

Admin

-
    + + + + + AGECEM + {{ template "general-html" }} + + + {{ template "header-html" }} +

    Admin

    + - - +
+ + {{ end }} diff --git a/templates/html/documentation.gohtml b/templates/html/documentation.gohtml index 9ba8761..2f432f3 100644 --- a/templates/html/documentation.gohtml +++ b/templates/html/documentation.gohtml @@ -1,30 +1,29 @@ {{ define "documentation-html" }} - - - - - AGECEM | Documentation - {{ template "general-html" }} - - - {{ template "header-html" }} -
-

Documentation

-

- {{ range . }} + + + + + AGECEM | Documentation + {{ template "general-html" }} + + + {{ template "header-html" }} +

+

Documentation

+

+ {{ range . }} {{ $bucket_name := .Name }}

- {{ $bucket_name }} - -
    - {{ range .Documents }} -
  • {{ . }}
    • - {{ end}} -
+ {{ $bucket_name }} +
    + {{ range .Documents }} +
  • {{ . }}
    • + {{ end}} +
- {{ end }} -

-
- - + {{ end }} +

+
+ + {{ end }} diff --git a/templates/html/formulaires.gohtml b/templates/html/formulaires.gohtml index b60fd64..795c028 100644 --- a/templates/html/formulaires.gohtml +++ b/templates/html/formulaires.gohtml @@ -1,14 +1,14 @@ {{ define "formulaires-html" }} - - - - - AGECEM | Formulaires - {{ template "general-html" }} - - - {{ template "header-html" }} -

Formulaires

- - + + + + + AGECEM | Formulaires + {{ template "general-html" }} + + + {{ template "header-html" }} +

Formulaires

+ + {{ end }} diff --git a/templates/html/general.gohtml b/templates/html/general.gohtml index eefcdc7..35f7d8a 100644 --- a/templates/html/general.gohtml +++ b/templates/html/general.gohtml @@ -1,4 +1,11 @@ {{ define "general-html" }} + + {{ end }} diff --git a/templates/html/header.gohtml b/templates/html/header.gohtml index b75d20e..ba018eb 100644 --- a/templates/html/header.gohtml +++ b/templates/html/header.gohtml @@ -1,29 +1,20 @@ {{ define "header-html" }} - - -
-
- -
- - {{ end }} diff --git a/templates/html/index.gohtml b/templates/html/index.gohtml index 58ec63b..dab01aa 100644 --- a/templates/html/index.gohtml +++ b/templates/html/index.gohtml @@ -1,18 +1,18 @@ {{ define "index-html" }} - - - - - AGECEM - {{ template "general-html" }} - - - - {{ template "header-html" }} -
-

AGECEM

-

Association Générale Étudiante du Cégep Édouard-Montpetit

-
- - + + + + + AGECEM + {{ template "general-html" }} + + + + {{ template "header-html" }} +
+

AGECEM

+

Association Générale Étudiante du Cégep Édouard-Montpetit

+
+ + {{ end }} diff --git a/templates/html/vie-etudiante.gohtml b/templates/html/vie-etudiante.gohtml index 6d90023..893e770 100644 --- a/templates/html/vie-etudiante.gohtml +++ b/templates/html/vie-etudiante.gohtml @@ -1,16 +1,16 @@ {{ define "vie-etudiante-html" }} - - - - - AGECEM | Vie étudiante - {{ template "general-html" }} - - - {{ template "header-html" }} -
-

Vie étudiante

-
- - + + + + + AGECEM | Vie étudiante + {{ template "general-html" }} + + + {{ template "header-html" }} +
+

Vie étudiante

+
+ + {{ end }} From 5ccbee3d9dce8effbf11e88627331784cdde02f3 Mon Sep 17 00:00:00 2001 From: Alexel Date: Tue, 15 Aug 2023 17:23:30 -0400 Subject: [PATCH 16/19] Ajustement de la hauteur du header (60px) --- public/css/general.css | 6 +++++- public/css/header.css | 14 ++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/public/css/general.css b/public/css/general.css index e9a4a43..c933b55 100644 --- a/public/css/general.css +++ b/public/css/general.css @@ -14,7 +14,11 @@ img { body { margin: 0; - padding-top: 75px; + padding-top: 60px; +} + +ul { + margin: 0; } .wrapper { diff --git a/public/css/header.css b/public/css/header.css index af97035..7521bc2 100644 --- a/public/css/header.css +++ b/public/css/header.css @@ -4,7 +4,7 @@ width: 100%; top: 0; background-color: #fff; - height: 75px; + height: 60px; } .headerWrapper { @@ -39,6 +39,7 @@ a:visited { .headerMenuElement { padding-bottom: 5px; + margin: 0; } .headerMenuElement:hover { @@ -68,7 +69,7 @@ a:visited { background-color: #fff; display: flex; flex-flow: column; - justify-content: space-around; + justify-content: center; align-items: center; text-align: left; position: fixed; @@ -76,17 +77,14 @@ a:visited { width: 100%; height: 90%; margin: 0; - padding-top: 200px; - padding-bottom: 200px; + padding: auto; } /* Le header s'affiche en menu hamburger pour les breakpoints téléphone et tablette */ @media screen and (min-width: 778px) { .nav-is-active { - font-size: 3rem; - /*48px*/ - padding-top: 100px; - padding-bottom: 100px; + font-size: 2rem; + /*32px*/ } } From b61d532a1fdb8d165d115105c2380ccc8d43569c Mon Sep 17 00:00:00 2001 From: Alexel Date: Wed, 16 Aug 2023 12:46:53 -0400 Subject: [PATCH 17/19] Ajout des changements du main --- templates/html/admin-upload.gohtml | 4 ++-- templates/html/documentation.gohtml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/html/admin-upload.gohtml b/templates/html/admin-upload.gohtml index 1729ba0..e8420fa 100644 --- a/templates/html/admin-upload.gohtml +++ b/templates/html/admin-upload.gohtml @@ -12,8 +12,8 @@

Document: diff --git a/templates/html/documentation.gohtml b/templates/html/documentation.gohtml index 2f432f3..247e3f0 100644 --- a/templates/html/documentation.gohtml +++ b/templates/html/documentation.gohtml @@ -13,6 +13,7 @@

{{ range . }} {{ $bucket_name := .Name }} + {{ $bucket_display_name := .DisplayName }}

{{ $bucket_name }}
    From 018e7747525e6ede782e8ea3f137670dc038f03b Mon Sep 17 00:00:00 2001 From: Alexel Date: Wed, 16 Aug 2023 13:26:11 -0400 Subject: [PATCH 18/19] revert des ajouts pour DisplayName des buckets --- templates/html/admin-upload.gohtml | 4 ++-- templates/html/documentation.gohtml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/html/admin-upload.gohtml b/templates/html/admin-upload.gohtml index e8420fa..e711453 100644 --- a/templates/html/admin-upload.gohtml +++ b/templates/html/admin-upload.gohtml @@ -12,8 +12,8 @@
    Document: diff --git a/templates/html/documentation.gohtml b/templates/html/documentation.gohtml index 247e3f0..2f432f3 100644 --- a/templates/html/documentation.gohtml +++ b/templates/html/documentation.gohtml @@ -13,7 +13,6 @@

    {{ range . }} {{ $bucket_name := .Name }} - {{ $bucket_display_name := .DisplayName }}

    {{ $bucket_name }}
      From 6bddacafae27cefd718debaf1500817a235cb86d Mon Sep 17 00:00:00 2001 From: Alexel Date: Wed, 16 Aug 2023 13:34:14 -0400 Subject: [PATCH 19/19] Remplacement tab par 2 espaces --- templates/html/admin-upload.gohtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/html/admin-upload.gohtml b/templates/html/admin-upload.gohtml index e711453..1729ba0 100644 --- a/templates/html/admin-upload.gohtml +++ b/templates/html/admin-upload.gohtml @@ -12,7 +12,7 @@