move poles to /about, resize menu #174 #191 (#194)

Co-authored-by: CLIC EPFL <[email protected]>
clicepfl · Sep 22, 2021 · d0b7ed8 · d0b7ed8
1 parent efe03f5
commit d0b7ed8
Show file tree

Hide file tree

Showing 40 changed files with 36 additions and 106 deletions.
diff --git a/src/components/base-view.njk b/src/components/base-view.njk
@@ -76,15 +76,9 @@
 
                 <div class="menu">
                     <ul>
-                        <li {% if tab == "home" %} class="current" {% endif %}>
-                            <a href="/">Accueil</a>
-                        </li>
                         <li {% if tab == "about" %} class="current" {% endif %}>
                             <a href="/about">L'association</a>
                         </li>
-                        <li {% if tab == "poles" %} class="current" {% endif %}>
-                            <a href="/poles">Pôles</a>
-                        </li>
                         <li {% if tab == "commissions" %} class="current" {% endif %}>
                             <a href="/commissions">Commissions</a>
                         </li>
@@ -109,9 +103,6 @@
                         <li>
                             <a href="/about">L'Association</a>
                         </li>
-                        <li>
-                            <a href="/poles">Pôles</a>
-                        </li>
                         <li>
                             <a href="/commissions">Commissions</a>
                         </li>

diff --git a/src/pages/about/about-page-view.njk b/src/pages/about/about-page-view.njk
@@ -69,6 +69,28 @@
             </div>
         </div>
 
+        <div class="wrapper bg-white">
+            <div class="center">
+                <div class="content padded-40">
+                    <h1>Nos Pôles</h1>
+                    <div class="poles padded-40">
+                        {% for row in polesList | batch(4) %}
+                            <div class="poles-row">
+                            {% for item in row %}
+                                <div class="poles-item">
+                                    <a href="/about/{{item.slug}}">
+                                        <img src="/about/{{item.imageURL}}" alt="{{item.name}}">
+                                        <p class="title">{{item.name}}</p>
+                                    </a>
+                                </div>
+                            {% endfor %}
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        </div>
+
         {{ base.footer() }}
 
         <script type="text/javascript" src="/vendor/jquery.min.js"></script>

diff --git a/src/pages/about/about-page.ts b/src/pages/about/about-page.ts
@@ -7,6 +7,7 @@
 import { Page } from '../page'
 import { Request, Response } from 'express'
 import { Sponsor, sponsorsComponent } from '../../components/sponsors/sponsors'
+import { Pole, poleComponent } from './poles/pole'
 
 /**
  * View model that binds the data to the template for the about page
@@ -15,6 +16,7 @@ import { Sponsor, sponsorsComponent } from '../../components/sponsors/sponsors'
  */
 class AboutPageViewModel {
     sponsorsList: Sponsor[] = sponsorsComponent.listValid()
+    polesList: Pole[] = poleComponent.list()
 }
 
 /**
@@ -36,4 +38,4 @@ class AboutPage extends Page {
  * Export a single instance of the about page
  */
 const aboutPage = new AboutPage()
