cleanup (#117)

* cleanup * fix template
Suwayomi · Dec 19, 2021 · 83f0251 · 83f0251
1 parent 2a7b069
commit 83f0251
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-<--! 
+<!--
 Pull Request Checklist:
 - Mention what the pull request does and the rational behind the changes
 - Include enough before and after images if there are visual changes

diff --git a/src/components/ChapterCard.tsx → src/components/chapter/ChapterCard.tsx b/src/components/ChapterCard.tsx → src/components/chapter/ChapterCard.tsx
diff --git a/src/components/ChapterList.tsx → src/components/chapter/ChapterList.tsx b/src/components/ChapterList.tsx → src/components/chapter/ChapterList.tsx
@@ -9,14 +9,14 @@ import React, { useState, useEffect } from 'react';
 import { Box, styled } from '@mui/system';
 import { Virtuoso } from 'react-virtuoso';
 import Typography from '@mui/material/Typography';
-import ChapterCard from 'components/ChapterCard';
 import { CircularProgress, Fab } from '@mui/material';
 import { Link } from 'react-router-dom';
 import makeToast from 'components/util/Toast';
 import client from 'util/client';
 import PlayArrow from '@mui/icons-material/PlayArrow';
-import ChapterOptions from 'components/ChapterOptions';
-import useLocalStorage from '../util/useLocalStorage';
+import ChapterOptions from 'components/chapter/ChapterOptions';
+import ChapterCard from 'components/chapter/ChapterCard';
+import useLocalStorage from 'util/useLocalStorage';
 
 const List = styled(Virtuoso)(({ theme }) => ({
     listStyle: 'none',

diff --git a/src/components/ChapterOptions.tsx → src/components/chapter/ChapterOptions.tsx b/src/components/ChapterOptions.tsx → src/components/chapter/ChapterOptions.tsx
@@ -20,7 +20,7 @@ interface IProps{
     setOptions: React.Dispatch<React.SetStateAction<ChapterListOptions>>
 }
 
-const SortTab: [SortMode, string][] = [['source', 'By Source'], ['fetchedAt', 'By Fetch date']];
+const SortTab: [ChapterSortMode, string][] = [['source', 'By Source'], ['fetchedAt', 'By Fetch date']];
 
 export default function ChapterOptions(props: IProps) {
     const { options, setOptions } = props;
@@ -48,7 +48,7 @@ export default function ChapterOptions(props: IProps) {
         setOptions({ ...options, active, bookmarked: newBookmarked });
     };
 
-    const setSort = (newSort: SortMode) => {
+    const setSort = (newSort: ChapterSortMode) => {
         if (newSort !== options.sortBy) {
             setOptions({ ...options, sortBy: newSort });
         } else {

diff --git a/src/screens/Manga.tsx b/src/screens/Manga.tsx
@@ -11,7 +11,7 @@ import MangaDetails from 'components/MangaDetails';
 import NavbarContext from 'components/context/NavbarContext';
 import client from 'util/client';
 import LoadingPlaceholder from 'components/util/LoadingPlaceholder';
-import ChapterList from 'components/ChapterList';
+import ChapterList from 'components/chapter/ChapterList';
 import { useParams } from 'react-router-dom';
 
 export default function Manga() {

diff --git a/src/typings.d.ts b/src/typings.d.ts
@@ -219,14 +219,14 @@ interface PaginatedList<T> {
 
 type NullAndUndefined<T> = T | null | undefined;
 
-type SortMode = 'fetchedAt' | 'source';
+type ChapterSortMode = 'fetchedAt' | 'source';
 
 interface ChapterListOptions {
     active: boolean
     unread: NullAndUndefined<boolean>
     downloaded: NullAndUndefined<boolean>
     bookmarked: NullAndUndefined<boolean>
     reverse: boolean
-    sortBy: SortMode
+    sortBy: ChapterSortMode
     showChapterNumber: boolean
 }