Skip to content

Commit e9a1462

Browse files
flovflov
committed
🔧 eslint: changed import/order rule
1 parent 5fbbc82 commit e9a1462

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+262
-184
lines changed

‎.eslintrc.json

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
{
22
"extends": "next/core-web-vitals",
33
"rules": {
4-
"react-hooks/exhaustive-deps": "off"
4+
"react-hooks/exhaustive-deps": "off",
5+
"import/order": [
6+
"error",
7+
{
8+
"groups": ["builtin", "external", "parent", "sibling", "index"],
9+
"alphabetize": {
10+
"order": "asc"
11+
},
12+
"newlines-between": "always"
13+
}
14+
],
15+
"sort-imports": [
16+
"error",
17+
{
18+
"allowSeparatedGroups": true,
19+
"ignoreDeclarationSort": true
20+
}
21+
]
522
}
623
}

‎package.json

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"dev": "next dev -p 3000",
77
"devInspect": "NODE_OPTIONS='--inspect' next dev",
88
"build": "next build",
9+
"fix": "eslint --fix --ext .js,.jsx,.ts,.tsx .",
910
"start": "next start",
1011
"lint": "next lint",
1112
"test": "jest --watch"
@@ -61,6 +62,7 @@
6162
"@types/uuid": "^8.3.4",
6263
"eslint": "8.18.0",
6364
"eslint-config-next": "13.0.1",
65+
"eslint-plugin-import": "^2.28.1",
6466
"flowbite-typography": "^1.0.3",
6567
"jest": "^29.3.1",
6668
"jest-environment-jsdom": "^29.3.1",

‎pages/_app.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import LogRocket from 'logrocket';
2+
import type { AppProps } from 'next/app';
3+
import { ThemeProvider } from 'next-themes';
4+
import '../styles/globals.css';
15
import React from 'react';
26

3-
import '../styles/globals.css';
4-
import type { AppProps } from 'next/app';
57
import Layout from '../src/components/Layout';
6-
import { ThemeProvider } from 'next-themes';
78
import { AuthProvider } from '../src/components/contexts/AuthContext';
9+
import LoginModalProvider from '../src/components/contexts/LoginModal';
810
import ToastsProvider from '../src/components/contexts/ToastContext';
9-
import LogRocket from 'logrocket';
1011
import GoogleAnalyticsSetup from '../src/utils/GoogleAnalyticsSetup';
11-
import LoginModalProvider from '../src/components/contexts/LoginModal';
1212

1313
function MyApp({ Component, pageProps }: AppProps) {
1414
// Log rocket set up

‎pages/_document.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Html, Head, Main, NextScript } from 'next/document';
1+
import { Head, Html, Main, NextScript } from 'next/document';
22
import Script from 'next/script';
33

