Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit d0b7ed8

Browse files
s314cyCLIC EPFL
s314cy
and
CLIC EPFL
authored
move poles to /about, resize menu #174 #191 (#194)
Co-authored-by: CLIC EPFL <48416147+clicepfl@users.noreply.github.com>
1 parent efe03f5 commit d0b7ed8

40 files changed

+36
-106
lines changed

‎src/components/base-view.njk

-9
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,9 @@
7676

7777
<div class="menu">
7878
<ul>
79-
<li {% if tab == "home" %} class="current" {% endif %}>
80-
<a href="/">Accueil</a>
81-
</li>
8279
<li {% if tab == "about" %} class="current" {% endif %}>
8380
<a href="/about">L'association</a>
8481
</li>
85-
<li {% if tab == "poles" %} class="current" {% endif %}>
86-
<a href="/poles">Pôles</a>
87-
</li>
8882
<li {% if tab == "commissions" %} class="current" {% endif %}>
8983
<a href="/commissions">Commissions</a>
9084
</li>
@@ -109,9 +103,6 @@
109103
<li>
110104
<a href="/about">L'Association</a>
111105
</li>
112-
<li>
113-
<a href="/poles">Pôles</a>
114-
</li>
115106
<li>
116107
<a href="/commissions">Commissions</a>
117108
</li>

‎src/pages/about/about-page-view.njk

+22
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,28 @@
6969
</div>
7070
</div>
7171

72+
<div class="wrapper bg-white">
73+
<div class="center">
74+
<div class="content padded-40">
75+
<h1>Nos Pôles</h1>
76+
<div class="poles padded-40">
77+
{% for row in polesList | batch(4) %}
78+
<div class="poles-row">
79+
{% for item in row %}
80+
<div class="poles-item">
81+
<a href="/about/{{item.slug}}">
82+
<img src="/about/{{item.imageURL}}" alt="{{item.name}}">
83+
<p class="title">{{item.name}}</p>
84+
</a>
85+
</div>
86+
{% endfor %}
87+
</div>
88+
{% endfor %}
89+
</div>
90+
</div>
91+
</div>
92+
</div>
93+
7294
{{ base.footer() }}
7395

7496
<script type="text/javascript" src="/vendor/jquery.min.js"></script>

‎src/pages/about/about-page.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import { Page } from '../page'
88
import { Request, Response } from 'express'
99
import { Sponsor, sponsorsComponent } from '../../components/sponsors/sponsors'
10+
import { Pole, poleComponent } from './poles/pole'
1011

1112
/**
1213
* View model that binds the data to the template for the about page
@@ -15,6 +16,7 @@ import { Sponsor, sponsorsComponent } from '../../components/sponsors/sponsors'
1516
*/
1617
class AboutPageViewModel {
1718
sponsorsList: Sponsor[] = sponsorsComponent.listValid()
19+
polesList: Pole[] = poleComponent.list()
1820
}
1921

2022
/**
@@ -36,4 +38,4 @@ class AboutPage extends Page {
3638
* Export a single instance of the about page
3739
*/
3840
const aboutPage = new AboutPage()
39-
export { aboutPage }
41+
export { aboutPage }

‎src/pages/poles/assets/admin.md ‎src/pages/about/poles/assets/admin.md

File renamed without changes.

‎src/pages/poles/assets/coaching.md ‎src/pages/about/poles/assets/coaching.md

File renamed without changes.

‎src/pages/poles/assets/com.md ‎src/pages/about/poles/assets/com.md

File renamed without changes.

‎src/pages/poles/assets/event.md ‎src/pages/about/poles/assets/event.md

File renamed without changes.

‎src/pages/poles/assets/it.md ‎src/pages/about/poles/assets/it.md

File renamed without changes.

‎src/pages/poles/assets/log.md ‎src/pages/about/poles/assets/log.md

File renamed without changes.

‎src/pages/poles/assets/portraits/arthurvignon.jpg ‎src/pages/about/poles/assets/portraits/arthurvignon.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/camillemontemagni.jpg ‎src/pages/about/poles/assets/portraits/camillemontemagni.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/default.png ‎src/pages/about/poles/assets/portraits/default.png

File renamed without changes.

‎src/pages/poles/assets/portraits/eloisedoyard.jpg ‎src/pages/about/poles/assets/portraits/eloisedoyard.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/gonxheidrizi.jpg ‎src/pages/about/poles/assets/portraits/gonxheidrizi.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/hugoelguedj.jpg ‎src/pages/about/poles/assets/portraits/hugoelguedj.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/kevinfaustini.jpg ‎src/pages/about/poles/assets/portraits/kevinfaustini.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/maelysbillon.jpg ‎src/pages/about/poles/assets/portraits/maelysbillon.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/malloryhenriet.jpg ‎src/pages/about/poles/assets/portraits/malloryhenriet.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/manonmichel.jpg ‎src/pages/about/poles/assets/portraits/manonmichel.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/marinebossanne.jpg ‎src/pages/about/poles/assets/portraits/marinebossanne.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/rayandaod.jpg ‎src/pages/about/poles/assets/portraits/rayandaod.jpg

File renamed without changes.

‎src/pages/poles/assets/portraits/tomdemont.jpg ‎src/pages/about/poles/assets/portraits/tomdemont.jpg

File renamed without changes.

‎src/pages/poles/assets/pres.md ‎src/pages/about/poles/assets/pres.md

File renamed without changes.

‎src/pages/poles/assets/sponso.md ‎src/pages/about/poles/assets/sponso.md

File renamed without changes.

