gatsby-core-theme 38.0.1 → 38.0.3

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## [38.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v38.0.2...v38.0.3) (2024-09-02)
+
+
+### Bug Fixes
+
+* edit page admin bar ([c3bc9c6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c3bc9c640e4cd65461af0be28cf288a13da4ded4))
+* styling for storybook ([d677898](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d67789874f09f00b2fdd8ef3aa886ab591027bba))
+* styling for storybook ([40b45b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/40b45b19ac2aef925585c6ef0a6c85770ed8433c))
+* styling for storybook ([189fdb8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/189fdb8ca98cb6f67cbdbb87484f6d098859ce7c))
+* styling for storybook ([3a63b68](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3a63b68831086abcec57f293d6497bb0bd3a396c))
+* styling for storybook ([53d0e13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/53d0e13c174cec2ef0be061605823b9e6d55777e))
+* styling for storybook ([93c65e9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/93c65e941ce0388cbea504547cb33431a4eb363c))
+* styling for storybook ([2b329a3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2b329a316fd134644750290cd2705edee5e42ed3))
+* styling for storybook ([cc388af](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cc388af8f1860ac19827ce9002d72b8de4386d20))
+* styling for storybook ([aa73531](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/aa73531e10513123425c3fa874cff1ae7e150a68))
+* styling for storybook ([85e8a22](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/85e8a228ae61e28a72246360bf26ada0a424848f))
+
+
+### Code Refactoring
+
+* correction to path ([95d6f32](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/95d6f32f08103ecb06db890d6747d9fb03855f4c))
+* remove stylelint scss rule ([66e920e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/66e920e6c29768d76d5419ee770241047c49f8b8))
+
+
+* Merge branch 'tm-4567-feedback-modal' into 'master' ([2d4383e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2d4383e86bc0cf5683e2516ac5fc5fd5be737f0e))
+* Merge branch 'master' into tm-4567-feedback-modal ([32226c7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/32226c78ccb26c0d70e7930a7848ee802251c9bc))
+
+## [38.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v38.0.1...v38.0.2) (2024-09-02)
+
+
+### Bug Fixes
+
+* added Admin bar ([b018a7e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b018a7e34c1f29af2e83ea03b91dec0bc286df36))
+* edit page admin bar ([080fb4e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/080fb4efa91fcfe41a40c6ffbed7e809c0855b15))
+* site name env ([e9122bb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e9122bbe969790ee8ed998e011ace4d6db8c2929))
+
 ## [38.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v38.0.0...v38.0.1) (2024-08-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "38.0.1",
+  "version": "38.0.3",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/admin/admin.module.scss

@@ -0,0 +1,30 @@
+.container {
+     background-color: #23282d;
+}
+
+.innerContainer {
+    max-width: var(--main-container-max);
+    margin: 0 auto;
+
+    @include flex-align(center, space-between);
+    
+    a, span {
+        color: #fff;
+        font-size: 1.3rem;
+        padding: 1rem 2rem;
+    }
+
+    a {
+        @include flex-align(center, center);
+
+        gap: .5rem;
+
+        &:hover {
+            background-color: #32373c;
+            color: #00b9eb;
+        }
+    }
+}
+    
+
+    

package/src/components/atoms/admin/admin.test.js

@@ -0,0 +1,17 @@
+/* eslint-disable no-unused-expressions */
+import React from "react";
+import { render } from "@testing-library/react";
+import "@testing-library/jest-dom/extend-expect";
+import Admin from ".";
+
+describe("OperatorCtaButton Component", () => {
+  test("OperatorCtaButton with status active", () => {
+    const { getByText, container } = render(
+      <Admin page={{ id:123 } } />
+    );
+  
+    expect(getByText("Edit Page")).toBeInTheDocument();
+    expect(container.querySelector('a').getAttribute('href')).toBe('https://hercules.g2m.com/site-pages/123');
+
+  });
+});

package/src/components/atoms/admin/index.js

@@ -0,0 +1,24 @@
+import React from "react";
+import { FaEdit } from '@react-icons/all-files/fa/FaEdit';
+import styles from "./admin.module.scss";
+
+const index = ({ page }) => (
+  <div className={styles.container}>
+    <div className={styles.innerContainer}>
+      <span>Hercules CMS</span>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href={`${process.env.HERCULES_BACKEND_URL}site-pages/${page.id}`}
+            rel="noreferrer"
+          >
+            <FaEdit /> Edit Page
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+);
+
+export default index;

