Skip to content

Commit

Permalink
chore: npm run lint:fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ggrossetie committed Dec 11, 2024
1 parent 6bd84a2 commit a60e923
Show file tree
Hide file tree
Showing 187 changed files with 6,366 additions and 3,777 deletions.
6 changes: 4 additions & 2 deletions front/src/components/404.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ import App from '../layouts/App'

import styles from '../components/Write/write.module.scss'

export default function PageNotFound () {
export default function PageNotFound() {
const location = useLocation()
return (
<App layout="fullPage">
<section className={styles.container}>
<article className={styles.error}>
<h2>Error 404</h2>

<p>Page not found at <code>{location.pathname}</code>.</p>
<p>
Page not found at <code>{location.pathname}</code>.
</p>
</article>
</section>
</App>
Expand Down
24 changes: 12 additions & 12 deletions front/src/components/Article.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ query getArticleContributors($articleId: ID!) {
}
}

query deleteArticle ($article: ID!) {
article (article: $article) {
delete (dryRun: false)
query deleteArticle($article: ID!) {
article(article: $article) {
delete(dryRun: false)
}
}

Expand All @@ -61,19 +61,19 @@ mutation duplicateArticle($user: ID, $article: ID!, $to: ID!) {
}
}

query addTags ($article: ID!, $tags: [ID]!) {
article (article: $article) {
addTags (tags: $tags) {
query addTags($article: ID!, $tags: [ID]!) {
article(article: $article) {
addTags(tags: $tags) {
_id
name
color
}
}
}

query removeTags ($article: ID!, $tags: [ID]!) {
article (article: $article) {
removeTags (tags: $tags) {
query removeTags($article: ID!, $tags: [ID]!) {
article(article: $article) {
removeTags(tags: $tags) {
_id
name
color
Expand All @@ -82,7 +82,7 @@ query removeTags ($article: ID!, $tags: [ID]!) {
}

query getArticleInfo($articleId: ID!) {
article (article: $articleId) {
article(article: $articleId) {
title

workingVersion {
Expand All @@ -92,7 +92,7 @@ query getArticleInfo($articleId: ID!) {
}

query getArticleTags($articleId: ID!) {
article (article: $articleId) {
article(article: $articleId) {
tags {
_id
name
Expand All @@ -102,7 +102,7 @@ query getArticleTags($articleId: ID!) {
}

mutation startCollaborativeSession($articleId: ID!) {
article (articleId: $articleId) {
article(articleId: $articleId) {
startCollaborativeSession {
id
}
Expand Down
Loading

3 comments on commit a60e923

@thom4parisot
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'est pas cool, c'est l'enfer de rebase les pull request :-(

@ggrossetie
Copy link
Collaborator Author

@ggrossetie ggrossetie commented on a60e923 Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oups je n'avais pas pensé à ça, désolé 😞
On avait mis en place un linter (Prettier) mais il n'a pas été lancé depuis un moment. Initialement je vous le lancer uniquement sur ma branche #1149 mais ça introduisait trop de changements donc je me suis dis pourquoi pas le passer sur master (sans trop y réfléchir).

C'est autant l'enfer si tu passes Prettier sur la branche avant de rebase?

@ggrossetie
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Et comme c'est moi qui passé le linter en force, je peux m'occuper de rebase les PR

Please sign in to comment.