@licklist/design 0.58.5 → 0.58.6-dev.1

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

@@ -12,9 +12,6 @@
   .left-block {
     flex: 1;
     align-items: stretch;
-    border-radius: 0.5rem;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
     padding: 1rem;
     background-color: $snippet-page-body-left-block-background-color;
     border: 0;
@@ -33,7 +30,6 @@
       display: flex;
       align-items: flex-start;
       justify-content: space-between;
-
       .title {
         color: $snippet-elements-body-color;
         margin: 0;
@@ -64,7 +60,7 @@
       overflow-x: hidden;
       scrollbar-width: thin;
       .iframe-event-card {
-        border-bottom: 2px solid $separator-color;
+        border-bottom: 1px solid $separator-color;
       }
 
       @include media-breakpoint-down(sm) {
@@ -81,8 +77,6 @@
   }
 
   .right-block {
-    margin-left: 1rem;
-    border-radius: 0.5rem;
     height: calc(100% - 1rem);
     max-width: 17.5rem;
     min-width: 17.5rem;
@@ -115,7 +109,7 @@
       }
 
       .collapse {
-        max-height: calc(100vh - 19rem);
+        max-height: calc(100vh - 15rem);
         transition: none 0s ease 0s;
 
         &.show {
@@ -125,7 +119,7 @@
         }
 
         @include media-breakpoint-down(sm) {
-          max-height: 7.5rem;
+          max-height: 100%;
         }
       }
       .collapse-with-people-input {
@@ -151,8 +145,14 @@
     }
 
     .iframe-event-card {
-      background-color: transparent;
-      border-color: transparent;
+      border: none;
+
+      .card-image {
+        border-radius: 0;
+      }
+      .card-body {
+        padding-left: 1rem;
+      }
     }
 
     .price {
@@ -262,3 +262,24 @@
     }
   }
 }
+
+.event-list-page-body {
+  overflow: auto;
+  .left-block {
+    .navigation {
+      font-size: 1.125rem;
+      font-weight: 500;
+      padding-bottom: 2.625rem;
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      margin-top: 0.125rem;
+
+      .title {
+        position: absolute;
+        color: $snippet-elements-body-color;
+        margin: 0;
+      }
+    }
+  }
+}

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

@@ -20,55 +20,57 @@ $base-height: 2.5rem;
       transition: $color-transition;
       border: 0;
     }
+  }
+}
 
