@licklist/design 0.44.485-dev.78 → 0.44.485-dev.8

package/src/setting/dashboard/snippets/form/context.tsx

@@ -0,0 +1,18 @@
+import React, { createContext, useState } from "react";
+
+interface LoadingContext {
+  isLoading: boolean;
+  setLoading: (loading: boolean) => void;
+}
+
+export const SnippetLoadingContext = createContext<LoadingContext | null>(null);
+
+export function SnippetContextProvider({ children }) {
+  const [loading, setLoading] = useState(false);
+
+  return (
+    <SnippetLoadingContext.Provider value={{ isLoading: loading, setLoading }}>
+      {children}
+    </SnippetLoadingContext.Provider>
+  );
+}

package/src/setting/dashboard/snippets/form/index.ts

@@ -0,0 +1 @@
+export * from "./SnippetForm";

package/src/setting/dashboard/snippets/modal/SnippetViewTypeModal.stories.tsx

@@ -0,0 +1,28 @@
+import React, { useState } from "react";
+import { Button } from "react-bootstrap";
+import { Meta, Story } from "@storybook/react";
+
+import {
+  SnippetViewTypeModal,
+  SnippetViewTypeModalProps,
+} from "./SnippetViewTypeModal";
+
+export default {
+  title: "Snippets / SnippetViewTypeModal",
+} as Meta;
+
+export const Default: Story<SnippetViewTypeModalProps> = () => {
+  const [isVisible, setIsVisible] = useState(false);
+  return (
+    <div>
+      <Button onClick={() => setIsVisible(true)}>Open modal</Button>
+      <SnippetViewTypeModal
+        isVisible={isVisible}
+        onSubmit={(value) => console.log(value)}
+        onHide={() => setIsVisible(false)}
+      />
+    </div>
+  );
+};
+
+Default.args = {};

package/src/setting/dashboard/snippets/modal/SnippetViewTypeModal.tsx

