From 980f0cee60e7da967189d6716d7a118c89014951 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sat, 13 Mar 2021 17:06:28 -0500 Subject: [PATCH] chore: move contexts into their own folder --- .../web/src/{api-context => contexts/api}/ApiContext.spec.tsx | 0 packages/web/src/{api-context => contexts/api}/ApiContext.tsx | 0 .../{api-context => contexts/api}/getDefaultApiUrl.spec.ts | 0 .../web/src/{api-context => contexts/api}/getDefaultApiUrl.ts | 0 .../{session-context => contexts/session}/SessionContext.tsx | 2 +- packages/web/src/index.tsx | 4 ++-- packages/web/src/pages/auth/login.tsx | 2 +- packages/web/src/pages/dev-tools/session-debug.tsx | 4 ++-- packages/web/src/pages/dev-tools/set-api.tsx | 2 +- packages/web/src/pages/landing.tsx | 2 +- packages/web/src/pages/picker.tsx | 2 +- packages/web/src/pages/servers.tsx | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename packages/web/src/{api-context => contexts/api}/ApiContext.spec.tsx (100%) rename packages/web/src/{api-context => contexts/api}/ApiContext.tsx (100%) rename packages/web/src/{api-context => contexts/api}/getDefaultApiUrl.spec.ts (100%) rename packages/web/src/{api-context => contexts/api}/getDefaultApiUrl.ts (100%) rename packages/web/src/{session-context => contexts/session}/SessionContext.tsx (98%) diff --git a/packages/web/src/api-context/ApiContext.spec.tsx b/packages/web/src/contexts/api/ApiContext.spec.tsx similarity index 100% rename from packages/web/src/api-context/ApiContext.spec.tsx rename to packages/web/src/contexts/api/ApiContext.spec.tsx diff --git a/packages/web/src/api-context/ApiContext.tsx b/packages/web/src/contexts/api/ApiContext.tsx similarity index 100% rename from packages/web/src/api-context/ApiContext.tsx rename to packages/web/src/contexts/api/ApiContext.tsx diff --git a/packages/web/src/api-context/getDefaultApiUrl.spec.ts b/packages/web/src/contexts/api/getDefaultApiUrl.spec.ts similarity index 100% rename from packages/web/src/api-context/getDefaultApiUrl.spec.ts rename to packages/web/src/contexts/api/getDefaultApiUrl.spec.ts diff --git a/packages/web/src/api-context/getDefaultApiUrl.ts b/packages/web/src/contexts/api/getDefaultApiUrl.ts similarity index 100% rename from packages/web/src/api-context/getDefaultApiUrl.ts rename to packages/web/src/contexts/api/getDefaultApiUrl.ts diff --git a/packages/web/src/session-context/SessionContext.tsx b/packages/web/src/contexts/session/SessionContext.tsx similarity index 98% rename from packages/web/src/session-context/SessionContext.tsx rename to packages/web/src/contexts/session/SessionContext.tsx index 511458f..ebedab4 100644 --- a/packages/web/src/session-context/SessionContext.tsx +++ b/packages/web/src/contexts/session/SessionContext.tsx @@ -1,6 +1,6 @@ import { SessionData } from '@roleypoly/types'; import * as React from 'react'; -import { useApiContext } from '../api-context/ApiContext'; +import { useApiContext } from '../api/ApiContext'; type SessionContextT = { session?: Omit, 'tokens'>; diff --git a/packages/web/src/index.tsx b/packages/web/src/index.tsx index bcaef66..7d33083 100644 --- a/packages/web/src/index.tsx +++ b/packages/web/src/index.tsx @@ -1,8 +1,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { ApiContextProvider } from './api-context/ApiContext'; import { AppRouter } from './app-router/AppRouter'; -import { SessionContextProvider } from './session-context/SessionContext'; +import { ApiContextProvider } from './contexts/api/ApiContext'; +import { SessionContextProvider } from './contexts/session/SessionContext'; ReactDOM.render( diff --git a/packages/web/src/pages/auth/login.tsx b/packages/web/src/pages/auth/login.tsx index 408910e..0980dda 100644 --- a/packages/web/src/pages/auth/login.tsx +++ b/packages/web/src/pages/auth/login.tsx @@ -1,7 +1,7 @@ import { AuthLogin } from '@roleypoly/design-system/templates/auth-login'; import { GuildSlug } from '@roleypoly/types'; import React from 'react'; -import { useApiContext } from '../../api-context/ApiContext'; +import { useApiContext } from '../../contexts/api/ApiContext'; const Login = () => { const { apiUrl, fetch } = useApiContext(); diff --git a/packages/web/src/pages/dev-tools/session-debug.tsx b/packages/web/src/pages/dev-tools/session-debug.tsx index 8c6621a..53d30d2 100644 --- a/packages/web/src/pages/dev-tools/session-debug.tsx +++ b/packages/web/src/pages/dev-tools/session-debug.tsx @@ -1,5 +1,5 @@ -import { useApiContext } from '../../api-context/ApiContext'; -import { useSessionContext } from '../../session-context/SessionContext'; +import { useApiContext } from '../../contexts/api/ApiContext'; +import { useSessionContext } from '../../contexts/session/SessionContext'; const SessionDebug = () => { const session = useSessionContext(); diff --git a/packages/web/src/pages/dev-tools/set-api.tsx b/packages/web/src/pages/dev-tools/set-api.tsx index a7d817c..afce059 100644 --- a/packages/web/src/pages/dev-tools/set-api.tsx +++ b/packages/web/src/pages/dev-tools/set-api.tsx @@ -1,6 +1,6 @@ import { navigate } from '@reach/router'; import * as React from 'react'; -import { useApiContext } from '../../api-context/ApiContext'; +import { useApiContext } from '../../contexts/api/ApiContext'; const SetApi = () => { const apiContext = useApiContext(); diff --git a/packages/web/src/pages/landing.tsx b/packages/web/src/pages/landing.tsx index b5b3d86..4501321 100644 --- a/packages/web/src/pages/landing.tsx +++ b/packages/web/src/pages/landing.tsx @@ -1,7 +1,7 @@ import { Redirect } from '@reach/router'; import { LandingTemplate } from '@roleypoly/design-system/templates/landing'; import * as React from 'react'; -import { useSessionContext } from '../session-context/SessionContext'; +import { useSessionContext } from '../contexts/session/SessionContext'; const Landing = () => { const { isAuthenticated } = useSessionContext(); diff --git a/packages/web/src/pages/picker.tsx b/packages/web/src/pages/picker.tsx index 8005000..707bd37 100644 --- a/packages/web/src/pages/picker.tsx +++ b/packages/web/src/pages/picker.tsx @@ -3,7 +3,7 @@ import { RolePickerTemplate } from '@roleypoly/design-system/templates/role-pick import { ServerSetupTemplate } from '@roleypoly/design-system/templates/server-setup'; import { PresentableGuild, RoleUpdate, UserGuildPermissions } from '@roleypoly/types'; import * as React from 'react'; -import { useSessionContext } from '../session-context/SessionContext'; +import { useSessionContext } from '../contexts/session/SessionContext'; import { makeRoleTransactions } from '../utils/roleTransactions'; type PickerProps = { diff --git a/packages/web/src/pages/servers.tsx b/packages/web/src/pages/servers.tsx index a362cbe..c9496fd 100644 --- a/packages/web/src/pages/servers.tsx +++ b/packages/web/src/pages/servers.tsx @@ -1,7 +1,7 @@ import { Redirect } from '@reach/router'; import { ServersTemplate } from '@roleypoly/design-system/templates/servers'; import * as React from 'react'; -import { useSessionContext } from '../session-context/SessionContext'; +import { useSessionContext } from '../contexts/session/SessionContext'; const ServersPage = () => { const { isAuthenticated, session } = useSessionContext();