44
export default function Document() {

‎pages/api/hello.ts

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ export default function handler(
1111
) {
1212
res.status(200).json({ name: 'John Doe' });
1313
}
14-

‎pages/blog/[id]/edit.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { Breadcrumb } from 'flowbite-react';
22
import { Formik } from 'formik';
33
import { GetServerSideProps, NextPage } from 'next';
4+
import Head from 'next/head';
45
import React from 'react';
56
import { FaHome } from 'react-icons/fa';
7+
68
import PostForm from '../../../src/components/Blog/PostForm';
79
import { useToasts } from '../../../src/components/contexts/ToastContext';
810
import { getPost, updatePost } from '../../../src/db/posts';
911
import { Post } from '../../../src/types/Post';
1012
import { objectToString } from '../../../src/utils';
11-
import Head from 'next/head';
1213

1314
export const getServerSideProps: GetServerSideProps = async ({ query }) => {
1415
const id = query.id;

‎pages/blog/[id]/index.tsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import React from 'react';
2-
3-
import Head from 'next/head';
4-
import ReactMarkdown from 'react-markdown';
51
import { Breadcrumb } from 'flowbite-react';
6-
import { FaHome } from 'react-icons/fa';
72
import { GetServerSideProps, NextPage } from 'next';
3+
import Head from 'next/head';
4+
import React from 'react';
5+
import { FaHome } from 'react-icons/fa';
6+
import ReactMarkdown from 'react-markdown';
87

98
import CommentSection from '@/components/Blog/CommentSection';
109
import PostComponent from '@/components/Blog/Post';
11-
import { Post } from '@/types/Post';
1210
import { createPostComment } from '@/db/comments';
1311
import { getPost } from '@/db/posts';
12+
import { Post } from '@/types/Post';
1413

1514
export const getServerSideProps: GetServerSideProps = async ({ query }) => {
1615
try {

‎pages/blog/index.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import React from 'react';
2-
1+
import { GetStaticProps, NextPage } from 'next';
32
import Head from 'next/head';
43
import Link from 'next/link';
5-
import { GetStaticProps, NextPage } from 'next';
4+
import React from 'react';
65

76
import PostCard from '@/components/Blog/PostCard';
8-
import { Post } from '@/types/Post';
97
import { getPosts } from '@/db/posts';
8+
import { Post } from '@/types/Post';
109

1110
export const getStaticProps: GetStaticProps = async () => {
1211
try {

‎pages/blog/new.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import React from 'react';
2-
3-
import Head from 'next/head';
41
import { Formik } from 'formik';
52
import { NextPage } from 'next';
3+
import Head from 'next/head';
64
import { useRouter } from 'next/router';
5+
import React from 'react';
76

87
import PostForm from '@/components/Blog/PostForm';
9-
import { createPost } from '@/db/posts';
108
import { useToasts } from '@/components/contexts/ToastContext';
9+
import { createPost } from '@/db/posts';
1110

1211
const New: NextPage = () => {
1312
const { addToast } = useToasts();

‎pages/confirm_account.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { GetServerSideProps, NextPage } from 'next';
22
import { useRouter } from 'next/router';
33
import React, { useEffect } from 'react';
4+
45
import { useToasts } from '../src/components/contexts/ToastContext';
56
import { confirmAccount } from '../src/db/users';
67
import { objectToString } from '../src/utils';

‎pages/contact.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { Button, Label, Textarea, TextInput } from 'flowbite-react';
1+
import { Button, Label, TextInput, Textarea } from 'flowbite-react';
22
import { Field, Form, Formik, FormikValues } from 'formik';
33
import { NextPage } from 'next';
44
import React from 'react';
5+
56
import { useToasts } from '../src/components/contexts/ToastContext';
67
import { postContactForm } from '../src/db/users';
78

‎pages/forgot_password.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Alert, Label, TextInput } from 'flowbite-react';
22
import { Field, Form, Formik, FormikValues } from 'formik';
33
import React, { FC, useState } from 'react';
44
import { FiMail } from 'react-icons/fi';
5+
56
import { useToasts } from '../src/components/contexts/ToastContext';
67
import { postResetPassword } from '../src/db/users';
78
import { showErrors } from '../src/utils/viewHelpers';

‎pages/hitchhikers/[id].tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import Head from 'next/head';
2-
import React, { useEffect, useState } from 'react';
3-
import Link from 'next/link';
4-
import ReactMarkdown from 'react-markdown';
51
import { AxiosResponse } from 'axios';
62
import { Alert, Button, Pagination } from 'flowbite-react';
73
import { GetServerSideProps, NextPage } from 'next';
4+
import Head from 'next/head';
5+
import Link from 'next/link';
86
import { useRouter } from 'next/router';
7+
import React, { useEffect, useState } from 'react';
8+
import ReactMarkdown from 'react-markdown';
99

1010
import JVectorMap from '@/components/JVectorMap';
11-
import ProfileStats from '@/components/users/ProfileStats';
11+
import { ListTrips } from '@/components/ListTrips';
12+
import { useAuth } from '@/components/contexts/AuthContext';
1213
import VehiclesForProfile from '@/components/helpers/VehiclesForProfile';
14+
import ProfileStats from '@/components/users/ProfileStats';
15+
import { getTripsWithQuery } from '@/db/trips';
16+
import { fetchProfile, getGeomap } from '@/db/users';
1317
import { Geomap, Profile, Trip } from '@/types';
14-
import { ListTrips } from '@/components/ListTrips';
1518
import { capitalize } from '@/utils';
1619
import { experiencesForProfile } from '@/utils/viewHelpers';
17-
import { fetchProfile, getGeomap } from '@/db/users';
18-
import { getTripsWithQuery } from '@/db/trips';
19-
import { useAuth } from '@/components/contexts/AuthContext';
2020

2121
export const getServerSideProps: GetServerSideProps = async ({
2222
query,

‎pages/hitchhikers/[id]/send_message.tsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import React from 'react';
2-
3-
import Head from 'next/head';
41
import { Alert } from 'flowbite-react';
52
import { Formik, FormikValues } from 'formik';
63
import { GetServerSideProps, NextPage } from 'next';
4+
import Head from 'next/head';
75
import { useRouter } from 'next/router';
6+
import React from 'react';
87

98
import { SendMessageForm } from '@/components/Forms';
10-
import { capitalize } from '@/utils';
11-
import { sendMessage } from '@/db/users';
129
import { useAuth } from '@/components/contexts/AuthContext';
1310
import { useToasts } from '@/components/contexts/ToastContext';
11+
import { sendMessage } from '@/db/users';
12+
import { capitalize } from '@/utils';
1413

1514
export const getServerSideProps: GetServerSideProps = async ({ params }) => {
1615
const id = params?.id;

‎pages/hitchhikers/edit_profile.tsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import React, { useState } from 'react';
2-
3-
import Head from 'next/head';
4-
import Image from 'next/image';
51
import { Alert, Button } from 'flowbite-react';
62
import { Formik, FormikValues } from 'formik';
7-
import { GetServerSideProps, NextPage } from 'next';
83
import { GoogleApiWrapper } from 'google-maps-react';
4+
import { GetServerSideProps, NextPage } from 'next';
5+
import Head from 'next/head';
6+
import Image from 'next/image';
97
import { useRouter } from 'next/router';
8+
import React, { useState } from 'react';
109

1110
import EditProfileForm from '@/components/EditProfileForm';
1211
import LoadingContainer from '@/components/LoadingContainer';
13-
import { profilePicture, showErrors } from '@/utils/viewHelpers';
14-
import { updateUser } from '@/db/users';
1512
import { useAuth } from '@/components/contexts/AuthContext';
1613
import { useToasts } from '@/components/contexts/ToastContext';
14+
import { updateUser } from '@/db/users';
15+
import { profilePicture, showErrors } from '@/utils/viewHelpers';
1716

1817
export const getServerSideProps: GetServerSideProps = async ({ req }) => {
1918
try {

‎pages/hitchhikers/index.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import { Pagination, Table } from 'flowbite-react';
2-
import Image from 'next/image';
32
import { GetServerSideProps, NextPage } from 'next';
3+
import Head from 'next/head';
4+
import Image from 'next/image';
45
import Link from 'next/link';
6+
import { useRouter } from 'next/router';
57
import React, { useEffect, useState } from 'react';
8+
9+
import Skeleton from '../../src/components/Hitchhikers/Skeleton';
610
import { getUsers } from '../../src/db/users';
711
import { User } from '../../src/types';
812
import { profilePicture } from '../../src/utils';
913
import {
1014
countryFlag,
1115
showNumberOfRides,
12-
viewNumberOfTrips,
1316
showUserGender,
1417
viewNumberOfStories,
18+
viewNumberOfTrips,
1519
} from '../../src/utils/viewHelpers';
16-
import { useRouter } from 'next/router';
17-
import Head from 'next/head';
18-
import Skeleton from '../../src/components/Hitchhikers/Skeleton';
1920

2021
export const getServerSideProps: GetServerSideProps = async ({ query }) => {
2122
return {

‎pages/index.tsx

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
import { Button } from 'flowbite-react';
12
import type { NextPage } from 'next';
23
import Head from 'next/head';
3-
import { Button } from 'flowbite-react';
4-
import { FaMap, FaUsers } from 'react-icons/fa';
4+
import Image from 'next/image';
55
import Link from 'next/link';
6-
import { getLatestTrips, getRandomTrips } from '../src/db/trips';
76
import { useEffect, useState } from 'react';
7+
import { FaMap, FaUsers } from 'react-icons/fa';
8+
89
import {
910
RandomPhotos,
10-
RandomVideos,
1111
RandomStories,
12+
RandomVideos,
1213
} from '../src/components/Trips';
13-
import Image from 'next/image';
14+
import { getLatestTrips, getRandomTrips } from '../src/db/trips';
1415
import { Trip } from '../src/types';
16+
1517
import { LatestTrips } from '@/components/Trips/LatestTrips';
1618

1719
const Home: NextPage = () => {

‎pages/login.tsx

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import React, { FC, useState } from 'react';
1+
import { Alert, Label, TextInput } from 'flowbite-react';
22
import { Field, Form, Formik, FormikHelpers, FormikValues } from 'formik';
3-
import { useRouter } from 'next/router';
4-
import { useAuth } from '../src/components/contexts/AuthContext';
53
import Cookies from 'js-cookie';
6-
import { Alert, Label, TextInput } from 'flowbite-react';
4+
import Head from 'next/head';
75
import Link from 'next/link';
6+
import { useRouter } from 'next/router';
7+
import React, { FC, useState } from 'react';
88
import { FiKey, FiMail } from 'react-icons/fi';
9-
import { useToasts } from '../src/components/contexts/ToastContext';
10-
import { postLogin } from '../src/db/users';
11-
import Head from 'next/head';
9+
10+
import { useAuth } from '@/components/contexts/AuthContext';
11+
import { useToasts } from '@/components/contexts/ToastContext';
12+
import { postLogin } from '@/db/users';
1213

1314
type Values = {
1415
password: string;

‎pages/register.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Alert, Button, Label, Select, TextInput } from 'flowbite-react';
22
import { Field, Form, Formik, FormikValues } from 'formik';
3+
import Head from 'next/head';
34
import Link from 'next/link';
45
import { useRouter } from 'next/router';
56
import React, { FC, useState } from 'react';
6-
import { object, string } from 'yup';
77
import { FiMail } from 'react-icons/fi';
8+
import { object, string } from 'yup';
9+
810
import { useToasts } from '../src/components/contexts/ToastContext';
9-
import Head from 'next/head';
1011
import { createUser } from '../src/db/users';
1112

1213
const UserSchema = object().shape({

‎pages/reset_password.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import axios from '../src/config/axios';
21
import { Alert, Button, TextInput } from 'flowbite-react';
32
import { Field, Form, Formik, FormikValues } from 'formik';
43
import { GetServerSideProps, NextPage } from 'next';
54
import { useRouter } from 'next/router';
65
import React, { useState } from 'react';
6+
77
import { useToasts } from '../src/components/contexts/ToastContext';
8+
import axios from '../src/config/axios';
89
import { showErrors } from '../src/utils/viewHelpers';
910

1011
export const getServerSideProps: GetServerSideProps = async ({ query }) => {

‎pages/statistics.tsx

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
import React from 'react';
21
import {
32
ArcElement,
4-
Chart as ChartJS,
3+
BarElement,
54
CategoryScale,
5+
Chart as ChartJS,
6+
Legend,
7+
LineElement,
68
LinearScale,
79
PointElement,
8-
LineElement,
910
Title,
1011
Tooltip,
11-
Legend,
12-
BarElement,
1312
} from 'chart.js';
1413
import { NextPage } from 'next';
14+
import React from 'react';
15+
1516
import { AgeOfHitchhikers } from '@/components/Statistics/AgeOfHitchhikers';
16-
import { HallOfFame } from '@/components/Statistics/HallOfFame';
17-
import { GenderStats } from '@/components/Statistics/GenderStats';
1817
import { AverageWaitingTime } from '@/components/Statistics/AverageWaitingTime';
18+
import { GenderStats } from '@/components/Statistics/GenderStats';
19+
import { HallOfFame } from '@/components/Statistics/HallOfFame';
1920

2021
ChartJS.register(
2122
ArcElement,

0 commit comments

Comments
 (0)