-    .button-wrapper {
-      background-color: $snippet-page-header-steps-close-button-background-color;
-      height: $base-height;
+.iframe-page {
+  .button-wrapper {
+    background-color: $snippet-page-header-steps-close-button-background-color;
+    height: $base-height;
+    width: $base-height;
+    border-radius: $base-height;
+    transition: $color-transition;
+
+    .close-button {
+      font-size: 1.25rem;
       width: $base-height;
-      border-radius: $base-height;
+      height: $base-height;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: $snippet-page-header-steps-close-button-border-color;
       transition: $color-transition;
 
-      .close-button {
-        font-size: 1.25rem;
-        width: $base-height;
-        height: $base-height;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: $snippet-page-header-steps-close-button-border-color;
-        transition: $color-transition;
-
-        &:hover {
-          cursor: pointer;
-        }
+      &:hover {
+        cursor: pointer;
       }
+    }
 
-      &.close-button {
-        margin-left: 1rem;
-      }
+    &.close-button {
+      margin-left: 1rem;
+    }
 
-      .back-button {
-        font-size: 2rem;
-        width: $base-height;
-        height: $base-height;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-weight: lighter;
-        color: $snippet-page-header-steps-close-button-border-color;
-        transition: $color-transition;
+    .back-button {
+      font-size: 2rem;
+      width: $base-height;
+      height: $base-height;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: lighter;
+      color: $snippet-page-header-steps-close-button-border-color;
+      transition: $color-transition;
 
-        &:hover {
-          cursor: pointer;
-        }
+      &:hover {
+        cursor: pointer;
       }
+    }
 
-      &.back-button {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 1rem;
-      }
+    &.back-button {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 1rem;
     }
   }
 }

package/src/styles/product-set/EditVenueMapSetModal.scss

@@ -91,7 +91,7 @@
   }
 
   @include media-breakpoint-down(sm) {
-    top: 50%;
+    top: 100%;
   
     .step-save-btn {
       width: 100%;

package/src/styles/sales/BookingResults.scss

@@ -5,7 +5,7 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 14.25rem;
+      height: 14rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);

package/jest.config.js

@@ -1,29 +0,0 @@
-// For a detailed explanation regarding each configuration property, visit:
-// https://jestjs.io/docs/en/configuration.html
-
-module.exports = {
-  modulePathIgnorePatterns: ["/dist/"],
-  roots: ["<rootDir>/src", "<rootDir>/tests"],
-  globals: {
-    "ts-jest": {
-      isolatedModules: true,
-      babelConfig: {
-        presets: ["@babel/preset-env", "@babel/preset-react"],
-      },
-    },
-  },
-  transform: {
-    "^.+\\.(t|j)sx?$": "ts-jest",
-  },
-  transformIgnorePatterns: [
-    "node_modules/(?!(redux-persist)/)",
-    "node_modules/(?!(@licklist)/)",
-  ],
-  testRegex: ["(\\/tests\\/.*.(test|spec))\\.tsx?$"],
-  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
-  moduleNameMapper: {
-    "^.+\\.(css|scss|sass|less)$": "<rootDir>/tests/__mock__/styleMock.js",
-    ".+\\.(svg|png|jpg)$": "identity-obj-proxy",
-  },
-};

package/tests/Auth/Authorizer.test.tsx

@@ -1,194 +0,0 @@
-import RouteService from "@licklist/plugins/dist/services/Route/RouteService";
-import { mount, shallow } from "enzyme";
-import * as React from "react";
-import { act } from "react-dom/test-utils";
-import { QueryClientProvider } from "react-query";
-import { Authorizer } from "../../src/auth/Authorizer";
-import useAuthMock from "../__mock__/hooks/useAuthMock";
-import useUserMock from "../__mock__/hooks/useUserMock";
-import useAuthApi from "../__mock__/hooks/useAuthApi";
-import { queryClient } from "../packages/react-query";
-
-jest.mock("react-i18next", () => ({
-  Trans: jest.fn().mockReturnValue("test"),
-  useTranslation: () => ({
-    t: jest.fn((arg) => arg),
-  }),
-}));
-jest.mock("@licklist/plugins/dist/context/user/hooks/useAuth");
-jest.mock("@licklist/plugins/dist/context/user/hooks/useUser");
-jest.mock("@licklist/plugins/dist/hooks/Api/useAuthApi");
-
-const DEFAULT_PROFILE_RESPONSE = {
-  useProfile: () => ({
-    isLoading: false,
-    isFetching: false,
-    isError: false,
-    data: { access_token: "test" },
-  }),
-};
-
-const DEFAULT_PROFILE_LOADING_RESPONSE = {
-  useProfile: () => ({
-    isLoading: true,
-    isFetching: false,
-    isError: false,
-    data: { access_token: "test" },
-  }),
-};
-
-describe("Authorizer", () => {
-  it("should be rendered without issues", () => {
-    useAuthMock({
-      secrets: null,
-    });
-    useUserMock({
-      profile: null,
-    });
-    useAuthApi(DEFAULT_PROFILE_LOADING_RESPONSE);
-
-    const component = shallow(
-      <QueryClientProvider client={queryClient}>
-        <Authorizer />
-      </QueryClientProvider>
-    );
-
-    expect(component.exists()).toBeTruthy();
-  });
-
-  it("should render children if authorized", () => {
-    let component: any;
-
-    useAuthMock({
-      secrets: "not-null",
-    });
-    useUserMock({
-      profile: "not-null",
-    });
-    useAuthApi(DEFAULT_PROFILE_LOADING_RESPONSE);
-
-    RouteService.getCurrentPage = jest.fn();
-    RouteService.getCurrentRoute = jest.fn();
-    RouteService.cleanRedirect = jest.fn();
-
-    act(() => {
-      component = mount(
-        <QueryClientProvider client={queryClient}>
-          <Authorizer>
-            <p>test</p>
-          </Authorizer>
-        </QueryClientProvider>
-      );
-    });
-
-    component.update();
-
-    expect(RouteService.getCurrentPage).toHaveBeenCalledTimes(0);
-    expect(RouteService.getCurrentRoute).toHaveBeenCalledTimes(0);
-    expect(RouteService.cleanRedirect).toHaveBeenCalledTimes(0);
-    expect(component.exists()).toBeTruthy();
-    expect(component.find("BlockLoader").exists()).toBeTruthy();
-  });
-
-  it("should render children if current page is login", () => {
-    let component: any;
-
-    useAuthMock({
-      secrets: null,
-    });
-    useUserMock({
-      profile: null,
-    });
-    useAuthApi(DEFAULT_PROFILE_LOADING_RESPONSE);
-
-    RouteService.getCurrentPage = jest.fn().mockReturnValue("/login");
-    RouteService.getCurrentRoute = jest.fn();
-    RouteService.cleanRedirect = jest.fn();
-
-    act(() => {
-      component = mount(
-        <QueryClientProvider client={queryClient}>
-          <Authorizer>
-            <p>test</p>
-          </Authorizer>
-        </QueryClientProvider>
-      );
-    });
-
-    component.update();
-
-    expect(RouteService.getCurrentPage).toHaveBeenCalledTimes(0);
-    expect(RouteService.getCurrentRoute).toHaveBeenCalledTimes(0);
-    expect(RouteService.cleanRedirect).toHaveBeenCalledTimes(0);
-    expect(component.exists()).toBeTruthy();
-    expect(component.find("BlockLoader").exists()).toBeTruthy();
-  });
-
-  it("should NOT render children if profile is loading or fetching", () => {
-    let component: any;
-
-    useAuthMock({
-      secrets: null,
-    });
-    useUserMock({
-      profile: null,
-    });
-    useAuthApi(DEFAULT_PROFILE_LOADING_RESPONSE);
-
-    RouteService.getCurrentPage = jest.fn();
-    RouteService.getCurrentRoute = jest.fn();
-    RouteService.cleanRedirect = jest.fn();
-
-    act(() => {
-      component = mount(
-        <QueryClientProvider client={queryClient}>
-          <Authorizer>
-            <p>test</p>
-          </Authorizer>
-        </QueryClientProvider>
-      );
-    });
-
-    component.update();
-
-    expect(RouteService.getCurrentPage).toHaveBeenCalledTimes(0);
-    expect(RouteService.getCurrentRoute).toHaveBeenCalledTimes(0);
-    expect(RouteService.cleanRedirect).toHaveBeenCalledTimes(0);
-    expect(component.exists()).toBeTruthy();
-    expect(component.find("BlockLoader").exists()).toBeTruthy();
-  });
-
-  it("should NOT render children if unauthorized and current page is not login", () => {
-    let component: any;
-
-    useAuthMock({
-      secrets: null,
-    });
-    useUserMock({
-      profile: null,
-    });
-    useAuthApi(DEFAULT_PROFILE_RESPONSE);
-
-    RouteService.getCurrentPage = jest.fn();
-    RouteService.getCurrentRoute = jest.fn();
-    RouteService.cleanRedirect = jest.fn();
-
-    act(() => {
-      component = mount(
-        <QueryClientProvider client={queryClient}>
-          <Authorizer>
-            <p>test</p>
-          </Authorizer>
-        </QueryClientProvider>
-      );
-    });
-
-    component.update();
-
-    expect(RouteService.getCurrentPage).toHaveBeenCalledTimes(3);
-    expect(RouteService.getCurrentRoute).toHaveBeenCalledTimes(1);
-    expect(RouteService.cleanRedirect).toHaveBeenCalledTimes(1);
-    expect(component.exists()).toBeTruthy();
-    expect(component.find("BlockLoader").exists()).toBeTruthy();
-  });
-});

package/tests/Auth/Layout/UserNavDropDown.test.tsx

@@ -1,43 +0,0 @@
-import RouteService from "@licklist/plugins/dist/services/Route/RouteService";
-import { mount, shallow } from "enzyme";
-import * as React from "react";
-import useTranslationMock from "../../__mock__/hooks/useTranslationMock";
-import useUserMock from "../../__mock__/hooks/useUserMock";
-import { UserNavDropDown } from "../../../src/auth/Layout/UserNavDropDown";
-
-jest.mock("react-i18next");
-jest.mock("@licklist/plugins/dist/context/user/hooks/useUser");
-
-describe("UserNavDropDown", () => {
-  it("should be rendered without issues", () => {
-    useTranslationMock({
-      t: jest.fn(),
-    });
-    useUserMock({
-      profile: null,
-    });
-
-    const component = shallow(<UserNavDropDown />);
-
-    expect(component.exists()).toBeTruthy();
-  });
-
-  it("should logout on click", () => {
-    useTranslationMock({
-      t: jest.fn(),
-    });
-    useUserMock({
-      logout: jest.fn(),
-    });
-
-    RouteService.redirectTo = jest.fn();
-
-    const component = mount(<UserNavDropDown />);
-
-    expect(component.exists()).toBeTruthy();
-
-    component.children().prop("onClick")();
-
-    expect(RouteService.redirectTo).toHaveBeenCalledTimes(1);
-  });
-});

package/tests/Auth/Layout/UserNavDropDownToggle.test.tsx

@@ -1,33 +0,0 @@
-import { IUser } from "@licklist/plugins/dist/types/context/user/IUser";
-import { shallow } from "enzyme";
-import * as React from "react";
-import { UserNavDropDownToggle } from "../../../src/auth/Layout/UserNavDropDownToggle";
-import useTranslationMock from "../../__mock__/hooks/useTranslationMock";
-
-jest.mock("react-i18next");
-jest.mock("@licklist/plugins/dist/context/user/hooks/useUser");
-
-const user: IUser = {
-  id: 1,
-  first_name: "first_name",
-  last_name: "last_name",
-  email: "email",
-  user_roles: [],
-  user_detail: {
-    postcode: "",
-    birthday: "",
-    phone: "",
-  },
-};
-
-describe("UserNavDropDownToggle", () => {
-  it("should be rendered without issues", () => {
-    useTranslationMock({
-      t: jest.fn(),
-    });
-
-    const component = shallow(<UserNavDropDownToggle user={user} />);
-
-    expect(component.exists()).toBeTruthy();
-  });
-});