diff --git a/pages/requests/new/[ware].js b/pages/requests/new/[ware].js
index 93b5192..7604f8b 100644
--- a/pages/requests/new/[ware].js
+++ b/pages/requests/new/[ware].js
@@ -31,6 +31,7 @@ const NewRequest = ({ session }) => {
const { ware } = useOneWare(wareID, accessToken)
const { dynamicForm, isLoadingInitialRequest, isInitialRequestError } = useInitializeRequest(wareID, accessToken)
const oneWeekFromNow = addDays((new Date()), 7).toISOString().slice(0, 10)
+ const disabled = session === null ? true : false
const initialFormData = { 'suppliers_identified': 'Yes' }
const initialState = {
billingSameAsShipping: false,
@@ -83,7 +84,6 @@ const NewRequest = ({ session }) => {
* using a guard clause with an early return inside the api methods also violates the react-hooks/rules-of-hooks rule.
*/
if (session === undefined) return pageLoading
- if (session === null) return unauthorizedUser
/**
* @param {object} event onChange event
@@ -172,52 +172,61 @@ const NewRequest = ({ session }) => {
}
return(
-
-
- {dynamicForm.schema ? (
- <>
-
-
+ >
)
}
-const StandardRequestOptions = ({ buttonDisabled, defaultRequiredDate, requestForm, updateRequestForm, }) => {
+const StandardRequestOptions = ({ buttonDisabled, defaultRequiredDate, requestForm, updateRequestForm, disabled }) => {
return (
<>
@@ -227,6 +236,7 @@ const StandardRequestOptions = ({ buttonDisabled, defaultRequiredDate, requestFo
billingCountry={requestForm.billing.country}
shippingCountry={requestForm.shipping.country}
updateRequestForm={updateRequestForm}
+ disabled={disabled}
/>
@@ -234,13 +244,14 @@ const StandardRequestOptions = ({ buttonDisabled, defaultRequiredDate, requestFo
updateRequestForm={updateRequestForm}
defaultRequiredDate={defaultRequiredDate}
backgroundColor={requestFormHeaderBg}
+ disabled={disabled}
/>
-const unauthorizedUser = (
+const SignInRequired = () => (
{
}
export const useInitializeRequest = (id, accessToken) => {
- const { data, error } = useSWR(accessToken ? [`/wares/${id}/quote_groups/new.json`, accessToken] : null)
+ const { data, error } = useSWR(id ? [`/wares/${id}/quote_groups/new.json`, accessToken] : null)
let dynamicForm = { name: data?.name }
let dynamicFormInfo = data?.dynamic_forms[0]
diff --git a/utils/theme/theme.module.scss b/utils/theme/theme.module.scss
index 5bd04b7..1bc6c49 100644
--- a/utils/theme/theme.module.scss
+++ b/utils/theme/theme.module.scss
@@ -5,7 +5,7 @@ $secondary: #936AAA;
$light: #F2F2F2;
$dark: #070818;
$success: #B0E298;
-$info: #FFFBA6;
+$info: #8eb3fc;
$warning: #E9DF00;
$danger: #D20000;
$black: #000000;