Skip to content

Commit 1014fce

Browse files
dvishal485dvishal485
authored
Merge pull request #185 from pushkardev123/main
Refactor: Move Static Data Imports to commonlib/types
2 parents c45415c + 6b45805 commit 1014fce

34 files changed

+38
-297
lines changed

‎src/components/EditionCard/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { TagIcon } from "@/assets/TagIcon";
2-
import { Edition } from "@/types/edition";
3-
import { EditionStatus } from "@/types/editionStatus";
2+
import { IEdition as Edition } from "@/commonlib/types/edition";
3+
import { EditionStatus } from "@/commonlib/types/edition";
44
import { Link } from "react-router-dom";
55
import { NixImage } from "../NixImage";
66

‎src/components/MoreMenu/generator.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import API from "@/services/API";
2-
import { Blog } from "@/types/blog";
3-
import BlogStatus from "@/types/blogStatus";
4-
import { CustomError } from "@/types/contextTypes";
5-
import Permission from "@/types/permissions";
2+
import { IBlog as Blog } from "@/commonlib/types/blog";
3+
import BlogStatus from "@/commonlib/types/blogStatus";
4+
import { CustomError } from "@/commonlib/types/frontend/contextTypes";
5+
import Permission from "@/commonlib/types/permissions";
66
import { NavigateFunction } from "react-router-dom";
77
import { toast } from "react-toastify";
88
import { Option } from ".";

‎src/components/MoreMenu/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import MoreVerticalIcon from "@/assets/MoreIcon";
2-
import BlogStatus from "@/types/blogStatus";
2+
import BlogStatus from "@/commonlib/types/blogStatus";
33
import { useEffect, useRef, useState } from "react";
44
import { PermissionProtector } from "../PermissionProtector";
5-
import Permission from "@/types/permissions";
5+
import Permission from "@/commonlib/types/permissions";
66

77
export interface Option {
88
label: string;

‎src/components/PermissionProtector/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CurrUserCtx } from "@/contexts/current_user";
22
import { PermErrCtx } from "@/contexts/permission_error";
3-
import Permission from "@/types/permissions";
3+
import Permission from "@/commonlib/types/permissions";
44
import React, { ReactNode } from "react";
55

66
type FallbackChild =

‎src/components/SideNavigation/sideNavItems.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import DownArrow from "@/assets/ChevronDownIcon";
22
import { PermissionProtector } from "@/components/PermissionProtector";
3-
import RouteElement from "@/types/routeElement";
3+
import RouteElement from "@/commonlib/types/frontend/routeElement";
44
import { useEffect, useState } from "react";
55
import { NavLink } from "react-router-dom";
66

‎src/contexts/current_user.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CurrentUserCtxType,
44
GrantedPermissions,
55
IUser,
6-
} from "@/types/contextTypes";
6+
} from "@/commonlib/types/frontend/contextTypes";
77
import { getUserFromStorage } from "@/services/localStorageParser";
88

99
export const CurrUserCtx = React.createContext<CurrentUserCtxType | null>(null);

‎src/contexts/error.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { CustomError, ErrorCtxType } from "@/types/contextTypes";
2+
import { CustomError, ErrorCtxType } from "@/commonlib/types/frontend/contextTypes";
33
import { toast } from "react-toastify";
44
import { useNavigate } from "react-router-dom";
55
import axios from "axios";

‎src/contexts/permission_error.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Permission from "@/types/permissions";
1+
import Permission from "@/commonlib/types/permissions";
22
import React from "react";
3-
import { PermErrCtxType } from "@/types/contextTypes";
3+
import { PermErrCtxType } from "@/commonlib/types/frontend/contextTypes";
44

55
export const PermErrCtx = React.createContext<PermErrCtxType | null>(null);
66

