remove toast

app/routes/account.tsx

@@ -6,9 +6,6 @@ import {
 } from '@remix-run/react';
 import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {type CustomerFragment} from 'customer-accountapi.generated';
-import {useEffect} from 'react';
-import notify, {Toaster} from 'react-hot-toast';
-import {getToast} from 'remix-toast';
 import {CUSTOMER_DETAILS_QUERY} from '~/graphql/customer-account/CustomerDetailsQuery';
 import {type User} from '~/lib/api/model';
 
@@ -52,49 +49,17 @@ export async function loader({context, request}: LoaderFunctionArgs) {
     throw new Error('Customer not found');
   }
 
-  const {toast} = await getToast(request);
-
-  return json(
-    {
-      customer: data.customer,
-      toast,
-    },
-    {
-      headers: {
-        'Cache-Control': 'no-cache, no-store, must-revalidate',
-        'Set-Cookie': await context.session.commit(),
-      },
-    },
-  );
+  return json({
+    customer: data.customer,
+  });
 }
 
 export default function Acccount() {
-  const {customer, toast} = useLoaderData<typeof loader>();
-
-  useEffect(() => {
-    if (toast) {
-      switch (toast.type) {
-        case 'success':
-          notify.success(toast.message);
-          return;
-        case 'error':
-          notify.error(toast.message);
-
-          return;
-        default:
-          return;
-      }
-    }
-  }, [toast]);
+  const {customer} = useLoaderData<typeof loader>();
 
   return (
     <>
       <Outlet context={{customer}} />
-      <Toaster
-        position="top-center"
-        reverseOrder={false}
-        toastOptions={{duration: 3000, className: 'toast', id: 'toast'}}
-      />
     </>
   );
 }

app/routes/business.booked.$blockedId.destroy.tsx

@@ -1,5 +1,4 @@
 import {redirect, type ActionFunction} from '@shopify/remix-oxygen';
-import {redirectWithSuccess} from 'remix-toast';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {getCustomer} from '~/lib/get-customer';
 
@@ -12,9 +11,7 @@ export const action: ActionFunction = async ({context, params}) => {
       params.blockedId || '',
     );
 
-    return redirectWithSuccess('/business/booked', {
-      message: 'Ferie er nu slettet!',
-    });
+    return redirect('/business/booked');
   } catch (error) {
     return redirect('/business/booked');
   }

app/routes/business.booked.create.tsx

@@ -1,9 +1,8 @@
 import {getFormProps, getInputProps, useForm} from '@conform-to/react';
 import {parseWithZod} from '@conform-to/zod';
 import {FocusTrap, Modal, Stack, TextInput} from '@mantine/core';
-import {Form, useActionData} from '@remix-run/react';
+import {Form, redirect, useActionData} from '@remix-run/react';
 import type {ActionFunctionArgs} from 'react-router';
-import {redirectWithSuccess} from 'remix-toast';
 import {type z} from 'zod';
 import DateTimeInput from '~/components/form/DateTimeInput';
 import {SubmitButton} from '~/components/form/SubmitButton';
@@ -29,9 +28,7 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
       submission.value,
     );
 
-    return redirectWithSuccess('/business/booked', {
-      message: 'Ferie er nu tilføjet!',
-    });
+    return redirect('/business/booked');
   } catch (error) {
     return submission.reply();
   }

app/routes/business.locations.$locationId._index.tsx

@@ -8,6 +8,7 @@ import {Form, Link, useActionData, useLoaderData} from '@remix-run/react';
 
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
@@ -17,7 +18,6 @@ import {customerLocationUpdateBody} from '~/lib/zod/bookingShopifyApi';
 
 import {parseWithZod} from '@conform-to/zod';
 import {Anchor, Group, Stack, Text, TextInput} from '@mantine/core';
-import {redirectWithSuccess} from 'remix-toast';
 import {AddressAutocompleteInput} from '~/components/form/AddressAutocompleteInput';
 import {NumericInput} from '~/components/form/NumericInput';
 import {SubmitButton} from '~/components/form/SubmitButton';
@@ -59,9 +59,7 @@ export const action = async ({
       `${baseURL}/customer/${customerId}/locations`,
     );
 
-    return redirectWithSuccess('.', {
-      message: 'Lokation er opdateret!',
-    });
+    return redirect('.');
   } catch (error) {
     return submission.reply();
   }

app/routes/business.locations.$locationId.destroy.tsx

