@openeventkit/event-site 1.0.10 → 1.0.12

package/gatsby-config.js

@@ -18,6 +18,19 @@ catch (e) {
   console.log("Falling back to default site settings.")
 }
 
+const relativeContentDir = `${__dirname}/${STATIC_CONTENT_DIR_PATH}`;
+const resolvedContentDir = path.resolve(STATIC_CONTENT_DIR_PATH);
+const contentDirs = [relativeContentDir];
+if (relativeContentDir !== resolvedContentDir) {
+  contentDirs.unshift(resolvedContentDir);
+};
+const gatsbySourceFilesystemContentConfigs = contentDirs.map(contentDir => ({
+  resolve: "gatsby-source-filesystem",
+  options: {
+    path: contentDir
+  }
+}));
+
 module.exports = {
   siteMetadata: {
     title: `${siteSettings?.siteMetadata?.title || process.env.GATSBY_METADATA_TITLE || 'Event Site'}`,
@@ -77,13 +90,7 @@ module.exports = {
         name: "pages"
       }
     },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/${STATIC_CONTENT_DIR_PATH}`,
-        name: "content"
-      }
-    },
+    ...gatsbySourceFilesystemContentConfigs,
     "gatsby-plugin-image",
     "gatsby-plugin-sharp",
     "gatsby-transformer-sharp",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",

package/src/components/Footer/index.js

@@ -2,7 +2,7 @@ import * as React from "react";
 import { connect } from "react-redux";
 import FooterTemplate from "./template";
 
-import footerContent from "../../content/footer/index.json";
+import footerContent from "content/footer/index.json";
 
 const Footer = ({ summit, marketing }) => (
   <FooterTemplate

package/src/components/FooterMarketing.js

@@ -1,7 +1,7 @@
 import * as React from "react";
 import Link from "./Link";
 
-import footerContent from "../content/footer/index.json";
+import footerContent from "content/footer/index.json";
 
 import styles from "../styles/footer.module.scss";
 
@@ -22,11 +22,7 @@ const FooterMarketing = () => (
       {footerContent.social.networks.map((net, index) => (
         net.display &&
         <Link href={net.link} className={styles.link} key={index}>
-          {net.icon === 'fa-facebook' ?
-            <img alt="logo" style={{ width: 25, margin: '-10px 10px 0 0' }} src="/img/f_logo_RGB-White_58.png" />
-            :
-            <i className={`fa icon is-large ${net.icon}`} />
-          }
+          <i className={`fa icon is-large ${net.icon}`} />
         </Link>
       ))}
     </div>

package/src/components/Navbar/index.js

@@ -17,7 +17,6 @@ import { PAGE_RESTRICTIONS } from "../../cms/config/collections/configurationsCo
 import navbarContent from "content/navbar/index.json";
 
 const Navbar = ({
-  location,
   summitPhase,
   summit,
   isLoggedUser,

package/src/components/summit-my-orders-tickets/components/TicketPopup/TicketPopupEditDetailsForm/TicketPopupEditDetailsForm.js

@@ -91,7 +91,8 @@ export const TicketPopupEditDetailsForm = ({
     const isUserTicketOwner = order.owner_id === userProfile.id;
 
     useEffect(() => {
-        dispatch(getMainOrderExtraQuestions({ summit }));
+        const attendeeId = ticket?.owner?.id;
+        dispatch(getMainOrderExtraQuestions({ summit, attendeeId }));
     }, [ticket]);
 
     const toggleSaveMessage = () => {

package/src/components/summit-my-orders-tickets/store/actions/summit-actions.js

@@ -28,15 +28,15 @@ export const CLEAR_MARKETING_SETTINGS = 'CLEAR_MARKETING_SETTINGS';
 
 export const setSummit = (summit) => async (dispatch) => dispatch(createAction(SET_SUMMIT)(summit))
 
-export const getMainOrderExtraQuestions = ({ summit }) => async (dispatch, getState, { apiBaseUrl, getAccessToken, loginUrl }) => {
+export const getMainOrderExtraQuestions = ({ summit, attendeeId }) => async (dispatch, getState, { apiBaseUrl, getAccessToken, loginUrl }) => {
 
-    if (!summit) return Promise.reject();
+    if (!summit || !attendeeId) return Promise.reject();
 
     const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
 
     if (!accessToken) return Promise.reject();
 
-    const apiUrl = URI(`${apiBaseUrl}/api/v1/summits/${summit.id}/attendees/me/allowed-extra-questions`);
+    const apiUrl = URI(`${apiBaseUrl}/api/v1/summits/${summit.id}/attendees/${attendeeId}/allowed-extra-questions`);
 
     apiUrl.addQuery('access_token', accessToken);
     apiUrl.addQuery('expand', '*sub_question_rules,*sub_question,*values');

package/src/styles/footer.module.scss

@@ -64,6 +64,7 @@
   padding: 1rem 2rem;
   display: flex;
   align-items: center;
+  z-index: 1;
 
   .link {
     color: #ffffff;