Skip to content

Commit

Permalink
update 404 page + refactor img src
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucaterre committed Apr 15, 2024
1 parent a353acd commit 5907a6a
Show file tree
Hide file tree
Showing 9 changed files with 8,082 additions and 4,943 deletions.
12,841 changes: 7,915 additions & 4,926 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"lint": "vue-cli-service lint",
"test::unit": "jest --no-cache --verbose"
},

"dependencies": {
"@vuepic/vue-datepicker": "^7.4.1",
"axios": "^1.6.5",
Expand Down Expand Up @@ -40,6 +39,7 @@
"babel-plugin-module-resolver": "^5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.7.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"vue-loader": "^16.8.3"
}
Expand Down
14 changes: 10 additions & 4 deletions src/assets/css/splash_screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,19 @@
opacity: 1;
}


#splash-screen__banner {
position: absolute;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
object-fit: cover;
opacity: 0.45;
width: 100%;
height: 100%;
background-image: url("@/assets/images/splash-screen.jpg");
background-size: cover;
background-position: center;
background-repeat: no-repeat;
z-index: 0;
opacity: 0.5;
}

.splash-screen__content {
Expand Down
20 changes: 10 additions & 10 deletions src/components/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,43 +41,43 @@
<div class="logos-container is-flex">

<a href="https://www.chartes.psl.eu/fr/rubrique-centre-jean-mabillon/centre-jean-mabillon" target="_blank">
<img src="@/assets/partners_logo/Logo-CMJ.png" alt="Logo Centre Jean Mabillon" class="logo logo-cmj"/>
<img :src="require('@/assets/partners_logo/Logo-CMJ.png')" alt="Logo Centre Jean Mabillon" class="logo logo-cmj"/>
</a>

<a href="https://www.chartes.psl.eu/fr" target="_blank">
<img src="@/assets/partners_logo/Logo_ENC_PSL.svg" alt="Logo École nationale des chartes" class="logo logo-enc"/>
<img :src="require('@/assets/partners_logo/Logo_ENC_PSL.svg')" alt="Logo École nationale des chartes" class="logo logo-enc"/>
</a>

<a href="https://anr.fr/Projet-ANR-20-CE27-0012" target="_blank">
<img src="@/assets/partners_logo/logo_ANR.svg" alt="Logo ANR" class="logo logo-anr"/>
<img :src="require('@/assets/partners_logo/logo_ANR.svg')" alt="Logo ANR" class="logo logo-anr"/>
</a>

<a href="https://lamop.pantheonsorbonne.fr/laboratoire-medievistique-occidentale-paris" target="_blank">
<img src="@/assets/partners_logo/logo_LAMOP_gris.svg" alt="Logo Laboratoire médievistique occidentale" class="logo logo-lamop" />
<img :src="require('@/assets/partners_logo/logo_LAMOP_gris.svg')" alt="Logo Laboratoire médievistique occidentale" class="logo logo-lamop" />
</a>

<a href="https://www.pantheonsorbonne.fr/" target="_blank">
<img src="@/assets/partners_logo/logo_Paris_Sorbonne.svg" alt="Logo Paris 1 Panthéon-Sorbonne" class="logo logo-paris1"/>
<img :src="require('@/assets/partners_logo/logo_Paris_Sorbonne.svg')" alt="Logo Paris 1 Panthéon-Sorbonne" class="logo logo-paris1"/>
</a>

<a href="https://www.cnrs.fr/fr" target="_blank">
<img src="@/assets/partners_logo/logo_CNRS.svg" alt="Logo CNRS" class="logo logo-cnrs"/>
<img :src="require('@/assets/partners_logo/logo_CNRS.svg')" alt="Logo CNRS" class="logo logo-cnrs"/>
</a>

<a href="https://u-paris.fr/" target="_blank">
<img src="@/assets/partners_logo/logo_Paris_Cite.svg" alt="Logo Paris Cité" class="logo logo-pariscite"/>
<img :src="require('@/assets/partners_logo/logo_Paris_Cite.svg')" alt="Logo Paris Cité" class="logo logo-pariscite"/>
</a>

<a href="https://www.archives-nationales.culture.gouv.fr/" target="_blank">
<img src="@/assets/partners_logo/logo_Archives_Nationales.svg" alt="Logo École nationale des chartes" class="logo logo-an"/>
<img :src="require('@/assets/partners_logo/logo_Archives_Nationales.svg')" alt="Logo École nationale des chartes" class="logo logo-an"/>
</a>

<a href="https://www.bnf.fr/fr" target="_blank">
<img src="@/assets/partners_logo/logo_BNF.svg" alt="Logo École nationale des chartes" class="logo logo-bnf"/>
<img :src="require('@/assets/partners_logo/logo_BNF.svg')" alt="Logo École nationale des chartes" class="logo logo-bnf"/>
</a>

<a href="https://www.bibliotheque-mazarine.fr/fr/" target="_blank">
<img src="@/assets/partners_logo/Logo_mazarine_sansfond 6B6B6B.svg" alt="Logo Bibliothèque Mazarine" class="logo logo-mazarine"/>
<img :src="require('@/assets/partners_logo/Logo_mazarine_sansfond_6B6B6B.svg')" alt="Logo Bibliothèque Mazarine" class="logo logo-mazarine"/>
</a>

</div>
Expand Down
5 changes: 5 additions & 0 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import FacSimileView from "@/views/FacSimileView.vue";
import ContactView from "@/views/ContactView.vue";
import CreditView from "@/views/CreditView.vue";
import TermsOfServiceView from "@/views/TermsOfServiceView.vue";
import NotFoundPage from "@/views/NotFoundPage.vue";

const rootURL = `${process.env.VUE_APP_APP_ROOT_URL}`

Expand Down Expand Up @@ -57,6 +58,10 @@ const routes = [
path:'/termsofservice',
name: 'termsofservice',
component: TermsOfServiceView
},
{
path: '/:pathMatch(.*)*',
component: NotFoundPage
}

]
Expand Down
4 changes: 2 additions & 2 deletions src/views/HomeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="splash-screen" class="splash-screen">
<div class="move-round-point"></div>
<div>
<img id="splash-screen__banner" src="@/assets/images/splash-screen.jpg"/>
<div id="splash-screen__banner"/>
</div>
<div class="splash-screen__content">
<h1 class="title">
Expand Down Expand Up @@ -78,7 +78,7 @@ export default {
let splashScreen = document.getElementById('splash-screen');
if (!localStorage.getItem('splashScreenDisplayed')) {
// if the splash screen has not been displayed yet, display it during 2 seconds
setSplashScreenTimming(splashScreen, 2000);
setSplashScreenTimming(splashScreen, 3000);
} else {
// if the splash screen has already been displayed, hide it immediately
splashScreen.style.display = 'none';
Expand Down
71 changes: 71 additions & 0 deletions src/views/NotFoundPage.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<template>
<div class="container container-not-found-global">
<div class="column">
<h1 class="title-not-found">❦ 404 - Page introuvable ❦</h1>
<div class="container-not-found-description">
<p class="description-not-found">La page que vous cherchez n'existe pas.</p>
<p class="description-not-found">☞ Ciquer
<router-link to="/">ici</router-link> pour retourner à la page d'accueil.
</p>
</div>
</div>
</div>
</template>

<script>
export default {
name: "NotFoundPage"
}
</script>

<style scoped>
.container-not-found-global {
position: relative;
}
.container-not-found-global::before {
content: "";
background-image: url("@/assets/images/splash-screen.jpg");
background-size: cover;
background-position: center;
height: 100%;
width: 100%;
position: absolute;
top: 0;
left: 0;
opacity: 0.93;
}
.column {
background-color: rgba(255, 255, 255, 0.8);
padding: 60px;
border-radius: 5px;
box-shadow: 0 0 40px rgba(0, 0, 0, 0.2);
position: relative;
}
.title-not-found {
font-size: 36px;
font-weight: 700;
color: var(--dark-grey);
border-bottom: solid 1px #979797;
}
.container-not-found-description {
margin-top: 20px;
}
.description-not-found {
font-size: 20px;
color: var(--dark-grey);
}
a {
color: var(--dark-grey);
text-decoration: underline;
}
a:hover {
color: var(--light-brown);
}
</style>
68 changes: 68 additions & 0 deletions tests/fixtures/eventsResponse.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,73 @@
"Date inconnue": 2
}
}
},
{
"data": [
{
"date": "1392-06-15",
"type": "Entrée"
},
{
"date": "~1392-06-15",
"type": "Entrée"
},
{
"date": "1415",
"type": "Entrée"
},
{
"date": "1415-07-12",
"type": "Entrée"
},
{
"date": "~1419",
"type": "Entrée"
},
{
"date": "1418",
"type": "Entrée"
},
{
"date": "1424-07-12",
"type": "Sortie"
},
{
"date": "1424-07-12",
"type": "Entrée"
},
{
"date": "1424-07-21",
"type": "Entrée"
},
{
"date": "1424-08-02",
"type": "Entrée"
}
],
"toChecked": {
"orderDateExpected": [
"1392-06-15",
"~1392-06-15",
"1415",
"1415-07-12",
"1418",
"~1419",
"1424-07-12",
"1424-07-21",
"1424-08-02"
],
"totalEventsByDateExpected": {
"1392-06-15": 1,
"~1392-06-15": 1,
"1415": 1,
"1415-07-12": 1,
"1418": 1,
"~1419": 1,
"1424-07-12": 2,
"1424-07-21": 1,
"1424-08-02": 1
}
}
}
]

0 comments on commit 5907a6a

Please sign in to comment.