@@ -1,5 +1,4 @@
-import {type ActionFunction} from '@shopify/remix-oxygen';
-import {redirectWithSuccess} from 'remix-toast';
+import {redirect, type ActionFunction} from '@shopify/remix-oxygen';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {baseURL} from '~/lib/api/mutator/query-client';
 import {getCustomer} from '~/lib/get-customer';
@@ -22,7 +21,5 @@ export const action: ActionFunction = async ({context, params}) => {
     ),
   ]);
 
-  return redirectWithSuccess('/business/locations', {
-    message: 'Lokation er slettet!!',
-  });
+  return redirect('/business/locations');
 };

app/routes/business.locations.$locationId.tsx

@@ -1,11 +1,10 @@
 import {Form, Link, Outlet, useLoaderData} from '@remix-run/react';
 
-import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {getCustomer} from '~/lib/get-customer';
 
 import {Button, Container, rem} from '@mantine/core';
-import {jsonWithSuccess} from 'remix-toast';
 import {AccountButton} from '~/components/account/AccountButton';
 import {AccountContent} from '~/components/account/AccountContent';
 import {AccountTitle} from '~/components/account/AccountTitle';
@@ -24,7 +23,7 @@ export async function loader({context, params}: LoaderFunctionArgs) {
     context,
   );
 
-  return jsonWithSuccess(response.payload, {message: 'Location er opdateret!'});
+  return json(response.payload);
 }
 
 export default function AccountLocationsEdit() {

app/routes/business.locations.create.tsx

@@ -1,6 +1,7 @@
 import {Form, useActionData, useLoaderData} from '@remix-run/react';
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
@@ -16,7 +17,6 @@ import {
 } from '@conform-to/react';
 import {parseWithZod} from '@conform-to/zod';
 import {Container, rem, Stack, TextInput} from '@mantine/core';
-import {redirectWithSuccess} from 'remix-toast';
 import {AccountContent} from '~/components/account/AccountContent';
 import {AccountTitle} from '~/components/account/AccountTitle';
 import {AddressAutocompleteInput} from '~/components/form/AddressAutocompleteInput';
@@ -49,9 +49,7 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
       `${baseURL}/customer/${customerId}/locations`,
     );
 
-    return redirectWithSuccess('/business/locations', {
-      message: 'Lokation er nu oprettet!',
-    });
+    return redirect('/business/locations');
   } catch (error) {
     return submission.reply();
   }

app/routes/business.public._index.tsx

@@ -2,6 +2,7 @@ import {Stack, Text, TextInput, rem} from '@mantine/core';
 import {Form, useActionData, useLoaderData} from '@remix-run/react';
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
@@ -16,10 +17,10 @@ import {
 import {parseWithZod} from '@conform-to/zod';
 
 import {useTranslation} from 'react-i18next';
-import {redirectWithSuccess} from 'remix-toast';
 import {MultiTags} from '~/components/form/MultiTags';
 import {RadioGroup} from '~/components/form/RadioGroup';
 import {SubmitButton} from '~/components/form/SubmitButton';
+import {useProfessionAndSkills} from '~/components/ProfessionButton';
 import {TextEditor} from '~/components/richtext/TextEditor';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {convertHTML} from '~/lib/convertHTML';
@@ -44,9 +45,7 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
       aboutMeHtml: convertHTML(submission.value.aboutMe),
     });
 
-    return redirectWithSuccess('/business/public', {
-      message: 'Profil er opdateret!',
-    });
+    return redirect('/business/public');
   } catch (error) {
     return submission.reply();
   }
