From 128db96c274fa77fd1a573c7a725cbdd5d4eb92e Mon Sep 17 00:00:00 2001
From: danieldeng2 <danieldeng223@gmail.com>
Date: Sat, 5 Sep 2020 22:08:46 +0100
Subject: [PATCH] Create new file for types
---
src/components/atoms/ModuleCard/index.tsx | 7 +------
.../molecules/CategoryList/index.tsx | 3 ++-
src/components/pages/ModuleList/list.ts | 3 ++-
src/components/pages/ModuleOverview/index.tsx | 2 +-
.../components/CurrentDirectoryView.tsx | 2 +-
.../components/FoldersView.tsx | 2 +-
.../ModuleResources/components/ListView.tsx | 2 +-
.../components/QuickAccessView.tsx | 2 +-
.../ModuleResources/components/StaffView.tsx | 2 +-
.../pages/ModuleResources/index.tsx | 3 ++-
src/components/pages/ModuleResources/utils.ts | 16 +--------------
src/components/pages/StandardView/index.tsx | 1 +
.../Timeline/components/EventGrid/index.tsx | 2 +-
src/constants/types.ts | 20 +++++++++++++++++++
14 files changed, 36 insertions(+), 31 deletions(-)
create mode 100644 src/constants/types.ts
diff --git a/src/components/atoms/ModuleCard/index.tsx b/src/components/atoms/ModuleCard/index.tsx
index 59059a7b0..130d3b889 100644
--- a/src/components/atoms/ModuleCard/index.tsx
+++ b/src/components/atoms/ModuleCard/index.tsx
@@ -6,12 +6,7 @@ import Col from "react-bootstrap/Col";
import { Link } from "react-router-dom";
import { faSun, faLeaf, faSeedling } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-export enum Term {
- AUTUMN,
- SPRING,
- SUMMER
-}
+import { Term } from "constants/types";
export enum ProgressStatus {
NOT_STARTED = "Not Started",
diff --git a/src/components/molecules/CategoryList/index.tsx b/src/components/molecules/CategoryList/index.tsx
index 9884daf02..71b48684e 100644
--- a/src/components/molecules/CategoryList/index.tsx
+++ b/src/components/molecules/CategoryList/index.tsx
@@ -1,8 +1,9 @@
import React from "react";
import { faSquare, faCheckSquare } from "@fortawesome/free-regular-svg-icons";
-import { Resource, resourceTypeToIcon } from "../../pages/ModuleResources/utils";
+import { resourceTypeToIcon } from "../../pages/ModuleResources/utils";
import { SelectionProps } from "components/molecules/SelectionView";
import FileListItem from "components/atoms/FileListItem";
+import { Resource } from "constants/types";
export interface CategoryListProps {
categoryItems: Resource[];
diff --git a/src/components/pages/ModuleList/list.ts b/src/components/pages/ModuleList/list.ts
index aa3b28f91..d97c5f437 100644
--- a/src/components/pages/ModuleList/list.ts
+++ b/src/components/pages/ModuleList/list.ts
@@ -8,7 +8,8 @@ import reasoningIllustration from "assets/images/reasoning-illustration.png";
import architectureIllustration from "assets/images/architecture-illustration.png";
import databaseIllustration from "assets/images/database-illustration.png";
-import { Term, ProgressStatus } from "components/atoms/ModuleCard";
+import { ProgressStatus } from "components/atoms/ModuleCard";
+import { Term } from "constants/types";
export const modulesList = [
{
diff --git a/src/components/pages/ModuleOverview/index.tsx b/src/components/pages/ModuleOverview/index.tsx
index 572ab3a34..d8283b20b 100644
--- a/src/components/pages/ModuleOverview/index.tsx
+++ b/src/components/pages/ModuleOverview/index.tsx
@@ -10,12 +10,12 @@ import MyBreadcrumbs from "components/atoms/MyBreadcrumbs";
import FileListItem from "components/atoms/FileListItem";
import {
resourceTypeToIcon,
- Resource,
openResource,
tags,
} from "../ModuleResources/utils";
import LoadingScreen from "components/molecules/LoadingScreen";
import { titleCase } from "utils/functions";
+import { Resource } from "constants/types";
export interface ModuleOverviewProps {
year: string;
diff --git a/src/components/pages/ModuleResources/components/CurrentDirectoryView.tsx b/src/components/pages/ModuleResources/components/CurrentDirectoryView.tsx
index 234007cb1..863d69b43 100644
--- a/src/components/pages/ModuleResources/components/CurrentDirectoryView.tsx
+++ b/src/components/pages/ModuleResources/components/CurrentDirectoryView.tsx
@@ -1,9 +1,9 @@
import React from "react";
-import { Resource } from "../utils";
import SelectionView, {
SelectionProps
} from "components/molecules/SelectionView";
import CurrentDirectoryRow from "components/molecules/CurrentDirectoryRow";
+import { Resource } from "constants/types";
export interface CurrentDirectoryViewProps {
resources: Resource[];
diff --git a/src/components/pages/ModuleResources/components/FoldersView.tsx b/src/components/pages/ModuleResources/components/FoldersView.tsx
index 7a35e17ef..dc8721ae2 100644
--- a/src/components/pages/ModuleResources/components/FoldersView.tsx
+++ b/src/components/pages/ModuleResources/components/FoldersView.tsx
@@ -1,10 +1,10 @@
import React from "react";
-import { Folder } from "../utils";
import SelectionView, {
SelectionProps
} from "components/molecules/SelectionView";
import FoldersRow from "components/molecules/FoldersRow";
import { useHistory, useLocation } from "react-router-dom";
+import { Folder } from "constants/types";
export interface FoldersViewProps {
folders: Folder[];
diff --git a/src/components/pages/ModuleResources/components/ListView.tsx b/src/components/pages/ModuleResources/components/ListView.tsx
index 1f0dee1c8..7ca236fb4 100644
--- a/src/components/pages/ModuleResources/components/ListView.tsx
+++ b/src/components/pages/ModuleResources/components/ListView.tsx
@@ -1,11 +1,11 @@
import React from "react";
-import { Resource, Folder } from "../utils";
import SelectionView, {
SelectionProps
} from "components/molecules/SelectionView";
import CategoryList from "components/molecules/CategoryList";
import CategoryHeader from "components/molecules/CategoryHeader";
import { faSquare, faCheckSquare } from "@fortawesome/free-regular-svg-icons";
+import { Folder, Resource } from "constants/types";
export interface ListViewProps {
folders: Folder[];
diff --git a/src/components/pages/ModuleResources/components/QuickAccessView.tsx b/src/components/pages/ModuleResources/components/QuickAccessView.tsx
index 8dda0dbda..fcad4e9a5 100644
--- a/src/components/pages/ModuleResources/components/QuickAccessView.tsx
+++ b/src/components/pages/ModuleResources/components/QuickAccessView.tsx
@@ -1,9 +1,9 @@
import React from "react";
-import { Resource } from "../utils";
import SelectionView, {
SelectionProps,
} from "components/molecules/SelectionView";
import QuickAccessRow from "components/molecules/QuickAccessRow";
+import { Resource } from "constants/types";
export interface QuickAccessViewProps {
resources: Resource[];
diff --git a/src/components/pages/ModuleResources/components/StaffView.tsx b/src/components/pages/ModuleResources/components/StaffView.tsx
index 937041e55..489b06fdf 100644
--- a/src/components/pages/ModuleResources/components/StaffView.tsx
+++ b/src/components/pages/ModuleResources/components/StaffView.tsx
@@ -9,12 +9,12 @@ import { faDownload, faTrash, faUpload } from "@fortawesome/free-solid-svg-icons
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import UploadModal from "./UploadModal"
import AlertModal from "../../../atoms/AlertModal"
-import { Resource, Folder } from "../utils";
import CategoryList from "components/molecules/CategoryList";
import CategoryHeader from "components/molecules/CategoryHeader";
import { staffRequest, download } from "utils/api"
import { api, methods } from "constants/routes"
+import { Folder, Resource } from "constants/types";
export interface StaffViewProps {
year: string;
diff --git a/src/components/pages/ModuleResources/index.tsx b/src/components/pages/ModuleResources/index.tsx
index ab5ef80aa..342b6ef2d 100644
--- a/src/components/pages/ModuleResources/index.tsx
+++ b/src/components/pages/ModuleResources/index.tsx
@@ -12,7 +12,8 @@ import StaffView from "./components/StaffView";
import MyBreadcrumbs from "components/atoms/MyBreadcrumbs";
import LoadingScreen from "components/molecules/LoadingScreen";
-import { Resource, openResource, tags, folders } from "./utils";
+import { openResource, tags, folders } from "./utils";
+import { Resource } from "constants/types";
export interface ResourcesProps {
year: string;
diff --git a/src/components/pages/ModuleResources/utils.ts b/src/components/pages/ModuleResources/utils.ts
index b650b0ede..f94052093 100644
--- a/src/components/pages/ModuleResources/utils.ts
+++ b/src/components/pages/ModuleResources/utils.ts
@@ -7,21 +7,7 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import { request } from "../../../utils/api";
import { api, methods } from "../../../constants/routes";
-
-export interface Folder {
- title: string;
- id: number;
-}
-
-export interface Resource {
- title: string;
- type: string;
- tags: string[];
- folder: string;
- id: number;
- path?: string;
- thumbnail?: string;
-}
+import { Resource, Folder } from "constants/types";
export function tags(resources: Resource[]) {
let tagSet = new Set<string>();
diff --git a/src/components/pages/StandardView/index.tsx b/src/components/pages/StandardView/index.tsx
index db364f6f9..143dd75f9 100644
--- a/src/components/pages/StandardView/index.tsx
+++ b/src/components/pages/StandardView/index.tsx
@@ -39,6 +39,7 @@ const StandardView: React.FC<StandardViewProps> = ({
initTimelineSideBar,
}: StandardViewProps) => {
const [modulesFilter, setModulesFilter] = useState("In Progress");
+ const [timelineTerm, setTimelineTerm] = useState("In Progress");
return (
<div
diff --git a/src/components/pages/Timeline/components/EventGrid/index.tsx b/src/components/pages/Timeline/components/EventGrid/index.tsx
index 4a5284f0e..ffb57d17b 100644
--- a/src/components/pages/Timeline/components/EventGrid/index.tsx
+++ b/src/components/pages/Timeline/components/EventGrid/index.tsx
@@ -1,6 +1,6 @@
import React from "react";
import styles from "./style.module.scss";
-import { TimelineEvent, ModuleTracks } from "../..";
+import { ModuleTracks } from "../..";
import TimelineEventCard from "../TimelineEventCard";
export interface EventGridProps {
numWeeks: number;
diff --git a/src/constants/types.ts b/src/constants/types.ts
new file mode 100644
index 000000000..1acb08ac5
--- /dev/null
+++ b/src/constants/types.ts
@@ -0,0 +1,20 @@
+export enum Term {
+ AUTUMN,
+ SPRING,
+ SUMMER
+}
+
+export interface Folder {
+ title: string;
+ id: number;
+}
+
+export interface Resource {
+ title: string;
+ type: string;
+ tags: string[];
+ folder: string;
+ id: number;
+ path?: string;
+ thumbnail?: string;
+}
\ No newline at end of file
--
GitLab