@openeventkit/event-site 2.0.117 → 2.0.119

package/gatsby-config.mjs

@@ -53,7 +53,7 @@ const manifestPlugin = faviconAsset ? [
 
 const googleTagManagerPlugin = process.env.GATSBY_GOOGLE_TAGMANAGER_ID ? [
   {
-    resolve: "gatsby-plugin-google-tagmanager",
+    resolve: require.resolve("./plugins/gatsby-plugin-google-tagmanager"),
     options: {
       id: process.env.GATSBY_GOOGLE_TAGMANAGER_ID,
       includeInDevelopment: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.117",
+  "version": "2.0.119",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",

package/src/cms/config/collections/defaultPagesCollection/index.js

@@ -6,6 +6,7 @@ import marketingPage from "./marketingPage";
 import lobbyPage from "./lobbyPage";
 import expoHallPage from "./expoHallPage";
 import invitationsRejectPage from "./invitationsRejectPage";
+import mySchedulePage from "./mySchedulePage";
 
 const defaultPagesCollection = {
   ...collectionDefaults({
@@ -16,7 +17,8 @@ const defaultPagesCollection = {
     marketingPage,
     lobbyPage,
     expoHallPage,
-    invitationsRejectPage
+    invitationsRejectPage,
+    mySchedulePage
   ]
 };
 

package/src/cms/config/collections/defaultPagesCollection/mySchedulePage/index.js

@@ -0,0 +1,36 @@
+import {
+  booleanField,
+  stringField
+} from "../../../fields";
+
+import {
+  MY_SCHEDULE_PAGE_FILE_PATH
+} from "@utils/filePath";
+
+const mySchedulePage = {
+  label: "My Schedule Page",
+  name: "my-schedule-page",
+  file: MY_SCHEDULE_PAGE_FILE_PATH,
+  fields: [
+    stringField({
+      label: "Title",
+      name: "title",
+      default: "My Schedule",
+      required: true
+    }),
+    stringField({
+      label: "Key",
+      name: "key",
+      default: "my-schedule-main",
+      required: true
+    }),
+    booleanField({
+      label: "Needs Ticket Permission?",
+      name: "needsTicketAuthz",
+      required: true,
+      default: false
+    })
+  ]
+};
+
+export default mySchedulePage;

package/src/cms/config/collections/defaultPagesCollection/mySchedulePage/typeDefs.js

@@ -0,0 +1,8 @@
+
+module.exports = `
+  type mySchedulePageJson implements Node {
+    title: String
+    key: String
+    needsTicketAuthz: Boolean
+  }
+`;

package/src/cms/config/collections/defaultPagesCollection/typeDefs.js

@@ -2,10 +2,12 @@ const marketingPageTypeDefs = require("./marketingPage/typeDefs");
 const lobbyPageTypeDefs = require("./lobbyPage/typeDefs");
 const expoHallPageTypeDefs = require("./expoHallPage/typeDefs");
 const invitationsRejectPageTypeDefs = require("./invitationsRejectPage/typeDefs");
+const mySchedulePageTypeDefs = require("./mySchedulePage/typeDefs");
 
 module.exports = [
   marketingPageTypeDefs,
   lobbyPageTypeDefs,
   expoHallPageTypeDefs,
-  invitationsRejectPageTypeDefs
+  invitationsRejectPageTypeDefs,
+  mySchedulePageTypeDefs
 ].join("");

package/src/content/my-schedule-page/index.json

@@ -0,0 +1,5 @@
+{
+  "title": "My Schedule",
+  "key": "my-schedule-main",
+  "needsTicketAuthz": true
+}

package/src/pages/a/[...].js

@@ -22,6 +22,23 @@ import Link from "../../components/Link";
 import { titleFromPathname } from "../../utils/urlFormating";
 import {graphql} from "gatsby";
 
+const mySchedulePage = ({ location, summitPhase,isLoggedUser, user, allowClick, title, key }) => {
+  return  <SchedulePage
+    path="/my-schedule"
+    location={location}
+    summitPhase={summitPhase}
+    isLoggedIn={isLoggedUser}
+    user={user}
+    scheduleProps={{
+      title: title,
+      showSync: true,
+      subtitle: <Link to={"/a/schedule"}>Show Schedule</Link>
+    }}
+    schedKey={key}
+    allowClick={allowClick}
+  />;
+}
+
 export const appQuery = graphql`
   query {
     invitationsRejectPageJson {
@@ -33,10 +50,19 @@ export const appQuery = graphql`
       alreadyAcceptedInvitationError
       alreadyRejectedInvitationError
     }
+    mySchedulePageJson {
+      title
+      key
+      needsTicketAuthz
+    }
   }
 `;
 
+
 const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
+
+  const { mySchedulePageJson } = data;
+
   return (
     <Location>
       {({ location }) => (
@@ -55,24 +81,12 @@ const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
             <MyTicketsPage path="/my-tickets" isLoggedIn={isLoggedUser} user={user} location={location} />
             <FullProfilePage path="/profile" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />
             <ExtraQuestionsPage path="/extra-questions" isLoggedIn={isLoggedUser} user={user} location={location} />
+            { !mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title:mySchedulePageJson.title, key: mySchedulePageJson.key }) }
             <WithAuthzRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                 <PostersPage path="/posters" trackGroupId={0} location={location} />
                 <PostersPage path="/posters/:trackGroupId" location={location} />
                 <PosterDetailPage path="/poster/:presentationId/" isLoggedIn={isLoggedUser} user={user} location={location} />
-                <SchedulePage
-                  path="/my-schedule"
-                  location={location}
-                  summitPhase={summitPhase}
-                  isLoggedIn={isLoggedUser}
-                  user={user}
-                  scheduleProps={{
-                    title: "My Schedule",
-                    showSync: true,
-                    subtitle: <Link to={"/a/schedule"}>Show Schedule</Link>
-                  }}
-                  schedKey="my-schedule-main"
-                  allowClick={allowClick}
-                />
+              { mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title: mySchedulePageJson.title, key: mySchedulePageJson.key }) }
                 <ShowOpenRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                   <WithBadgeRoute path="/event/:eventId" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                     <EventPage path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />

package/src/utils/filePath.js

@@ -44,6 +44,8 @@ const CMS_FONT_FILE_PATH = "/static/fonts/"
 const PAYMENTS_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/payments.json`;
 const APPLE_PAY_DOMAIN_FILE_PATH = `/static/.well-known/`
 const APPLE_PAY_DOMAIN_FILE_NAME = `apple-developer-merchantid-domain-association`;
+const MY_SCHEDULE_PAGE_DIR_PATH = `${STATIC_CONTENT_DIR_PATH}/my-schedule-page`;
+const MY_SCHEDULE_PAGE_FILE_PATH = `${MY_SCHEDULE_PAGE_DIR_PATH}/index.json`;
 
 exports.REQUIRED_DIR_PATHS = [
   DATA_DIR_PATH,
@@ -55,8 +57,10 @@ exports.REQUIRED_DIR_PATHS = [
   LOBBY_PAGE_DIR_PATH,
   INVITATIONS_REJECT_PAGE_FILE_PATH,
   NAVBAR_DIR_PATH,
-  FOOTER_DIR_PATH
+  FOOTER_DIR_PATH,
+  MY_SCHEDULE_PAGE_FILE_PATH
 ];
+
 exports.STATIC_CONTENT_DIR_PATH = STATIC_CONTENT_DIR_PATH;
 exports.PAGES_DIR_PATH = PAGES_DIR_PATH;
 exports.CONTENT_PAGES_PATH_NAME = CONTENT_PAGES_PATH_NAME;
@@ -95,3 +99,4 @@ exports.CMS_FONT_FILE_PATH = CMS_FONT_FILE_PATH;
 exports.PAYMENTS_FILE_PATH = PAYMENTS_FILE_PATH;
 exports.APPLE_PAY_DOMAIN_FILE_PATH = APPLE_PAY_DOMAIN_FILE_PATH;
 exports.APPLE_PAY_DOMAIN_FILE_NAME = APPLE_PAY_DOMAIN_FILE_NAME;
+exports.MY_SCHEDULE_PAGE_FILE_PATH = MY_SCHEDULE_PAGE_FILE_PATH;