From 64bfe83bcf8a9bb4da46c8fefb8eca13735d144c Mon Sep 17 00:00:00 2001 From: sebastian marcet Date: Wed, 14 Aug 2024 12:07:56 -0300 Subject: [PATCH 1/4] chore: update a2a widget to 3.1.1-beta.10 (#102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ochore: update a2a widget to 3.1.1-beta.13 * fix: add missing profile parameters to a2a widget * chore: update yarn.lcck Signed-off-by: smarcet * Add new checkmark to manage public profile settings Signed-off-by: Tomás Castillo * Add new 'show telephone' checkmark on profile Signed-off-by: Tomás Castillo * feat:a2a ad-hoc profile sync up * feat: a2a widget reacts to any profile property change * fix: a2a widget anonymous fullname and email * fix: a2a qa feedback fixes and profile updates sync up at tracker level * a2a log verbosity * fix: refresh chat api from tracker --------- Signed-off-by: smarcet Signed-off-by: Tomás Castillo Co-authored-by: romanetar Co-authored-by: Tomás Castillo --- package.json | 4 +- .../AttendeeToAttendeeWidgetComponent.js | 46 ++- src/templates/full-profile-page.js | 71 +++- yarn.lock | 335 +++++------------- 4 files changed, 194 insertions(+), 262 deletions(-) diff --git a/package.json b/package.json index 4b6b36ae..52f979f1 100644 --- a/package.json +++ b/package.json @@ -21,14 +21,14 @@ "@sentry/integrations": "^7.39.0", "@sentry/react": "^7.39.0", "@sentry/webpack-plugin": "^1.20.0", - "@supabase/supabase-js": "^1.35.6", + "@supabase/supabase-js": "2.45.1", "@types/googlemaps": "^3.39.9", "@types/markerclustererplus": "^2.1.33", "@types/react": "^16.9.42", "@vimeo/player": "^2.16.3", "ably": "^1.2.34", "assert": "^2.1.0", - "attendee-to-attendee-widget": "3.1.0", + "attendee-to-attendee-widget": "3.1.1-beta.29", "autoprefixer": "10.4.14", "awesome-bootstrap-checkbox": "^1.0.1", "axios": "^0.19.2", diff --git a/src/components/AttendeeToAttendeeWidgetComponent.js b/src/components/AttendeeToAttendeeWidgetComponent.js index d1c7b372..2c007eb4 100644 --- a/src/components/AttendeeToAttendeeWidgetComponent.js +++ b/src/components/AttendeeToAttendeeWidgetComponent.js @@ -59,7 +59,13 @@ const AttendeesWidgetComponent = ({ user, event, chatSettings }) => { linked_in_profile, twitter_name, wechat_user, - public_profile_show_fullname } = idpProfile || {}; + public_profile_show_fullname, + public_profile_show_email, + public_profile_allow_chat_with_me, + public_profile_show_photo, + public_profile_show_social_media_info, + public_profile_show_bio + } = idpProfile || {}; useEffect(() => { if (!user || !userProfile || !idpProfile) return; @@ -127,6 +133,12 @@ const AttendeesWidgetComponent = ({ user, event, chatSettings }) => { .flatMap((st) => st.badge.features) .filter((v, i, a) => a.map((item) => item.id).indexOf(v.id) === i), bio: bio, + showEmail: public_profile_show_email === true, + allowChatWithMe: public_profile_allow_chat_with_me === true, + showFullName: public_profile_show_fullname === true, + showProfilePic: public_profile_show_photo === true, + showSocialInfo: public_profile_show_social_media_info === true, + showBio: public_profile_show_bio === true, hasPermission: (permission) => { const isAdmin = groups && groups.map((g) => g.slug).filter((g) => adminGroups.includes(g)) @@ -186,6 +198,20 @@ const mapState = ({ settingState }) => ({ export const AttendeesWidget = connect(mapState)(AttendeesWidgetComponent); const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings }) => { + const chatProps = { + streamApiKey: getEnvVariable(STREAM_IO_API_KEY), + apiBaseUrl: getEnvVariable(IDP_BASE_URL), + chatApiBaseUrl: getEnvVariable(CHAT_API_BASE_URL), + onAuthError: (err, res) => console.log(err), + openDir: "left", + activity: null, + getAccessToken: async () => { + const accessToken = await getAccessToken(); + //console.log("AttendeesList->getAccessToken", accessToken); + return accessToken; + }, + }; + const trackerRef = useRef(); const handleLogout = useCallback(() => { @@ -237,11 +263,15 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings }) => { wechat_user, public_profile_show_fullname, public_profile_show_email, - public_profile_allow_chat_with_me + public_profile_allow_chat_with_me, + public_profile_show_photo, + public_profile_show_social_media_info, + public_profile_show_bio } = user.idpProfile; const widgetProps = { user: { + id: sub, idpUserId: sub, fullName: public_profile_show_fullname ? `${given_name} ${family_name}` : `${given_name}`, email: email, @@ -260,11 +290,17 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings }) => { .flatMap((st) => st.badge.features) .filter((v, i, a) => a.map((item) => item.id).indexOf(v.id) === i), bio: bio, - showEmail: public_profile_show_email, - allowChatWithMe: public_profile_allow_chat_with_me ?? true + showEmail: public_profile_show_email === true, + allowChatWithMe: public_profile_allow_chat_with_me === true, + showFullName: public_profile_show_fullname === true, + showProfilePic: public_profile_show_photo === true, + showSocialInfo: public_profile_show_social_media_info === true, + showBio: public_profile_show_bio === true }, summitId: parseInt(getEnvVariable(SUMMIT_ID)), - ...sbAuthProps, + keepAliveEnabled: true, + ...chatProps, + ...sbAuthProps }; if (!chatSettings.enabled) return null; diff --git a/src/templates/full-profile-page.js b/src/templates/full-profile-page.js index 005e482c..5a42715c 100644 --- a/src/templates/full-profile-page.js +++ b/src/templates/full-profile-page.js @@ -16,6 +16,7 @@ import withOrchestra from "../utils/widgetOrchestra"; import LiteScheduleComponent from '../components/LiteScheduleComponent' import ProfilePopupComponent from '../components/ProfilePopupComponent' import ChangePasswordComponent from '../components/ChangePasswordComponent'; +import AccessTracker from "../components/AttendeeToAttendeeWidgetComponent"; import { updateProfilePicture, updateProfile, getIDPProfile, updatePassword } from '../actions/user-actions' @@ -46,6 +47,10 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up const [showFullName, setShowFullName] = useState(false); const [allowChatWithMe, setAllowChatWithMe] = useState(false) const [showEmail, setShowEmail] = useState(false); + const [showPicture, setShowPicture] = useState(false); + const [showBio, setShowBio] = useState(false); + const [showSocialMedia, setShowSocialMedia] = useState(false); + const [showTelephone, setShowTelephone] = useState(false); const [bio, setBio] = useState(''); const [statementOfInterest, setStatementOfInterest] = useState(''); @@ -88,6 +93,10 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up setShowFullName(user.idpProfile.public_profile_show_fullname); setAllowChatWithMe(user.idpProfile.public_profile_allow_chat_with_me); setShowEmail(user.idpProfile.public_profile_show_email); + setShowPicture(user.idpProfile.public_profile_show_photo); + setShowBio(user.idpProfile.public_profile_show_bio); + setShowSocialMedia(user.idpProfile.public_profile_show_social_media_info); + setShowTelephone(user.idpProfile.public_profile_show_telephone_number); setBio(user.idpProfile.bio || ''); setStatementOfInterest(user.idpProfile.statement_of_interest || ''); setAddress({ @@ -139,6 +148,10 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up public_profile_show_fullname: showFullName, public_profile_allow_chat_with_me: allowChatWithMe, public_profile_show_email: showEmail, + public_profile_show_photo: showPicture, + public_profile_show_bio: showBio, + public_profile_show_social_media_info: showSocialMedia, + public_profile_show_telephone_number: showTelephone, bio: bio, statement_of_interest: statementOfInterest, address1: address.street, @@ -204,6 +217,10 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up setShowFullName(user.idpProfile.public_profile_show_fullname); setAllowChatWithMe(user.idpProfile.public_profile_allow_chat_with_me); setShowEmail(user.idpProfile.public_profile_show_email); + setShowPicture(user.idpProfile.public_profile_show_photo); + setShowBio(user.idpProfile.public_profile_show_bio); + setShowSocialMedia(user.idpProfile.public_profile_show_social_media_info); + setShowTelephone(user.idpProfile.public_profile_show_telephone_number); break; case 'bio': setBio(user.idpProfile.bio || ''); @@ -423,20 +440,45 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up - -
- -
- +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
@@ -602,6 +644,7 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up closePopup={() => handleTogglePopup(!showProfile)} /> } + ) }; diff --git a/yarn.lock b/yarn.lock index da7b0daf..9c798861 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2905,11 +2905,6 @@ git-url-parse "^6.0.2" shelljs "^0.7.0" -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - "@lezer/common@^0.15.0", "@lezer/common@^0.15.7": version "0.15.12" resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.15.12.tgz#2f21aec551dd5fd7d24eb069f90f54d5bc6ee5e9" @@ -4157,11 +4152,6 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== - "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" @@ -4229,52 +4219,62 @@ resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.41.0.tgz#986f3f222ba4466301f7809934afafafde9b28fd" integrity sha512-9cbv1CO/fF37qDiHFCxkRgSJjlIZLV0bl+m6zu4dUObRnfYq5bpczCByOvhiSWtbrKqNhYL1j+otPSogRfSqGw== -"@supabase/functions-js@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@supabase/functions-js/-/functions-js-1.3.4.tgz#44f86f7cf949baa7f1bb414f3b8c0985a19df633" - integrity sha512-yYVgkECjv7IZEBKBI3EB5Q7R1p0FJ10g8Q9N7SWKIHUU6i6DnbEGHIMFLyQRm1hmiNWD8fL7bRVEYacmTRJhHw== +"@supabase/auth-js@2.64.4": + version "2.64.4" + resolved "https://registry.yarnpkg.com/@supabase/auth-js/-/auth-js-2.64.4.tgz#f27fdabf1ebd1b532ceb57e8bbe66969ee09cfba" + integrity sha512-9ITagy4WP4FLl+mke1rchapOH0RQpf++DI+WSG2sO1OFOZ0rW3cwAM0nCrMOxu+Zw4vJ4zObc08uvQrXx590Tg== dependencies: - cross-fetch "^3.1.5" + "@supabase/node-fetch" "^2.6.14" + +"@supabase/functions-js@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@supabase/functions-js/-/functions-js-2.4.1.tgz#373e75f8d3453bacd71fb64f88d7a341d7b53ad7" + integrity sha512-8sZ2ibwHlf+WkHDUZJUXqqmPvWQ3UHN0W30behOJngVh/qHHekhJLCFbh0AjkE9/FqqXtf9eoVvmYgfCLk5tNA== + dependencies: + "@supabase/node-fetch" "^2.6.14" -"@supabase/gotrue-js@^1.22.21": - version "1.24.0" - resolved "https://registry.yarnpkg.com/@supabase/gotrue-js/-/gotrue-js-1.24.0.tgz#0afbb158071a8dd5e78cf386a068c71c9f534425" - integrity sha512-6PVv7mHCFOxLm6TSBfR7hsq/y3CMKpvzePVR+ZWtlFBTjJ2J87g2OYE9bgC61P5TNeZopUXKw93H92yz0MTALw== +"@supabase/node-fetch@2.6.15", "@supabase/node-fetch@^2.6.14": + version "2.6.15" + resolved "https://registry.yarnpkg.com/@supabase/node-fetch/-/node-fetch-2.6.15.tgz#731271430e276983191930816303c44159e7226c" + integrity sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ== dependencies: - cross-fetch "^3.0.6" + whatwg-url "^5.0.0" -"@supabase/postgrest-js@^0.37.4": - version "0.37.4" - resolved "https://registry.yarnpkg.com/@supabase/postgrest-js/-/postgrest-js-0.37.4.tgz#8bc2a1353e139962dca931a8e7c8416d60b4a8ed" - integrity sha512-x+c2rk1fz9s6f1PrGxCJ0QTUgXPDI0G3ngIqD5sSiXhhCyfl8Q5V92mXl2EYtlDhkiUkjFNrOZFhXVbXOHgvDw== +"@supabase/postgrest-js@1.15.8": + version "1.15.8" + resolved "https://registry.yarnpkg.com/@supabase/postgrest-js/-/postgrest-js-1.15.8.tgz#827aaa408cdbc89e67d0a758e7a545ac86e34312" + integrity sha512-YunjXpoQjQ0a0/7vGAvGZA2dlMABXFdVI/8TuVKtlePxyT71sl6ERl6ay1fmIeZcqxiuFQuZw/LXUuStUG9bbg== dependencies: - cross-fetch "^3.1.5" + "@supabase/node-fetch" "^2.6.14" -"@supabase/realtime-js@^1.7.5": - version "1.7.5" - resolved "https://registry.yarnpkg.com/@supabase/realtime-js/-/realtime-js-1.7.5.tgz#387f094655c11d5608df9a3039c5f01186a5f401" - integrity sha512-nXuoxt7NE1NTI+G8WBim1K2gkUC8YE3e9evBUG+t6xwd9Sq+sSOrjcE0qJ8/Y631BCnLzlhX6yhFYQFh1oQDOg== +"@supabase/realtime-js@2.10.2": + version "2.10.2" + resolved "https://registry.yarnpkg.com/@supabase/realtime-js/-/realtime-js-2.10.2.tgz#c2b42d17d723d2d2a9146cfad61dc3df1ce3127e" + integrity sha512-qyCQaNg90HmJstsvr2aJNxK2zgoKh9ZZA8oqb7UT2LCh3mj9zpa3Iwu167AuyNxsxrUE8eEJ2yH6wLCij4EApA== dependencies: + "@supabase/node-fetch" "^2.6.14" "@types/phoenix" "^1.5.4" - websocket "^1.0.34" + "@types/ws" "^8.5.10" + ws "^8.14.2" -"@supabase/storage-js@^1.7.2": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@supabase/storage-js/-/storage-js-1.7.3.tgz#b53cd6d289e2223919e6526364fd46977a643fbe" - integrity sha512-jnIZWqOc9TGclOozgX9v/RWGFCgJAyW/yvmauexgRZhWknUXoA4b2i8tj7vfwE0WTvNRuA5JpXID98rfJeSG7Q== +"@supabase/storage-js@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@supabase/storage-js/-/storage-js-2.6.0.tgz#0fa5e04db760ed7f78e4394844a6d409e537adc5" + integrity sha512-REAxr7myf+3utMkI2oOmZ6sdplMZZ71/2NEIEMBZHL9Fkmm3/JnaOZVSRqvG4LStYj2v5WhCruCzuMn6oD/Drw== dependencies: - cross-fetch "^3.1.0" + "@supabase/node-fetch" "^2.6.14" -"@supabase/supabase-js@^1.35.6": - version "1.35.7" - resolved "https://registry.yarnpkg.com/@supabase/supabase-js/-/supabase-js-1.35.7.tgz#2d7a899f12b4772fe3a276a97d1702cedc302c7a" - integrity sha512-X+qCzmj5sH0dozagbLoK7LzysBaWoivO0gsAUAPPBQkQupQWuBfaOqG18gKhlfL0wp2PL888QzhQNScp/IwUfA== +"@supabase/supabase-js@2.45.1": + version "2.45.1" + resolved "https://registry.yarnpkg.com/@supabase/supabase-js/-/supabase-js-2.45.1.tgz#38992923e4150dc5d8f99fda02c9f81bf0d5a4d6" + integrity sha512-/PVe3lXmalazD8BGMIoI7+ttvT1mLXy13lNcoAPtjP1TDDY83g8csZbVR6l+0/RZtvJxl3LGXfTJT4bjWgC5Nw== dependencies: - "@supabase/functions-js" "^1.3.4" - "@supabase/gotrue-js" "^1.22.21" - "@supabase/postgrest-js" "^0.37.4" - "@supabase/realtime-js" "^1.7.5" - "@supabase/storage-js" "^1.7.2" + "@supabase/auth-js" "2.64.4" + "@supabase/functions-js" "2.4.1" + "@supabase/node-fetch" "2.6.15" + "@supabase/postgrest-js" "1.15.8" + "@supabase/realtime-js" "2.10.2" + "@supabase/storage-js" "2.6.0" "@swc/helpers@^0.4.12", "@swc/helpers@^0.4.2": version "0.4.14" @@ -4283,13 +4283,6 @@ dependencies: tslib "^2.4.0" -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== - dependencies: - defer-to-connect "^1.0.1" - "@szmarczak/http-timer@^4.0.5": version "4.0.6" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" @@ -4784,6 +4777,11 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== +"@types/prop-types@^15.0.0": + version "15.7.12" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" + integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== + "@types/prop-types@^15.7.11": version "15.7.11" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" @@ -4912,6 +4910,13 @@ dependencies: "@types/node" "*" +"@types/ws@^8.5.10": + version "8.5.12" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e" + integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "21.0.3" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" @@ -5878,21 +5883,19 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -attendee-to-attendee-widget@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/attendee-to-attendee-widget/-/attendee-to-attendee-widget-3.1.0.tgz#24d1ad806fb83f1cde97c5687abb2d738810df79" - integrity sha512-UYfElmNkGLCSdSaXWEzZ8GmybVwHklrrJJLF4BJQ3Mihktft7bf/z1xQvQFM8bjAFgds0uHr/NIR5yY/9Crlqg== +attendee-to-attendee-widget@3.1.1-beta.29: + version "3.1.1-beta.29" + resolved "https://registry.yarnpkg.com/attendee-to-attendee-widget/-/attendee-to-attendee-widget-3.1.1-beta.29.tgz#def5ec1120f493671aec898aa8417ab4f5c3e80f" + integrity sha512-fxeqh4yqm1WORDM6m3nIZ0h8OF9AqsTyZI9O3MePuG/TjkbwExRxJsENRRIVchn2z3re6ifM+21+scN9wtAQQg== dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@supabase/supabase-js" "^1.35.6" + "@supabase/supabase-js" "2.45.1" formik "^2.2.6" lodash.debounce "^4.0.8" - luxon "^1.26.0" - public-ip "^4.0.3" react-device-detect "^2.0.1" react-error-boundary "^3.1.3" react-infinite-scroll-component "^6.0.0" - react-markdown "^6.0.2" + react-markdown "^8.0.6" + react-router-dom "^5.3.4" react-tooltip "^4.2.19" rehype-raw "^5.1.0" stream-chat "4.2.0" @@ -6526,13 +6529,6 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -bufferutil@^4.0.1: - version "4.0.6" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433" - integrity sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw== - dependencies: - node-gyp-build "^4.3.0" - bulma@^0.9.0: version "0.9.4" resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1" @@ -6608,19 +6604,6 @@ cacheable-request@^10.2.8: normalize-url "^8.0.0" responselike "^3.0.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" - cacheable-request@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" @@ -7480,7 +7463,7 @@ cross-env@^7.0.2, cross-env@^7.0.3: dependencies: cross-spawn "^7.0.1" -cross-fetch@3.1.5, cross-fetch@^3.0.4, cross-fetch@^3.0.6, cross-fetch@^3.1.0, cross-fetch@^3.1.5: +cross-fetch@3.1.5, cross-fetch@^3.0.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== @@ -7813,7 +7796,7 @@ dayjs@^1.11.10: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e" integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg== -debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.6.0: +debug@2, debug@2.6.9, debug@^2.6.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -8211,13 +8194,6 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== - dependencies: - mimic-response "^1.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -8283,11 +8259,6 @@ deepmerge@^4.3.1: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== - defer-to-connect@^2.0.0, defer-to-connect@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" @@ -8544,20 +8515,6 @@ dnd-core@^16.0.1: "@react-dnd/invariant" "^4.0.1" redux "^4.2.0" -dns-packet@^5.2.4: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - -dns-socket@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/dns-socket/-/dns-socket-4.2.2.tgz#58b0186ec053ea0731feb06783c7eeac4b95b616" - integrity sha512-BDeBd8najI4/lS00HSKpdFia+OvUMytaVjfzR9n5Lq8MlZRSvtbI+uLtx1+XmQFls5wFU9dssccTmQQ6nfpjdg== - dependencies: - dns-packet "^5.2.4" - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -8797,11 +8754,6 @@ dropzone@^5.7.2: resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== -duplexer3@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" @@ -11029,13 +10981,6 @@ get-prefix@^1.0.0: resolved "https://registry.yarnpkg.com/get-prefix/-/get-prefix-1.0.0.tgz#0d305448a4e3176f9c277175b14e16dbe6fba0b5" integrity sha512-pW0k3ZHGeRfLQ6eftImZ1lXmP4wlN7VJ0duwVbqtITlDjGLIo3fp+/p47cmxzyPqQ1Pvi3A6IZkmLtG3RKv/Lw== -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" @@ -11248,23 +11193,6 @@ got@^12.1.0: p-cancelable "^3.0.0" responselike "^3.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - gotrue-js@^0.9.24: version "0.9.29" resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.29.tgz#08e62184d4eaadcd87f95cb6e49e3c4a9742a052" @@ -12290,11 +12218,6 @@ invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip-regex@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" - integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== - ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -12584,13 +12507,6 @@ is-invalid-path@^0.1.0: dependencies: is-glob "^2.0.0" -is-ip@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8" - integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q== - dependencies: - ip-regex "^4.0.0" - is-lower-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz#1c0884d3012c841556243483aa5d522f47396d2a" @@ -13574,11 +13490,6 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== - json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" @@ -13705,13 +13616,6 @@ keycode@^2.2.0: resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff" integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg== -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== - dependencies: - json-buffer "3.0.0" - keyv@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6" @@ -14149,11 +14053,6 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -14193,11 +14092,6 @@ lru-queue@^0.1.0: dependencies: es5-ext "~0.10.2" -luxon@^1.26.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf" - integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ== - lz-string@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" @@ -15533,7 +15427,7 @@ mimic-fn@^4.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== @@ -15995,11 +15889,6 @@ normalize-url@^1.9.1: query-string "^4.1.0" sort-keys "^1.0.0" -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - normalize-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" @@ -16329,11 +16218,6 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - p-cancelable@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" @@ -17089,11 +16973,6 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - prettier@^2.0.5: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" @@ -17281,15 +17160,6 @@ psl@^1.1.33: resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== -public-ip@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/public-ip/-/public-ip-4.0.4.tgz#b3784a5a1ff1b81d015b9a18450be65ffd929eb3" - integrity sha512-EJ0VMV2vF6Cu7BIPo3IMW1Maq6ME+fbR0NcPmqDfpfNGIRPue1X8QrGjrg/rfjDkOsIkKHIf2S5FlEa48hFMTA== - dependencies: - dns-socket "^4.2.2" - got "^9.6.0" - is-ip "^3.1.0" - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -17912,6 +17782,27 @@ react-markdown@^6.0.2: unist-util-visit "^2.0.0" vfile "^4.0.0" +react-markdown@^8.0.6: + version "8.0.7" + resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.7.tgz#c8dbd1b9ba5f1c5e7e5f2a44de465a3caafdf89b" + integrity sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ== + dependencies: + "@types/hast" "^2.0.0" + "@types/prop-types" "^15.0.0" + "@types/unist" "^2.0.0" + comma-separated-tokens "^2.0.0" + hast-util-whitespace "^2.0.0" + prop-types "^15.0.0" + property-information "^6.0.0" + react-is "^18.0.0" + remark-parse "^10.0.0" + remark-rehype "^10.0.0" + space-separated-tokens "^2.0.0" + style-to-object "^0.4.0" + unified "^10.0.0" + unist-util-visit "^4.0.0" + vfile "^5.0.0" + react-masonry-css@^1.0.14: version "1.0.16" resolved "https://registry.yarnpkg.com/react-masonry-css/-/react-masonry-css-1.0.16.tgz#72b28b4ae3484e250534700860597553a10f1a2c" @@ -18053,7 +17944,7 @@ react-remove-scroll@^2.5.2: use-callback-ref "^1.3.0" use-sidecar "^1.1.2" -react-router-dom@^5.2.0: +react-router-dom@^5.2.0, react-router-dom@^5.3.4: version "5.3.4" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6" integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ== @@ -19178,13 +19069,6 @@ resolve@^2.0.0-next.5: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== - dependencies: - lowercase-keys "^1.0.0" - responselike@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" @@ -20595,7 +20479,7 @@ style-to-object@1.0.6: dependencies: inline-style-parser "0.2.3" -style-to-object@^0.4.1: +style-to-object@^0.4.0, style-to-object@^0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.4.tgz#266e3dfd56391a7eefb7770423612d043c3f33ec" integrity sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg== @@ -21016,11 +20900,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -21835,13 +21714,6 @@ url-loader@^4.1.1: mime-types "^2.1.27" schema-utils "^3.0.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - dependencies: - prepend-http "^2.0.0" - url-parse@^1.5.3: version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" @@ -21912,13 +21784,6 @@ use-ssr@^1.0.22: resolved "https://registry.yarnpkg.com/use-ssr/-/use-ssr-1.0.24.tgz#213a3df58f5ab9268e6fe1a57ad0a9de91e514d1" integrity sha512-0MFps7ezL57/3o0yl4CvrHLlp9z20n1rQZV/lSRz7if+TUoM6POU1XdOvEjIgjgKeIhTEye1U0khrIYWCTWw4g== -utf-8-validate@^5.0.2: - version "5.0.9" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3" - integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q== - dependencies: - node-gyp-build "^4.3.0" - utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" @@ -22333,18 +22198,6 @@ webpack@^5.88.1: watchpack "^2.4.1" webpack-sources "^3.2.3" -websocket@^1.0.34: - version "1.0.34" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111" - integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ== - dependencies: - bufferutil "^4.0.1" - debug "^2.2.0" - es5-ext "^0.10.50" - typedarray-to-buffer "^3.1.5" - utf-8-validate "^5.0.2" - yaeti "^0.0.6" - what-input@^5.1.4, what-input@^5.2.10: version "5.2.12" resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.12.tgz#6eb5b5d39ebff4e2273df8bf69d8d2fc9a6e060a" @@ -22590,6 +22443,11 @@ ws@^7.4.2, ws@^7.4.4: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== +ws@^8.14.2: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== + ws@^8.17.0: version "8.17.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" @@ -22680,11 +22538,6 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yaeti@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" - integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== - yallist@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" From 7487fbba9fc02a936f15a871ddad91bd081c3f09 Mon Sep 17 00:00:00 2001 From: smarcet Date: Wed, 14 Aug 2024 12:11:55 -0300 Subject: [PATCH 2/4] v2.0.122 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52f979f1..3fca19fd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@openeventkit/event-site", "description": "Event Site", - "version": "2.0.121", + "version": "2.0.122", "author": "Tipit LLC", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.5.2", From 479168202184e2cff0455df07bd46a55b525c909 Mon Sep 17 00:00:00 2001 From: Sam Young Date: Thu, 22 Aug 2024 09:43:42 -0700 Subject: [PATCH 3/4] calculate text color sass func --- .../components/TicketPopup/ticket-popup.scss | 3 +- .../styles/_variables.scss | 1 + src/styles/utils.scss | 34 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/styles/utils.scss diff --git a/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss b/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss index 41d93296..9663854e 100644 --- a/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss +++ b/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss @@ -1,4 +1,5 @@ @import "../../styles/variables"; +@import "../../../../styles/utils.scss"; .ticket-popup { z-index: 1000; @@ -110,7 +111,7 @@ } .ticket-popup-title { - color: $color-primary-contrast; + @include get-contrasting-text-color($color-primary, $color-text-light, $color-text-dark); white-space: normal; overflow: hidden; diff --git a/src/components/summit-my-orders-tickets/styles/_variables.scss b/src/components/summit-my-orders-tickets/styles/_variables.scss index b50af40b..5ac38f83 100644 --- a/src/components/summit-my-orders-tickets/styles/_variables.scss +++ b/src/components/summit-my-orders-tickets/styles/_variables.scss @@ -3,6 +3,7 @@ $color-primary: var(--color_primary, #d4e5f4); $color-primary-contrast: var(--color_primary_contrast, #e6f3ff); $color-secondary-contrast: var(--color_secondary_contrast, #3fa2f7); $color-text-dark: var(--color_text_dark, #3486cd); +$color-text-light: var(--color_text_light, #ffffff); $color-text-input-hints: var(--color_text_input_hints, #a4c7e6); $color-white: #fff; diff --git a/src/styles/utils.scss b/src/styles/utils.scss new file mode 100644 index 00000000..c1d25e1f --- /dev/null +++ b/src/styles/utils.scss @@ -0,0 +1,34 @@ +// Helper function to convert HEX to RGB +@function hex-to-rgb($hex) { + $r: red($hex); + $g: green($hex); + $b: blue($hex); + @return ($r, $g, $b); +} + +// calculate luminance val +@function luminance-value($color) { + $normalized: $color / 255; + @if $normalized <= 0.03928 { + @return $normalized / 12.92; + } @else { + @return pow(($normalized + 0.055) / 1.055, 2.4); + } +} + +// Helper function to calculate luminance +@function luminance($r, $g, $b) { + $lum: luminance-value($r) * 0.2126 + luminance-value($g) * 0.7152 + luminance-value($b) * 0.0722; + @return $lum; +} + +// Mixin to get contrasting text color +@mixin get-contrasting-text-color($bg-color, $light-color, $dark-color) { + $rgb: hex-to-rgb($bg-color); + $r: nth($rgb, 1); + $g: nth($rgb, 2); + $b: nth($rgb, 3); + $lum: luminance($r, $g, $b); + $contrast-color: if($lum > 0.179, $dark-color, $light-color); + color: $contrast-color; +} \ No newline at end of file From 61f566358f9acb37dc351766707a97a0a121bcd7 Mon Sep 17 00:00:00 2001 From: Sam Young Date: Tue, 10 Sep 2024 08:41:19 -0700 Subject: [PATCH 4/4] import colors.scss directly --- .../components/TicketPopup/ticket-popup.scss | 1 + src/styles/colors.scss | 22 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss b/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss index 9663854e..a2513fab 100644 --- a/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss +++ b/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss @@ -1,5 +1,6 @@ @import "../../styles/variables"; @import "../../../../styles/utils.scss"; +@import "../../../../styles/colors.scss"; .ticket-popup { z-index: 1000; diff --git a/src/styles/colors.scss b/src/styles/colors.scss index 4d47b2cd..7644ecd0 100644 --- a/src/styles/colors.scss +++ b/src/styles/colors.scss @@ -1,19 +1,13 @@ -/** -* Warning: -* Dont edit this file by hand, has been generated by colors scss util -* Uses default colors as base and then overriden by colors set via marketing -**/ - $color_accent: #ff5e32; $color_alerts: #ff0000; $color_background_light: #ffffff; $color_background_dark: #000000; $color_button_background_color: #ffffff; $color_button_color: #000000; -$color_gray_lighter: #F2F2F2; -$color_gray_light: #DFDFDF; +$color_gray_lighter: #f2f2f2; +$color_gray_light: #dfdfdf; $color_gray_dark: #999999; -$color_gray_darker: #4A4A4A; +$color_gray_darker: #4a4a4a; $color_horizontal_rule_light: #e5e5e5; $color_horizontal_rule_dark: #7b7b7b; $color_icon_light: #ffffff; @@ -25,13 +19,13 @@ $color_input_text_color_light: #363636; $color_input_text_color_dark: #ffffff; $color_input_text_color_disabled_light: #ffffff; $color_input_text_color_disabled_dark: #ffffff; -$color_primary: #6d6e71; -$color_primary_contrast: #f1f2f2; -$color_secondary: #00CEC4; -$color_secondary_contrast: #ff5e32; +$color_primary: #b3965a; +$color_primary_contrast: #fafaf7; +$color_secondary: #b3965a; +$color_secondary_contrast: #342512; $color_text_light: #ffffff; $color_text_med: #828282; -$color_text_dark: #333333; +$color_text_dark: #000000; $color_text_input_hints_light: #7b7b7b; $color_text_input_hints_dark: #7b7b7b; $color_text_input_hints: #c4c4c4;