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

Main #150

Open
wants to merge 106 commits into
base: dev
Choose a base branch
from
Open

Main #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
b9d0eb5
:rocket: trigger release
mehdilouraoui Jun 3, 2022
e52e4cb
:ambulance: fix download links
mehdilouraoui Jun 7, 2022
783e53d
fix(stats): statistic page (#117) (#118)
mehdilouraoui Dec 1, 2022
70ef2b2
:bookmark: release v1.12.0
SocialGroovyBot Dec 1, 2022
0c923ea
Merge branch 'dev'
mehdilouraoui Mar 27, 2023
7ea08d4
Merge branch 'dev' of https://github.com/SocialGouv/archifiltre-site-v2
mehdilouraoui Mar 27, 2023
3bb9e7b
trigger deploy
mehdilouraoui Jun 3, 2022
4a43b84
update
mehdilouraoui Mar 27, 2023
217ea4d
update
mehdilouraoui Mar 27, 2023
0aff9c4
:bookmark: release v1.13.0
SocialGroovyBot Mar 27, 2023
871faab
feat/update-site-v2
mehdilouraoui Mar 27, 2023
ec7991c
Merge branch 'main' of https://github.com/SocialGouv/archifiltre-site-v2
mehdilouraoui Mar 27, 2023
e304936
:bookmark: release v1.14.0
SocialGroovyBot Mar 27, 2023
3c41ab9
feat/update (#145) (#146)
mehdilouraoui Mar 27, 2023
6ad7814
feat(version): add 4.0
mehdilouraoui Jul 7, 2023
5bc3f2a
:bookmark: release v1.15.0
SocialGroovyBot Jul 7, 2023
9f8e733
fix(version): fix lock
mehdilouraoui Jul 7, 2023
3e70fd2
fix: resolve lockfile
lsagetlethias Jul 7, 2023
ebfcda2
:bookmark: release v1.16.0
SocialGroovyBot Jul 7, 2023
f510bb1
:rotating_light: Lint
lsagetlethias Jul 7, 2023
be8b67d
:bookmark: release v1.17.0
SocialGroovyBot Jul 7, 2023
4024980
feat: update stats (#149)
mehdilouraoui Sep 4, 2023
de5f6ad
:bookmark: release v1.18.0
SocialGroovyBot Sep 4, 2023
a0d9a5d
Merge branch 'main' of https://github.com/SocialGouv/archifiltre-site-v2
mehdilouraoui Sep 5, 2023
215684c
feat/update (#145)
mehdilouraoui Mar 27, 2023
0251ccd
feat: update download page (#153)
mehdilouraoui Sep 5, 2023
6986d0b
:bookmark: release v1.19.0
SocialGroovyBot Sep 5, 2023
27032e7
feat/update download page (#154)
mehdilouraoui Sep 19, 2023
6567d41
:bookmark: release v1.20.0
SocialGroovyBot Sep 19, 2023
cf79b16
feat: fix posthog (#155)
mehdilouraoui Sep 19, 2023
d945bec
:bookmark: release v1.21.0
SocialGroovyBot Sep 19, 2023
e2ef8f4
feat: fix posthog logs (#157)
mehdilouraoui Sep 19, 2023
0502368
feat: fix posthog logs (#158)
mehdilouraoui Sep 19, 2023
18ee7ed
feat/posthog
mehdilouraoui Sep 19, 2023
1cf8724
:bookmark: release v1.22.0
SocialGroovyBot Sep 19, 2023
e138203
feat: posthog dep capt (#159)
mehdilouraoui Sep 19, 2023
45a7234
:bookmark: release v1.23.0
SocialGroovyBot Sep 19, 2023
f2eacf8
feat: fix ph
mehdilouraoui Sep 19, 2023
736f396
:bookmark: release v1.24.0
SocialGroovyBot Sep 19, 2023
43f5a45
feat/update (#160)
mehdilouraoui Nov 14, 2023
735c167
:bookmark: release v1.25.0
SocialGroovyBot Nov 14, 2023
fad653f
fix: remove vercel advertising (#162)
TimotheeMalard Dec 6, 2023
ecf5063
:bookmark: release v1.26.0
SocialGroovyBot Dec 6, 2023
41f514e
fix: footer link
TimotheeMalard Dec 21, 2023
b0203d3
:bookmark: release v1.27.0
SocialGroovyBot Dec 21, 2023
664082d
Added the line for Tally in policy (#163)
sam-pires Dec 22, 2023
52310c3
:bookmark: release v1.28.0
SocialGroovyBot Dec 22, 2023
57d3c43
chore: move prod to OVH (#167)
gary-van-woerkens Feb 15, 2024
735f792
:bookmark: release v1.29.0
SocialGroovyBot Feb 15, 2024
8f6afa3
chore: update prod req/lim
gary-van-woerkens Feb 15, 2024
6861f51
:bookmark: release v1.30.0
SocialGroovyBot Feb 15, 2024
2f05028
fix: handle certificate for custom domains
achauve Feb 15, 2024
a20556a
:bookmark: release v1.31.0
SocialGroovyBot Feb 15, 2024
794a294
fix: add redirection from site v1 now removed
achauve Feb 15, 2024
3d941f2
:bookmark: release v1.32.0
SocialGroovyBot Feb 15, 2024
e1e0028
fix: home link
TimotheeMalard Feb 22, 2024
efe686f
:bookmark: release v1.33.0
SocialGroovyBot Feb 22, 2024
efd3bdb
fix: add .yarn to gitignore
TimotheeMalard Mar 1, 2024
0f9567f
feat: add page for Digital Cleanup Day
TimotheeMalard Mar 1, 2024
ff32b1e
feat: add pirsch
TimotheeMalard Mar 1, 2024
4bccf79
:bookmark: release v1.34.0
SocialGroovyBot Mar 1, 2024
d846fdd
fix: use next/router instead of react-router-dom
TimotheeMalard Mar 1, 2024
40f54d7
:bookmark: release v1.35.0
SocialGroovyBot Mar 1, 2024
2e265ba
feat: add @types/iframe-resizer
TimotheeMalard Mar 1, 2024
c44ddf1
fix: lint
TimotheeMalard Mar 1, 2024
14d6337
:bookmark: release v1.36.0
SocialGroovyBot Mar 1, 2024
bcb3b9f
feat: set docs to 4.1.0
TimotheeMalard Mar 8, 2024
eca85f3
:bookmark: release v1.37.0
SocialGroovyBot Mar 8, 2024
a2b4cde
fix: lint
TimotheeMalard Mar 8, 2024
d90fec5
:bookmark: release v1.38.0
SocialGroovyBot Mar 8, 2024
9dc0dbe
feat: update node 14 to 18.19.1
TimotheeMalard Mar 14, 2024
994945c
feat: improve display & add AnnouncementBanner
TimotheeMalard Mar 14, 2024
cc80271
:bookmark: release v1.39.0
SocialGroovyBot Mar 14, 2024
a5c9aa7
fix: update docker file to node 18
TimotheeMalard Mar 14, 2024
b6c2159
:bookmark: release v1.40.0
SocialGroovyBot Mar 14, 2024
723664d
fix: update sharp 0.30 to 0.33
TimotheeMalard Mar 14, 2024
ab484f6
:bookmark: release v1.41.0
SocialGroovyBot Mar 14, 2024
4e157d7
fix: lint & prettier
TimotheeMalard Mar 14, 2024
7d53c15
:bookmark: release v1.42.0
SocialGroovyBot Mar 14, 2024
7a4a7bf
feat: improve display
TimotheeMalard Mar 14, 2024
61d7df0
:bookmark: release v1.43.0
SocialGroovyBot Mar 14, 2024
db3ae9f
fix: change ARCHIFILTRE_MAIL_ADDRESS
TimotheeMalard Apr 3, 2024
7c9be17
:bookmark: release v1.44.0
SocialGroovyBot Apr 3, 2024
4966122
tmp: disable banner
TimotheeMalard Apr 3, 2024
f7c6576
:bookmark: release v1.45.0
SocialGroovyBot Apr 3, 2024
7d035f8
Fixed the typo in contact email
sam-pires Apr 23, 2024
e09846d
Merge pull request #169 from SocialGouv/fix/contac-email-fix
sam-pires Apr 23, 2024
eb18e75
:bookmark: release v1.46.0
SocialGroovyBot Apr 23, 2024
b291d50
set archifiltre-docs to v4.1.1 (#172)
TimotheeMalard May 17, 2024
b9ce4f8
:bookmark: release v1.47.0
SocialGroovyBot May 17, 2024
46b2a82
set archifiltre-docs to v4.1.2 (#173)
TimotheeMalard Jun 4, 2024
90fadd5
:bookmark: release v1.48.0
SocialGroovyBot Jun 4, 2024
1b56a54
Update Legals.tsx
sam-pires Jun 13, 2024
543bf89
:bookmark: release v1.49.0
SocialGroovyBot Jun 13, 2024
225dc15
Update Policy.tsx
sam-pires Jun 13, 2024
8fe2539
:bookmark: release v1.50.0
SocialGroovyBot Jun 13, 2024
d0b1fd9
Update Legals.tsx
sam-pires Jun 13, 2024
9adfbcb
:bookmark: release v1.51.0
SocialGroovyBot Jun 13, 2024
fd6cd60
fix: prettier errors
gary-van-woerkens Jun 14, 2024
9a4ac5c
:bookmark: release v1.52.0
SocialGroovyBot Jun 14, 2024
436052d
fix: resources
igorrenquin Jul 30, 2024
c06a875
:bookmark: release v1.53.0
SocialGroovyBot Jul 30, 2024
bce6548
Mise à jour de la banner d'annonce de notre site pour l'annnonce du n…
sam-pires Aug 2, 2024
a28c131
:bookmark: release v1.54.0
SocialGroovyBot Aug 2, 2024
25b122f
fix: code lint
gary-van-woerkens Aug 2, 2024
e975330
:bookmark: release v1.55.0
SocialGroovyBot Aug 2, 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
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require('path');
const tsconfigPath = path.resolve(__dirname, './tsconfig.json');

/** @type {import("eslint").Linter.Config} */
const defaultConfig = {
const config = {
root: true,
extends: ['next/core-web-vitals', 'prettier'],
ignorePatterns: ['node_modules'],
Expand All @@ -20,6 +20,7 @@ const defaultConfig = {
],
reportUnusedDisableDirectives: true,
rules: {
quotes: [2, 'single', { avoidEscape: true }],
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'typescript-sort-keys/interface': 'error',
Expand Down Expand Up @@ -56,4 +57,4 @@ const defaultConfig = {
},
};

module.exports = defaultConfig;
module.exports = config;
45 changes: 0 additions & 45 deletions .eslintrc.json

This file was deleted.

5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Protect workflow files
.github/workflows/*.yml @socialgouv/sre
.github/CODEOWNERS @socialgouv/sre
.kontinuous/ @socialgouv/sre
Dockerfile @socialgouv/sre
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"enabled": false
}
}
4 changes: 2 additions & 2 deletions .github/workflows/tag-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Bump version and git tag main branch
on:
push:
branches:
- main
- main

jobs:
tag-main:
Expand Down Expand Up @@ -32,4 +32,4 @@ jobs:
GIT_COMMITTER_NAME: ${{ secrets.SOCIALGROOVYBOT_NAME }}
run: |
npm version minor --sign-git-tag --message ":bookmark: release v%s"
git push --follow-tags origin
git push --follow-tags origin
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*
.yarn/

# local env files
.env*.local
Expand All @@ -38,3 +39,7 @@ yarn-error.log*
.now
.vercel
.env
.idea

# because of yarn
package-lock.json
2 changes: 2 additions & 0 deletions .kontinuous/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ projectName: archifiltre
dependencies:
fabrique:
import: SocialGouv/kontinuous/plugins/fabrique
extends:
- name: ovh

environmentPatterns:
# prod: main
Expand Down
17 changes: 9 additions & 8 deletions .kontinuous/env/prod/values.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
app:
host: archifiltre.fr
ingress:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
kubernetes.io/tls-acme: "true"
redirectFrom:
- "{{ .Values.global.host }}"
autoscale:
enabled: true
minReplicas: 1
maxReplicas: 3
- archifiltre.fabrique.social.gouv.fr
resources:
requests:
cpu: 10m
memory: 256Mi
cpu: 100m
memory: 768Mi
limits:
cpu: 40m
memory: 512Mi
cpu: 200m
memory: 1Gi

jobs:
runs:
Expand Down
4 changes: 2 additions & 2 deletions .kontinuous/templates/app.sealed-secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
annotations:
sealedsecrets.bitnami.com/cluster-wide: 'true'
sealedsecrets.bitnami.com/cluster-wide: "true"
name: app
spec:
encryptedData:
PRISMIC_ACCESS_TOKEN: AgCzsmddW8XOUzhRx6OYK91hF7xaqofT5vzAMvpd1S57FkNW3jZpDgUbHDJ0Z1NsHg4gPCJzmMhtPy384/xs4sf6zxWmGfCL/xkFHrgwFdrcss00rnLGR0d1z2sjU07933oH6cp6UspSnO7j0++1dRkFhapGH8tuvlyuRjCOJB7z+Wl0xRf08lk17Zx40/HKyxQhOJ84E3coSJBNoLebyCFdor2uSpoNDA4d67CPdTuzU/6fJ7UolYY2qxPOVDpuUVPiRgIN2ZVipDMA1zbtp5qxI4PlDhwVebMuPBCrAQvzAWzQsUbW93yx1d4ivQ+6q4hAgsO805es2ZvwtnvZ8GIeGlInkpWagFq7eI+o9qLNTe1IXuKmE0Y/rTY2NiSAqbXcnP5VxlIlb+Xl+ENZyaHoReIJcuy66Umh00isvVr4PwXY+hiINW4yl53OK0FA5EaTPjWRcFWamOtNkvH6SU8bqO1rlBrJAYwE+eYqUw0pfGhZeGdEFJjfXOk+LYo9/GkOs5yxzaxIBCcrj5KSwQDqeCdMFt38PZ/ScLHAimbNrTCziHC+pqPlbfWg6p7tIZNaoXMXLC+qzBPnZi6yfbpsiiVidUAqBI4pdZsFjzM7646tpoId6HaOtlEYN810WLxOrEfDD7Jw2m9SG+9Aet2wmZeQUSEwZe5BPnpQ6LkEEh03hWqDxwmQRLiX+VDBBaLLr2s7OpK8UlPItb60lt4tHbncUzmFlOHuTOfemA6BV7f1TIppeU8eQNoTcTKQAh8uP+zZKhzEVyj1PtVH1yqcKM8+OcH33qip66CMtY9x+PdpaLwlsV9ymo/zf35tFC4Zp//rSGHc
template:
metadata:
annotations:
sealedsecrets.bitnami.com/cluster-wide: 'true'
sealedsecrets.bitnami.com/cluster-wide: "true"
name: app
type: Opaque
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
v18.19.1
17 changes: 7 additions & 10 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-config-sass-guidelines"
],
"rules": {
"max-nesting-depth": null,
"selector-max-id" : null,
"selector-class-pattern": null
}
}
"extends": ["stylelint-config-standard", "stylelint-config-sass-guidelines"],
"rules": {
"max-nesting-depth": null,
"selector-max-id": null,
"selector-class-pattern": null
}
}
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"esbenp.prettier-vscode",
"eg2.tslint"
]
}
}
11 changes: 3 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
"css.validate": false,
"less.validate": false,
"scss.validate": false,
"stylelint.validate": [
"css",
"scss"
],
"stylelint.validate": ["css", "scss"],
"[css]": {
"editor.defaultFormatter": "stylelint.vscode-stylelint"
},
Expand All @@ -29,9 +26,7 @@
"cssModules.camelCase": true,
"json.schemas": [
{
"fileMatch": [
"renovate.json"
],
"fileMatch": ["renovate.json"],
"url": "https://docs.renovatebot.com/renovate-schema.json"
}
],
Expand All @@ -44,4 +39,4 @@
"files.associations": {
".env.dist": "dotenv"
}
}
}
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Install dependencies only when needed
FROM node:16-alpine AS deps
FROM node:18-alpine AS deps
WORKDIR /app
ARG PRODUCTION

Expand All @@ -8,7 +8,7 @@ RUN apk add --no-cache libc6-compat
COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile

FROM node:16-alpine as builder
FROM node:18-alpine as builder
WORKDIR /app
ARG PRODUCTION

Expand All @@ -17,7 +17,7 @@ COPY . .

RUN yarn build

FROM node:16-alpine as runner
FROM node:18-alpine as runner
WORKDIR /app
ENV NODE_ENV production
ARG PRODUCTION
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Archifiltre Site v2

## Init

```sh
yarn install
```
Expand All @@ -12,4 +13,5 @@ yarn dev
```

## License

See license [Apache-2.0](LICENSE)
20 changes: 10 additions & 10 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- [x] SEO (fin default + par page)
- [x] _error page
- [x] 404 page
- [x] fin style (title = quicksand, text = arial (or other)) + cassures positions titles
- [x] remplir mentions légales et politique de confidentialité
- [x] SEO (fin default + par page)
- [x] \_error page
- [x] 404 page
- [x] fin style (title = quicksand, text = arial (or other)) + cassures positions titles
- [x] remplir mentions légales et politique de confidentialité

----
---

- [ ] inline logo ?
- [ ] a11y ?
- [ ] switch sur CSSModules
- [ ] i18n
- [ ] inline logo ?
- [ ] a11y ?
- [ ] switch sur CSSModules
- [ ] i18n
14 changes: 14 additions & 0 deletions components/AnnouncementBanner/AnnouncementBanner.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.announcement-banner {
background-color: rgb(59, 117, 176);
color: white;
text-align: center;
font-size: 15px;
padding: 2rem;
width: 100%;
z-index: 2;

.announcement-link {
color: rgb(243, 193, 90);
text-decoration: underline;
}
}
16 changes: 16 additions & 0 deletions components/AnnouncementBanner/AnnouncementBanner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
// import { getDownloadLink } from '../../utils';

const AnnouncementBanner = () => {
// const docsDownloadLink = getDownloadLink(undefined, 'docs');

return (
<div className="announcement-banner">
<strong>Attention : </strong>
Notre nouveau site va bientôt faire peau neuve. Nouvelle identité et
nouvelle URL
</div>
);
};

export default AnnouncementBanner;
Loading
Loading