-export { aboutPage }
+export { aboutPage }
diff --git a/src/pages/poles/assets/admin.md → src/pages/about/poles/assets/admin.md b/src/pages/poles/assets/admin.md → src/pages/about/poles/assets/admin.md
diff --git a/src/pages/poles/assets/coaching.md → src/pages/about/poles/assets/coaching.md b/src/pages/poles/assets/coaching.md → src/pages/about/poles/assets/coaching.md
diff --git a/src/pages/poles/assets/com.md → src/pages/about/poles/assets/com.md b/src/pages/poles/assets/com.md → src/pages/about/poles/assets/com.md
diff --git a/src/pages/poles/assets/event.md → src/pages/about/poles/assets/event.md b/src/pages/poles/assets/event.md → src/pages/about/poles/assets/event.md
diff --git a/src/pages/poles/assets/it.md → src/pages/about/poles/assets/it.md b/src/pages/poles/assets/it.md → src/pages/about/poles/assets/it.md
diff --git a/src/pages/poles/assets/log.md → src/pages/about/poles/assets/log.md b/src/pages/poles/assets/log.md → src/pages/about/poles/assets/log.md
diff --git a/...s/poles/assets/portraits/arthurvignon.jpg → ...t/poles/assets/portraits/arthurvignon.jpg b/...s/poles/assets/portraits/arthurvignon.jpg → ...t/poles/assets/portraits/arthurvignon.jpg
diff --git a/...es/assets/portraits/camillemontemagni.jpg → ...es/assets/portraits/camillemontemagni.jpg b/...es/assets/portraits/camillemontemagni.jpg → ...es/assets/portraits/camillemontemagni.jpg
diff --git a/src/pages/poles/assets/portraits/default.png → .../about/poles/assets/portraits/default.png b/src/pages/poles/assets/portraits/default.png → .../about/poles/assets/portraits/default.png
diff --git a/...s/poles/assets/portraits/eloisedoyard.jpg → ...t/poles/assets/portraits/eloisedoyard.jpg b/...s/poles/assets/portraits/eloisedoyard.jpg → ...t/poles/assets/portraits/eloisedoyard.jpg
diff --git a/...s/poles/assets/portraits/gonxheidrizi.jpg → ...t/poles/assets/portraits/gonxheidrizi.jpg b/...s/poles/assets/portraits/gonxheidrizi.jpg → ...t/poles/assets/portraits/gonxheidrizi.jpg
diff --git a/...es/poles/assets/portraits/hugoelguedj.jpg → ...ut/poles/assets/portraits/hugoelguedj.jpg b/...es/poles/assets/portraits/hugoelguedj.jpg → ...ut/poles/assets/portraits/hugoelguedj.jpg
diff --git a/.../poles/assets/portraits/kevinfaustini.jpg → .../poles/assets/portraits/kevinfaustini.jpg b/.../poles/assets/portraits/kevinfaustini.jpg → .../poles/assets/portraits/kevinfaustini.jpg
diff --git a/...s/poles/assets/portraits/maelysbillon.jpg → ...t/poles/assets/portraits/maelysbillon.jpg b/...s/poles/assets/portraits/maelysbillon.jpg → ...t/poles/assets/portraits/maelysbillon.jpg
diff --git a/...poles/assets/portraits/malloryhenriet.jpg → ...poles/assets/portraits/malloryhenriet.jpg b/...poles/assets/portraits/malloryhenriet.jpg → ...poles/assets/portraits/malloryhenriet.jpg
diff --git a/...es/poles/assets/portraits/manonmichel.jpg → ...ut/poles/assets/portraits/manonmichel.jpg b/...es/poles/assets/portraits/manonmichel.jpg → ...ut/poles/assets/portraits/manonmichel.jpg
diff --git a/...poles/assets/portraits/marinebossanne.jpg → ...poles/assets/portraits/marinebossanne.jpg b/...poles/assets/portraits/marinebossanne.jpg → ...poles/assets/portraits/marinebossanne.jpg
diff --git a/...ages/poles/assets/portraits/rayandaod.jpg → ...bout/poles/assets/portraits/rayandaod.jpg b/...ages/poles/assets/portraits/rayandaod.jpg → ...bout/poles/assets/portraits/rayandaod.jpg
diff --git a/...ages/poles/assets/portraits/tomdemont.jpg → ...bout/poles/assets/portraits/tomdemont.jpg b/...ages/poles/assets/portraits/tomdemont.jpg → ...bout/poles/assets/portraits/tomdemont.jpg
diff --git a/src/pages/poles/assets/pres.md → src/pages/about/poles/assets/pres.md b/src/pages/poles/assets/pres.md → src/pages/about/poles/assets/pres.md
diff --git a/src/pages/poles/assets/sponso.md → src/pages/about/poles/assets/sponso.md b/src/pages/poles/assets/sponso.md → src/pages/about/poles/assets/sponso.md
diff --git a/src/pages/poles/assets/thumbnails/admin.PNG → ...s/about/poles/assets/thumbnails/admin.PNG b/src/pages/poles/assets/thumbnails/admin.PNG → ...s/about/poles/assets/thumbnails/admin.PNG
diff --git a/...ages/poles/assets/thumbnails/coaching.PNG → ...bout/poles/assets/thumbnails/coaching.PNG b/...ages/poles/assets/thumbnails/coaching.PNG → ...bout/poles/assets/thumbnails/coaching.PNG
diff --git a/src/pages/poles/assets/thumbnails/com.PNG → ...ges/about/poles/assets/thumbnails/com.PNG b/src/pages/poles/assets/thumbnails/com.PNG → ...ges/about/poles/assets/thumbnails/com.PNG
diff --git a/src/pages/poles/assets/thumbnails/event.PNG → ...s/about/poles/assets/thumbnails/event.PNG b/src/pages/poles/assets/thumbnails/event.PNG → ...s/about/poles/assets/thumbnails/event.PNG
diff --git a/src/pages/poles/assets/thumbnails/it.PNG → ...ages/about/poles/assets/thumbnails/it.PNG b/src/pages/poles/assets/thumbnails/it.PNG → ...ages/about/poles/assets/thumbnails/it.PNG
diff --git a/src/pages/poles/assets/thumbnails/log.PNG → ...ges/about/poles/assets/thumbnails/log.PNG b/src/pages/poles/assets/thumbnails/log.PNG → ...ges/about/poles/assets/thumbnails/log.PNG
diff --git a/src/pages/poles/assets/thumbnails/pres.PNG → ...es/about/poles/assets/thumbnails/pres.PNG b/src/pages/poles/assets/thumbnails/pres.PNG → ...es/about/poles/assets/thumbnails/pres.PNG
diff --git a/src/pages/poles/assets/thumbnails/sponso.PNG → .../about/poles/assets/thumbnails/sponso.PNG b/src/pages/poles/assets/thumbnails/sponso.PNG → .../about/poles/assets/thumbnails/sponso.PNG
diff --git a/src/pages/poles/pole-list.json → src/pages/about/poles/pole-list.json b/src/pages/poles/pole-list.json → src/pages/about/poles/pole-list.json
diff --git a/src/pages/poles/pole-page-view.njk → src/pages/about/poles/pole-page-view.njk b/src/pages/poles/pole-page-view.njk → src/pages/about/poles/pole-page-view.njk
@@ -16,7 +16,7 @@
     </head>
 
     <body>
