@licklist/design 0.44.486-dev.9 → 0.44.487

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/CountryCodeSelect.tsx

@@ -52,9 +52,11 @@ function CountryCodeSelect({
           {t("chooseCountry")}
         </option>
         {sortedCountries.map((key: keyof typeof en) => (
-          <option key={key as string} value={key as string}>
-            {en[key]}
-          </option>
+          <>
+            <option key={key as string} value={key as string}>
+              {en[key]}
+            </option>
+          </>
         ))}
       </Form.Control>
       <Form.Control.Feedback type="invalid">{error}</Form.Control.Feedback>

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

@@ -3,7 +3,7 @@ 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";
-import { Modifier } from "@popperjs/core";
+import type Popper from "@popperjs/core";
 import { useId } from "@react-aria/utils";
 import { Icon } from "..";
 import {
@@ -15,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;
 };
 
@@ -30,7 +29,6 @@ export const DateRangeInput = ({
   endDate,
   onDateChange,
   months = 2,
-  disabled,
 }: DateRangeInputProps) => {
   const { t } = useTranslation("Design");
 
@@ -125,7 +123,6 @@ export const DateRangeInput = ({
           <Form.Control
             type="input"
             placeholder={placeholder}
-            disabled={disabled}
             readOnly
             className="date-range-input"
             value={stringDatesToInputValue({ startDate, endDate })}
@@ -141,7 +138,7 @@ export const DateRangeInput = ({
   );
 };
 
-const sameWidthPopperModifier: Modifier<
+export const sameWidthPopperModifier: Popper.Modifier<
   "sameWidth",
   Record<string, unknown>
 > = {

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/Calendar.scss

@@ -1,3 +1,4 @@
+
 .calendar-wrapper {
   display: flex;
 
@@ -20,7 +21,7 @@
           background-color: transparent;
         }
 
-        &:focus {
+        &:focus{
           box-shadow: none;
         }
       }
@@ -72,9 +73,10 @@
       }
     }
 
+    
+
     .calendar-dates-wrapper {
-      .calendar-weekdays,
-      .calendar-dates {
+      .calendar-weekdays, .calendar-dates {
         display: grid;
         grid-template-columns: repeat(7, auto);
         grid-gap: 0.5rem 1rem;
@@ -96,17 +98,17 @@
         margin-top: 0.75rem;
 
         .calendar-date {
+          height: 2rem;
           display: flex;
-          flex-direction: column;
           align-items: center;
           justify-content: center;
-          padding: 0.25rem;
+          padding: 0;
           border-radius: 0.25rem;
           background-color: $snippet-calendar-button-background-color;
           color: $snippet-calendar-button-font-color;
           font-size: 0.875rem;
           line-height: 1.3125rem;
-          border: 1px solid $snippet-calendar-button-border-color;
+          border: 1px solid $snippet-calendar-button-border-color;;
 
           &.selected-date {
             background-color: $snippet-calendar-active-button-background-color;
@@ -136,7 +138,7 @@
           &:hover {
             border-color: $snippet-calendar-active-button-border-color;
           }
-
+            
           &:focus {
             box-shadow: none;
           }
@@ -165,11 +167,11 @@
         justify-content: center;
         width: 3.75rem;
         height: 2.5rem;
-        background-color: #f2f2f2;
+        background-color: #F2F2F2;
         color: $black;
         font-size: 0.75rem;
         border-radius: 0.25rem;
-
+  
         &.selected-time {
           background-color: $blue;
           color: $white;
@@ -187,16 +189,14 @@
     flex-direction: column;
     align-items: center;
 
-    .calendar,
-    .start-time-wrapper {
+    .calendar, .start-time-wrapper {
       min-width: 20.75rem;
 
       .calendar-dates-wrapper {
-        .calendar-weekdays,
-        .calendar-dates {
+        .calendar-weekdays, .calendar-dates {
           grid-gap: 0.5rem;
         }
-
+  
         .calendar-dates {
           .calendar-date {
             width: 2.5rem;

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

@@ -64,11 +64,6 @@
   font-weight: 400;
   font-size: 0.875rem;
 
-  b {
-    display: block;
-    font-size: 1rem;
-  }
-
   .accordion > button {
     width: 100%;
     border: 0;
@@ -198,7 +193,7 @@
 }
 
 .steps-wrapper {
-  margin: 0 3rem;
+  margin-left: 1rem;
   flex: 1;
   display: flex;
   align-items: center;
@@ -207,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 {
@@ -230,7 +225,6 @@
     height: 2rem;
     transition: $color-transition;
     max-width: calc(100% - 12rem);
-    flex-grow: 1;
 
     .step {
       display: flex;
@@ -239,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;
         }
 
@@ -199,8 +197,7 @@
         color: $snippet-elements-button-color;
         border: none;
         background-color: $snippet-elements-button-background-color;
-        box-shadow: 0 0 0 $input-btn-focus-width
-          $snippet-elements-button-background-color;
+        box-shadow: 0 0 0 $input-btn-focus-width $snippet-elements-button-background-color;
       }
 
       &:disabled {
@@ -235,7 +232,7 @@
     font-weight: 500;
     border-radius: 0.25rem;
     font-size: 0.875rem;
-    min-height: 2.25rem;
+    height: 2.25rem;
 
     &:focus {
       box-shadow: unset;

package/src/styles/packages.scss

@@ -8,12 +8,9 @@
 @import "./sales";
 @import "./setting";
 @import "./sidebar";
-@import "./sortable-field";
 @import "./sortable-tree";
 @import "./static";
 @import "./table";
-@import "./back-button";
-@import "./iframe-customers-journey";
 @import "./custom-fields";
 @import "./file-upload";
 @import "./iframe-events";
@@ -32,12 +29,9 @@
 @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/resources-blocking/_index.scss

@@ -7,37 +7,6 @@
     overflow: auto;
   }
 
-  .reccurrence-interval-container {
-    .form-group {
-      margin-bottom: 0.5rem;
-      .form-control {
-        height: 1.5rem;
-        font-size: 0.625rem;
-        border: 2px solid #dcdcdc;
-        border-radius: 0.5rem;
-      }
-    }
-  }
-
-  .custom-checkbox .custom-control-label::before {
-    width: 1.5rem;
-    height: 1.5rem;
-    border-radius: 0.5rem;
-    border: 2px solid #0e8ce2;
-    margin-top: -0.3rem;
-  }
-  .custom-checkbox .custom-control-label::after {
-    width: 1.5rem;
-    height: 1.5rem;
-    top: 0;
-  }
-
-  .custom-control-label {
-    padding-left: 0.5rem;
-    font-weight: 400;
-    font-size: 0.875rem;
-  }
-
   label,
   header,
   button {
@@ -45,10 +14,6 @@
     font-size: 0.875rem;
   }
 
-  .title {
-    margin-left: 0.25rem;
-  }
-
   header {
     display: flex;
     justify-content: space-between;
@@ -81,7 +46,6 @@
     display: flex;
     align-items: center;
     gap: 1rem;
-    margin-bottom: 1rem;
 
     span {
       font-weight: 600;
@@ -94,7 +58,6 @@
     justify-content: space-between;
     align-items: center;
     gap: 0.25rem;
-    margin-bottom: 0.5rem;
   }
 
   .text-input.form-group {
@@ -127,7 +90,7 @@
       font-weight: 600;
     }
 
-    .resource {
+    .lane {
       margin-bottom: 0.25rem;
     }
   }

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,20 +175,18 @@
       .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;
 
         .icon {
           margin-left: 0.5rem;
-          border: none;
-          padding: 0;
           cursor: pointer;
           width: 1.125rem;
           height: 1.125rem;
-          background-color: #dcdcdc;
+          background-color: #DCDCDC;
           border-radius: 1rem;
           display: flex;
           align-items: center;
@@ -230,4 +196,4 @@
       }
     }
   }
-}
+}

package/src/styles/sales/ManualBooking.scss

@@ -158,12 +158,6 @@
     font-weight: 600;
   }
 
-  .category-start-time {
-    font-size: 1rem;
-    width: 11rem;
-    margin-top: 1rem;
-  }
-
   .accordion-form-control {
     border: none;
     border-bottom: 2px solid $gray-400;
@@ -285,7 +279,7 @@
   .small-sizes-input {
     font-size: 1.5rem;
     padding: 0;
-    padding-left: 1.5rem;
+    padding-left: 1.7rem;
     padding-right: 1rem;
     margin: 0 auto;
     width: 7rem;