Skip to content
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

Apr-24-2024: Merge and deploy develop to master #127

Merged
merged 107 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
68148b7
adds remaining files
esolano2 Nov 18, 2021
ebee797
add files
esolano2 Nov 18, 2021
4399d96
commit
esolano2 Nov 18, 2021
9354dd3
updates wrapper item
esolano2 Nov 19, 2021
4838c9d
updates list js
esolano2 Nov 25, 2021
f1aa941
adds initial update to mapathon landing page
esolano2 Dec 17, 2021
dadfda5
creating step form wrapper for desktop
haseebk Jan 3, 2022
a76f581
css changes and commenting unused fields
haseebk Jan 4, 2022
35a766d
changing Create a Mapathon header to Create for english lang
haseebk Jan 4, 2022
e47bbe4
creating progress bar + making pane wider
haseebk Jan 4, 2022
d9ebe47
adjusting progress section
haseebk Jan 4, 2022
0e14506
adjusting form css + adding more wrappers
haseebk Jan 4, 2022
847df5a
modifying progress bar
haseebk Jan 4, 2022
992519e
Allowing user to exit review without making a change
ParsaHonarmand Jan 19, 2022
70dd4a0
Merge pull request #100 from axsmap/AM-291
ParsaHonarmand Jan 19, 2022
23ed4a5
creating styled buttons
haseebk Jan 19, 2022
3d62d0c
updating progress bar to use step number
haseebk Jan 19, 2022
00185cc
fix spacing
haseebk Jan 19, 2022
8a245a9
cleanup ProgressBar file
haseebk Jan 27, 2022
5a2c1d8
create Step component
haseebk Jan 27, 2022
730849c
adding some new English strings
haseebk Jan 27, 2022
00b27e1
updating Form.js to use new Step component
haseebk Jan 27, 2022
0e0022a
cleaning up Form and Step
haseebk Jan 28, 2022
62c2745
adding english strings
haseebk Feb 1, 2022
e0cf212
adding more english strings
haseebk Feb 1, 2022
0efa1c9
fixing searching with accented characters
ParsaHonarmand Feb 11, 2022
72469af
Merge pull request #101 from axsmap/AM-309
imraminradmand Feb 11, 2022
1cba29e
updating form to include confirmation page
haseebk Feb 15, 2022
56ec9a4
adding some missed english strings
haseebk Feb 15, 2022
44f2249
creating summary step
haseebk Feb 24, 2022
30fd749
adding spanish, french, & japanese strings
haseebk Feb 26, 2022
3ea1136
updating styling to match concept
haseebk Feb 26, 2022
688da95
adding button strings to language files
haseebk Feb 26, 2022
092001e
updating summary page
haseebk Mar 1, 2022
20b8066
created test image uploader
imraminradmand Mar 6, 2022
f237ad8
test2
imraminradmand Mar 6, 2022
12c47b0
disabling multiple image upload
imraminradmand Mar 6, 2022
077bee6
adding reference for input tag
imraminradmand Mar 6, 2022
5b00a7e
adding ref for later use on styled component
imraminradmand Mar 6, 2022
280a0e4
styling changes
imraminradmand Mar 6, 2022
a02ef8d
hiding uploader div once image is loaded
imraminradmand Mar 6, 2022
a6739b7
modal created + partial styling
imraminradmand Mar 6, 2022
f79cf6c
more styling fixes and added upload funcionality back
imraminradmand Mar 6, 2022
2885dc2
more styling changes
imraminradmand Mar 6, 2022
df973e7
added privacy policy link
ParsaHonarmand Mar 11, 2022
dee92d5
Merge pull request #105 from axsmap/AM-310
ParsaHonarmand Mar 11, 2022
0043331
making font sizes smaller in the footer
ParsaHonarmand Mar 30, 2022
1b170f9
Merge pull request #107 from axsmap/AM-310
ParsaHonarmand Mar 30, 2022
6362506
commit
esolano2 Mar 30, 2022
1c69ff5
commit
esolano2 Mar 30, 2022
5d4c90e
tries to fix video dimensions
esolano2 Mar 30, 2022
662e8a9
updates to mapathon landing. comments out details update
esolano2 Mar 30, 2022
e04297b
cleans up commented code
esolano2 Mar 30, 2022
a7d11f7
adjusts filter buttons on mobile
esolano2 Mar 30, 2022
9f7e8ed
Merge pull request #108 from elvinsolano/feature/mapathon-landing
ParsaHonarmand Apr 13, 2022
6c41bc1
styling fixes
imraminradmand Apr 27, 2022
30a224e
default image choosing working now
imraminradmand Apr 27, 2022
11d3b4a
cleanup ProgressBar file
haseebk Jan 3, 2022
a13fb32
create Step component
haseebk Jan 27, 2022
62907b4
adding some new English strings
haseebk Jan 27, 2022
46a3711
updating Form.js to use new Step component
haseebk Jan 27, 2022
d4df65e
cleaning up Form and Step
haseebk Jan 28, 2022
5c92e49
adding english strings
haseebk Feb 1, 2022
16ee4a6
adding more english strings
haseebk Feb 1, 2022
6e7abcf
updating form to include confirmation page
haseebk Feb 15, 2022
d41a1c8
adding some missed english strings
haseebk Feb 15, 2022
fcf851d
creating summary step
haseebk Feb 24, 2022
7789c46
adding spanish, french, & japanese strings
haseebk Feb 26, 2022
ca3de2b
updating styling to match concept
haseebk Feb 26, 2022
014f4f0
adding button strings to language files
haseebk Feb 26, 2022
1682084
updating summary page
haseebk Mar 1, 2022
0a89fe6
created test image uploader
imraminradmand Mar 6, 2022
83edc10
test2
imraminradmand Mar 6, 2022
bfcf65f
disabling multiple image upload
imraminradmand Mar 6, 2022
ccd726b
adding reference for input tag
imraminradmand Mar 6, 2022
73bf2d4
adding ref for later use on styled component
imraminradmand Mar 6, 2022
6083a6e
styling changes
imraminradmand Mar 6, 2022
fb25e27
hiding uploader div once image is loaded
imraminradmand Mar 6, 2022
57fb8a4
modal created + partial styling
imraminradmand Mar 6, 2022
99b576f
more styling fixes and added upload funcionality back
imraminradmand Mar 6, 2022
7e9b51a
more styling changes
imraminradmand Mar 6, 2022
bfe87de
adjusting mapathons summary ui
haseebk Apr 5, 2022
26749c4
check validation for description field
haseebk Jun 8, 2022
9443598
field validations
ParsaHonarmand Jun 29, 2022
8df23e8
Merge + merge conflict resolution
imraminradmand Jul 6, 2022
f435eee
reverting imageUploader to have state
imraminradmand Jul 6, 2022
661e160
idek anymore
imraminradmand Jul 7, 2022
774a3bf
idek anymore
imraminradmand Jul 7, 2022
9ef6feb
default image fix ip
ParsaHonarmand Jul 7, 2022
387bfc2
updating image state after upload
imraminradmand Jul 7, 2022
22f9a0c
Adding Chinese translation
imraminradmand Sep 15, 2022
063e241
Merge pull request #113 from axsmap/AM-319
imraminradmand Sep 16, 2022
cb9c64a
some responsive styling
haseebk Oct 22, 2022
2b00f89
Updated FAQ video URL (#115)
imraminradmand Oct 27, 2022
a2b1a64
AM-323 (#114)
imraminradmand Nov 10, 2022
52183fb
style changes to form
haseebk Nov 12, 2022
73bf21d
Delete package-lock.json
haseebk Nov 12, 2022
9630f58
Revert "Delete package-lock.json"
haseebk Nov 12, 2022
c7f2fca
Merge pull request #116 from axsmap/AM-303_stepper_component
haseebk Nov 13, 2022
a0dad92
increase icon size of focus areas (#122)
haseebk Jan 23, 2023
d3dace5
decrease uploaded image size to 90% (#123)
haseebk Jan 23, 2023
6f79311
add padding above step buttons (#124)
haseebk Jan 23, 2023
11917f0
fix button sizing and reformat code
haseebk Oct 24, 2023
090047f
fix content over-scrolling
haseebk Oct 24, 2023
5ee60ef
fix modal scrolling behaviour
haseebk Dec 20, 2023
e1a7b28
Merge pull request #126 from axsmap/AM-331
haseebk Jan 31, 2024
6aedc45
Merge pull request #125 from axsmap/AM-332
haseebk Jan 31, 2024
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
22,053 changes: 21,957 additions & 96 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"react-ga": "2.5.3",
"react-google-maps": "9.4.5",
"react-helmet": "5.2.0",
"react-icons": "^4.3.1",
"react-intl": "2.4.0",
"react-loadable": "5.4.0",
"react-redux": "5.0.7",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
padding: 0;
width: 100%;

background-color: #FAFAFA;
background-color: #FFF;

font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
Expand Down
Binary file added public/privacypolicy.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions src/components/Container/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ const Container = styled.div`
justify-content: center;
display: flex;
padding: 2rem 1rem;
padding: 0;
//padding: 2rem 1rem;
width: 100%;
background-color: ${colors.lightestGrey};
background-color: transparent;
${media.tablet`
padding: 2rem 0;
Expand Down
Loading