Merge pull request #290 from scientist-softserv/code-cleanup

Code cleanup

Author: alishaevn

.env.local.example

@@ -0,0 +1,13 @@
+NEXTAUTH_SECRET=
+NEXTAUTH_URL=
+CLIENT_ID=
+CLIENT_SECRET=
+NEXT_PUBLIC_TOKEN=
+
+# uncomment the “SENTRY” prefixed variables below if you are using sentry and need to catch errors in local dev
+# SENTRY_DSN=
+# NEXT_PUBLIC_SENTRY_DSN=
+# SENTRY_URL=https://sentry.io/
+# SENTRY_ORG=
+# SENTRY_PROJECT=
+# SENTRY_AUTH_TOKEN=

pages/_app.js

@@ -32,7 +32,7 @@ const WebStore = ({ Component }) => {
         navLinks={NAVIGATION_LINKS}
         userSession={session}
       />
-      <Component />
+      <Component session={session} />
       <Footer
         color={headerAndFooterLinkColors}
         companyName={FOOTER_NAME}

pages/browse/index.js

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
-import { useSession } from 'next-auth/react'
 import {
   Item,
   ItemLoading,
@@ -14,17 +13,17 @@ import {
   useFilteredWares,
 } from '../../utils'
 
-const Browse = () => {
+const Browse = ({ session }) => {
   const router = useRouter()
-  const { data: session } = useSession()
   const [query, setQuery] = useState('')
   const existingQuery = router.query.q
+  const accessToken = session?.accessToken
 
   useEffect(() => {
     if (existingQuery) setQuery(existingQuery)
   }, [existingQuery])
 
-  const { wares, isLoading, isError } = useFilteredWares(query, session?.accessToken)
+  const { wares, isLoading, isError } = useFilteredWares(query, accessToken)
   const services = configureServices({ data: wares, path: '/requests/new' })
 
   const handleOnSubmit = ({ value }) => {

pages/requests/[uuid].js

@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react'
 import { useRouter } from 'next/router'
-import { useSession } from 'next-auth/react'
 import {
   ActionsGroup,
   CollapsibleSection,
@@ -28,9 +27,8 @@ import {
   useOneRequest,
 } from '../../utils'
 
-const Request = () => {
+const Request = ({ session }) => {
   const router = useRouter()
-  const { data: session } = useSession()
   /**
    * as a dynamically routed file, the router query will always consist of a "key: value" pair that's determined by the name of
    * the file (key) and path string (value). additional query properties may also exist if they were explicitly passed.

pages/requests/index.js

@@ -1,5 +1,4 @@
 import React from 'react'
-import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/router'
 import {
   LinkedButton,
@@ -15,11 +14,11 @@ import {
   useAllRequests
 } from '../../utils'
 
-const Requests = () => {
+const Requests = ({ session }) => {
   const router = useRouter()
-  const { data: session } = useSession()
-  const { requests, isLoadingAllRequests, isAllRequestsError } = useAllRequests(session?.accessToken)
-  const { defaultWareID, isLoadingDefaultWare, isDefaultWareError } = useDefaultWare(session?.accessToken)
+  const accessToken = session?.accessToken
+  const { requests, isLoadingAllRequests, isAllRequestsError } = useAllRequests(accessToken)
+  const { defaultWareID, isLoadingDefaultWare, isDefaultWareError } = useDefaultWare(accessToken)
   const isError = isAllRequestsError || isDefaultWareError
   const isLoading = isLoadingAllRequests || isLoadingDefaultWare
 

pages/requests/new/[ware].js

@@ -3,7 +3,6 @@ import { default as BsForm } from 'react-bootstrap/Form'
 import Form from '@rjsf/core'
 import validator from '@rjsf/validator-ajv8'
 import { useRouter } from 'next/router'
-import { useSession } from 'next-auth/react'
 import {
   AdditionalInfo,
   BlankRequestForm,
@@ -23,9 +22,8 @@ import {
   useInitializeRequest,
 } from '../../../utils'
 
-const NewRequest = () => {
+const NewRequest = ({ session }) => {
   const router = useRouter()
-  const { data: session } = useSession()
   const accessToken = session?.accessToken
   const wareID = router.query.id
   const { dynamicForm, isLoadingInitialRequest, isInitialRequestError } = useInitializeRequest(wareID, accessToken)

pages/services/[ware].js

@@ -1,13 +1,12 @@
 import { useRouter } from 'next/router'
-import { useSession } from 'next-auth/react'
 import { ItemPage, Notice, Loading } from '@scientist-softserv/webstore-component-library'
 import { configureErrors, DEFAULT_WARE_IMAGE, useOneWare } from '../../utils'
 
-const Service = () => {
+const Service = ({ session }) => {
   const router = useRouter()
-  const { data: session } = useSession()
   const { id } = router.query
-  const { ware, isLoading, isError } = useOneWare(id, session?.accessToken)
+  const accessToken = session?.accessToken
+  const { ware, isLoading, isError } = useOneWare(id, accessToken)
 
   if (isLoading) return <Loading wrapperClass='item-page mt-5' />