Исправления eslint

eugeneviktorov · Jul 20, 2024 · 259d3bb · 259d3bb
1 parent 4ebc5ef
commit 259d3bb
Show file tree

Hide file tree

Showing 18 changed files with 354 additions and 81 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,3 +1,32 @@
 {
-  "extends": "next/core-web-vitals"
+  "plugins": ["react", "import"],
+  "extends": [
+    "next/core-web-vitals",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript"
+  ],
+
+  "rules": {
+    "import/no-named-default": "off",
+    "import/no-unresolved": "error",
+    "import/order": [
+      "error",
+      {
+        "groups": [
+          "builtin",
+          "external",
+          "internal",
+          ["sibling", "parent"],
+          "index",
+          "unknown"
+        ],
+        "newlines-between": "always",
+        "alphabetize": {
+          "order": "asc",
+          "caseInsensitive": true
+        }
+      }
+    ]
+  }
 }
diff --git a/README.md b/README.md
@@ -58,3 +58,17 @@ These rules redirect requests to a secure connection (HTTPS), which is important
 `emailjs-com`
 
 `react-input-mask`
+
+## Eslint commands
+
+Error checking:
+
+```
+npm run lint
+```
+
+Error correction
+
+```
+npm run lint -- --fix
+```
diff --git a/app/documentation/privacy-policy/page.tsx b/app/documentation/privacy-policy/page.tsx
@@ -1,11 +1,12 @@
-import type { Metadata } from "next";
-import type { Viewport } from "next";
-import styles from "../Documentation.module.css";
-import PageView from "@/components/PageView";
-import Loading from "@/components/Loading/loading";
+import type { Metadata , Viewport } from "next";
+
+import Footer from "@/components/Footer";
 import Header from "@/components/Header";
+import Loading from "@/components/Loading/loading";
 import PageContainer from "@/components/PageContainer";