@@ -0,0 +1,104 @@
+import React, { useState } from "react";
+import { Button, Modal } from "react-bootstrap";
+import { useTranslation } from "react-i18next";
+import clsx from "clsx";
+
+import ModalHeader from "react-bootstrap/ModalHeader";
+import ModalTitle from "react-bootstrap/ModalTitle";
+import Col from "react-bootstrap/Col";
+import {
+  SNIPPET_VIEW_TYPE_GRID,
+  SNIPPET_VIEW_TYPE_LIST,
+  SnippetViewType,
+} from "@licklist/core/dist/DataMapper/Provider/SnippetDataMapper";
+import Icon from "../../../../static/Icon";
+
+export const SNIPPET_VIEW_TYPES: {
+  [SNIPPET_VIEW_TYPE_GRID]: { label: string; icon: string };
+  [SNIPPET_VIEW_TYPE_LIST]: { label: string; icon: string };
+} = {
+  [SNIPPET_VIEW_TYPE_GRID]: {
+    label: SNIPPET_VIEW_TYPE_GRID,
+    icon: "th",
+  },
+  [SNIPPET_VIEW_TYPE_LIST]: {
+    label: SNIPPET_VIEW_TYPE_LIST,
+    icon: "bars",
+  },
+};
+
+export interface SnippetViewTypeModalProps {
+  isVisible: boolean;
+  onHide: () => void;
+  onSubmit: (value: SnippetViewType) => void;
+}
+
+export const SnippetViewTypeModal = ({
+  isVisible,
+  onHide,
+  onSubmit,
+}: SnippetViewTypeModalProps) => {
+  const { t } = useTranslation(["Design"]);
+  const allViewTypes = Object.keys(SNIPPET_VIEW_TYPES);
+  const [viewType, setViewType] = useState<SnippetViewType>("grid");
+
+  const onModalSubmit = () => {
+    onSubmit(viewType);
+    onHide();
+  };
+
+  return (
+    <Modal
+      size="lg"
+      centered
+      show={isVisible}
+      onHide={onHide}
+      className="p-3 border-0"
+      animation={false}
+      contentClassName="rounded"
+    >
+      <ModalHeader className="align-items-center border-0">
+        <ModalTitle as="h5">{t("Design:selectSnippetViewType")}</ModalTitle>
+
+        <Button variant="danger" className="btn-sm rounded" onClick={onHide}>
+          <Icon type="times" height="1.2rem" />
+        </Button>
+      </ModalHeader>
+
+      <Modal.Body>
+        <div className="d-flex flex-row flex-wrap p-4 justify-content-between">
+          {allViewTypes.map((currentViewType) => {
+            const { label, icon } = SNIPPET_VIEW_TYPES[currentViewType];
+            return (
+              <Col key={label}>
+                <Button
+                  variant="outline-light"
+                  className={clsx(
+                    "d-flex justify-content-center align-items-center flex-column w-100 py-6 rounded",
+                    viewType === currentViewType && "selected-snippet-type"
+                  )}
+                  role="button"
+                  tabIndex={0}
+                  onClick={() =>
+                    setViewType(currentViewType as SnippetViewType)
+                  }
+                >
+                  <Icon type={icon} color="#0e8ce2" height="4rem" />
+                  <h6 className="text-dark mt-3">{t(label)}</h6>
+                </Button>
+              </Col>
+            );
+          })}
+        </div>
+      </Modal.Body>
+      <Modal.Footer className="border-0">
+        <Button variant="secondary" onClick={onHide}>
+          {t("cancel")}
+        </Button>
+        <Button variant="primary" onClick={onModalSubmit}>
+          {t("confirm")}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};

package/src/setting/dashboard/snippets/modal/index.ts

@@ -0,0 +1,2 @@
+export { SnippetViewTypeModal } from "./SnippetViewTypeModal";
+export type { SnippetViewTypeModalProps } from "./SnippetViewTypeModal";

package/src/snippet/snippet-template/SnippetTemplate.tsx

@@ -44,7 +44,7 @@ export function SnippetTemplate({
         <SnippetTemplateViewContextProvider>
           <div
             ref={containerRef}
-            className="d-flex flex-column-reverse flex-sm-row overflow-auto"
+            className="d-flex flex-column-reverse flex-sm-row"
           >
             <div className="d-flex flex-grow-1">
               <Preview

package/src/snippet/snippet-template/form/SnippetTemplateForm.tsx

@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 import { isEqual } from "lodash";
 import {
   SnippetTemplateValues,
-  SNIPPET_TEMPLATE_TYPE_EVENT_LIST,
-  SNIPPET_TEMPLATE_TYPE_VENUE_MAP,
+  SNIPPET_TEMPLATE_TYPE_EVENT,
+  SNIPPET_TEMPLATE_TYPE_CALENDAR,
 } from "@licklist/core/dist/DataMapper/Provider/SnippetTemplateDataMapper";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import Row from "react-bootstrap/Row";
@@ -80,7 +80,7 @@ export function SnippetTemplateForm({
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
         <h2 className="mb-2 pb-1 border-bottom border-secondary">
-          {t("designSettings")}
+          {t("templateSettings")}
         </h2>
 
         <Row>
@@ -113,21 +113,21 @@ export function SnippetTemplateForm({
         {providerHasMap && (
           <Row>
             <Form.Group as={Col} xs sm={12} md={8} lg={10} xl={12}>
-              <Form.Label>{t("widgetType")}</Form.Label>
+              <Form.Label>{t("snippetType")}</Form.Label>
               <Form.Control
                 as="select"
                 {...register("type", {
                   required: t("Validation:fieldRequired", {
-                    attribute: t("widgetType"),
+                    attribute: t("snippetType"),
                   }) as string,
                 })}
-                placeholder={t("widgetType")}
+                placeholder={t("snippetType")}
               >
-                <option value={SNIPPET_TEMPLATE_TYPE_EVENT_LIST}>
-                  {t("widgetTypeEventList")}
+                <option value={SNIPPET_TEMPLATE_TYPE_EVENT}>
+                  {t("snippetTypeEventList")}
                 </option>
-                <option value={SNIPPET_TEMPLATE_TYPE_VENUE_MAP}>
-                  {t("widgetTypeVenueMaps")}
+                <option value={SNIPPET_TEMPLATE_TYPE_CALENDAR}>
+                  {t("snippetTypeVenueMaps")}
                 </option>
               </Form.Control>
             </Form.Group>

package/src/snippet/snippet-template/preview/Preview.tsx

@@ -3,8 +3,8 @@ import { useTranslation } from "react-i18next";
 import { MemoryRouter } from "react-router-dom";
 import { Button } from "react-bootstrap";
 import {
-  SNIPPET_TYPE_EVENT_LIST,
-  SNIPPET_TYPE_VENUE_MAP,
+  SNIPPET_TYPE_EVENT,
+  SNIPPET_TYPE_CALENDAR,
 } from "@licklist/core/dist/DataMapper/Provider/SnippetDataMapper";
 import { ProductSet } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
 import { IframeEventCard } from "../../../iframe/event/event-card";
@@ -44,7 +44,7 @@ export function Preview({
 
   const { setView } = useContext(SnippetTemplateViewContext);
   const {
-    template: { type = SNIPPET_TYPE_EVENT_LIST },
+    template: { type = SNIPPET_TYPE_EVENT },
   } = useContext(SnippetTemplateContext);
 
   const handleOnClick = (nextView: keyof typeof snippetTemplateViews) => {
@@ -186,7 +186,7 @@ export function Preview({
                   </div>
                 </SettingButton>
 
-                {providerHasMap && type === SNIPPET_TYPE_VENUE_MAP && (
+                {providerHasMap && type === SNIPPET_TYPE_CALENDAR && (
                   <>
                     <div className="pt-4">
                       <h4>{t("Calendar")}</h4>
@@ -368,6 +368,11 @@ export function Preview({
                   type="Party Doors 22:00 - 03:00"
                   cost={6}
                   date="Sat 2nd May"
+                  snippetSetting={{
+                    displayCost: true,
+                    displayType: true,
+                    displayDescription: true,
+                  }}
                   goToDetails={() => null}
                   shortDate="07/03/2023"
                 />

package/src/sortable-tree/SortableTreeItem.tsx

@@ -40,9 +40,6 @@ export interface SortableTreeItemProps {
   isIconInHeader?: boolean;
   treeLineIconColor?: string;
   modalLabel?: string;
-  cancelChanges?: () => void;
-  edit?: () => void;
-  saveValidField?: () => void;
   modalClass?: ProductSetModalClassesType;
   isNewAdded?: boolean;
   onDelete?: () => void;
@@ -73,9 +70,6 @@ export function SortableTreeItem({
   isNewAdded = false,
   onDelete,
   validate,
-  cancelChanges,
-  saveValidField,
-  edit,
   secondaryBadge,
   setIsExpanded,
 }: SortableTreeItemProps) {
@@ -128,26 +122,7 @@ export function SortableTreeItem({
     if (!validate) setIsModalVisible(false);
 
     const success = await validate?.();
-
-    if (success) {
-      if (saveValidField) saveValidField();
-      setIsModalVisible(false);
-    }
-  };
-
-  const onCancel = () => {
-    if (!cancelChanges) {
-      onHide();
-      return;
-    }
-    cancelChanges();
-    setIsModalVisible(false);
-  };
-
-  const onEdit = (e) => {
-    e.stopPropagation();
-    if (edit && !isModalVisible) edit();
-    setIsModalVisible(true);
+    if (success) setIsModalVisible(false);
   };
 
   useEffect(() => {
@@ -283,7 +258,10 @@ export function SortableTreeItem({
                   className="border-0 open-edit-right-modal-button"
                   role="button"
                   tabIndex={0}
-                  onClick={(e) => onEdit(e)}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    setIsModalVisible(true);
+                  }}
                   onKeyDown={(e) => e.stopPropagation()}
                 >
                   <Icon type="ellipsis-h" color="#0E8CE2" height="1rem" />
@@ -313,7 +291,7 @@ export function SortableTreeItem({
                   <button
                     className="p-0 cancel-add-step-btn border-0"
                     type="button"
-                    onClick={onCancel}
+                    onClick={onHide}
                   >
                     <span>{t("Design:cancel")}</span>
                   </button>

package/src/static/date-range-input/DateRangeInput.tsx

@@ -3,7 +3,6 @@ import { Button, Form, OverlayTrigger, Popover } from "react-bootstrap";
 import { DateRange, Range } from "react-date-range";
 import { useClickAway } from "react-use";
 import { useTranslation } from "react-i18next";
-// @TODO fix issue with Poper, because we can't import DateRangeInput to our apps
 import type Popper from "@popperjs/core";
 import { useId } from "@react-aria/utils";
 import { Icon } from "..";
@@ -16,12 +15,11 @@ import {
 import "react-date-range/dist/styles.css";
 import "react-date-range/dist/theme/default.css";
 
-type DateRangeInputProps = {
+export type DateRangeInputProps = {
   placeholder: string;
   startDate?: string;
   endDate?: string;
   months?: number;
-  disabled?: boolean;
   onDateChange?: (dates: { startDate?: string; endDate?: string }) => void;
 };
 
@@ -31,7 +29,6 @@ export const DateRangeInput = ({
   endDate,
   onDateChange,
   months = 2,
-  disabled,
 }: DateRangeInputProps) => {
   const { t } = useTranslation("Design");
 
@@ -126,7 +123,6 @@ export const DateRangeInput = ({
           <Form.Control
             type="input"
             placeholder={placeholder}
-            disabled={disabled}
             readOnly
             className="date-range-input"
             value={stringDatesToInputValue({ startDate, endDate })}

package/src/styles/events/EventStatisticModal.scss

@@ -6,6 +6,43 @@
     .modal-body {
       height: 75vh;
       overflow: scroll;
+
+      table.event-statistic-table {
+        thead {
+          display: none;
+        }
+      
+        tbody {
+          tr {
+            border-bottom: 1px solid $gray-500;
+            td {
+              text-transform: capitalize;
+
+              &:nth-child(2), &:nth-child(3) {
+                text-align: right;
+              }
+              &:nth-child(2) {
+                width: 20%;
+              }
+              &:nth-child(3) {
+                width: 35%;
+              }
+            }
+
+            td:has(div.header-row){
+              background-color: #d8ecf7;
+            }
+
+            &:first-child {
+              border-top: 1px solid $gray-500;
+            }
+          }
+        }
+
+        .bold {
+          font-weight: 600;
+        }
+      }
     }
   }
 

package/src/styles/events/EventVenueMap.scss

@@ -55,7 +55,7 @@
   .zoom-buttons {
     position: absolute;
     top: calc((100% - 10rem) / 2);
-    right: 1.75rem;
+    right: 0.75rem;
     z-index: 5;
 
     .buttons-wrapper {

package/src/styles/iframe-events/_index.scss

@@ -15,6 +15,3 @@
 @import "./CalendarSelect.scss";
 @import "./EventStepVenueMapZones.scss";
 @import "./CategoryStepsForm.scss";
-@import "./ActivitiesSelectedCard.scss";
-@import "./SelectDateAndTimeEvent.scss";
-@import "./ActivitiesCard.scss";

package/src/styles/iframe-order-process/IframeOrderProcess.scss

@@ -193,7 +193,7 @@
 }
 
 .steps-wrapper {
-  margin: 0 3rem;
+  margin-left: 1rem;
   flex: 1;
   display: flex;
   align-items: center;
@@ -202,7 +202,7 @@
 
   .step-numbers {
     font-weight: 500;
-    margin: 0 1rem;
+    margin-left: 1rem;
     color: $snippet-page-header-steps-inactive-step-body-color;
 
     .active-step {
@@ -225,7 +225,6 @@
     height: 2rem;
     transition: $color-transition;
     max-width: calc(100% - 12rem);
-    flex-grow: 1;
 
     .step {
       display: flex;
@@ -234,13 +233,11 @@
       margin: 0 0.5rem;
       z-index: 1;
       scroll-margin: 10rem;
-      flex-grow: 1;
 
       .number {
         text-align: center;
-        max-width: 17rem;
-        width: 100%;
-        height: 0.35rem;
+        width: 3rem;
+        height: 0.25rem;
         line-height: 2.5rem;
         background: $snippet-page-header-steps-inactive-step-background-color;
         display: block;

package/src/styles/iframe-page/PageBody.scss

@@ -60,7 +60,6 @@
 
     .left-block-container {
       height: calc(100svh - 12rem);
-      scrollbar-width: none;
       overflow: scroll;
 
       .iframe-event-card {
@@ -120,7 +119,6 @@
 
         &.show {
           overflow: scroll;
-          scrollbar-width: none;
           overflow-x: hidden;
         }
 

package/src/styles/packages.scss

@@ -29,12 +29,10 @@
 @import "./iframe-page";
 @import "./affiliate";
 @import "./zones";
+@import "./widgets/";
 @import "./resources-blocking";
 @import "./ryft-payment-form";
 @import "./skeleton";
 @import "./virtualized/";
 @import "./error";
 @import "./customers/";
-@import "./striped-static-table/";
-@import "./image-radio-input/";
-@import "./radio-card/";

package/src/styles/sales/BookingFilter.scss

@@ -33,7 +33,7 @@
             margin: 0.875rem;
             z-index: 3;
           }
-
+          
           .form-control {
             height: 2.75rem;
             color: $blue;
@@ -57,11 +57,7 @@
         margin-right: 0.5rem;
       }
 
-      .cancel-button,
-      .add-filters-button,
-      .refresh-button,
-      .fullscreen-button,
-      .minimize-button {
+      .cancel-button, .add-filters-button, .refresh-button, .fullscreen-button, .minimize-button {
         display: flex;
         color: $gray-800;
 
@@ -96,14 +92,11 @@
         }
       }
 
-      .fullscreen-button,
-      .minimize-button {
+      .fullscreen-button, .minimize-button {
         min-width: 7.25rem;
       }
 
-      .refresh-button,
-      .fullscreen-button,
-      .minimize-button {
+      .refresh-button, .fullscreen-button, .minimize-button {
         .icon {
           background-color: transparent;
 
@@ -152,37 +145,13 @@
   .additional-filter-section {
     margin-top: 1.25rem;
 
-    @include media-breakpoint-up(md) {
+    @include media-breakpoint-up(md){
       .form-group {
         margin-bottom: 0;
       }
     }
   }
 
-  .additional-filter-container {
-    flex-wrap: nowrap;
-
-    @include media-breakpoint-down(md) {
-      flex-wrap: wrap;
-      .date-container {
-        width: 100%;
-        flex: 1;
-      }
-      .btn-primary {
-        margin-top: 1rem;
-      }
-    }
-
-    @include media-breakpoint-between(md, lg) {
-      flex-wrap: nowrap;
-
-      .date-container {
-        width: auto;
-        flex: 0 0 35%;
-      }
-    }
-  }
-
   .searching-for-section {
     .tags {
       display: flex;
@@ -192,9 +161,8 @@
       p {
         margin: 0;
       }
-
-      .label,
-      .search-query-param {
+      
+      .label, .search-query-param {
         font-size: 1.125rem;
         font-weight: 600;
       }
@@ -207,8 +175,8 @@
       .result-tag {
         display: flex;
         align-items: center;
-        border: 1px solid #dcdcdc;
-        background-color: #f5f5f5;
+        border: 1px solid #DCDCDC;
+        background-color: #F5F5F5;
         padding: 0.5rem 0.75rem;
         font-size: 0.75rem;
         text-transform: capitalize;
@@ -218,7 +186,7 @@
           cursor: pointer;
           width: 1.125rem;
           height: 1.125rem;
-          background-color: #dcdcdc;
+          background-color: #DCDCDC;
           border-radius: 1rem;
           display: flex;
           align-items: center;
@@ -228,4 +196,4 @@
       }
     }
   }
-}
+}

package/src/styles/sales/RandomColors.scss

@@ -1,20 +1,17 @@
 .random-color {
   &-blue {
-    background-color: #e4f9ff;
+    background-color: #E4F9FF;
   }
 
   &-yellow {
-    background-color: #f7f4c1;
+    background-color: #F7F4C1;
   }
 
   &-green {
-    background-color: #e4fff3;
+    background-color: #E4FFF3;
   }
 
   &-pink {
-    background-color: #ffe4f8;
-  }
-  &-violet {
-    background-color: #e4e4ff;
+    background-color: #FFE4F8;
   }
 }

package/src/styles/snippet-templates/SnippetTemplateCard.scss

@@ -45,22 +45,6 @@ $snippet-template-card-button-transition: $product-set-card-transition !default;
     display: flex;
     justify-content: space-between;
     align-items: center;
-
-    a {
-      white-space: nowrap;
-      display: inline-block;
-      text-overflow: ellipsis;
-      width: 85%;
-      overflow: hidden;
-    }
-  }
-
-  .snippet-template-card-subject {
-    white-space: nowrap;
-    display: inline-block;
-    text-overflow: ellipsis;
-    width: 100%;
-    overflow: hidden;
   }
 
   .snippet-template-card-button {

package/src/styles/static/DateRangeInput.scss

@@ -5,10 +5,6 @@
 
   .date-range-input[readonly] {
     background-color: transparent;
-
-    &:disabled {
-      background-color: #ebebeb;
-    }
   }
 
   .date-range-input-icon {
@@ -17,4 +13,4 @@
     bottom: 1rem;
     color: $gray-500;
   }
-}
+}