-        {{ base.header(tab = "poles") }}
+        {{ base.header(tab = "about") }}
 
         <div class="wrapper bg-white">
             <div class="center">
@@ -27,7 +27,7 @@
                         &gt; {{ pole.name }}
                     </p>
 
-                    <img src="/poles/{{ pole.imageURL }}" alt="logo" class="center-image">
+                    <img src="/about/{{ pole.imageURL }}" alt="logo" class="center-image">
                     <div class="pole-page">
                         {{ pole.pageBody | safe }}
                     </div>
@@ -79,7 +79,7 @@
                             <a href="{{member.websiteURL}}" target="_blank">
 
                                 <div class="member">
-                                    <img src="/poles/portraits/{{member.imageURL}}" alt="{{member.name}}"/>
+                                    <img src="/about/portraits/{{member.imageURL}}" alt="{{member.name}}"/>
                                     <div class="desc">
                                         <p class="name">{{member.name}}</p>
                                         <p class="role">{{member.role}}</p>
@@ -94,7 +94,7 @@
                         {% for teammate in pole.teammates %}
                             <a href="{{member.websiteURL}}" target="_blank">
                                 <div class="member">
-                                    <img src="/poles/portraits/{{teammate.imageURL}}" alt="{{teammate.name}}">
+                                    <img src="/about/portraits/{{teammate.imageURL}}" alt="{{teammate.name}}">
                                     <div class="desc">
                                         <p class="name">{{teammate.name}}</p>
                                         <p class="role">Équipier</p>

