Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #26

Merged
merged 98 commits into from
Apr 30, 2024
Merged

Dev #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
5e91400
Header, footer, home View (desktop)
denischiron Mar 13, 2024
9d8b069
Header menu, Footer logos, registres liste (desktop)
denischiron Mar 13, 2024
56199e7
Facets registres - selection de date (desktop)
denischiron Mar 13, 2024
14c5824
Facets registres nosketch form (desktop)
denischiron Mar 14, 2024
040a7ea
Fac-simile - mise en place (desktop)
denischiron Mar 14, 2024
5d45929
Pictos SVG : recherche ouvrir/fermer
denischiron Mar 14, 2024
f110ff9
Fac-simile - cards (desktop)
denischiron Mar 14, 2024
daa74cb
Fac-simile - prediction et banner (desktop)
denischiron Mar 14, 2024
fbe4a8e
Fac-simile - mise en place ressources, calage banners (desktop)
denischiron Mar 14, 2024
69ba891
Fac-simile - merge
denischiron Mar 14, 2024
9ccce7c
Liste des personnes - mise en plaec et nouvelle banniere home (desktop)
denischiron Mar 15, 2024
75c7a12
Liste des personnes (desktop)
denischiron Mar 17, 2024
fead2d0
Details personne - mise en place (desktop)
denischiron Mar 18, 2024
816d483
fix person timeline events order + jest integration
Lucaterre Mar 18, 2024
2d951fb
fix person timeline events order + jest integration
Lucaterre Mar 18, 2024
380322f
fix person timeline events order + jest integration
Lucaterre Mar 18, 2024
9f31b05
fix person timeline events order + jest integration
Lucaterre Mar 18, 2024
c447928
Details personne - Timeline - Mise en forme Contacts (desktop)
denischiron Mar 19, 2024
827a82b
fix PersonDataTimeline : render correct ISO date order + add person t…
Lucaterre Mar 19, 2024
284d014
Calage ecrans (desktop)
denischiron Mar 20, 2024
f232876
Affichage du sous-menu (desktop)
denischiron Mar 21, 2024
dac8de0
Premier calage Menu et Accueil - ajout bouton Burger (mobile)
denischiron Mar 21, 2024
2308b5e
Reorganisation des header et colonnes des différents ecrans (mobile)
denischiron Mar 21, 2024
1f384c0
Accueil, registres (mobile)
denischiron Mar 21, 2024
58536a8
Registres : bouton Filtres (mobile)
denischiron Mar 22, 2024
0ddf81c
fix personDataTimeline.vue conflicts (html, css)
Lucaterre Mar 22, 2024
0c11635
Ajustements 1 (desktop)
denischiron Mar 22, 2024
8c0709e
Carousel (desktop)
denischiron Mar 22, 2024
ba6241b
Ajustements 2 : sticky + legende carousel (desktop)
denischiron Mar 25, 2024
922623a
responsive tests on histogram
Lucaterre Mar 25, 2024
cf1697d
Merge branch 'denischiron-master-css' into dev
Lucaterre Mar 25, 2024
ff8d079
Merge pull request #10 from chartes/fix_histogram_slider
Lucaterre Mar 25, 2024
f98aad8
change home text + justify home text + little move for lettrine + pas…
Lucaterre Mar 25, 2024
97ba088
Registres : boutons filtres, sticky, tableau des pages (mobile)
denischiron Mar 25, 2024
1eafa0e
Merge pull request #11 from chartes/fix_home_text
Lucaterre Mar 25, 2024
1a18e09
Registres : ac-simile (mobile)
denischiron Mar 25, 2024
e619503
fix histogram (styles, animation, y-axis)
Lucaterre Mar 25, 2024
d2790a5
fix slider transition effect + fix histogram
Lucaterre Mar 25, 2024
c935a09
Merge pull request #13 from chartes/fix_minor_histogram_slider
Lucaterre Mar 25, 2024
a1ec39c
Personnes (mobile)
denischiron Mar 25, 2024
87f04e7
Merge chartes/dev + FIX
denischiron Mar 25, 2024
2c4e11a
Ressources (mobile)
denischiron Mar 25, 2024
aa7b3e3
Merge branch 'denischiron-master-css' into dev
Lucaterre Mar 26, 2024
91b26cf
text update on facsimile page (warning et citations) + remove close o…
Lucaterre Mar 26, 2024
16548c6
Ajustements : boutons reset, input focus, registres sticky mobile
denischiron Mar 26, 2024
3761a6f
Ajustements : bgcolor boutons rechercher nosketch
denischiron Mar 26, 2024
8c3cd16
Merge remote-tracking branch 'upstream/dev' into master-css
denischiron Mar 26, 2024
4e28396
Merge branch 'denischiron-master-css' into dev
Lucaterre Mar 26, 2024
f90ba5c
update footer text
Lucaterre Mar 26, 2024
3217938
update data json (nav_by_dates, nav_by_volumes)
Lucaterre Mar 28, 2024
91f32ab
Fiche personne (Timeline, Carousel) et autres ajustements mobile
denischiron Apr 1, 2024
4cd1d50
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 2, 2024
ac9bea5
update picto condition in timeline to facsimile access + justify left…
Lucaterre Apr 2, 2024
d5b5f8a
Ajustements 1 desktop/mobile
denischiron Apr 4, 2024
d9d1f96
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 4, 2024
4ccb965
alignement du texte de la home page à gauche + modification .logos-co…
Lucaterre Apr 4, 2024
42e4e2e
Ajustements 2 (histogramme, bug carousel, titres ressources, burger)
denischiron Apr 5, 2024
6aff6ec
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 5, 2024
4cda62c
Ajustements : placement histogramme, logos footer mobile
denischiron Apr 5, 2024
2bdbc17
Merge remote-tracking branch 'upstream/dev' into master-css
denischiron Apr 5, 2024
4617b78
Ajustement : histogramme marge et overflow
denischiron Apr 5, 2024
65660d3
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 5, 2024
513852b
add splash screen
Lucaterre Apr 5, 2024
4f8fcb0
update splash screen
Lucaterre Apr 5, 2024
26991aa
update ressources page (schema WIP) + add string formater for comma +…
Lucaterre Apr 9, 2024
533bfef
update jest config
Lucaterre Apr 9, 2024
afc8495
edit ressource, termsofservice, credit, contact views + update string…
Lucaterre Apr 11, 2024
2d98d94
edit
Lucaterre Apr 11, 2024
27819e1
update credits, mentions légales + contact
Lucaterre Apr 12, 2024
5fe472e
update bulma call in main.js (bypass cdn)
Lucaterre Apr 12, 2024
8e2e50c
Corrections dont : timeline, pages ressources, exception scrolltop fa…
denischiron Apr 12, 2024
e91172b
Merge remote-tracking branch 'upstream/dev' into master-css
denischiron Apr 12, 2024
c320efc
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 15, 2024
e28c6e1
Registres : tooltip icone
denischiron Apr 15, 2024
dbaa6be
Merge remote-tracking branch 'upstream/dev' into master-css
denischiron Apr 15, 2024
3995fd5
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 15, 2024
be49d11
Route change scrolltop facsimile, facsimile nav view height
denischiron Apr 15, 2024
0f4c4ea
update env
Lucaterre Apr 15, 2024
efacbb2
Merge branch 'master-css' of github.com:denischiron/endp-vue into den…
Lucaterre Apr 15, 2024
b694a4d
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 15, 2024
ad31acf
update credits + termsofservice + ressources list
Lucaterre Apr 15, 2024
a353acd
add favicon
Lucaterre Apr 15, 2024
5907a6a
update 404 page + refactor img src
Lucaterre Apr 15, 2024
e721906
optimize splash screen
Lucaterre Apr 15, 2024
e9ceff4
change labels in Timeline + comment legend 'date inconnue' in Timelin…
Lucaterre Apr 18, 2024
e764572
Fixesx : scroll Timeline, text align justify to left, ...
denischiron Apr 19, 2024
1077753
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 19, 2024
9e626ec
Fix : Timeline min-height
denischiron Apr 19, 2024
2322a96
temp fix on Mirador
Lucaterre Apr 25, 2024
27c982b
Merge branch 'master-css' of github.com:denischiron/endp-vue into den…
Lucaterre Apr 25, 2024
a3b4988
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 25, 2024
404f138
Fix Mirador viewer (unmounted, collection modal remove by default) + …
Lucaterre Apr 25, 2024
86b9e4e
remove justify on ressources and terms of service page
Lucaterre Apr 26, 2024
1c99839
add padding on card-header for raw-prediction-card-parent
Lucaterre Apr 26, 2024
ba93ec0
add url formatter in PersonDataView to create http link
Lucaterre Apr 26, 2024
7a7d3bc
Fix : Fac-simile navigation par page (min-height/max-height) responsive
denischiron Apr 29, 2024
dd68e7d
Merge branch 'denischiron-master-css' into dev
Lucaterre Apr 30, 2024
ed1c78b
update Readme
Lucaterre Apr 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ VUE_APP_APP_URL=http://localhost:9091

