From d8ae58844c184a48a47fe621263f879a40a8c25b Mon Sep 17 00:00:00 2001
From: Aaron William Po <apo2@uwo.ca>
Date: Wed, 8 Feb 2023 07:57:55 -0500
Subject: [PATCH] Remove userContext from pages dir

---
 components/BeerById/BeerInfoHeader.tsx                         | 3 ++-
 {pages/contexts => contexts}/userContext.ts                    | 0
 pages/_app.tsx                                                 | 2 +-
 pages/beers/[id].tsx                                           | 2 +-
 pages/user/current.tsx                                         | 2 +-
 requests/{sendLoginUserRequest.tsx => sendLoginUserRequest.ts} | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename {pages/contexts => contexts}/userContext.ts (100%)
 rename requests/{sendLoginUserRequest.tsx => sendLoginUserRequest.ts} (100%)

diff --git a/components/BeerById/BeerInfoHeader.tsx b/components/BeerById/BeerInfoHeader.tsx
index 8d1f2b9..fbcc49c 100644
--- a/components/BeerById/BeerInfoHeader.tsx
+++ b/components/BeerById/BeerInfoHeader.tsx
@@ -4,9 +4,10 @@ import format from 'date-fns/format';
 import { useContext, useEffect, useState } from 'react';
 import { FaRegThumbsUp, FaThumbsUp } from 'react-icons/fa';
 import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
-import UserContext from '@/pages/contexts/userContext';
+
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
+import UserContext from '@/contexts/userContext';
 
 const BeerInfoHeader: React.FC<{ beerPost: BeerPostQueryResult }> = ({ beerPost }) => {
   const createdAtDate = new Date(beerPost.createdAt);
diff --git a/pages/contexts/userContext.ts b/contexts/userContext.ts
similarity index 100%
rename from pages/contexts/userContext.ts
rename to contexts/userContext.ts
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 18c5037..6069da6 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,7 +1,7 @@
+import UserContext from '@/contexts/userContext';
 import useUser from '@/hooks/useUser';
 import '@/styles/globals.css';
 import type { AppProps } from 'next/app';
-import UserContext from './contexts/userContext';
 
 export default function App({ Component, pageProps }: AppProps) {
   const { user, isLoading, error } = useUser();
diff --git a/pages/beers/[id].tsx b/pages/beers/[id].tsx
index 8360bf9..cb0e65f 100644
--- a/pages/beers/[id].tsx
+++ b/pages/beers/[id].tsx
@@ -3,6 +3,7 @@ import BeerInfoHeader from '@/components/BeerById/BeerInfoHeader';
 import BeerRecommendations from '@/components/BeerById/BeerRecommendations';
 import CommentCard from '@/components/BeerById/CommentCard';
 import Layout from '@/components/ui/Layout';
+import UserContext from '@/contexts/userContext';
 import getAllBeerComments from '@/services/BeerComment/getAllBeerComments';
 import { BeerCommentQueryResultArrayT } from '@/services/BeerComment/schema/BeerCommentQueryResult';
 import getBeerPostById from '@/services/BeerPost/getBeerPostById';
@@ -13,7 +14,6 @@ import { NextPage, GetServerSideProps } from 'next';
 import Head from 'next/head';
 import Image from 'next/image';
 import { useState, useEffect, useContext } from 'react';
-import UserContext from '../contexts/userContext';
 
 interface BeerPageProps {
   beerPost: BeerPostQueryResult;
diff --git a/pages/user/current.tsx b/pages/user/current.tsx
index ecccf31..0e6159e 100644
--- a/pages/user/current.tsx
+++ b/pages/user/current.tsx
@@ -1,10 +1,10 @@
 import Layout from '@/components/ui/Layout';
 import Spinner from '@/components/ui/Spinner';
 import withPageAuthRequired from '@/config/auth/withPageAuthRequired';
+import UserContext from '@/contexts/userContext';
 
 import { GetServerSideProps, NextPage } from 'next';
 import { useContext } from 'react';
-import UserContext from '../contexts/userContext';
 
 const ProtectedPage: NextPage = () => {
   const { user, error, isLoading } = useContext(UserContext);
diff --git a/requests/sendLoginUserRequest.tsx b/requests/sendLoginUserRequest.ts
similarity index 100%
rename from requests/sendLoginUserRequest.tsx
rename to requests/sendLoginUserRequest.ts