@@ -57,20 +56,14 @@ export async function loader({context}: LoaderFunctionArgs) {
 
   const {payload: user} = await getBookingShopifyApi().customerGet(customerId);
 
-  const {payload: professionOptions} =
-    await getBookingShopifyApi().metaProfessions();
-
-  const {payload: specialityOptions} =
-    await getBookingShopifyApi().metaspecialties();
-
-  return json({user, professionOptions, specialityOptions});
+  return json({user});
 }
 
 export default function AccountBusiness() {
   const {t} = useTranslation(['global']);
   const lastResult = useActionData<typeof action>();
-  const {user, professionOptions, specialityOptions} =
-    useLoaderData<typeof loader>();
+  const {professionOptions, skillsOptions} = useProfessionAndSkills();
+  const {user} = useLoaderData<typeof loader>();
 
   const [
     form,
@@ -125,7 +118,7 @@ export default function AccountBusiness() {
 
           <MultiTags
             field={specialties}
-            data={specialityOptions}
+            data={skillsOptions}
             label="Hvad er dine specialer?"
             placeholder="Vælge special(er)?"
           />

app/routes/business.public.social.tsx

@@ -2,14 +2,14 @@ import {Stack, TextInput, rem} from '@mantine/core';
 import {Form, useActionData, useLoaderData} from '@remix-run/react';
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
 
 import {getFormProps, getInputProps, useForm} from '@conform-to/react';
 import {parseWithZod} from '@conform-to/zod';
 import {IconAt} from '@tabler/icons-react';
-import {redirectWithSuccess} from 'remix-toast';
 import {SubmitButton} from '~/components/form/SubmitButton';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {getCustomer} from '~/lib/get-customer';
@@ -32,9 +32,7 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
   try {
     await getBookingShopifyApi().customerUpdate(customerId, submission.value);
 
-    return redirectWithSuccess('.', {
-      message: 'Social er opdateret!',
-    });
+    return redirect('.');
   } catch (error) {
     return submission.reply();
   }

app/routes/business.public.theme.tsx

@@ -8,14 +8,14 @@ import {
 import {Form, useActionData, useLoaderData} from '@remix-run/react';
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
 
 import {getFormProps, useForm, useInputControl} from '@conform-to/react';
 import {parseWithZod} from '@conform-to/zod';
 import {IconCheck} from '@tabler/icons-react';
-import {redirectWithSuccess} from 'remix-toast';
 import {SubmitButton} from '~/components/form/SubmitButton';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {getCustomer} from '~/lib/get-customer';
@@ -38,9 +38,7 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
   try {
     await getBookingShopifyApi().customerUpdate(customerId, submission.value);
 
-    return redirectWithSuccess('.', {
-      message: 'Tema er opdateret!',
-    });
+    return redirect('.');
   } catch (error) {
     return submission.reply();
   }

app/routes/business.public.upload.tsx

@@ -7,12 +7,12 @@ import {
 } from '@remix-run/react';
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
 import {IconFileCv, IconInfoCircle} from '@tabler/icons-react';
 import {useEffect, useRef, useState} from 'react';
-import {redirectWithSuccess} from 'remix-toast';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {getCustomer} from '~/lib/get-customer';
 
@@ -41,9 +41,7 @@ export const action = async ({
     resourceUrl,
   });
 
-  return redirectWithSuccess('.', {
-    message: 'Der kan gå få sekunder inden dit billed bliver opdateret!',
-  });
+  return redirect('.');
 };
 
 export async function loader({context}: LoaderFunctionArgs) {

app/routes/business.schedules.$scheduleHandle.destroy.tsx

@@ -1,5 +1,4 @@
-import {type ActionFunction} from '@shopify/remix-oxygen';
-import {redirectWithSuccess} from 'remix-toast';
+import {redirect, type ActionFunction} from '@shopify/remix-oxygen';
 
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {baseURL} from '~/lib/api/mutator/query-client';
@@ -26,7 +25,5 @@ export const action: ActionFunction = async ({context, params}) => {
     `${baseURL}/customer/${customerId}/schedules`,
   );
 
-  return redirectWithSuccess('/business/schedules', {
-    message: 'Vagtplanen er slettet!',
-  });
+  return redirect('/business/schedules');
 };

app/routes/business.schedules.$scheduleHandle.edit.tsx

@@ -3,6 +3,7 @@ import {Form, useActionData, useLoaderData} from '@remix-run/react';
 
 import {
   json,
+  redirect,
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
 } from '@shopify/remix-oxygen';
@@ -12,7 +13,6 @@ import {customerScheduleCreateBody} from '~/lib/zod/bookingShopifyApi';
 
 import {parseWithZod} from '@conform-to/zod';
 import {FocusTrap, Stack, TextInput} from '@mantine/core';
-import {redirectWithSuccess} from 'remix-toast';
 import {SubmitButton} from '~/components/form/SubmitButton';
 import {baseURL} from '~/lib/api/mutator/query-client';
 
@@ -52,9 +52,7 @@ export const action = async ({
       `${baseURL}/customer/${customerId}/schedules`,
     );
 
-    return redirectWithSuccess(`/business/schedules/${response.payload._id}`, {
-      message: 'Vagtplan er opdateret!',
-    });
+    return redirect(`/business/schedules/${response.payload._id}`);
   } catch (error) {
     return submission.reply();
   }