# SERVICES
# - DB Person
VUE_APP_DB_ADMIN=https://dev.chartes.psl.eu/endp-person/admin
VUE_APP_DB_API=https://dev.chartes.psl.eu/endp-person/api
VUE_APP_DB_SHOW=https://dev.chartes.psl.eu/endp-person/endp-person
VUE_APP_DB_ADMIN=https://endp.chartes.psl.eu/endp-person/admin
VUE_APP_DB_API=https://endp.chartes.psl.eu/endp-person/api
VUE_APP_DB_SHOW=https://endp.chartes.psl.eu/endp-person/endp-person

# - NoSketch (Indexation Engine)
VUE_APP_NOSKETCH_APP=https://nosketch-engine.lamop.fr/
Expand Down
8 changes: 4 additions & 4 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
VUE_APP_APP_ROOT_URL=/endp/
VUE_APP_APP_ROOT_URL=/
VUE_APP_APP_URL=http://localhost:9091

# SERVICES
# - DB Person
VUE_APP_DB_ADMIN=https://dev.chartes.psl.eu/endp-person/admin
VUE_APP_DB_API=https://dev.chartes.psl.eu/endp-person/api
VUE_APP_DB_SHOW=https://dev.chartes.psl.eu/endp-person/endp-person
VUE_APP_DB_ADMIN=https://endp.chartes.psl.eu/endp-person/admin
VUE_APP_DB_API=https://endp.chartes.psl.eu/endp-person/api
VUE_APP_DB_SHOW=https://endp.chartes.psl.eu/endp-person/endp-person

