Skip to content

Commit 23fbc4e

Browse files
committed
chore: move UserContext and AuthContext to ui/context.ts
1 parent c92c649 commit 23fbc4e

File tree

7 files changed

+32
-25
lines changed

7 files changed

+32
-25
lines changed

src/context.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/ui/auth/AuthProvider.tsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
import React, { createContext, useContext, useState, useEffect } from 'react';
1+
import React, { useContext, useState, useEffect } from 'react';
22
import { getUserInfo } from '../services/auth';
33
import { PublicUser } from '../../db/types';
4-
5-
interface AuthContextType {
6-
user: PublicUser | null;
7-
setUser: React.Dispatch<any>;
8-
refreshUser: () => Promise<void>;
9-
isLoading: boolean;
10-
}
11-
12-
const AuthContext = createContext<AuthContextType | undefined>(undefined);
4+
import { AuthContext } from '../context';
135

146
export const AuthProvider: React.FC<React.PropsWithChildren<object>> = ({ children }) => {
157
const [user, setUser] = useState<PublicUser | null>(null);

src/ui/context.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { createContext } from 'react';
2+
import { PublicUser } from '../db/types';
3+
4+
export const UserContext = createContext<UserContextType>({
5+
user: {
6+
admin: false,
7+
},
8+
});
9+
10+
export interface UserContextType {
11+
user: {
12+
admin: boolean;
13+
};
14+
}
15+
16+
export interface AuthContextType {
17+
user: PublicUser | null;
18+
setUser: React.Dispatch<any>;
19+
refreshUser: () => Promise<void>;
20+
isLoading: boolean;
21+
}
22+
23+
export const AuthContext = createContext<AuthContextType | undefined>(undefined);

src/ui/layouts/Dashboard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Sidebar from '../components/Sidebar/Sidebar';
99
import routes from '../../routes';
1010
import styles from '../assets/jss/material-dashboard-react/layouts/dashboardStyle';
1111
import logo from '../assets/img/git-proxy.png';
12-
import { UserContext } from '../../context';
12+
import { UserContext } from '../context';
1313
import { getUser } from '../services/user';
1414
import { Route as RouteType } from '../types';
1515
import { PublicUser } from '../../db/types';

src/ui/views/RepoDetails/RepoDetails.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import { makeStyles } from '@material-ui/core/styles';
1818
import AddUser from './Components/AddUser';
1919
import { Code, Delete, RemoveCircle, Visibility } from '@material-ui/icons';
2020
import { useNavigate, useParams } from 'react-router-dom';
21-
import { UserContext } from '../../../context';
21+
import { UserContext } from '../../context';
2222
import CodeActionButton from '../../components/CustomButtons/CodeActionButton';
2323
import { trimTrailingDotGit } from '../../../db/helper';
2424
import { fetchRemoteRepositoryData } from '../../utils';
25-
import { RepoView, SCMRepositoryMetadata, UserContextType } from '../../types';
25+
import { RepoView, SCMRepositoryMetadata } from '../../types';
26+
import { UserContextType } from '../../context';
2627

2728
const useStyles = makeStyles((theme) => ({
2829
root: {

src/ui/views/RepoList/Components/Repositories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { getRepos } from '../../../services/repo';
99
import GridContainer from '../../../components/Grid/GridContainer';
1010
import GridItem from '../../../components/Grid/GridItem';
1111
import NewRepo from './NewRepo';
12-
import { RepoView, UserContextType } from '../../../types';
12+
import { RepoView } from '../../../types';
1313
import RepoOverview from './RepoOverview';
14-
import { UserContext } from '../../../../context';
14+
import { UserContext, UserContextType } from '../../../context';
1515
import Search from '../../../components/Search/Search';
1616
import Pagination from '../../../components/Pagination/Pagination';
1717
import Filtering, { FilterOption, SortOrder } from '../../../components/Filtering/Filtering';

src/ui/views/User/UserProfile.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import CardBody from '../../components/Card/CardBody';
77
import Button from '../../components/CustomButtons/Button';
88
import FormLabel from '@material-ui/core/FormLabel';
99
import { getUser, updateUser } from '../../services/user';
10-
import { UserContext } from '../../../context';
10+
import { UserContext, UserContextType } from '../../context';
1111

12-
import { UserContextType } from '../../types';
1312
import { PublicUser } from '../../../db/types';
1413
import { makeStyles } from '@material-ui/core/styles';
1514

0 commit comments

Comments
 (0)