Skip to content

Commit c0d6769

Browse files
Overk1llsOverk1lls
committed
Components structure update
1 parent b561529 commit c0d6769

11 files changed

Lines changed: 22 additions & 22 deletions

File tree

src/components/CommitsTable.test.tsx renamed to src/components/CommitsTable/CommitsTable.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { cleanup, render, screen } from '@testing-library/react';
22
import { Provider } from 'react-redux';
33
import { BrowserRouter } from 'react-router-dom';
4-
import { store } from '../app/store';
5-
import { mockCommits } from '../test';
4+
import { store } from '../../app/store';
5+
import { mockCommits } from '../../test';
66
import CommitsTable, { mapCommits } from './CommitsTable';
77

88
describe('CommitsTable component', () => {

src/components/CommitsTable.tsx renamed to src/components/CommitsTable/CommitsTable.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { FC, useState } from 'react';
22
import { DataGrid, GridColumns } from '@mui/x-data-grid';
3-
import { Commit } from '../models/commits';
4-
import { useAppSelector } from '../app/hooks';
5-
import { useCommits } from '../hooks/useCommits';
3+
import { Commit } from '../../models/commit';
4+
import { useAppSelector } from '../../app/hooks';
5+
import { useCommits } from '../../hooks/useCommits';
66
import Box from '@mui/material/Box';
77
import Toolbar from '@mui/material/Toolbar';
88
import Typography from '@mui/material/Typography';

src/components/Navbar.test.tsx renamed to src/components/Navbar/Navbar.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { cleanup, render, screen } from '@testing-library/react';
22
import { Provider } from 'react-redux';
33
import { BrowserRouter } from 'react-router-dom';
4-
import { setAccessToken } from '../app/auth';
5-
import { store } from '../app/store';
4+
import { setAccessToken } from '../../app/auth';
5+
import { store } from '../../app/store';
66
import { infoToDisplay } from './Navbar';
7-
import { mockUser } from '../test';
7+
import { mockUser } from '../../test';
88
import Navbar from './Navbar';
99

1010
describe('Navbar component', () => {

src/components/Navbar.tsx renamed to src/components/Navbar/Navbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useState } from 'react';
2-
import { User } from '../models/user';
3-
import { signOut } from '../app/auth';
2+
import { User } from '../../models/user';
3+
import { signOut } from '../../app/auth';
44
import { useNavigate } from 'react-router-dom';
5-
import { useGetCurrentUserQuery } from '../features/user/userAPI';
5+
import { useGetCurrentUserQuery } from '../../features/user/userAPI';
66
import AppBar from '@mui/material/AppBar';
77
import Box from '@mui/material/Box';
88
import Toolbar from '@mui/material/Toolbar';

src/components/RepositoryList.test.tsx renamed to src/components/RepositoryList/RepositoryList.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { render, screen, cleanup } from '@testing-library/react';
22
import { Provider } from 'react-redux';
33
import { BrowserRouter } from 'react-router-dom';
4-
import { setAccessToken } from '../app/auth';
5-
import { store } from '../app/store';
4+
import { setAccessToken } from '../../app/auth';
5+
import { store } from '../../app/store';
66
import RepositoryList from './RepositoryList';
77

88
describe('RepositoryList component', () => {

src/components/RepositoryList.tsx renamed to src/components/RepositoryList/RepositoryList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FC } from 'react';
2-
import { useAppDispatch, useAppSelector } from '../app/hooks';
3-
import { useRepositories } from '../hooks/useRepositories';
4-
import { addRepositoryName } from '../features/repositories/repositorySlice';
2+
import { useAppDispatch, useAppSelector } from '../../app/hooks';
3+
import { useRepositories } from '../../hooks/useRepositories';
4+
import { addRepositoryName } from '../../features/repositories/repositorySlice';
55
import InputLabel from '@mui/material/InputLabel';
66
import Select, { SelectChangeEvent } from '@mui/material/Select';
77
import FormControl from '@mui/material/FormControl';

‎src/features/commits/commitsAPI.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
22
import { getAccessToken } from '../../app/auth';
33
import { getConfig } from '../../app/config';
4-
import { Commit } from '../../models/commits';
4+
import { Commit } from '../../models/commit';
55
import { GithubData } from '../../models/github-data';
66

77
const { baseUrl } = getConfig();

‎src/hooks/useCommits.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FetchBaseQueryError } from '@reduxjs/toolkit/dist/query';
33
import { useEffect } from 'react';
44
import { Optional } from '../app/types';
55
import { useLazyGetRepositoryCommitsQuery } from '../features/commits/commitsAPI';
6-
import { Commit } from '../models/commits';
6+
import { Commit } from '../models/commit';
77

88
type CommitsHookReturnType = [
99
Optional<Commit[]>,

src/models/commits.ts renamed to src/models/commit.ts

File renamed without changes.

‎src/pages/Home/Home.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { useState } from 'react';
22
import { Navigate } from 'react-router-dom';
33
import { isSignedIn } from '../../app/auth';
44
import Box from '@mui/material/Box';
5-
import Navbar from '../../components/Navbar';
6-
import RepositoryList from '../../components/RepositoryList';
7-
import CommitsTable from '../../components/CommitsTable';
5+
import Navbar from '../../components/Navbar/Navbar';
6+
import RepositoryList from '../../components/RepositoryList/RepositoryList';
7+
import CommitsTable from '../../components/CommitsTable/CommitsTable';
88
import Container from '@mui/material/Container';
99
import TextField from '@mui/material/TextField';
1010

0 commit comments

Comments
 (0)