Move Providers to api/rest

Newbies-Workplace · Apr 12, 2022 · de58206 · de58206
1 parent 7a4a7ed
commit de58206
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 35 deletions.
diff --git a/src/common/models/ProvidersList.ts → src/api/rest/auth/oauth/Provider.ts b/src/common/models/ProvidersList.ts → src/api/rest/auth/oauth/Provider.ts
@@ -1,7 +1,7 @@
 
-enum ProvidersList {
+enum Provider {
     github = 'github',
     githubDev = 'devgithub'
 }
 
-export default ProvidersList;
+export default Provider;
diff --git a/src/common/models/Agenda.model.ts b/src/common/models/Agenda.model.ts
diff --git a/src/common/models/SimpleEvent.model.ts → src/common/models/Event.ts b/src/common/models/SimpleEvent.model.ts → src/common/models/Event.ts
diff --git a/src/common/models/Provider.ts b/src/common/models/Provider.ts
diff --git a/src/components/ui/EventList/EventList.tsx b/src/components/ui/EventList/EventList.tsx
@@ -7,7 +7,7 @@ import {
     EventListQueryVars,
     GET_EVENTS_LIST_QUERY
 } from "../../../api/graphql/events/EventListQuery";
-import {Event} from "../../../common/models/SimpleEvent.model";
+import {Event} from "../../../common/models/Event";
 import {Link} from "react-router-dom";
 
 

diff --git a/src/components/ui/NavMenu/NavMenu.tsx b/src/components/ui/NavMenu/NavMenu.tsx
@@ -12,24 +12,28 @@ export const NavMenu: React.FC = () => {
     return (
         <div className={styles.container}>
 
-            <div className={styles.userInfo}>
-                <h3 className={styles.username}>{user?.nickname}</h3>
-                <p className={styles.role}>Użytkownik</p>
-            </div>
+            {user &&
+                <div className={styles.userInfo}>
+                    <h3 className={styles.username}>{user?.nickname}</h3>
+                    <p className={styles.role}>Użytkownik</p>
+                </div>
+            }
 
             <div className={styles.innerContainer}>
 
-                <NavMenuItemLink
-                    location="/studio">
-                    jeteo™ studio
-                </NavMenuItemLink>
-
-                <NavMenuItemLink
-                    location="/options">
-                    ustawienia
-                </NavMenuItemLink>
-
-                <hr className={styles.separator}/>
+                {user &&
+                    <>
+                        <NavMenuItemLink
+                            location="/studio">
+                            jeteo™ studio
+                        </NavMenuItemLink>
+                        <NavMenuItemLink
+                            location="/options">
+                            ustawienia
+                        </NavMenuItemLink>
+                        <hr className={styles.separator}/>
+                    </>
+                }
 
                 {user ? 
                     <NavMenuItemButton 

diff --git a/src/contexts/auth/AuthContext.tsx b/src/contexts/auth/AuthContext.tsx
@@ -5,7 +5,7 @@ import { authByProvidersToken, refreshToken as refreshApiToken } from "../../api
 import { AuthResponse } from "../../api/rest/auth/AuthResponse.interface";
 import { createAxiosClient } from "./axiosService";
 import { createApolloClient } from "./apolloService";
-import Providers from "../../common/models/ProvidersList";
+import Providers from "../../api/rest/auth/oauth/Provider";
 import { User } from "../../common/models/User";
 
 export interface AuthContextInterface {

diff --git a/src/views/auth/callback/github/index.tsx b/src/views/auth/callback/github/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Navigate } from 'react-router';
 import { useQuery } from '../../../../common/utils/useQuery';
 import { useAuth } from '../../../../contexts/auth/hooks/useAuth.hook';
-import Providers from '../../../../common/models/ProvidersList';
+import Providers from '../../../../api/rest/auth/oauth/Provider';
 
 /**
  * Most advanced auth component

diff --git a/src/views/auth/callback/githubdev/GithubDevCallback.tsx b/src/views/auth/callback/githubdev/GithubDevCallback.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Navigate } from 'react-router';
 import { useQuery } from '../../../../common/utils/useQuery';
 import { useAuth } from '../../../../contexts/auth/hooks/useAuth.hook';
-import Providers from '../../../../common/models/ProvidersList';
+import Providers from '../../../../api/rest/auth/oauth/Provider';
 
 export const GithubDevCallback: React.FC = () => {
     const { auth, user } = useAuth();