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

Commit

Permalink
fix: lint & prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
TimotheeMalard committed Mar 14, 2024
1 parent ab484f6 commit 4e157d7
Show file tree
Hide file tree
Showing 49 changed files with 295 additions and 321 deletions.
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
3 changes: 1 addition & 2 deletions .kontinuous/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ dependencies:
fabrique:
import: SocialGouv/kontinuous/plugins/fabrique
extends:
- name: ovh

- name: ovh

environmentPatterns:
# prod: main
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
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"
}
}
}
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
2 changes: 1 addition & 1 deletion components/AnnouncementBanner/AnnouncementBanner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
z-index: 2;

.announcement-link {
color: rgb(243,193,90);
color: rgb(243, 193, 90);
text-decoration: underline;
}
}
29 changes: 21 additions & 8 deletions components/common/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,33 @@ export const Header = () => (
<header id="header">
<Logo />
<nav>
<Link href="/docs" className="underline">Docs</Link>
<Link href="/docs" className="underline">
Docs
</Link>

<Link href="/mails" className="underline">Mails</Link>
<Link href="/mails" className="underline">
Mails
</Link>

<Link href="/qui-sommes-nous" className="underline">Qui sommes-nous ?</Link>
<Link href="/qui-sommes-nous" className="underline">
Qui sommes-nous ?
</Link>

<Link href="/faq" className="underline">FAQ</Link>
<Link href="/faq" className="underline">
FAQ
</Link>

<Link href="/telechargements" className="underline">Téléchargements</Link>
<Link href="/telechargements" className="underline">
Téléchargements
</Link>

<Link href="/stats" className="underline">Statistiques</Link>

<Link href="/digital-cleanup-day" className="underline">Digital Cleanup Day</Link>
<Link href="/stats" className="underline">
Statistiques
</Link>

<Link href="/digital-cleanup-day" className="underline">
Digital Cleanup Day
</Link>
</nav>

<div className="header__button">
Expand Down
4 changes: 2 additions & 2 deletions components/common/UnderConstruction.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Link from "next/link";
import { DOCS_SLUG, MAILS_SLUG } from "../../utils/constant";
import Link from 'next/link';
import { DOCS_SLUG, MAILS_SLUG } from '../../utils/constant';

export const UnderConstruction = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion customtypes/aboutUs/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion customtypes/docs/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion customtypes/download/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion customtypes/faq/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion customtypes/homepage/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion customtypes/mails/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion hooks/usePostHog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const usePostHog = () => {
return () => {
router.events.off('routeChangeComplete', handleRouteChange);
};
}, []);
}, [router?.events]);
};

export const PostHogTracker = () => {
Expand Down
15 changes: 9 additions & 6 deletions pages/500.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@ const Custom500 = () => {
</Link>
</li>
<li>
<Link href="/docs" className="underline">Docs</Link>

<Link href="/docs" className="underline">
Docs
</Link>
</li>
<li>
<Link href="/mails" className="underline">Mails</Link>

<Link href="/mails" className="underline">
Mails
</Link>
</li>
<li>
<Link href="/qui-sommes-nous" className="underline">Qui sommes nous ?</Link>

<Link href="/qui-sommes-nous" className="underline">
Qui sommes nous ?
</Link>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion slices/AboutPeople/model.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
}
}
]
}
}
56 changes: 28 additions & 28 deletions slices/DownloadInfos/index.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import React from 'react'
import { PrismicRichText } from '@prismicio/react'
import { PrismicRichText } from '@prismicio/react';
import React from 'react';

const DownloadInfos = ({ slice }) => (
<section>
<span className="title">
{
slice.primary.title ?
<PrismicRichText field={slice.primary.title}/>
: <h2>Template slice, update me!</h2>
}
</span>
{
slice.primary.description ?
<PrismicRichText field={slice.primary.description}/>
: <p>start by editing this slice from inside Slice Machine!</p>
}
<style jsx>{`
section {
max-width: 600px;
margin: 4em auto;
text-align: center;
}
.title {
color: #8592e0;
}
`}</style>
</section>
)
<section>
<span className="title">
{slice.primary.title ? (
<PrismicRichText field={slice.primary.title} />
) : (
<h2>Template slice, update me!</h2>
)}
</span>
{slice.primary.description ? (
<PrismicRichText field={slice.primary.description} />
) : (
<p>start by editing this slice from inside Slice Machine!</p>
)}
<style jsx>{`
section {
max-width: 600px;
margin: 4em auto;
text-align: center;
}
.title {
color: #8592e0;
}
`}</style>
</section>
);

export default DownloadInfos
export default DownloadInfos;
2 changes: 1 addition & 1 deletion slices/DownloadInfos/model.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
"items": {}
}
]
}
}
Loading

0 comments on commit 4e157d7

Please sign in to comment.