package/src/components/organisms/navigation/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-named-as-default */
-import React, { useRef } from "react";
+import React, { useRef, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import Search from "~organisms/search";
 import Link from "~hooks/link";
@@ -8,6 +8,8 @@ import MarketDropdown from "~atoms/market-dropdown";
 import Notifications from "~atoms/notifications";
 import { toggleScroll } from "~helpers/scroll";
 import ConditionalWrapper from "~atoms/conditional-wrapper";
+import { getCookie } from "~helpers/cookies";
+import Admin from "~atoms/admin";
 import Sticky from "~molecules/sticky";
 import CustomComponent from "~atoms/menu/variables";
 import { pageTypes } from "../../../constants/site-settings/navigation";
@@ -36,16 +38,17 @@ const Navigation = ({
   megaMenu = false,
   menu,
 }) => {
+  const [showAdminBar, setShowAdminBar] = useState(false);
   const navRef = useRef(React.createRef());
   const showMenu =
     pageTypes[template]?.showNavMenu ?? pageTypes.default.showNavMenu;
-  
+
   const showNotifications =
     pageTypes[template]?.showNotification ?? pageTypes.default.showNotification;
 
   let searchURLPageName = "s";
 
-  const showLogoWithLink = 
+  const showLogoWithLink =
     pageTypes[template]?.showLogoWithLink ?? pageTypes.default.showLogoWithLink;
 
   const logoImg = (
@@ -76,6 +79,15 @@ const Navigation = ({
     }
   };
 
+  useEffect(() => {
+    if (
+      typeof window !== `undefined` &&
+      getCookie("showAdminBar") === "true"
+    ) {
+      setShowAdminBar(true);
+    }
+  }, []);
+
   return (
     <ConditionalWrapper
       condition={sticky}
@@ -90,6 +102,7 @@ const Navigation = ({
         </Sticky>
       )}
     >
+      {showAdminBar && <Admin page={pageContext.page} />}
       <nav className={styles.nav || ""} ref={navRef}>
         <NavigationProvider>
           {showMenu && showLogoWithLink ? (
@@ -102,7 +115,7 @@ const Navigation = ({
               {logoImg}
             </Link>
           ) : (
-            <div className={`${styles.logo || ''}`}>{logoImg}</div>
+            <div className={`${styles.logo || ""}`}>{logoImg}</div>
           )}
           {showMenu && (
             <>

package/src/hooks/modal/modal.module.scss

@@ -12,7 +12,7 @@
   height: 100vh;
   top: 0;
   left: 0;
-  z-index: --custom-zindex(modal);
+  z-index: map.get($z-index, modal);
 }
 
 .activeModal {
@@ -26,7 +26,7 @@
   height: 100vh;
   top: 0;
   left: 0;
-  z-index: --custom-zindex(modal);
+  z-index: map.get($z-index, modal);
 }
 
 .modalContent {
@@ -37,7 +37,7 @@
   width: 100%;
   max-width: calc(var(--main-container-max) - 48px);
   border-radius: 1rem;
-  z-index: --custom-zindex(modal);
+  z-index: map.get($z-index, modal);
   position: relative;
 }
 

package/src/styles/extensions/_extensions.scss

@@ -0,0 +1 @@
+@use 'sass:map';

package/src/styles/globals.scss

@@ -1,6 +1,6 @@
-// Global styles extended in each theme
-
-// Utils
+/* stylelint-disable no-invalid-position-at-import-rule */
+@use 'sass:map';
+// NOTE: Styles
 @import './utils/variables/typography';
 @import './utils/variables/layout';
 @import './utils/variables/stack-order';
@@ -10,4 +10,4 @@
 @import './utils/loader';
 @import './utils/mixins';
 @import './utils/scrollbar';
-@import './utils/animations';
+@import './utils/animations';

package/src/styles/utils/variables/_stack-order.scss

@@ -1,5 +1,3 @@
-@use 'sass:map';
-
 $z-index: (
   modal: var(--modal-index),
   navigation: var(--navigation-index),
@@ -9,8 +7,4 @@ $z-index: (
   above-content: 1,
   content: 0,
   below-content: -1,
-);
-
-@function --custom-zindex($key){
-  @return map.get($z-index, $key);
-};
+);

package/tests/envVars.js

@@ -3,7 +3,7 @@ process.env.GATSBY_SITE_URL = 'http://urltest.com/';
 process.env.IMAGE_CDN_URL = 'https://cdn.images.com';
 process.env.TRACKER_LINK_FORMAT_MAIN = '[no],[visit],short_name';
 process.env.TRACKER_LINK_FORMAT_NON_MAIN = '[no],[visit],short_name,type,[tracker]';
-
+process.env.HERCULES_BACKEND_URL="https://hercules.g2m.com/"
 process.env.SITE_ID = 82;
 process.env.GATSBY_TRACKING_API_URL = 'testlink';
 process.env.IS_TRACKING_SSR = true;