‎src/pages/Edition/AllEditions/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { Spinner } from "@/components/Spinner";
99
import EditionCard from "@/components/EditionCard";
1010
import Pagination from "@/components/Pagination";
1111
import { EDITIONS_PER_PAGE as perPage } from "@/config";
12-
import { Edition } from "@/types/edition";
13-
import { EditionStatus } from "@/types/editionStatus";
12+
import { IEdition as Edition } from "@/commonlib/types/edition";
13+
import { EditionStatus } from "@/commonlib/types/edition";
1414

1515
interface AllEditionsState {
1616
editions: Edition[];

‎src/pages/Edition/NewEdition/index.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { PermissionProtector } from "@/components/PermissionProtector";
22
import { Spinner } from "@/components/Spinner";
33
import { ErrorContext } from "@/contexts/error";
44
import API from "@/services/API";
5-
import { Edition } from "@/types/edition";
6-
import { EditionStatus } from "@/types/editionStatus";
7-
import Permission from "@/types/permissions";
5+
import { IEdition as Edition } from "@/commonlib/types/edition";
6+
import { EditionStatus } from "@/commonlib/types/edition";
7+
import Permission from "@/commonlib/types/permissions";
88
import { FormEvent, useContext, useEffect, useRef, useState } from "react";
99
import { useLocation, useNavigate, useParams } from "react-router-dom";
1010
import { toast } from "react-toastify";
@@ -18,7 +18,6 @@ const initial_state: Edition = {
1818
createdAt: null,
1919
updatedAt: null,
2020
};
21-
2221
export default function NewEdition({ edition: _ed }: { edition?: Edition }) {
2322
const location = useLocation();
2423
const navigate = useNavigate();

‎src/pages/Member/AllMembers/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Spinner } from "@/components/Spinner";
44
import UserCard from "@/components/UserCard";
55
import { ErrorContext } from "@/contexts/error";
66
import API from "@/services/API";
7-
import Member from "@/types/member";
7+
import {Member} from "@/commonlib/types/member";
88
import React from "react";
99
import { useEffect } from "react";
1010
import { MEMBERS_PER_PAGE as perPage } from "@/config";

‎src/pages/Member/EditMember/index.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import { Spinner } from "@/components/Spinner";
77
import { CurrUserCtx } from "@/contexts/current_user";
88
import { ErrorContext } from "@/contexts/error";
99
import API from "@/services/API";
10-
import { IUser, MainWebsiteRole } from "@/types/contextTypes";
11-
import Permission from "@/types/permissions";
12-
import { Role } from "@/types/role";
10+
import { IUser } from "@/commonlib/types/frontend/contextTypes";
11+
import { MainWebsiteRole } from "@/commonlib/types/mainWebsiteRole";
12+
import Permission from "@/commonlib/types/permissions";
13+
import { Role } from "@/commonlib/types/role";
1314
import React, { useContext } from "react";
1415
import { useNavigate, useParams } from "react-router-dom";
1516
import { toast } from "react-toastify";

‎src/pages/Member/MemberProfile/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { Spinner } from "@/components/Spinner";
44
import { CurrUserCtx } from "@/contexts/current_user";
55
import { ErrorContext } from "@/contexts/error";
66
import API from "@/services/API";
7-
import { IUser, MainWebsiteRole } from "@/types/contextTypes";
8-
import Permission from "@/types/permissions";
7+
import { IUser, MainWebsiteRole } from "@/commonlib/types/frontend/contextTypes";
8+
import Permission from "@/commonlib/types/permissions";
99
import React, { useContext, useEffect, useState } from "react";
1010
import { Link, useParams } from "react-router-dom";
1111

‎src/pages/Notification/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Spinner } from "@/components/Spinner";
22
import { ErrorContext } from "@/contexts/error";
33
import API from "@/services/API";
4-
import { INotification } from "@/types/notification";
4+
import { INotification } from "@/commonlib/types/notification";
55
import React, { useEffect, useState } from "react";
66
import {
77
setup_notification,

‎src/pages/Roles/AllRoles/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Collapsible from "@/components/Collapsible";
22
import { Spinner } from "@/components/Spinner";
33
import { ErrorContext } from "@/contexts/error";
44
import API from "@/services/API";
5-
import Permission from "@/types/permissions";
5+
import Permission from "@/commonlib/types/permissions";
66
import { useContext, useEffect, useState } from "react";
77
import { toast } from "react-toastify";
88
import DeleteIcon from "@/assets/DeleteIcon";

‎src/pages/Roles/NewRole/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import MyMultiselect from "@/components/MultiSelect";
22
import { Spinner } from "@/components/Spinner";
33
import { ErrorContext } from "@/contexts/error";
44
import API from "@/services/API";
5-
import Permission from "@/types/permissions";
6-
import { Role } from "@/types/role";
5+
import Permission from "@/commonlib/types/permissions";
6+
import { Role } from "@/commonlib/types/role";
77
import { useContext, useEffect, useReducer } from "react";
88
import { toast } from "react-toastify";
99

‎src/pages/Story/ReadStory/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import { Spinner } from "@/components/Spinner";
1111

1212
import { TagIcon } from "@/assets/TagIcon";
1313

14-
import BlogStatus from "@/types/blogStatus";
15-
import { BlogDetails } from "@/types/blog";
14+
import BlogStatus from "@/commonlib/types/blogStatus";
15+
import { BlogDetails } from "@/commonlib/types/blog";
1616
import "./index.css";
1717
import { NixImage } from "@/components/NixImage";
1818
import { PermissionProtector } from "@/components/PermissionProtector";
19-
import Permission from "@/types/permissions";
19+
import Permission from "@/commonlib/types/permissions";
2020
import { CurrUserCtx } from "@/contexts/current_user";
2121

2222
interface ReadStoryState {

‎src/router/ProtectedRoute.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Spinner } from "@/components/Spinner";
22
import { CurrUserCtx } from "@/contexts/current_user";
33
import { PermErrCtx } from "@/contexts/permission_error";
44
import Layout from "@/pages/Layout";
5-
import Permission from "@/types/permissions";
5+
import Permission from "@/commonlib/types/permissions";
66
import React, { useEffect } from "react";
77
import { Navigate, useNavigate, useRoutes } from "react-router-dom";
88
import { protectedRoutes } from "./routeMap";

‎src/router/routeMap.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import StoryIcon from "@/assets/StoryIcon";
1212
import TerminalIcon from "@/assets/TerminalIcon";
1313
import { PermissionProtector } from "@/components/PermissionProtector";
1414
import ErrorPage from "@/error-page";
15-
import Permission from "@/types/permissions";
16-
import CustomRouteElement from "@/types/routeElement";
15+
import Permission from "@/commonlib/types/permissions";
16+
import CustomRouteElement from "@/commonlib/types/frontend/routeElement";
1717
import React from "react";
1818
import ProfileIcon from "@/assets/ProfileIcon";
1919
import NotificationIcon from "@/assets/NotificationIcon";

‎src/services/localStorageParser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Permission from "@/types/permissions";
2-
import { GrantedPermissions, IUser } from "@/types/contextTypes";
1+
import Permission from "@/commonlib/types/permissions";
2+
import { GrantedPermissions, IUser } from "@/commonlib/types/frontend/contextTypes";
33

44
export const getUserFromStorage = () => {
55
const data = localStorage.getItem("user");

‎src/types/avatarImageProps.tsx

-10
This file was deleted.

‎src/types/blog.ts

-28
This file was deleted.

‎src/types/blogCategory.ts

-8
This file was deleted.

‎src/types/blogPages.ts

-8
This file was deleted.

‎src/types/blogStatus.ts

-11
This file was deleted.

‎src/types/contextTypes.ts

-48
This file was deleted.

‎src/types/edition.ts

-18
This file was deleted.

‎src/types/editionStatus.ts

-9
This file was deleted.

‎src/types/member.ts

-13
This file was deleted.

‎src/types/nixImageProps.ts

-11
This file was deleted.

0 commit comments

Comments
 (0)