@openeventkit/event-site 2.1.11 → 2.2.12-beta.2

package/gatsby-node.js

@@ -1,6 +1,6 @@
 const axios = require("axios");
 const path = require("path");
-const fs = require("fs");
+const fs = require("fs-extra");
 const webpack = require("webpack");
 const {
   createFilePath

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.11",
+  "version": "2.2.12-beta.2",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -55,7 +55,8 @@
     "final-form": "4.20.7",
     "font-awesome": "^4.7.0",
     "formik": "^2.4.6",
-    "full-schedule-widget": "3.0.9",
+    "fs-extra": "^11.3.0",
+    "full-schedule-widget": "3.0.10",
     "gatsby": "^5.13.5",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-decap-cms": "^4.0.4",
@@ -87,7 +88,7 @@
     "markdown-it": "^12.0.0",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
-    "my-orders-tickets-widget": "1.0.0-beta.56",
+    "my-orders-tickets-widget": "1.0.0-beta.59",
     "object.assign": "^4.1.5",
     "openstack-uicore-foundation": "4.2.8",
     "path-browserify": "^1.0.1",
@@ -135,7 +136,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "6.0.2",
+    "summit-registration-lite": "6.0.3",
     "superagent": "8.0.9",
     "sweetalert2": "^11.11.1",
     "upcoming-events-widget": "3.0.7",

package/src/actions/user-actions.js

@@ -414,7 +414,7 @@ export const updatePassword = (password) => async (dispatch) => {
     access_token: accessToken,
   };
 
-  putRequest(
+  return putRequest(
     createAction(START_LOADING_IDP_PROFILE),
     createAction(UPDATE_PASSWORD),
     `${window.IDP_BASE_URL}/api/v1/users/me`,

package/src/components/ChangePasswordComponent.js

@@ -1,8 +1,8 @@
-import React, { useState, useEffect } from "react";
+import React, {useEffect, useState} from "react";
 
 import styles from "../styles/change-password.module.scss";
 
-const ChangePasswordComponent = ({ updatePassword }) => {
+const ChangePasswordComponent = ({updatePassword}) => {
   const [currentPassword, setCurrentPassword] = useState("");
   const [displayCurrentPassword, setDisplayCurrentPassword] = useState(false);
   const [newPassword, setNewPassword] = useState("");
@@ -14,14 +14,27 @@ const ChangePasswordComponent = ({ updatePassword }) => {
 
   useEffect(() => {
     return () => {
-      setCurrentPassword("");
-      setNewPassword("");
-      setChangePassword(false);
-      setDisplayCurrentPassword(false);
-      setDisplayNewPassword(false);
+      resetFields();
     };
   }, []);
 
+  const resetFields = () => {
+    setCurrentPassword("");
+    setNewPassword("");
+    setNewPasswordConfirm("");
+    setChangePassword(false);
+    setDisplayCurrentPassword(false);
+    setDisplayNewPassword(false);
+    setDisplayNewPasswordConfirm(false);
+  }
+
+  const handleUpdatePassword = (e) => {
+    updatePassword(currentPassword, newPassword, newPasswordConfirm)
+      .finally(() => {
+        resetFields();
+      })
+  }
+
   return (
     <div className={styles.changePassowordContainer}>
       <div className={styles.title}>
@@ -45,7 +58,7 @@ const ChangePasswordComponent = ({ updatePassword }) => {
                   value={currentPassword}
                 />
                 <button className="link" onClick={() => setDisplayCurrentPassword(!displayCurrentPassword)}>
-                  <i className={`fa fa-2x ${displayCurrentPassword ? "fa-eye-slash" : "fa-eye"} icon is-large`} />
+                  <i className={`fa fa-2x ${displayCurrentPassword ? "fa-eye-slash" : "fa-eye"} icon is-large`}/>
                 </button>
               </div>
             </div>
@@ -60,7 +73,7 @@ const ChangePasswordComponent = ({ updatePassword }) => {
                   value={newPassword}
                 />
                 <button className="link" onClick={() => setDisplayNewPassword(!displayNewPassword)}>
-                  <i className={`fa fa-2x ${displayNewPassword ? "fa-eye-slash" : "fa-eye"} icon is-large`} />
+                  <i className={`fa fa-2x ${displayNewPassword ? "fa-eye-slash" : "fa-eye"} icon is-large`}/>
                 </button>
               </div>
             </div>
@@ -75,7 +88,7 @@ const ChangePasswordComponent = ({ updatePassword }) => {
                   value={newPasswordConfirm}
                 />
                 <button className="link" onClick={() => setDisplayNewPasswordConfirm(!displayNewPasswordConfirm)}>
-                  <i className={`fa fa-2x ${displayNewPasswordConfirm ? "fa-eye-slash" : "fa-eye"} icon is-large`} />
+                  <i className={`fa fa-2x ${displayNewPasswordConfirm ? "fa-eye-slash" : "fa-eye"} icon is-large`}/>
                 </button>
               </div>
             </div>
@@ -83,8 +96,8 @@ const ChangePasswordComponent = ({ updatePassword }) => {
           <div className={`columns is-mobile ${styles.buttons}`}>
             <div className={`column is-full`}>
               <button disabled={!newPassword || !newPasswordConfirm}
-                className="button is-large"
-                onClick={() => updatePassword(currentPassword, newPassword, newPasswordConfirm)}
+                      className="button is-large"
+                      onClick={handleUpdatePassword}
               >
                 Update
               </button>

package/src/templates/full-profile-page.js

@@ -173,7 +173,7 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
             password,
             password_confirmation
         };
-        updatePassword(passwordObject);
+        return updatePassword(passwordObject);
     };
 
     const handleTogglePopup = (profile) => {

package/src/utils/real_time_updates/withRealTimeUpdates.js

@@ -40,7 +40,11 @@ const withRealTimeUpdates = WrappedComponent => {
             this._checkForPastNoveltiesDebounced = _.debounce(this.checkForPastNovelties, CHECK_FOR_NOVELTIES_DELAY);
 
             try {
-                this._supabase = SupabaseClientBuilder.getClient(getEnvVariable(SUPABASE_URL), getEnvVariable(SUPABASE_KEY));
+                const supabaseUrl = getEnvVariable(SUPABASE_URL);
+                const supabaseKey = getEnvVariable(SUPABASE_KEY);
+                if(supabaseUrl && supabaseKey){
+                    this._supabase = SupabaseClientBuilder.getClient(supabaseUrl, supabaseKey);
+                }
             } catch (e) {
                 this._supabase = null;
                 console.log(e);