-import Footer from "@/components/Footer";
+import PageView from "@/components/PageView";
+
+import styles from "../Documentation.module.css";
 
 export const metadata: Metadata = {
   title: "ПОЛИТИКА КОНФИДЕНЦИАЛЬНОСТИ",

diff --git a/app/documentation/terms-of-use/page.tsx b/app/documentation/terms-of-use/page.tsx
@@ -1,11 +1,12 @@
-import type { Metadata } from "next";
-import type { Viewport } from "next";
-import styles from "../Documentation.module.css";
-import PageView from "@/components/PageView";
-import Loading from "@/components/Loading/loading";
+import type { Metadata , Viewport } from "next";
+
+import Footer from "@/components/Footer";
 import Header from "@/components/Header";
+import Loading from "@/components/Loading/loading";
 import PageContainer from "@/components/PageContainer";
-import Footer from "@/components/Footer";
+import PageView from "@/components/PageView";
+
+import styles from "../Documentation.module.css";
 
 export const metadata: Metadata = {
   title: "ПОЛЬЗОВАТЕЛЬСКОЕ СОГЛАШЕНИЕ",

diff --git a/app/not-found.tsx b/app/not-found.tsx
@@ -1,9 +1,9 @@
-import type { Metadata } from "next";
-import type { Viewport } from "next";
-import PageView from "@/components/PageView";
-import Loading from "@/components/Loading/loading";
+import type { Metadata , Viewport } from "next";
+
 import ErrorContainer from "@/components/ErrorContainer";
 import Footer from "@/components/Footer";
+import Loading from "@/components/Loading/loading";
+import PageView from "@/components/PageView";
 
 export const metadata: Metadata = {
   title: "404",

diff --git a/app/page.tsx b/app/page.tsx
@@ -1,12 +1,12 @@
-import type { Metadata } from "next";
-import type { Viewport } from "next";
-import PageView from "@/components/PageView";
-import Loading from "@/components/Loading/loading";
-import Header from "@/components/Header";
+import type { Metadata , Viewport } from "next";
+
 import About from "@/chapters/About";
-import { InitialPortfolio } from "@/chapters/Portfolio";
 import Contacts from "@/chapters/Contacts";
+import { InitialPortfolio } from "@/chapters/Portfolio";
 import Footer from "@/components/Footer";
+import Header from "@/components/Header";
+import Loading from "@/components/Loading/loading";
+import PageView from "@/components/PageView";
 
 export const metadata: Metadata = {
   title: "Викторов",

diff --git a/app/portfolio/page.tsx b/app/portfolio/page.tsx
@@ -1,10 +1,10 @@
-import type { Metadata } from "next";
-import type { Viewport } from "next";
-import PageView from "@/components/PageView";
-import Loading from "@/components/Loading/loading";
-import Header from "@/components/Header";
+import type { Metadata , Viewport } from "next";
+
 import { MainPortfolio } from "@/chapters/Portfolio";
 import Footer from "@/components/Footer";
+import Header from "@/components/Header";
+import Loading from "@/components/Loading/loading";
+import PageView from "@/components/PageView";
 
 export const metadata: Metadata = {
   title: "Портфолио",

diff --git a/components/ErrorContainer/index.tsx b/components/ErrorContainer/index.tsx
@@ -1,8 +1,11 @@
-import Link from "next/link";
 import Image from "next/image";
-import styles from "./ErrorContainer.module.css";
+import Link from "next/link";
+
 import Logotype from "@/public/assets/icons/Logotype.svg";
 
+import styles from "./ErrorContainer.module.css";
+
+
 export default function ErrorContainer() {
   return (
     <div className={styles.container}>

diff --git a/components/Footer/index.tsx b/components/Footer/index.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+
 import styles from "./Footer.module.css";
 
 export default function Footer() {

diff --git a/components/Header/Header.module.css b/components/Header/Header.module.css
@@ -30,6 +30,7 @@
   color: var(--colorDarkBlue);
   text-decoration: none;
   text-align: center;
+  text-transform: uppercase;
 }
 
 @media (max-width: 768px) {

diff --git a/components/Header/components/ButtonNavigate/index.tsx b/components/Header/components/ButtonNavigate/index.tsx
@@ -1,6 +1,7 @@
 "use client";
-import { MouseEventHandler } from "react";
 import Link from "next/link";
+import { MouseEventHandler } from "react";
+
 import styles from "./ButtonNavigate.module.css";
 
 export default function ButtonNavigate({

diff --git a/components/Header/components/MenuRight/index.tsx b/components/Header/components/MenuRight/index.tsx
@@ -1,9 +1,11 @@
-import { ReactNode, useEffect } from "react";
-import styles from "./MenuRight.module.css";
-import Link from "next/link";
 import Image from "next/image";
-import Logotype from "@/public/assets/icons/Logotype.svg";
+import Link from "next/link";
+import { ReactNode, useEffect } from "react";
+
 import Close from "@/public/assets/icons/Close.svg";
+import Logotype from "@/public/assets/icons/Logotype.svg";
+
+import styles from "./MenuRight.module.css";
 
 export default function MenuRight({
   isOpen,

diff --git a/components/Header/index.tsx b/components/Header/index.tsx
@@ -1,14 +1,17 @@
 "use client";
-import Link from "next/link";
 import Image from "next/image";
-import styles from "./Header.module.css";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
-import Logotype from "@/public/assets/icons/Logotype.svg";
-import Menu from "@/public/assets/icons/Menu.svg";
 import { useEffect, useState } from "react";
-import MenuRight from "./components/MenuRight";
+
 import { useIsMobileQuery } from "@/hooks/useIsMobileQuery";
+import Logotype from "@/public/assets/icons/Logotype.svg";
+import Menu from "@/public/assets/icons/Menu.svg";
+
 import ButtonNavigate from "./components/ButtonNavigate";
+import MenuRight from "./components/MenuRight";
+import styles from "./Header.module.css";
+
 
 export default function Header({
   main,

diff --git a/components/Loading/loading.tsx b/components/Loading/loading.tsx
@@ -1,9 +1,11 @@
 "use client";
 import Image from "next/image";
-import styles from "./Loading.module.css";
-import Logo from "@/public/assets/icons/Icon.svg";
 import { useEffect, useState } from "react";
 
+import Logo from "@/public/assets/icons/Icon.svg";
+
+import styles from "./Loading.module.css";
+
 export default function Loading() {
   const [loading, setLoading] = useState(false);
 

diff --git a/components/PageContainer/index.tsx b/components/PageContainer/index.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from "react";
+
 import styles from "./PageContainer.module.css";
 
 export default function PageContainer({

diff --git a/components/PageView/index.tsx b/components/PageView/index.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from "react";
+
 import styles from "./PageView.module.css";
 
 export default function PageView({ children }: { children: ReactNode }) {