‎src/pages/poles/assets/thumbnails/admin.PNG ‎src/pages/about/poles/assets/thumbnails/admin.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/coaching.PNG ‎src/pages/about/poles/assets/thumbnails/coaching.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/com.PNG ‎src/pages/about/poles/assets/thumbnails/com.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/event.PNG ‎src/pages/about/poles/assets/thumbnails/event.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/it.PNG ‎src/pages/about/poles/assets/thumbnails/it.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/log.PNG ‎src/pages/about/poles/assets/thumbnails/log.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/pres.PNG ‎src/pages/about/poles/assets/thumbnails/pres.PNG

File renamed without changes.

‎src/pages/poles/assets/thumbnails/sponso.PNG ‎src/pages/about/poles/assets/thumbnails/sponso.PNG

File renamed without changes.

‎src/pages/poles/pole-list.json ‎src/pages/about/poles/pole-list.json

File renamed without changes.

‎src/pages/poles/pole-page-view.njk ‎src/pages/about/poles/pole-page-view.njk

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</head>
1717

1818
<body>
19-
{{ base.header(tab = "poles") }}
19+
{{ base.header(tab = "about") }}
2020

2121
<div class="wrapper bg-white">
2222
<div class="center">
@@ -27,7 +27,7 @@
2727
&gt; {{ pole.name }}
2828
</p>
2929

30-
<img src="/poles/{{ pole.imageURL }}" alt="logo" class="center-image">
30+
<img src="/about/{{ pole.imageURL }}" alt="logo" class="center-image">
3131
<div class="pole-page">
3232
{{ pole.pageBody | safe }}
3333
</div>
@@ -79,7 +79,7 @@
7979
<a href="{{member.websiteURL}}" target="_blank">
8080

8181
<div class="member">
82-
<img src="/poles/portraits/{{member.imageURL}}" alt="{{member.name}}"/>
82+
<img src="/about/portraits/{{member.imageURL}}" alt="{{member.name}}"/>
8383
<div class="desc">
8484
<p class="name">{{member.name}}</p>
8585
<p class="role">{{member.role}}</p>
@@ -94,7 +94,7 @@
9494
{% for teammate in pole.teammates %}
9595
<a href="{{member.websiteURL}}" target="_blank">
9696
<div class="member">
97-
<img src="/poles/portraits/{{teammate.imageURL}}" alt="{{teammate.name}}">
97+
<img src="/about/portraits/{{teammate.imageURL}}" alt="{{teammate.name}}">
9898
<div class="desc">
9999
<p class="name">{{teammate.name}}</p>
100100
<p class="role">Équipier</p>

‎src/pages/poles/pole-page.ts ‎src/pages/about/poles/pole-page.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Page } from '../page'
1+
import { Page } from '../../page'
22
import { Request, Response } from 'express'
33
import { Pole } from './pole'
44

@@ -20,7 +20,7 @@ class PolePage extends Page {
2020

2121
/** @inheritDoc */
2222
render = (req: Request, res: Response) => {
23-
const template = "pages/poles/pole-page-view.njk"
23+
const template = "pages/about/poles/pole-page-view.njk"
2424

2525
res.render(template, this.viewModel)
2626
}

‎src/pages/poles/pole-router.ts ‎src/pages/about/poles/pole-router.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PolePage } from './pole-page'
44

55
const poleRouter = express.Router()
66

7-
poleRouter.use("/", express.static("src/pages/poles/assets/"))
7+
poleRouter.use("/", express.static("src/pages/about/poles/assets/"))
88

99
poleComponent.list().forEach(pole => {
1010
poleRouter.get("/" + pole.slug, new PolePage(pole).render)

‎src/pages/poles/pole.ts ‎src/pages/about/poles/pole.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import fs from 'fs'
22
import path from 'path'
33
import showdown from 'showdown'
44
import data from './pole-list.json'
5-
import { logger } from '../../logger'
5+
import { logger } from '../../../logger'
66
import { fstat } from 'fs'
77

88
/**
99
* Commission content path
1010
* Must correct to src/ folder since this will be compiled in dist
1111
*/
12-
const CONTENT_PATH = path.resolve(__dirname, "../../../src/pages/poles/assets/")
12+
const CONTENT_PATH = path.resolve(__dirname, "../../../../src/pages/about/poles/assets/")
1313

1414
class PoleMember {
1515
name: string

‎src/pages/poles/poles-page-view.njk

-51
This file was deleted.

‎src/pages/poles/poles-page.ts

-23
This file was deleted.

‎src/router.ts

+2-13
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import { coachingListRouter } from './pages/coaching/coaching-router'
2323
import { notFoundPage } from './pages/404/404-page'
2424
import { commissionRouter } from './pages/commissions/commission-router'
2525
import { commissionsPage } from './pages/commissions/commissions-page'
26-
import { poleRouter } from './pages/poles/pole-router'
27-
import { polesPage } from './pages/poles/poles-page'
26+
import { poleRouter } from './pages/about/poles/pole-router'
2827
import { eventRouter } from './pages/events/event-router'
2928
import { eventsPage } from './pages/events/events-page'
3029

@@ -61,16 +60,6 @@ router.get('/coaching', coachingPage.render)
6160
*/
6261
router.get('/commissions', commissionsPage.render)
6362

64-
/**
65-
* Poles page
66-
*/
67-
router.get('/poles', polesPage.render)
68-
69-
/**
70-
* Events page
71-
*/
72-
//router.get('/events', eventsPage.render)
73-
7463
/**
7564
* Sponsors router
7665
* Routes defined in {@link components/sponsors/sponsors-router.ts} will be
@@ -119,7 +108,7 @@ router.use("/coaching", coachingListRouter)
119108

120109
router.use("/commissions", commissionRouter)
121110

122-
router.use("/poles", poleRouter)
111+
router.use("/about", poleRouter)
123112

124113
router.use("/events", eventRouter)
125114

0 commit comments

Comments
 (0)