diff --git a/src/pages/poles/pole-page.ts → src/pages/about/poles/pole-page.ts b/src/pages/poles/pole-page.ts → src/pages/about/poles/pole-page.ts
@@ -1,4 +1,4 @@
-import { Page } from '../page'
+import { Page } from '../../page'
 import { Request, Response } from 'express'
 import { Pole } from './pole'
 
@@ -20,7 +20,7 @@ class PolePage extends Page {
 
     /** @inheritDoc */
     render = (req: Request, res: Response) => {
-        const template = "pages/poles/pole-page-view.njk"
+        const template = "pages/about/poles/pole-page-view.njk"
 
         res.render(template, this.viewModel)
     }

diff --git a/src/pages/poles/pole-router.ts → src/pages/about/poles/pole-router.ts b/src/pages/poles/pole-router.ts → src/pages/about/poles/pole-router.ts
@@ -4,7 +4,7 @@ import  { PolePage } from './pole-page'
 
 const poleRouter = express.Router()
 
-poleRouter.use("/", express.static("src/pages/poles/assets/"))
+poleRouter.use("/", express.static("src/pages/about/poles/assets/"))
 
 poleComponent.list().forEach(pole => {
     poleRouter.get("/" + pole.slug, new PolePage(pole).render)

diff --git a/src/pages/poles/pole.ts → src/pages/about/poles/pole.ts b/src/pages/poles/pole.ts → src/pages/about/poles/pole.ts
@@ -2,14 +2,14 @@ import fs from 'fs'
 import path from 'path'
 import showdown from 'showdown'
 import data from './pole-list.json'
-import { logger } from '../../logger'
+import { logger } from '../../../logger'
 import { fstat } from 'fs'
 
 /**
  * Commission content path
  * Must correct to src/ folder since this will be compiled in dist
  */
-const CONTENT_PATH = path.resolve(__dirname, "../../../src/pages/poles/assets/")
+const CONTENT_PATH = path.resolve(__dirname, "../../../../src/pages/about/poles/assets/")
 
 class PoleMember {
     name: string

diff --git a/src/pages/poles/poles-page-view.njk b/src/pages/poles/poles-page-view.njk
diff --git a/src/pages/poles/poles-page.ts b/src/pages/poles/poles-page.ts
diff --git a/src/router.ts b/src/router.ts
@@ -23,8 +23,7 @@ import { coachingListRouter } from './pages/coaching/coaching-router'
 import { notFoundPage } from './pages/404/404-page'
 import { commissionRouter } from './pages/commissions/commission-router'
 import { commissionsPage } from './pages/commissions/commissions-page'
-import { poleRouter } from './pages/poles/pole-router'
-import { polesPage } from './pages/poles/poles-page'
+import { poleRouter } from './pages/about/poles/pole-router'
 import { eventRouter } from './pages/events/event-router'
 import { eventsPage } from './pages/events/events-page'
 
@@ -61,16 +60,6 @@ router.get('/coaching', coachingPage.render)
  */
 router.get('/commissions', commissionsPage.render)
 
-/**
- * Poles page
- */
-router.get('/poles', polesPage.render)
-
-/**
- * Events page
- */
-//router.get('/events', eventsPage.render)
-
 /**
  * Sponsors router
  * Routes defined in {@link components/sponsors/sponsors-router.ts} will be
@@ -119,7 +108,7 @@ router.use("/coaching", coachingListRouter)
 
 router.use("/commissions", commissionRouter)
 
-router.use("/poles", poleRouter)
+router.use("/about", poleRouter)
 
 router.use("/events", eventRouter)