@openeventkit/event-site 2.0.11 → 2.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -75,7 +75,7 @@
     "netlify-cms-app": "^2.15.72",
     "netlify-cms-lib-widgets": "^1.8.0",
     "node-sass-utils": "^1.1.3",
-    "openstack-uicore-foundation": "^4.1.39",
+    "openstack-uicore-foundation": "^4.1.40",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
     "react": "^18.2.0",

package/src/components/AttendeeToAttendeeWidgetComponent.js

@@ -199,7 +199,7 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase }) => {
     return user.isAuthorized;
   };
 
-  // if summit_phase wasn't initialized yet (eg: due to a delay in the reducer), 
+  // if summitPhase wasn't initialized yet (eg: due to a delay in the reducer), 
   // this render shouldn't continue
   if (summitPhase === null) return null;
 

package/src/components/AuthComponent.js

@@ -50,7 +50,8 @@ const AuthComponent = ({
 
     useEffect(() => {
         const fragmentParser = new FragmentParser();
-        setIsActive(fragmentParser.getParam('login'));
+        // to show the login dialog check if we are already logged or not
+        setIsActive(fragmentParser.getParam('login') && !isLoggedUser);
         const paramInitialEmailValue = fragmentParser.getParam('email');
         if (paramInitialEmailValue)
             setInitialEmailValue(paramInitialEmailValue);
@@ -104,7 +105,6 @@ const AuthComponent = ({
     };
 
     const loginPasswordless = (code, email) => {
-
         const params = {
             connection: "email",
             otp: code,
@@ -141,7 +141,12 @@ const AuthComponent = ({
     const passwordlessLoginProps = {
         email: userEmail,
         codeLength: otpLength,
-        passwordlessLogin: (code) => loginPasswordless(code, userEmail).then(() => navigate(getBackURL(false))).catch((e) => console.log(e)),
+        passwordlessLogin: (code) => loginPasswordless(code, userEmail).then(() => {
+            // close popup and then navigate bc its its the same origin page
+            // it would not reload and closed the popup automatically
+            handleClosePopup();
+            navigate(getBackURL(false))
+        }).catch((e) => console.log(e)),
         codeError: otpError,
         goToLogin: () => setOtpLogin(false),
         getLoginCode: (email) => sendCode(email),

package/src/routes/ShowOpenRoute.js

@@ -11,7 +11,7 @@ import moment from "moment-timezone";
  *
  * @param children
  * @param isAuthorized
- * @param summit_phase
+ * @param summitPhase
  * @param requireExtraQuestions
  * @param hasTicket
  * @param userProfile
@@ -22,7 +22,7 @@ import moment from "moment-timezone";
 const ShowOpenRoute = ({
   children,
   isAuthorized,
-  summit_phase,
+  summitPhase,
   requireExtraQuestions,
   hasTicket,
   userProfile,
@@ -31,21 +31,21 @@ const ShowOpenRoute = ({
 
   // if we are at show time, and we have an attendee, perform virtual check-in
   useEffect(() => {
-    if(hasTicket && summit_phase === PHASES.DURING){
+    if(hasTicket && summitPhase === PHASES.DURING){
       // verify if we have an attendee , and if so do the virtual check in
       let attendee = userProfile?.summit_tickets[0]?.owner || null;
       if(attendee)
         doVirtualCheckIn(attendee);
     }
-  },[summit_phase, hasTicket, userProfile, doVirtualCheckIn]);
+  },[summitPhase, hasTicket, userProfile, doVirtualCheckIn]);
 
   const userCanByPassAuthz = () => {
     return isAuthorized;
   };
 
-  // if summit_phase wasn't initialized yet (eg: due to a delay in the reducer), 
+  // if summitPhase wasn't initialized yet (eg: due to a delay in the reducer), 
   // this render shouldn't continue
-  if (summit_phase === null) return null;
+  if (summitPhase === null) return null;
 
   // if we are providing the now fragment param then let the clock
   // component set it, so we need to bypass this next check
@@ -60,7 +60,7 @@ const ShowOpenRoute = ({
   }
 
   // if summit didnt started yet ...
-  if (!shouldBypassCheck && !userCanByPassAuthz() && summit_phase === PHASES.BEFORE) {
+  if (!shouldBypassCheck && !userCanByPassAuthz() && summitPhase === PHASES.BEFORE) {
     return <HeroComponent title="You are now logged in. Additional event info is now available on the website." redirectTo="/" />;
   }
 

package/src/styles/style.scss

@@ -422,7 +422,6 @@ div.event-feedback-container {
   max-height: 1500px;
 
   .disqus-header {
-    background-color: #fff;
     border-bottom: 1px solid #eee;
     padding: 0 15px;
     position: relative;