# - NoSketch (Indexation Engine)
VUE_APP_NOSKETCH_APP=https://nosketch-engine.lamop.fr/
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI
name: e-NDP Vue Node.js CI

on:
push:
branches: [ "master" ]
branches: [ "dev", "master" ]
pull_request:
branches: [ "master" ]
branches: [ "dev", "master" ]

jobs:
build:
Expand All @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [21.x]
node-version: [21.1.0]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand All @@ -26,6 +26,5 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- run: npm test
- run: npm install --force
- run: npm run test::unit
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
.DS_Store
node_modules
/dist
package-lock.json
#package-lock.json

# conf nginx
endp

deploiment-process.md

# local env files
.env.local
Expand All @@ -22,3 +27,5 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?

deploy.sh
54 changes: 46 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,63 @@
# endp-vue
# e-NDP Vue

[![e-NDP Vue Node.js CI](https://github.com/chartes/endp-vue/actions/workflows/node.js.yml/badge.svg)](https://github.com/chartes/endp-vue/actions/workflows/node.js.yml)

[![VueJS Framework](https://img.shields.io/badge/Vue.js-35495E?style=for-the-badge&logo=vuedotjs&logoColor=4FC08D)](https://vuejs.org/)


## Project setup

**Note : NodeJS 21.1.0 (using nvm to manage your NodeJs version)**

```
npm install
npm install --legacy-peer-deps
```

### Compiles and hot-reloads for development

```
npm run serve
```

### Compiles and minifies for production
### Run linter (Opt.)
```
npm run build
npm run lint
```

### Lints and fixes files
### Run tests (Opt.)
```
npm run lint
npm run test::unit
```

## Deployment

1. Go to `vue.config.js` and check the line :

- in dev
```js
publicPath: process.env.NODE_ENV === 'production' ? "/endp" : "/"
```

- in production
```js
publicPath: process.env.NODE_ENV === 'production' ? "/" : "/"
```

2. Go to `.env.production.local` (create it if it doesn't exist - check template `.env.development` or `.env.production`) and check the lines

3. Build the project using the following command :

```bash
npm run build
```

4. Send the `dist/` folder to the server using `scp`

-------------------

e-NDP Vue is developed at the Mission projets numériques, École nationale des chartes - PSL.

<img src="./src/assets/partners_logo/anr.png" width="200" align="right">


### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
Ce travail a bénéficié d’une aide de l’État gérée par l’Agence Nationale de la Recherche portant la référence [ANR-20-CE27-0012](https://anr.fr/Projet-ANR-20-CE27-0012) dans le cadre du projet "Notre-Dame de Paris et son cloître: les lieux, les gens, la vie – E-NDP".
24 changes: 24 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
// indique a jest de traiter les fichiers .vue
"moduleDirectories": [
"node_modules",
"src"
],
testEnvironment: "jsdom",
testEnvironmentOptions: {
customExportConditions: ["node", "node-addons"],
},
moduleFileExtensions: ['js', 'json', 'ts', 'vue'],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1'
},
transform: {
'^.+\\.vue$': '@vue/vue3-jest',
'^.+\\.js$': 'babel-jest'
},
testMatch: [
// indique à Jest où trouver les tests
'**/tests/unit/**/*.spec.js'
],
testPathIgnorePatterns: ['/node_modules/'],
};
Loading
Loading