diff --git a/cra-rxjs-styled-components/src/App.tsx b/cra-rxjs-styled-components/src/App.tsx index 856702afa..4b9379fb8 100644 --- a/cra-rxjs-styled-components/src/App.tsx +++ b/cra-rxjs-styled-components/src/App.tsx @@ -1,6 +1,5 @@ import { Outlet } from 'react-router'; import Header from './components/header'; -import { UserProvider } from './context/UserProvider'; function App() { return ( diff --git a/cra-rxjs-styled-components/src/components/AuthGuard.tsx b/cra-rxjs-styled-components/src/components/AuthGuard.tsx index 07053654b..263f56dad 100644 --- a/cra-rxjs-styled-components/src/components/AuthGuard.tsx +++ b/cra-rxjs-styled-components/src/components/AuthGuard.tsx @@ -1,5 +1,5 @@ -import { Navigate, useLocation } from 'react-router-dom'; import { AUTH_TOKEN } from '../constants/auth.constants'; +import { Navigate, useLocation } from 'react-router-dom'; export default function AuthGuard({ children }: { children: JSX.Element }) { const location = useLocation(); diff --git a/cra-rxjs-styled-components/src/components/Loading/LoadingBulletList.stories.tsx b/cra-rxjs-styled-components/src/components/Loading/LoadingBulletList.stories.tsx index 174e0c4da..e8399de42 100644 --- a/cra-rxjs-styled-components/src/components/Loading/LoadingBulletList.stories.tsx +++ b/cra-rxjs-styled-components/src/components/Loading/LoadingBulletList.stories.tsx @@ -1,6 +1,6 @@ +import LoadingBulletList from './LoadingBulletList'; import { Story, Meta } from '@storybook/react'; import React from 'react'; -import LoadingBulletList from './LoadingBulletList'; export default { component: LoadingBulletList, diff --git a/cra-rxjs-styled-components/src/components/Loading/LoadingTextLine.stories.tsx b/cra-rxjs-styled-components/src/components/Loading/LoadingTextLine.stories.tsx index e9e2ee377..a1f137b2b 100644 --- a/cra-rxjs-styled-components/src/components/Loading/LoadingTextLine.stories.tsx +++ b/cra-rxjs-styled-components/src/components/Loading/LoadingTextLine.stories.tsx @@ -1,6 +1,6 @@ +import LoadingTextLine from './LoadingTextLine'; import { Story, Meta } from '@storybook/react'; import React from 'react'; -import LoadingTextLine from './LoadingTextLine'; export default { component: LoadingTextLine, diff --git a/cra-rxjs-styled-components/src/components/DetailsDropdown/DetailsDropdown.stories.tsx b/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.stories.tsx similarity index 100% rename from cra-rxjs-styled-components/src/components/DetailsDropdown/DetailsDropdown.stories.tsx rename to cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.stories.tsx index b03d612e4..17df5a978 100644 --- a/cra-rxjs-styled-components/src/components/DetailsDropdown/DetailsDropdown.stories.tsx +++ b/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.stories.tsx @@ -1,5 +1,5 @@ -import { ComponentStory, ComponentMeta } from '@storybook/react'; import DetailsDropdown from './DetailsDropdown'; +import { ComponentStory, ComponentMeta } from '@storybook/react'; import { useArgs } from '@storybook/client-api'; export default { diff --git a/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.tsx b/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.tsx index 5dc972c0e..7142dd1ea 100644 --- a/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.tsx +++ b/cra-rxjs-styled-components/src/components/details-dropdown/DetailsDropdown.tsx @@ -1,5 +1,4 @@ import { FC } from 'react'; -import CloseIcon from '../icons/CloseIcon'; import { DropdownContainer, Dropdown, @@ -9,6 +8,7 @@ import { CloseDropdownContainer, CloseButton, } from './DetailsDropdown.style'; +import CloseIcon from '../icons/CloseIcon'; import type { DropdownTitle } from '../pull-request/types'; interface Props { diff --git a/cra-rxjs-styled-components/src/components/dropdown/Dropdown.stories.tsx b/cra-rxjs-styled-components/src/components/dropdown/Dropdown.stories.tsx index 2f700bf05..404561d1a 100644 --- a/cra-rxjs-styled-components/src/components/dropdown/Dropdown.stories.tsx +++ b/cra-rxjs-styled-components/src/components/dropdown/Dropdown.stories.tsx @@ -1,6 +1,6 @@ +import Dropdown from './Dropdown'; import { ComponentStory, ComponentMeta } from '@storybook/react'; import { Routes, Route, MemoryRouter } from 'react-router-dom'; -import Dropdown from './Dropdown'; export default { title: 'Navbar/Dropdown', diff --git a/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.stories.tsx b/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.stories.tsx index 399531a9b..a178acced 100644 --- a/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.stories.tsx +++ b/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.stories.tsx @@ -1,6 +1,6 @@ +import FileExplorer from './FileExplorer'; import { ComponentStory, ComponentMeta } from '@storybook/react'; import { Routes, Route, MemoryRouter } from 'react-router-dom'; -import FileExplorer from './FileExplorer'; export default { title: 'Repo/FileExplorer', diff --git a/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.tsx b/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.tsx index acc518c10..b2268971a 100644 --- a/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.tsx +++ b/cra-rxjs-styled-components/src/components/file-explorer/FileExplorer.tsx @@ -11,10 +11,9 @@ import { FileExplorerLink, FileExplorerFileContainer, } from './FileExplorer.styles'; - import { ForkIcon, DirectoryIcon, FileIcon } from '../icons/index'; -import { FileItem } from '../../types/types'; import { LoadingBulletList } from '../Loading'; +import { FileItem } from '../../types/types'; type Props = { branch: string; diff --git a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.data.tsx b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.data.tsx index de7d2dcee..c3453e641 100644 --- a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.data.tsx +++ b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.data.tsx @@ -1,8 +1,8 @@ -import { Code } from 'react-content-loader'; import FileViewerView from './FileViewer.view'; -import { mapExtensionToLanguage } from './mapExtensionToLanguage'; +import { Code } from 'react-content-loader'; import { useRepo } from '../../context/RepoContext'; import { useRepoBlob } from '../../hooks/repo-blob/use-repo-blob'; +import { mapExtensionToLanguage } from './mapExtensionToLanguage'; function FileViewer() { const { path, isRepoLoading } = useRepo(); diff --git a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.stories.tsx b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.stories.tsx index 35b293e68..46c1dda02 100644 --- a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.stories.tsx +++ b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.stories.tsx @@ -1,6 +1,6 @@ +import FileViewer from './FileViewer.view'; import { ComponentStory, ComponentMeta } from '@storybook/react'; import { Routes, Route, MemoryRouter } from 'react-router-dom'; -import FileViewer from './FileViewer.view'; export default { title: 'Navbar/FileViewer', diff --git a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.view.tsx b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.view.tsx index f0d37e567..1c5de17a4 100644 --- a/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.view.tsx +++ b/cra-rxjs-styled-components/src/components/file-viewer/FileViewer.view.tsx @@ -1,6 +1,6 @@ -import type { Language } from 'prism-react-renderer'; import FileCode from './FileCode'; import FileText from './FileText'; +import type { Language } from 'prism-react-renderer'; import { FileHeader, FileHeaderBytes, diff --git a/cra-rxjs-styled-components/src/components/header/Header.stories.tsx b/cra-rxjs-styled-components/src/components/header/Header.stories.tsx index 71a8228a8..36287eb19 100644 --- a/cra-rxjs-styled-components/src/components/header/Header.stories.tsx +++ b/cra-rxjs-styled-components/src/components/header/Header.stories.tsx @@ -1,6 +1,6 @@ +import Header from './Header'; import { ComponentStory, ComponentMeta } from '@storybook/react'; import { Routes, Route, MemoryRouter } from 'react-router-dom'; -import Header from './Header'; export default { title: 'Navbar/Header', diff --git a/cra-rxjs-styled-components/src/components/issue/Issue/Issue.data.tsx b/cra-rxjs-styled-components/src/components/issue/Issue/Issue.data.tsx index bca516511..0468d4997 100644 --- a/cra-rxjs-styled-components/src/components/issue/Issue/Issue.data.tsx +++ b/cra-rxjs-styled-components/src/components/issue/Issue/Issue.data.tsx @@ -1,5 +1,5 @@ -import { useState } from 'react'; import IssuesView from './Issue.view'; +import { useState } from 'react'; import type { Issue } from './Issue.type'; import type { IssueTabValues } from '../types'; diff --git a/cra-rxjs-styled-components/src/components/issue/issue-tab-header/IssueTabHeader.tsx b/cra-rxjs-styled-components/src/components/issue/issue-tab-header/IssueTabHeader.tsx index eadd802e6..9d986d698 100644 --- a/cra-rxjs-styled-components/src/components/issue/issue-tab-header/IssueTabHeader.tsx +++ b/cra-rxjs-styled-components/src/components/issue/issue-tab-header/IssueTabHeader.tsx @@ -2,9 +2,9 @@ import { useCallback, useState } from 'react'; import DetailsDropdown from '../../details-dropdown'; import CorrectIcon from '../../icons/CorrectIcon'; import IssueIcon from '../../icons/IssueIcon'; -import type { IssueTabValues, DropdownTitle } from '../types'; -import { Link } from 'react-router-dom'; import { Container, StatusLabel, StatusTab } from './IssueTabHeader.style'; +import { Link } from 'react-router-dom'; +import type { IssueTabValues, DropdownTitle } from '../types'; interface Props { toggleTab: (value: IssueTabValues) => void; } diff --git a/cra-rxjs-styled-components/src/components/paginate-button/PaginateButton.style.tsx b/cra-rxjs-styled-components/src/components/paginate-button/PaginateButton.style.tsx index 6b833d78c..07369e837 100644 --- a/cra-rxjs-styled-components/src/components/paginate-button/PaginateButton.style.tsx +++ b/cra-rxjs-styled-components/src/components/paginate-button/PaginateButton.style.tsx @@ -1,5 +1,5 @@ -import colors from '../../constants/colors'; import styled from 'styled-components'; +import colors from '../../constants/colors'; export const PaginateWrapper = styled.div` display: flex; diff --git a/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.style.tsx b/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.style.tsx index 4ea43079b..d9346dd6f 100644 --- a/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.style.tsx +++ b/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.style.tsx @@ -1,5 +1,4 @@ import styled, { css } from 'styled-components'; - import colors from '../../../constants/colors'; const flex = css` diff --git a/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.tsx b/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.tsx index a4c816d9d..a515fe857 100644 --- a/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.tsx +++ b/cra-rxjs-styled-components/src/components/pull-request/pull-request-card/PullRequestCard.tsx @@ -1,8 +1,8 @@ +import PullRequestCardIssueInfo from '../../pull-request-issue-info/PullRequestIssueInfo'; import MessageIcon from '../../icons/MessageIcon'; import { PullRequestCardWrapper } from './PullRequestCard.style'; import type { State } from '../types'; import { getPRIcon } from '../getPRIcon'; -import PullRequestCardIssueInfo from '../../pull-request-issue-info/PullRequestIssueInfo'; interface Props { state: State; diff --git a/cra-rxjs-styled-components/src/components/readme/Readme.styles.tsx b/cra-rxjs-styled-components/src/components/readme/Readme.styles.tsx index d2f9f7061..ef0d1a022 100644 --- a/cra-rxjs-styled-components/src/components/readme/Readme.styles.tsx +++ b/cra-rxjs-styled-components/src/components/readme/Readme.styles.tsx @@ -1,4 +1,5 @@ import styled from 'styled-components'; + export const ReadmeContainer = styled.div` margin: 1rem 0; border-radius: 0.375rem; diff --git a/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.stories.tsx b/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.stories.tsx index 4fb37eab6..bf10c991a 100644 --- a/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.stories.tsx +++ b/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.stories.tsx @@ -1,6 +1,6 @@ +import RepoAbout from './RepoAbout'; import { ComponentStory, ComponentMeta } from '@storybook/react'; import { Routes, Route, MemoryRouter } from 'react-router-dom'; -import RepoAbout from './RepoAbout'; export default { title: 'Repo/About', diff --git a/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.tsx b/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.tsx index 53465039b..4feb8507e 100644 --- a/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.tsx +++ b/cra-rxjs-styled-components/src/components/repo-about/RepoAbout.tsx @@ -1,5 +1,5 @@ -import { LinkIcon, ReadmeBookIcon } from '../icons/index'; import { LoadingTextLine } from '../Loading'; +import { LinkIcon, ReadmeBookIcon } from '../icons/index'; import { AboutContainer, Header, diff --git a/cra-rxjs-styled-components/src/components/repo-card/RepoCard.tsx b/cra-rxjs-styled-components/src/components/repo-card/RepoCard.tsx index 3e4dad7fc..5d5f3dd90 100644 --- a/cra-rxjs-styled-components/src/components/repo-card/RepoCard.tsx +++ b/cra-rxjs-styled-components/src/components/repo-card/RepoCard.tsx @@ -1,7 +1,7 @@ +import RepoMeta from '../repo-meta'; +import PrivacyBadge from '../misc/privacy-badge'; import { Star } from '@styled-icons/heroicons-outline'; import { Repository } from '../../interfaces/repositories.interfaces'; -import PrivacyBadge from '../misc/privacy-badge'; -import RepoMeta from '../repo-meta'; import { Aside, BadgeWrapper, diff --git a/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.tsx b/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.tsx index cf7ef5a76..dcf473462 100644 --- a/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.tsx +++ b/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.tsx @@ -1,6 +1,8 @@ -import { useState } from 'react'; import IssueView from './Issues.view'; + +import { useState } from 'react'; import type { IssueTabValues, IssueTypes } from '../../../types/types'; + type IssuesProps = { issues: IssueTypes; }; diff --git a/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.view.tsx b/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.view.tsx index 0c9217df8..d481dba80 100644 --- a/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.view.tsx +++ b/cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.view.tsx @@ -1,9 +1,10 @@ import IssueTabHeader from '../issue-tab-header'; import IssueCard from '../issue-card'; +import Pagination from '../../pagination'; import { Content, Wrapper } from './Issues.view.styles'; + import type { Issue } from './Issue.type'; import { IssueTabValues } from '../../../types/types'; -import Pagination from '../../pagination'; type IssueProps = { issues: Issue[]; diff --git a/cra-rxjs-styled-components/src/components/repo-issues/issue-card/IssueCard.tsx b/cra-rxjs-styled-components/src/components/repo-issues/issue-card/IssueCard.tsx index cb297865d..30160a3c5 100644 --- a/cra-rxjs-styled-components/src/components/repo-issues/issue-card/IssueCard.tsx +++ b/cra-rxjs-styled-components/src/components/repo-issues/issue-card/IssueCard.tsx @@ -1,7 +1,7 @@ +import IssueCardIssueInfo from '../issue-card-issue-info'; import ClosedIssueIcon from '../../icons/ClosedIssueIcon'; import MessageIcon from '../../icons/MessageIcon'; import OpenIssueIcon from '../../icons/OpenIssueIcon'; -import IssueCardIssueInfo from '../issue-card-issue-info'; import { IssueCardWrapper } from './IssueCard.styles'; import { Issue } from '../Issues/Issue.type'; import { State } from '../../../types/types'; diff --git a/cra-rxjs-styled-components/src/components/repo-issues/issue-tab-header/IssueTabHeader.tsx b/cra-rxjs-styled-components/src/components/repo-issues/issue-tab-header/IssueTabHeader.tsx index bb5c55c9d..fa66dea96 100644 --- a/cra-rxjs-styled-components/src/components/repo-issues/issue-tab-header/IssueTabHeader.tsx +++ b/cra-rxjs-styled-components/src/components/repo-issues/issue-tab-header/IssueTabHeader.tsx @@ -1,10 +1,10 @@ -import { useCallback, useState } from 'react'; import DetailsDropdown from '../../details-dropdown'; import CorrectIcon from '../../icons/CorrectIcon'; import OpenIssueIcon from '../../icons/OpenIssueIcon'; -import type { IssueTabValues } from '../../../types/types'; - import { Container, StatusLabel, StatusTab } from './IssueTabHeader.styles'; + +import { useCallback, useState } from 'react'; +import type { IssueTabValues } from '../../../types/types'; import type { DropdownTitle } from '../../../types/types'; interface Props { diff --git a/cra-rxjs-styled-components/src/components/repo-meta/MetaIcon.tsx b/cra-rxjs-styled-components/src/components/repo-meta/MetaIcon.tsx index d0016a1fb..1d9bafbf3 100644 --- a/cra-rxjs-styled-components/src/components/repo-meta/MetaIcon.tsx +++ b/cra-rxjs-styled-components/src/components/repo-meta/MetaIcon.tsx @@ -1,5 +1,5 @@ -import { ReactNode } from 'react'; import { SocialCount, TextSpan } from './RepoMeta.styles'; +import { ReactNode } from 'react'; interface MetaIconProps { text: number | string; diff --git a/cra-rxjs-styled-components/src/components/repo-meta/RepoMeta.tsx b/cra-rxjs-styled-components/src/components/repo-meta/RepoMeta.tsx index bd573e99d..fa3ffbc83 100644 --- a/cra-rxjs-styled-components/src/components/repo-meta/RepoMeta.tsx +++ b/cra-rxjs-styled-components/src/components/repo-meta/RepoMeta.tsx @@ -1,9 +1,10 @@ -import { formatDistance } from 'date-fns'; -import { getColourForLanguage } from '../../helpers/colours'; import { BranchLogo } from '../misc/BranchLogo'; import { StarLogo } from '../misc/StarLogo'; import MetaIcon from './MetaIcon'; import { LanguageColor, Metadata, SocialWrapper } from './RepoMeta.styles'; +import { getColourForLanguage } from '../../helpers/colours'; + +import { formatDistance } from 'date-fns'; interface RepoMetaProps { language?: string | null; diff --git a/cra-rxjs-styled-components/src/components/repo-page/RepoPage.data.tsx b/cra-rxjs-styled-components/src/components/repo-page/RepoPage.data.tsx index b6d637f48..9f3f32207 100644 --- a/cra-rxjs-styled-components/src/components/repo-page/RepoPage.data.tsx +++ b/cra-rxjs-styled-components/src/components/repo-page/RepoPage.data.tsx @@ -1,14 +1,14 @@ import type { RepoContextInterface } from '../../context/RepoContext'; -import type { ReactNode } from 'react'; import { RepoProvider } from '../../context/RepoContext'; -import { useEffect, useState } from 'react'; -import { tap, forkJoin } from 'rxjs'; +import { Repository } from '../../interfaces/repositories.interfaces'; +import { fromFetchWithAuth } from '../../hooks/auth/from-fetch-with-auth'; import { SINGLE_USER_REPO, ISSUE_PR_SEARCH, } from '../../constants/url.constants'; -import { Repository } from '../../interfaces/repositories.interfaces'; -import { fromFetchWithAuth } from '../../hooks/auth/from-fetch-with-auth'; + +import { useEffect, useState,ReactNode } from 'react'; +import { tap, forkJoin } from 'rxjs'; type IssueDetails = { total_count: number; diff --git a/cra-rxjs-styled-components/src/components/user-profile/OrgList.tsx b/cra-rxjs-styled-components/src/components/user-profile/OrgList.tsx index 4732ab507..019dd3d0e 100644 --- a/cra-rxjs-styled-components/src/components/user-profile/OrgList.tsx +++ b/cra-rxjs-styled-components/src/components/user-profile/OrgList.tsx @@ -1,4 +1,3 @@ -import { IOrganization } from '../../context/UserProvider'; import { ContainerWrapper, Heading, @@ -6,6 +5,7 @@ import { Organisation, OrgImage, } from './OrgList.styles'; +import { IOrganization } from '../../context/UserProvider'; interface OrgListProps { organizations: IOrganization[]; diff --git a/cra-rxjs-styled-components/src/components/user-profile/UserProfile.tsx b/cra-rxjs-styled-components/src/components/user-profile/UserProfile.tsx index c5e71f955..8594592cb 100644 --- a/cra-rxjs-styled-components/src/components/user-profile/UserProfile.tsx +++ b/cra-rxjs-styled-components/src/components/user-profile/UserProfile.tsx @@ -1,11 +1,7 @@ -import { - OfficeBuilding, - LocationMarker, -} from '@styled-icons/heroicons-outline'; -import { useUser } from '../../context/UserProvider'; -import LoadingProfile from './LoadingProfile'; import OrgList from './OrgList'; +import LoadingProfile from './LoadingProfile'; import { SocialIcons } from './SocialIcons'; +import { useUser } from '../../context/UserProvider'; import { Avatar, NameContainer, @@ -19,6 +15,10 @@ import { LinkIconStyles, UserProfileContainer, } from './UserProfile.styles'; +import { + OfficeBuilding, + LocationMarker, +} from '@styled-icons/heroicons-outline'; function UserProfileView() { const context = useUser(); diff --git a/cra-rxjs-styled-components/src/components/user-repos/UserRepos.tsx b/cra-rxjs-styled-components/src/components/user-repos/UserRepos.tsx index 14d3ff2ca..756e75918 100644 --- a/cra-rxjs-styled-components/src/components/user-repos/UserRepos.tsx +++ b/cra-rxjs-styled-components/src/components/user-repos/UserRepos.tsx @@ -1,6 +1,6 @@ +import RepoCard from '../repo-card'; import { RepoListWrapper } from './UserRepos.styles'; import { useUserRepositories } from '../../hooks/user-repositories/use-user-repositories'; -import RepoCard from '../repo-card'; function UserRepos({ isOrg = false }) { const { loading, repos } = useUserRepositories(isOrg); diff --git a/cra-rxjs-styled-components/src/context/RepoContext.tsx b/cra-rxjs-styled-components/src/context/RepoContext.tsx index c6e45aaab..c5dd9b2b7 100644 --- a/cra-rxjs-styled-components/src/context/RepoContext.tsx +++ b/cra-rxjs-styled-components/src/context/RepoContext.tsx @@ -1,5 +1,4 @@ -import type { ReactNode } from 'react'; -import { createContext, useContext } from 'react'; +import { createContext, useContext, ReactNode } from 'react'; export interface RepoContextInterface { name: string; diff --git a/cra-rxjs-styled-components/src/context/UserProvider.tsx b/cra-rxjs-styled-components/src/context/UserProvider.tsx index 901167217..65be69c5a 100644 --- a/cra-rxjs-styled-components/src/context/UserProvider.tsx +++ b/cra-rxjs-styled-components/src/context/UserProvider.tsx @@ -1,7 +1,7 @@ -import type { ReactNode } from 'react'; -import { createContext, useContext, useState, useEffect } from 'react'; import { fromFetchWithAuth } from '../hooks/auth/from-fetch-with-auth'; import { GITHUB_URL_BASE } from '../constants/url.constants'; + +import { createContext, useContext, useState, useEffect, ReactNode } from 'react'; import { tap, forkJoin } from 'rxjs'; export interface IUserContext { diff --git a/cra-rxjs-styled-components/src/hooks/auth/from-fetch-with-auth.ts b/cra-rxjs-styled-components/src/hooks/auth/from-fetch-with-auth.ts index 5a5636b0d..10f2da51a 100644 --- a/cra-rxjs-styled-components/src/hooks/auth/from-fetch-with-auth.ts +++ b/cra-rxjs-styled-components/src/hooks/auth/from-fetch-with-auth.ts @@ -1,6 +1,6 @@ +import { AUTH_TOKEN } from '../../constants/auth.constants'; import { Observable } from 'rxjs'; import { fromFetch } from 'rxjs/fetch'; -import { AUTH_TOKEN } from '../../constants/auth.constants'; type RequestInitWithSelector = RequestInit & { selector: (response: Response) => Observable | Promise; diff --git a/cra-rxjs-styled-components/src/hooks/auth/use-set-token.ts b/cra-rxjs-styled-components/src/hooks/auth/use-set-token.ts index db4b136d9..2891721f5 100644 --- a/cra-rxjs-styled-components/src/hooks/auth/use-set-token.ts +++ b/cra-rxjs-styled-components/src/hooks/auth/use-set-token.ts @@ -1,10 +1,11 @@ +import { AUTH_TOKEN } from '../../constants/auth.constants'; +import { GET_TOKEN_URL } from '../../constants/url.constants'; +import { AuthSuccessResponse } from '../../interfaces/auth.interfaces'; + import { useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; import { catchError, EMPTY, tap } from 'rxjs'; import { fromFetch } from 'rxjs/fetch'; -import { AUTH_TOKEN } from '../../constants/auth.constants'; -import { GET_TOKEN_URL } from '../../constants/url.constants'; -import { AuthSuccessResponse } from '../../interfaces/auth.interfaces'; export function useSetToken() { const navigate = useNavigate(); diff --git a/cra-rxjs-styled-components/src/hooks/auth/use-sign-in.ts b/cra-rxjs-styled-components/src/hooks/auth/use-sign-in.ts index 65b4f48bb..d43986b52 100644 --- a/cra-rxjs-styled-components/src/hooks/auth/use-sign-in.ts +++ b/cra-rxjs-styled-components/src/hooks/auth/use-sign-in.ts @@ -1,5 +1,5 @@ -import { FormEvent, useCallback } from 'react'; import { SIGN_IN_URL } from '../../constants/url.constants'; +import { FormEvent, useCallback } from 'react'; export function useSignIn(): (event: FormEvent) => void { return useCallback((event: FormEvent) => { diff --git a/cra-rxjs-styled-components/src/hooks/auth/use-sign-out.ts b/cra-rxjs-styled-components/src/hooks/auth/use-sign-out.ts index e18df4cb9..ba0d47e3f 100644 --- a/cra-rxjs-styled-components/src/hooks/auth/use-sign-out.ts +++ b/cra-rxjs-styled-components/src/hooks/auth/use-sign-out.ts @@ -1,9 +1,10 @@ +import { SIGN_OUT_URL } from '../../constants/url.constants'; +import { AUTH_TOKEN } from '../../constants/auth.constants'; + import { useCallback, useEffect, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; import { Subject, switchMap } from 'rxjs'; import { fromFetch } from 'rxjs/fetch'; -import { SIGN_OUT_URL } from '../../constants/url.constants'; -import { AUTH_TOKEN } from '../../constants/auth.constants'; export function useSignOut() { const clickListener$ = useMemo(() => new Subject(), []); diff --git a/cra-rxjs-styled-components/src/hooks/repositories/use-repos.ts b/cra-rxjs-styled-components/src/hooks/repositories/use-repos.ts index 5cea1ee4f..a11b1f81e 100644 --- a/cra-rxjs-styled-components/src/hooks/repositories/use-repos.ts +++ b/cra-rxjs-styled-components/src/hooks/repositories/use-repos.ts @@ -1,12 +1,3 @@ -import { - Observable, - Subscription, - filter, - map, - switchMap, - tap, - zip, -} from 'rxjs'; import { Pagination, Repository, @@ -17,10 +8,19 @@ import { extractBranchCount, sanitizeBranchesUrl, } from '../../helpers/extract-branch-count'; -import { useEffect, useState } from 'react'; - import { USER_REPO_LIST } from '../../constants/url.constants'; import { fromFetchWithAuth } from '../auth/from-fetch-with-auth'; + +import { + Observable, + Subscription, + filter, + map, + switchMap, + tap, + zip, +} from 'rxjs'; +import { useEffect, useState } from 'react'; import parse from 'parse-link-header'; export function useRepos(username: string | undefined): UseRepo { diff --git a/cra-rxjs-styled-components/src/index.tsx b/cra-rxjs-styled-components/src/index.tsx index 486f20593..bc0f2171f 100644 --- a/cra-rxjs-styled-components/src/index.tsx +++ b/cra-rxjs-styled-components/src/index.tsx @@ -1,7 +1,3 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import { BrowserRouter, Route, Routes } from 'react-router-dom'; import App from './App'; import AuthGuard from './components/AuthGuard'; import reportWebVitals from './reportWebVitals'; @@ -18,6 +14,11 @@ import RepoBranchTreePath from './routes/repo/repository-code/repository-tree/re import RepoBranchBlobPath from './routes/repo/repository-code/repository-blob/repository-blob'; import { UserProvider } from './context/UserProvider'; +import React from 'react'; +import ReactDOM from 'react-dom'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import './index.css'; + ReactDOM.render( diff --git a/cra-rxjs-styled-components/src/routes/profile.tsx b/cra-rxjs-styled-components/src/routes/profile.tsx index e6a960fb7..c31c4d966 100644 --- a/cra-rxjs-styled-components/src/routes/profile.tsx +++ b/cra-rxjs-styled-components/src/routes/profile.tsx @@ -1,13 +1,15 @@ -import UserProfileView from '../components/user-profile'; -import { Layout } from '../components/layouts/ProfileLayout'; import Header from '../components/header'; +import UserProfileView from '../components/user-profile'; +import RepoCard from '../components/repo-card' +import LoadingRepoCard from '../components/repo-card/LoadingRepoCard'; +import PaginateButton from '../components/paginate-button'; import { useUser } from '../context/UserProvider'; import { useRepos } from '../hooks/repositories/use-repos'; -import RepoCard from '../components/repo-card'; + import styled from 'styled-components'; + +import { Layout } from '../components/layouts/ProfileLayout'; import { PaginateWrapper } from '../components/paginate-button/PaginateButton.style'; -import PaginateButton from '../components/paginate-button'; -import LoadingRepoCard from '../components/repo-card/LoadingRepoCard'; function Profile() { const context = useUser(); diff --git a/cra-rxjs-styled-components/src/routes/repo/index.tsx b/cra-rxjs-styled-components/src/routes/repo/index.tsx index 17a6206be..81341ed4a 100644 --- a/cra-rxjs-styled-components/src/routes/repo/index.tsx +++ b/cra-rxjs-styled-components/src/routes/repo/index.tsx @@ -1,9 +1,9 @@ -import { Outlet, useLocation } from 'react-router'; -import { RepoLayout } from '../../components/layouts/RepoLayoutPage'; import Header from '../../components/header'; -import SubHeader from '../../components/sub-header'; import RepoPage from '../../components/repo-page'; +import SubHeader from '../../components/sub-header'; +import { Outlet, useLocation } from 'react-router'; import { useParams } from 'react-router-dom'; +import { RepoLayout } from '../../components/layouts/RepoLayoutPage'; function Repo() { const { username, repo, branch } = useParams(); diff --git a/cra-rxjs-styled-components/src/routes/repo/repository-code/repository-tree/repository-tree.tsx b/cra-rxjs-styled-components/src/routes/repo/repository-code/repository-tree/repository-tree.tsx index 2e5ae8200..681d46f8a 100644 --- a/cra-rxjs-styled-components/src/routes/repo/repository-code/repository-tree/repository-tree.tsx +++ b/cra-rxjs-styled-components/src/routes/repo/repository-code/repository-tree/repository-tree.tsx @@ -1,14 +1,14 @@ import RepoAbout from '../../../../components/repo-about/RepoAbout'; import Readme from '../../../../components/readme/Readme'; import FileExplorer from '../../../../components/file-explorer/FileExplorer'; +import { useRepo } from '../../../../context/RepoContext'; +import { useRepoExplorer } from '../../../../hooks/repo-explorer/use-repo-explorer'; import { RepoMain, RepoAside, RepoContainer, RepoGrid, } from '../../../../components/layouts/RepoLayoutPage'; -import { useRepo } from '../../../../context/RepoContext'; -import { useRepoExplorer } from '../../../../hooks/repo-explorer/use-repo-explorer'; export default function RepoBranchRoot() { const { owner, name, branch, path, basePath, data, isRepoLoading } = useRepo(); diff --git a/cra-rxjs-styled-components/src/routes/user-top-repos.tsx b/cra-rxjs-styled-components/src/routes/user-top-repos.tsx index 6877633f9..ecc0a9c63 100644 --- a/cra-rxjs-styled-components/src/routes/user-top-repos.tsx +++ b/cra-rxjs-styled-components/src/routes/user-top-repos.tsx @@ -1,11 +1,11 @@ -import { Layout } from '../components/layouts/Layout'; import RepoCard from '../components/repo-card'; import UserGists from '../components/user-gists'; -import styled from 'styled-components'; -import { useGists } from '../hooks/gists/use-gists'; -import { useRepos } from '../hooks/repositories/use-repos'; -import { useUser } from '../context/UserProvider'; import LoadingRepoCard from '../components/repo-card/LoadingRepoCard'; +import { useUser } from '../context/UserProvider'; +import { useRepos } from '../hooks/repositories/use-repos'; +import { useGists } from '../hooks/gists/use-gists'; +import styled from 'styled-components'; +import { Layout } from '../components/layouts/Layout'; const Page = styled.div` padding: 3rem;