Skip to content

Addition of asterisks for mandatory items in proposal submission #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 222 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
5ef010e
Fixed OSF stuff
smarcet Sep 25, 2020
d7b8af9
enable pres atachment on openstack
santipalenque Sep 25, 2020
cbcadf5
fix filename on upload input
santipalenque Sep 28, 2020
300c09f
change Title to JobTitle
santipalenque Sep 30, 2020
85b7fcf
fix missing media uploads on edit pres
santipalenque Oct 20, 2020
1da7733
new uploads tab
santipalenque Oct 21, 2020
bf2249a
bugfixes on upload
santipalenque Oct 21, 2020
302ff40
bugifx
santipalenque Oct 21, 2020
e761ec5
fix back button
santipalenque Oct 21, 2020
202ef4f
hide add button
santipalenque Oct 21, 2020
28b8532
bigfix
santipalenque Oct 23, 2020
46ac2be
disable title edit
santipalenque Oct 27, 2020
912d641
CAUTION - upload input upgrade
santipalenque Oct 28, 2020
52f647d
upoad input fix
santipalenque Oct 28, 2020
8079497
adjustments to upload process
santipalenque Nov 2, 2020
f208c1e
remove error when file uploads
santipalenque Nov 2, 2020
5f99028
update upload input - uicore
santipalenque Nov 9, 2020
3084398
update nav according to uploads
santipalenque Dec 2, 2020
520fc20
Refactoring on AUTH
smarcet Jan 28, 2021
e98aab1
Fixed op filter condition
smarcet Feb 16, 2021
4e839e2
fix tab navigation
santipalenque Apr 16, 2021
73547db
fix bug on tab navigation
santipalenque Apr 16, 2021
6588efe
nav fix again
santipalenque Apr 16, 2021
4181627
fix summit docs
santipalenque Apr 19, 2021
efc8475
update uicore
santipalenque Apr 20, 2021
27ab022
update dropzone
santipalenque Apr 20, 2021
84aeb78
roll back and fix dropzone version
santipalenque Apr 20, 2021
43f2610
remove levels if not allowed on type, do not validate speakers or mod…
santipalenque Apr 21, 2021
539bc49
add speakers attend question
santipalenque Apr 29, 2021
387a27a
adding default value to will_speakers_attend
santipalenque Apr 29, 2021
176a8db
Update presentation-summary-form.js
smarcet Apr 29, 2021
051e59e
Fixed languages edition on speaker form
smarcet Apr 30, 2021
1180d79
ui tweaks
smarcet May 20, 2021
97e9dca
Added selection plan extra questions
smarcet May 27, 2021
fe7e647
Added checkbox disclaimmer
smarcet May 28, 2021
b708c69
Removed social description validation rule
smarcet May 28, 2021
e67d68b
Fixed UX on speakers selection form
smarcet May 28, 2021
4eddfcf
Added html support to extra question labels
smarcet Jun 2, 2021
0feb542
Fixed title and dates on landing screen
smarcet Jun 3, 2021
6e12fda
Fixed date format
smarcet Jun 3, 2021
5d5d92e
add alpha sorting on track names
smarcet Jun 4, 2021
36e09fc
Fix on presentation form
smarcet Jun 7, 2021
57e3731
Fix on new speaker creation
smarcet Jun 14, 2021
7eac015
Add new speaker tweaks
smarcet Jun 14, 2021
0456943
Fix on get all summits query
smarcet Jun 21, 2021
a4737ca
Addition of asterisks for mandatory items in proposal submission
romanetar Jun 20, 2021
c05c257
Addition of asterisks for mandatory items in proposal submission
romanetar Jul 7, 2021
62cf24f
Addition of asterisks for mandatory items in proposal submission
romanetar Jul 7, 2021
0186825
Presentation Summary Form
smarcet Jul 14, 2021
8f726e4
Added validation for HTML text
smarcet Jul 23, 2021
171ca7f
Extra questions
smarcet Jul 27, 2021
f406e1d
Updated Media Upload Procedure
smarcet Dec 2, 2021
ec1ea77
Updated missing deps
smarcet Dec 17, 2021
9b657c3
Changed default logo for OSF
smarcet Dec 17, 2021
57ad844
Fixed index.ejs template
smarcet Dec 17, 2021
bed86b6
Changes track guide text. New items
tomrndom Dec 21, 2021
7edc4b8
Added fav icon url to ejs template
smarcet Jan 3, 2022
e4941df
remove The Forum section from track guide page
romanetar Jan 3, 2022
febb365
Changes in text for selection process page
tomrndom Jan 5, 2022
b1cf0bb
Changed join link for OSF
smarcet Jan 5, 2022
b31061e
Updated speaker support email
smarcet Jan 5, 2022
7b33d67
Change link for mailing list
tomrndom Jan 6, 2022
b366a0a
Adding new env variable to display/hide the language selection UI
tomrndom Jan 6, 2022
d71ab51
Custom landing page title for OSF
smarcet Jan 10, 2022
567fd2d
Fixed allowed tags loading on presentation deep linking
smarcet Jan 10, 2022
b065b66
added new .env variable
smarcet Jan 10, 2022
79dfb6e
several resourcing texts changed as requested
romanetar Jan 11, 2022
c63fc80
Remove checkbox from My Bio page + add multitenancy lang resourcing s…
romanetar Jan 11, 2022
0fa18e2
validation method fix
romanetar Feb 1, 2022
de081e4
remove NEW: from hardware_enablement i18n resource
romanetar Feb 17, 2022
d3f3b06
updated .env template
smarcet Mar 9, 2022
0df1f78
Selection plan overlap (#16)
santipalenque Mar 24, 2022
1597938
remove copy
santipalenque Mar 25, 2022
f5e197e
fix profile route bug (#17)
santipalenque Mar 28, 2022
6707b25
using selection plan disclaimer and fallback on marketing setting (#18)
santipalenque Apr 4, 2022
7dd7d46
Fix on marketing settings loading
smarcet Apr 4, 2022
a61ec60
Fixed presentations menu item redirection
smarcet Apr 4, 2022
fcaae8f
Change event type filtering by selection plan (#19)
tomrndom Apr 5, 2022
cdb6e46
Filter documents by selection plan (#20)
tomrndom Apr 29, 2022
18a6794
Added custom ordering on tracks
smarcet Apr 29, 2022
f5e1e8f
Updated presentation.getStatus logic
smarcet Aug 3, 2022
68a2515
moving steps logic to model and removing tag tab when empty (#21)
santipalenque Aug 16, 2022
26f62ce
fix backs, next, nav skips & deafults
santipalenque Aug 17, 2022
8707db1
pull event type from presentation
santipalenque Aug 24, 2022
56ceb2f
add last updated to pres table (#22)
santipalenque Aug 29, 2022
da0b8c9
done and bugfixes (#23)
santipalenque Aug 31, 2022
1d5bf24
Presentations Summary page
smarcet Sep 13, 2022
c673299
add max limit and min mandatory (#24)
santipalenque Sep 27, 2022
e689285
fix max files 0
santipalenque Oct 6, 2022
e3ce5c8
fix max files
santipalenque Oct 6, 2022
fa494cd
update env template
santipalenque Oct 6, 2022
ceffafd
Feature/uicore 4 migration (#25)
santipalenque Oct 10, 2022
bde6193
fix static pages
santipalenque Oct 25, 2022
75b036c
Add materials to submission preview (#27)
tomrndom Oct 31, 2022
4bfb3b1
Preventing page load before summit pull (#26)
santipalenque Oct 31, 2022
7b494dd
fix step transition to tags
santipalenque Nov 2, 2022
83be29d
Updated social desc to 280 chars
smarcet Nov 9, 2022
afb4e38
update selection process static page
santipalenque Nov 10, 2022
558b637
add forum to track guide page
santipalenque Nov 11, 2022
2632352
Feature: all selection plans dashboard (#28)
santipalenque Nov 18, 2022
40833da
done (#29)
santipalenque Nov 23, 2022
557943f
bugfix on private sel plans
santipalenque Nov 23, 2022
9bb5357
fix uicore LOGOUT_USER import
santipalenque Nov 24, 2022
433dafa
done (#30)
santipalenque Nov 29, 2022
e30b2ae
adjust new way of allowed selection plans (#31)
santipalenque Dec 2, 2022
f5d28fc
Private Selection Plan
smarcet Dec 8, 2022
8b7ba5a
Adds Google Analytics snippet. (#33)
gcutrini Dec 15, 2022
e690962
Added GTM ( google tag manager)
smarcet Dec 16, 2022
27a9620
add no plans copy
santipalenque Dec 21, 2022
1397410
add trim to links
santipalenque Jan 4, 2023
773108d
lockdown override (#34)
santipalenque Jan 17, 2023
4638496
fix speaker profile
santipalenque Jan 20, 2023
20079ea
fix bug on profile form
santipalenque Jan 20, 2023
378becc
check max summissions per user
santipalenque Jan 24, 2023
8fd455d
fix selection plan filter and redirect
santipalenque Jan 25, 2023
242844c
add description and links optional (#37)
santipalenque Jan 26, 2023
d045b33
adjust image size on disclaimer
santipalenque Jan 26, 2023
b5e8af8
add conditional show for menu items and fix profile item to marketing…
santipalenque Jan 26, 2023
96ad8fc
fix presentation status
santipalenque Jan 27, 2023
12c9c92
Added new login route /auth/login
smarcet Jan 27, 2023
f145938
auto select track and type (#38)
santipalenque Jan 27, 2023
b07ffd7
add menu item translation
santipalenque Jan 30, 2023
6cbf4e1
Fix on missing backUrl setting
smarcet Jan 30, 2023
1481055
integration with marketing settings per selection plan (#39)
tomrndom Jan 31, 2023
6e4208c
Fix missing resource on presentations page (#40)
tomrndom Jan 31, 2023
526ac8f
Upgraded uicore version
smarcet Feb 1, 2023
38a0b60
Updated uicore version
smarcet Feb 1, 2023
a3dcff1
Review Form Tweak
smarcet Feb 2, 2023
00ffc1a
Fix on Presentation Summary Form
smarcet Feb 2, 2023
3ff2c8e
Add new custom texts (#41)
tomrndom Feb 2, 2023
7729fd1
add rule to hide speakers tab (#42)
santipalenque Feb 2, 2023
5ea7f94
Speaker tabs
smarcet Feb 2, 2023
9d64355
Set max width to 100% of their container (#43)
tomrndom Feb 2, 2023
083ec8c
link to all plans on Done
santipalenque Feb 10, 2023
14a872a
change finish submit link to all-plans
santipalenque Feb 14, 2023
363203e
Updated Presentation.getStatus logic (#44)
smarcet Feb 14, 2023
ab48703
keep landing origin for submissions
santipalenque Feb 15, 2023
ec81c5b
Add new popup with custom message from selection plan settings (#45)
tomrndom Feb 17, 2023
d498aaa
Fix on show info popup on presention edition / add
smarcet Feb 22, 2023
40e3841
Presentation Summary
smarcet Feb 23, 2023
8940269
Presentation edition
smarcet Feb 23, 2023
c85c49f
Fixed CSS styles for TextEditor on readonly state
smarcet Feb 24, 2023
6063558
Adjusting size for images on edit presentation popup (#46)
tomrndom Feb 28, 2023
c18ea5b
Fix on modal showing twice
smarcet Mar 1, 2023
59cedc9
Change text on speaker profile required popup (#47)
tomrndom Mar 7, 2023
a3dc308
Updated UICORE
smarcet Mar 17, 2023
2843635
Hide tracks and activity types based on selection plan settings (#48)
tomrndom Mar 27, 2023
4354ee1
Updated UICORE v4.1.15
smarcet Mar 29, 2023
e517ebe
Changes in conditions to render tracks and event type ddl (#50)
tomrndom Apr 10, 2023
c46636c
honor is_editable on extra question input (#49)
santipalenque Apr 10, 2023
55ac755
use is_editable on media upload components (#51)
santipalenque Apr 10, 2023
4f6234d
Fix on extra question edition
smarcet Apr 19, 2023
d6edd2e
Summary Form
smarcet Apr 21, 2023
d250de6
Upload Form
smarcet Apr 21, 2023
2dfe62a
Feature/company input on speaker profile (#52)
santipalenque Apr 21, 2023
0f0cfad
Add swal2 container zindex value (#53)
tomrndom Apr 24, 2023
88f6317
Add missing presentation value on preview and review pages (#54)
tomrndom May 10, 2023
93fcccf
Fix issues with redirect after edit/create presentation (#55)
tomrndom May 10, 2023
2c87985
Fix on review form
smarcet May 11, 2023
03c6868
Make header height variable (#56)
tomrndom May 17, 2023
72e86f3
Add * to required fields (#57)
tomrndom May 23, 2023
797e0f4
Fix extra questions not displaying correctly (#59)
tomrndom May 24, 2023
bd2027c
Fix missing public comments, and button link (#58)
tomrndom May 24, 2023
ce6e3ac
Fix on redirection without selection plan ( All Plans)
smarcet May 24, 2023
678eeda
added clean branchs command
smarcet May 25, 2023
3a8e11f
fix on selection plan extra questions formatting
smarcet May 25, 2023
9eabf0d
Speaker BIO edition
smarcet Jun 16, 2023
8605b76
Use new prop to customize track question (#60)
tomrndom Jun 27, 2023
78b89a1
Add loading text if no profile data is available (#62)
tomrndom Jul 6, 2023
ee64ab4
Styling extra questions on review page (#61)
tomrndom Jul 13, 2023
e385b9f
Presentation table mobile scroll (#63)
tomrndom Jul 13, 2023
0fc80ba
show last edit always
santipalenque Jul 21, 2023
0b3bebe
Fix missing extra questions on review tab for multiple options select…
tomrndom Aug 21, 2023
aee10c8
render urls and files in event docs list (#65)
romanetar Aug 22, 2023
c23bcbd
ref file or web link based on the chosen upload (#66)
romanetar Nov 17, 2023
63e0428
fix error display and add max chars label (#67)
santipalenque Nov 27, 2023
b23d738
updated extra question max len from 512 to 1024
smarcet Nov 28, 2023
3b13d57
hotfix: fixed marketing settigns for selection plan
smarcet Dec 4, 2023
e9eeed1
fix req question validation
santipalenque Dec 5, 2023
e9be9d7
fix req question validation empty answer
santipalenque Dec 5, 2023
5bbf9e2
add text to thank you page
santipalenque Dec 5, 2023
10f6c19
change speaker input empty message
santipalenque Dec 6, 2023
3b5cb1b
feat: use summit.speakers_support_email as support email instead of e…
smarcet Dec 15, 2023
d48e458
fix: marketing settings per selection plan
smarcet Jan 11, 2024
6d8e7b0
fix: back url
smarcet Jan 12, 2024
192ef7a
add custom title to landing page
santipalenque Jan 15, 2024
29946a2
bug fix on landing page and direct link
santipalenque Jan 17, 2024
4bd441d
fix: logout redirect
smarcet Jan 18, 2024
176d3d9
fix bug on CountryComboBox extra question
santipalenque Jan 18, 2024
c561593
Selection plan profile route (#69)
santipalenque Jan 25, 2024
7df921b
fix backurl on speaker not found
santipalenque Jan 26, 2024
f134bbd
fix fallback on speaker not found
santipalenque Jan 29, 2024
bb86d70
fix alert on speaker profile
santipalenque Jan 30, 2024
f4ad943
improve speaker input message
santipalenque Mar 5, 2024
28167dd
WIP (#70)
santipalenque Mar 22, 2024
4bc242f
fix bug on summit docs
santipalenque May 13, 2024
e8c0e92
use rawHTML in media upload description
santipalenque May 13, 2024
b195230
change get presentations endpoint
santipalenque May 15, 2024
dabf73b
fix: redirect url on registration process on landing page
smarcet May 31, 2024
702a645
fix: register target changed from blank to self
smarcet May 31, 2024
1726233
fix: double slash on auth request
smarcet May 31, 2024
c884fcc
Summit docs reorder (#71)
santipalenque Jul 2, 2024
bf32566
Update selection plan on presentation form (#72)
tomrndom Jul 2, 2024
761a024
Hidden Selection Plans (#73)
santipalenque Jul 10, 2024
b2399dd
Check if user is not allowed on selection plan (#75)
tomrndom Jul 19, 2024
8e0e10e
fix: bug on presentation status
smarcet Dec 9, 2024
3f5e5fd
fix: selection plans sort (#77)
tomrndom Dec 10, 2024
2ed7996
feat: upload chunked files through file upload api (#78)
romanetar Dec 12, 2024
c0cee2c
Add required expand for missing documents (#80)
tomrndom Jan 20, 2025
95148fd
add new flag to trigger error scroll (#79)
tomrndom Jan 21, 2025
a6b7eb6
check event_types undefined
romanetar Jan 31, 2025
0916246
Merge pull request #81 from fntechgit/hotfix/event-types-undefined
santipalenque Jan 31, 2025
11698eb
fix: improved logic for lockDownPeriod
smarcet Feb 6, 2025
65b99df
fix: logout error from landing page
smarcet Mar 17, 2025
c514ccf
fix: add error handling to upload form
smarcet Mar 17, 2025
a1b6653
feat: add sentry integration (#76)
tomrndom Mar 18, 2025
1d54693
tweaks (#82)
santipalenque Apr 7, 2025
619f4d1
chore: update landing page oif
smarcet Apr 7, 2025
3746ff3
change copy in track guide
santipalenque Apr 9, 2025
345c02d
chore: add new track for oif
smarcet Apr 28, 2025
804fa07
add copies to track guide (#83)
santipalenque Jul 10, 2025
9969044
fix: isGlobalLanding was not matching the correct path
smarcet Jul 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
OAUTH2_CLIENT_ID=
IDP_BASE_URL=
API_BASE_URL=
FILE_UPLOAD_API_BASE_URL=
SCOPE_REALM=
OS_BASE_URL=
FILE_UPLOAD_SCOPES="files/upload"
SCOPES="profile address email openid ${SCOPE_REALM}/summits/read/all ${SCOPE_REALM}/speakers/write ${SCOPE_REALM}/speakers/write/me ${SCOPE_REALM}/members/read/me ${SCOPE_REALM}/members/write/me ${SCOPE_REALM}/summits/write-presentation ${SCOPE_REALM}/organizations/read ${SCOPE_REALM}/summits/write-presentation-materials ${FILE_UPLOAD_SCOPES}"
APP_CLIENT_NAME=
MARKETING_API_BASE_URL=
#LOGO_URL="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/images-fn-staging/idp-logo.png"
LOGO_URL="https://object-storage.public.mtl1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/OpenInfra-logo-RGB.svg"
SHOW_LANGUAGE_SELECTION=1|0
SUPPORT_EMAIL=""
TIMEINTERVALSINCE1970_API_URL=https://timeintervalsince1970.dev.fnopen.com
SENTRY_DSN=""
SENTRY_AUTH_TOKEN=""
SENTRY_RELEASE=""
SENTRY_ORG=""
SENTRY_PROJECT=""

# index.ejs config
TITLE="Speaker Management"
META_TITLE="FnTech | Speaker Management"
META_DESC="Submit your presentation, panel, or workshop."
OG_TITLE="FnTech Speaker Management"
OG_URL="https://speakermgmt.fntech.com"
OG_IMG="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/images-fn/idp-logo.png"
OG_SECURE_IMG="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/images-fn/idp-logo.png"
OG_DESC="Submit your presentation, panel, or workshop."
OG_SITE_NAME="FnSpeakers"
TWITTER_SITE="@fntech"
LINK_IMG_SRC="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/images-fn/idp-logo.png"
FAV_ICON_URL="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/images-fn/favicon.png"
GOOGLE_ANALYTICS_ID=
GOOGLE_GTM_ID=
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.env
.env.*
dist
.idea
node_modules
.env.dev
node_modules
.DS_Store
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.20.1
12,908 changes: 0 additions & 12,908 deletions package-lock.json

This file was deleted.

92 changes: 59 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,75 +6,101 @@
"scripts": {
"build-dev": "./node_modules/.bin/webpack --config webpack.dev.js",
"build": "./node_modules/.bin/webpack --config webpack.prod.js",
"serve": "webpack-dev-server --open --https --config webpack.dev.js"
"serve": "webpack-dev-server --open --https --config webpack.dev.js",
"clean-branchs": "git branch | grep -v \"master\\|main\\|production\" | xargs git branch -D"
},
"author": "",
"license": "ISC",
"dependencies": {
"@babel/core": "^7.5.5",
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/core": "^7.17.8",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
"@babel/plugin-proposal-object-rest-spread": "^7.17.3",
"@babel/preset-env": "^7.16.11",
"@babel/preset-flow": "^7.16.7",
"@babel/preset-react": "^7.16.7",
"@babel/runtime": "^7.17.8",
"@react-pdf/renderer": "^3.1.11",
"@sentry/react": "^8.32.0",
"@sentry/webpack-plugin": "^2.22.4",
"@types/googlemaps": "^3.39.3",
"@types/markerclustererplus": "^2.1.29",
"@types/react": "^16.9.32",
"awesome-bootstrap-checkbox": "^1.0.1",
"babel-cli": "^6.26.0",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^3.1.0",
"dotenv-webpack": "^1.7.0",
"file-loader": "^4.1.0",
"babel-loader": "^8.1.0",
"browser-tabs-lock": "1.2.15",
"buffer": "^6.0.3",
"clean-webpack-plugin": "^4.0.0",
"crypto-browserify": "^3.12.0",
"crypto-js": "^4.1.1",
"css-loader": "^6.7.1",
"dotenv-webpack": "^7.1.0",
"dropzone": "5.7.2",
"file-loader": "^6.2.0",
"file-saver": "^2.0.2",
"final-form": "^4.20.7",
"font-awesome": "^4.7.0",
"history": "^4.7.2",
"html-webpack-plugin": "^3.2.0",
"html-webpack-plugin": "^5.5.0",
"i18n-react": "^0.6.4",
"idtoken-verifier": "^1.2.0",
"idtoken-verifier": "^2.2.2",
"immutability-helper": "^2.7.1",
"js-yaml": ">=3.13.1",
"jodit-react": "^5.2.15",
"js-cookie": "^3.0.5",
"js-yaml": "^4.1.0",
"js-yaml-loader": "^1.2.2",
"less": "^3.9.0",
"less-loader": "^4.1.0",
"less": "^4.1.2",
"less-loader": "^10.2.0",
"lodash": "^4.17.14",
"mini-css-extract-plugin": "^0.8.0",
"mini-css-extract-plugin": "^2.6.0",
"moment": "^2.22.2",
"moment-timezone": "^0.5.21",
"node-sass": "^4.11.0",
"openstack-uicore-foundation": "2.0.53",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"node-sass": "^7.0.1",
"openstack-uicore-foundation": "4.1.98",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"path-browserify": "^1.0.1",
"postcss-loader": "^2.1.6",
"process": "^0.11.10",
"prop-types": "^15.7.2",
"react": "^16.6.3",
"react-bootstrap": "^0.31.5",
"react-breadcrumbs": "^2.1.6",
"react-burger-menu": "^2.6.10",
"react-datetime": "^2.15.0",
"react-dnd": "^2.6.0",
"react-dnd-html5-backend": "^2.6.0",
"react-dnd": "^15.1.1",
"react-dnd-html5-backend": "^15.1.2",
"react-dom": "^16.4.1",
"react-dropzone": "^4.2.13",
"react-final-form": "^6.5.9",
"react-flags-select": "^1.1.10",
"react-google-maps": "^9.4.5",
"react-hot-loader": "^3.1.3",
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-rte-ref-fix": "^0.16.2",
"react-rte": "^0.16.3",
"react-scroll": "^1.7.10",
"react-select": "^2.1.2",
"react-tooltip": "^3.11.2",
"react-tooltip": "^4.2.21",
"redux": "^3.7.2",
"redux-persist": "^5.10.0",
"redux-thunk": "^2.3.0",
"sass-loader": "^6.0.7",
"style-loader": "^0.19.1",
"superagent": "^3.8.1",
"sass-loader": "^12.6.0",
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.1",
"superagent": "^6.1.0",
"sweetalert2": "^8.15.2",
"urijs": "^1.19.1",
"url-loader": "^0.6.2",
"url-loader": "^4.1.1",
"validator": "^9.4.1",
"webpack": "^4.29.0",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.1.14",
"webpack-merge": "^4.2.1",
"video.js": "^7.8.2"
"video.js": "^7.8.2",
"webpack": "^5.70.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4",
"webpack-merge": "^5.8.0"
},
"devDependencies": {
"@babel/plugin-transform-arrow-functions": "^7.16.7"
}
}
71 changes: 14 additions & 57 deletions src/actions/auth-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,21 @@
import {
createAction,
getRequest,
showMessage,
startLoading,
stopLoading,
authErrorHandler,
initLogOut
} from "openstack-uicore-foundation/lib/methods";

import {REQUEST_USER_INFO, RECEIVE_USER_INFO} from 'openstack-uicore-foundation/lib/actions';


import history from '../history'
import T from "i18n-react/dist/i18n-react";
import Swal from "sweetalert2";
} from "openstack-uicore-foundation/lib/utils/actions";
import { getUserInfo} from 'openstack-uicore-foundation/lib/security/actions';
import {getAccessTokenSafely} from "../utils/methods";

export const RECEIVE_SPEAKER_INFO = 'RECEIVE_SPEAKER_INFO';

export const getSpeakerInfo = (backUrl) => (dispatch, getState) => {

let { loggedUserState } = getState();
let { accessToken } = loggedUserState;
export const getSpeakerInfo = () => async (dispatch, getState) => {
const accessToken = await getAccessTokenSafely();

dispatch(startLoading());

let params = {
const params = {
access_token : accessToken,
expand: 'member'
};
Expand All @@ -47,57 +38,23 @@ export const getSpeakerInfo = (backUrl) => (dispatch, getState) => {
createAction(RECEIVE_SPEAKER_INFO),
`${window.API_BASE_URL}/api/v1/speakers/me`,
speakerErrorHandler
)(params)(dispatch, getState).then(() => {

)(params)(dispatch, getState)
.catch(() => {
return getUserInfo('groups')(dispatch, getState);
})
.finally(() => {
dispatch(stopLoading());

if (backUrl) {
history.push(backUrl);
}
});
}

export const speakerErrorHandler = (err, res) => (dispatch, getState) => {
let { baseState } = getState();
const speakerErrorHandler = (err, res) => async (dispatch, getState) => {
let code = err.status;
dispatch(stopLoading());

if (code == 404) {
// speaker not found
//try to get member

Swal.fire({
title: T.translate("landing.speaker_profile_required"),
text: T.translate("landing.speaker_profile_required_text"),
type: "warning",
});

return getRequest(
createAction(REQUEST_USER_INFO),
createAction(RECEIVE_USER_INFO),
`${window.API_BASE_URL}/api/v1/members/me?expand=groups&access_token=${accessToken}`,
authErrorHandler
)({})(dispatch, getState).then(() => {
dispatch(stopLoading());

let { member } = getState().loggedUserState;
if( member == null || member == undefined){
let error_message = {
title: 'ERROR',
html: T.translate("errors.user_not_set"),
type: 'error'
};

dispatch(showMessage( error_message, initLogOut ));
return;
}

const redirectUrl = baseState.summit ? `/app/${baseState.summit.slug}/profile` : '/app/profile';
history.push(redirectUrl);
});

return Promise.reject('not found');
}
dispatch(authErrorHandler(err, res));

return dispatch(authErrorHandler(err, res));
}

Loading