Merge pull request #120 from jamalsoueidan/fix-service-and-remove-embla

fix service url and remove embla
jamalsoueidan · Jul 12, 2024 · 8528d9a · 8528d9a
2 parents 12f5dc8 + 88526f6
commit 8528d9a
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 141 deletions.
diff --git a/app/components/Slider.module.css b/app/components/Slider.module.css
diff --git a/app/components/Slider.tsx b/app/components/Slider.tsx
diff --git a/app/root.tsx b/app/root.tsx
@@ -1,4 +1,3 @@
-import carouselStyles from '@mantine/carousel/styles.css?url';
 import {
   ColorSchemeScript,
   DirectionProvider,
@@ -67,7 +66,6 @@ export const shouldRevalidate: ShouldRevalidateFunction = ({
 export const links = () => {
   return [
     {rel: 'stylesheet', href: appStyles},
-    {rel: 'stylesheet', href: carouselStyles},
     {rel: 'stylesheet', href: coreStyles},
     {rel: 'stylesheet', href: nprogressStyles},
     {

diff --git a/app/routes/business.locations._index.tsx b/app/routes/business.locations._index.tsx
@@ -27,7 +27,7 @@ import {getCustomer} from '~/lib/get-customer';
 export async function loader({context}: LoaderFunctionArgs) {
   const customerId = await getCustomer({context});
   const {payload: locations} =
-    await getBookingShopifyApi().customerLocationList(customerId, context);
+    await getBookingShopifyApi().customerLocationList(customerId);
 
   return json({locations});
 }

diff --git a/app/routes/business.locations.create.tsx b/app/routes/business.locations.create.tsx
@@ -25,7 +25,6 @@ import {RadioGroup} from '~/components/form/RadioGroup';
 import {SubmitButton} from '~/components/form/SubmitButton';
 import {getBookingShopifyApi} from '~/lib/api/bookingShopifyApi';
 import {CustomerLocationBaseLocationType} from '~/lib/api/model';
-import {baseURL} from '~/lib/api/mutator/query-client';
 
 const schema = customerLocationCreateBody;
 
@@ -45,10 +44,6 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
       submission.value,
     );
 
-    await context.storefront.cache?.delete(
-      `${baseURL}/customer/${customerId}/locations`,
-    );
-
     return redirect('/business/locations');
   } catch (error) {
     return submission.reply();

diff --git a/app/routes/business.public._index.tsx b/app/routes/business.public._index.tsx
@@ -109,25 +109,6 @@ export default function AccountBusiness() {
             ]}
           />
 
-          <MultiTags
-            field={professions}
-            data={professionOptions}
-            label="Hvad er dine professioner"
-            placeholder="Vælg professioner"
-          />
-
-          <MultiTags
-            field={specialties}
-            data={skillsOptions}
-            label="Hvad er dine specialer?"
-            placeholder="Vælge special(er)?"
-          />
-
-          <TextInput
-            label="Års erfaring"
-            {...getInputProps(yearsExperience, {type: 'number'})}
-          />
-
           <MultiTags
             field={speaks}
             data={[
@@ -158,6 +139,25 @@ export default function AccountBusiness() {
             />
           </div>
 
+          <MultiTags
+            field={professions}
+            data={professionOptions}
+            label="Hvad er dine professioner"
+            placeholder="Vælg professioner"
+          />
+
+          <MultiTags
+            field={specialties}
+            data={skillsOptions}
+            label="Hvad er dine specialer?"
+            placeholder="Vælge special(er)?"
+          />
+
+          <TextInput
+            label="Års erfaring"
+            {...getInputProps(yearsExperience, {type: 'number'})}
+          />
+
           <div>
             <SubmitButton>Gem ændringer</SubmitButton>
           </div>

diff --git a/app/routes/business.services.create.tsx b/app/routes/business.services.create.tsx
@@ -47,7 +47,6 @@ import {
   type CustomerProductLocationsItem,
   type OpenAIProductTitle200Payload,
 } from '~/lib/api/model';
-import {baseURL} from '~/lib/api/mutator/query-client';
 import {convertHTML} from '~/lib/convertHTML';
 import {getCustomer} from '~/lib/get-customer';
 import {customerProductAddBody} from '~/lib/zod/bookingShopifyApi';
@@ -75,10 +74,6 @@ export const action = async ({request, context}: ActionFunctionArgs) => {
       },
     );
 
-    await context.storefront.cache?.delete(
-      `${baseURL}/customer/${customerId}/products`,
-    );
-
     return redirect(`/business/services/${product.productId}`);
   } catch (error) {
     return submission.reply();
@@ -99,10 +94,10 @@ export async function loader({context}: LoaderFunctionArgs) {
   );
 
   const {payload: schedules} =
-    await getBookingShopifyApi().customerScheduleList(customerId, context);
+    await getBookingShopifyApi().customerScheduleList(customerId);
 
   const {payload: locations} =
-    await getBookingShopifyApi().customerLocationList(customerId, context);
+    await getBookingShopifyApi().customerLocationList(customerId);
 
   if (locations.length === 0 || schedules.length === 0) {
     return redirect('/business/services');
@@ -163,7 +158,7 @@ export default function AccountServicesCreate() {
   const aiSuggestion = useCallback(() => {
     fetcher.submit(
       {title: fields.title.value || ''},
-      {action: '/business/api/ai-suggestion'},
+      {action: '/business/api/ai/product'},
     );
   }, [fetcher, fields.title.value]);
 
@@ -174,13 +169,21 @@ export default function AccountServicesCreate() {
         name: fields.productType.name,
         value: fetcher.data.collection?.title || '',
       });
+      form.update({
+        name: fields.price.name,
+        value: {
+          amount: fetcher.data.price,
+          currencyCode: 'DKK',
+        },
+      });
       setDescriptionHtml(fetcher.data.description);
-      fetcher.load('/business/api/ai-suggestion'); //reset
+      fetcher.load('/api/reset'); //reset
     }
   }, [
     fetcher,
     fetcher.data,
     fetcher.state,
+    fields.price.name,
     fields.productType.name,
     fields.title.name,
     fields.title.value,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
     "@fullcalendar/interaction": "^6.1.14",
     "@fullcalendar/react": "^6.1.14",
     "@fullcalendar/timegrid": "^6.1.14",
-    "@mantine/carousel": "^7.11.0",
     "@mantine/core": "^7.11.0",
     "@mantine/hooks": "^7.11.0",
     "@mantine/modals": "^7.11.0",
@@ -58,8 +57,6 @@
     "country-flag-icons": "^1.5.11",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.1",
-    "embla-carousel-autoplay": "^7.1.0",
-    "embla-carousel-react": "^7.1.0",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "i18next": "^23.11.5",