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.

Sign up for GitHub

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

LOGIN #3 and #4 (KN-44 KN-70) Login Refactor #164

Merged
merged 93 commits into from
Jan 14, 2025
Merged

LOGIN #3 and #4 (KN-44 KN-70) Login Refactor #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
c397c73
Trigger re-deploy to heroku
AbigailDawson Oct 30, 2024
b00af0b
Add JP to Core Contributors, update Past Core Contributors and remove…
AbigailDawson Nov 3, 2024
8624573
Merge pull request #151 from AbigailDawson/update-core-contributors
AbigailDawson Nov 3, 2024
6f899cd
Re-deploy to heroku
AbigailDawson Nov 13, 2024
0b35959
Re-deploy
AbigailDawson Nov 13, 2024
e5a1c15
Include client/dist in deployment
AbigailDawson Nov 13, 2024
de7f750
Merge branch 'main' of https://github.com/AbigailDawson/knownative in…
JPEscobari Nov 13, 2024
ac7aefb
Add dist files back in to troubleshoot heroku deployment
AbigailDawson Nov 14, 2024
7462e92
Comment out client/dist for gitignore
AbigailDawson Nov 14, 2024
a7fca4e
Migrate Demo Difficulty Tag to .scss and BEM
JPEscobari Nov 19, 2024
579eb1b
add SASS to dev dependencies
rennacarver Nov 20, 2024
69a55a4
Merge pull request #153 from AbigailDawson/user-authentication-author…
AbigailDawson Nov 20, 2024
381d097
Merge branch 'develop' into rennacarver
AbigailDawson Nov 20, 2024
2f00773
Remove /client/dist from gitignore
AbigailDawson Nov 20, 2024
6c625b1
Merge branch 'develop' into rennacarver
AbigailDawson Nov 20, 2024
9b17345
Merge pull request #155 from AbigailDawson/rennacarver
AbigailDawson Nov 20, 2024
6d9f37a
Migrate to .scss Demo EditWord, ExitModal, Modal, Sidebar, WelcomeModal
JPEscobari Nov 20, 2024
8c79f83
Migrate to .scss DemoFlashCardForm, DemoFlashCard, DemoFlashCardGameM…
JPEscobari Nov 20, 2024
b497a34
Migrate to .scss DemoFlashcardGameModal component
JPEscobari Nov 20, 2024
e26ecae
Migrate to .scss DemoInfoSidebar
JPEscobari Nov 21, 2024
92af449
Migrate to .scss DemoLibrary.jsx
JPEscobari Nov 21, 2024
40f8627
Migrate DemoSavedWordsList to .scss
JPEscobari Nov 21, 2024
705521c
Migrate DemoLeftNav to .scss
JPEscobari Nov 22, 2024
0f72770
Create text schema
vik-wed Nov 22, 2024
02dfa98
Create card schema
vik-wed Nov 22, 2024
57f2296
Create deck schema
vik-wed Nov 22, 2024
a259583
Create tag schema
vik-wed Nov 22, 2024
caffa45
Migrate DemoTextPage styles to .scss
JPEscobari Nov 25, 2024
2ec5c87
Fix for Merge Conflicts
JPEscobari Nov 26, 2024
3481589
styling for login buttons, toggle visibility is added for password input
agrimes23 Nov 28, 2024
1e12507
styling for input is added, or separator line is added between login …
agrimes23 Nov 29, 2024
745f59b
placeholder to label animation works, but need to fix a few bugs
agrimes23 Nov 30, 2024
c8d63f8
Add note on level to text model
vik-wed Nov 30, 2024
cc2be15
animation behavior works on inputs for placeholder to label. Not yet …
agrimes23 Nov 30, 2024
9310aa9
styling matches wireframes with animations. All text is added
agrimes23 Nov 30, 2024
5140f05
existing error message styling is updated, message shows above login …
agrimes23 Nov 30, 2024
993a221
Merge pull request #157 from AbigailDawson/kn39-models
AbigailDawson Dec 1, 2024
2a23870
Refactor sytles for Signup Form input fields
JPEscobari Dec 1, 2024
115ce57
Merge branch 'develop' of github.com:AbigailDawson/knownative into al…
agrimes23 Dec 1, 2024
912d786
cleaned up some comments in the css file
agrimes23 Dec 1, 2024
6cd2cb6
when inputs are clicked, they do not move the rest of the elements be…
agrimes23 Dec 1, 2024
9315610
login modal has styling based on wireframes, uses the slightly modifi…
agrimes23 Dec 1, 2024
0966961
adjusted padding for visibility icon
agrimes23 Dec 1, 2024
7ddbda3
Merge branch 'alexg/login-refactor' of github.com:AbigailDawson/known…
agrimes23 Dec 1, 2024
544896c
login modal was moved to landing page components folder
agrimes23 Dec 1, 2024
16c3a8f
login screen has mobile styling
agrimes23 Dec 1, 2024
b877683
Merge branch 'alexg/login-refactor' of github.com:AbigailDawson/known…
agrimes23 Dec 1, 2024
3cc26d6
login modal now has styling for mobile
agrimes23 Dec 1, 2024
06438aa
Refactor FormInput to use .scss and BEM class naming convention
JPEscobari Dec 2, 2024
10c4b41
Refactor SignupPage.css to .scss, migrate SignupPage.jsx to BEM class…
JPEscobari Dec 2, 2024
3d88326
Refactor SignUp.jsx to match wireframe design
JPEscobari Dec 2, 2024
6a4e7cc
Taking out modal code once workflow is updated
Dec 3, 2024
afa8275
Merge pull request #158 from JPEscobari/signup-form-feature
agrimes23 Dec 3, 2024
1e479fb
updated css to use BEM naming conventions, now used in login jsx file
agrimes23 Dec 3, 2024
07e0499
styling for login page has converted from css to scss. deleted old cs…
agrimes23 Dec 3, 2024
e8a09bc
form input scss and jsx files are updated with styling changes origin…
agrimes23 Dec 3, 2024
691c4fb
error message appear only when errors
agrimes23 Dec 4, 2024
2c16a91
Form input is now used on login page
agrimes23 Dec 4, 2024
b5e8faf
error messages show like they are styled in the wireframes. Though cu…
agrimes23 Dec 4, 2024
f525320
Merge branch 'develop' into JP
JPEscobari Dec 4, 2024
e544865
Migrate KnowNativePage to .scss and BEM class naming convention
JPEscobari Dec 4, 2024
7198f8d
password functionality and icon are now on FormInput component
agrimes23 Dec 5, 2024
f125dd5
Migrate AboutPage to .scss
JPEscobari Dec 5, 2024
58a1ced
Migrate LandingPageNav to .scss
JPEscobari Dec 5, 2024
18bfa83
Migrate ContributePage to .scss
JPEscobari Dec 5, 2024
86e78b5
styling completed assuming we are using one line error messages in si…
agrimes23 Dec 5, 2024
3225e69
Migrate LandingPage and reusable-button to .scss
JPEscobari Dec 5, 2024
7a26296
Typo fix for DemoPreviewTextModal.jsx
JPEscobari Dec 5, 2024
9b5efb2
Migrate modal.jsx to .scss
JPEscobari Dec 5, 2024
d9bb128
Fix for Read and Study tabs not displaying any text
JPEscobari Dec 5, 2024
b245a91
Fix for DemoWelcomeModal.jsx not displaying the difficulty selection …
JPEscobari Dec 5, 2024
d78023c
error messages now show when user clicks outside and value is invalid
agrimes23 Dec 7, 2024
e42a8ab
input will change immeditately when correct, but will only show error…
agrimes23 Dec 8, 2024
c487970
found bug in styling. borders and error message shows on user clicks…
agrimes23 Dec 8, 2024
3707f92
refactored DemoStudyText and DemoTranslateText from css to scss files
Seanna-Arnold Dec 9, 2024
f763834
the important tag is added to the label being invalid and now has exp…
agrimes23 Dec 10, 2024
768be0c
adding FormInput component changes to the Sign up page
agrimes23 Dec 10, 2024
6e15581
Merge pull request #156 from JPEscobari/JP
AbigailDawson Dec 11, 2024
d301135
Add conditional rendering for password validation messages to match W…
JPEscobari Dec 11, 2024
6854bab
Merge pull request #162 from JPEscobari/Signup-Form-v.2.0
agrimes23 Dec 11, 2024
62c9a9c
fixed merge conflicts within signup files and form input. kept ours s…
agrimes23 Dec 12, 2024
a4b5031
resolved merge conflicts from KN-44-login-refactor, updated util name…
agrimes23 Dec 14, 2024
25f6531
added in newbutton styling name for scss to modal
agrimes23 Dec 14, 2024
5184e82
added FormInput component to login modal, adjusted styling to fit for…
agrimes23 Dec 14, 2024
e65a4ee
fix typo in modal's classname in order to apply styling
agrimes23 Dec 14, 2024
6a78326
fixed merge conflict when pulling from main
agrimes23 Dec 14, 2024
9d0da46
made changes to the AboutPage and gitignore to resolve merge conflicts
Seanna-Arnold Dec 18, 2024
0c0e359
remove client/dist
AbigailDawson Dec 20, 2024
0c9a527
remove client/dist
AbigailDawson Dec 20, 2024
9cd4375
resolve merge conflicts
AbigailDawson Dec 20, 2024
9e4aea1
resolve error message, update dependencies
AbigailDawson Dec 20, 2024
514af6e
Merge pull request #159 from AbigailDawson/seannamercedes
AbigailDawson Dec 20, 2024
d181de9
Merge branch 'develop' of github.com:AbigailDawson/knownative into al…
agrimes23 Jan 4, 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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# production
/client/build
/client/dist
# /client/dist
/server/build
/server/dist

Expand Down
165 changes: 0 additions & 165 deletions client/dist/assets/index-BQlo07nY.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion client/dist/assets/index-BoYVvlwz.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion client/dist/assets/index-Bs1L5mN8.css
View file
Open in desktop

This file was deleted.

48 changes: 24 additions & 24 deletions client/dist/assets/index-BKo2qcWO.js → client/dist/assets/index-BwbqQb1y.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file removed client/dist/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/Abigail.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/abigail-taiwan.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Alex-Grimes.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Austin-Rzansa.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Ellie-Wright.png
View file
Open in desktop
Binary file not shown.
Binary file added client/dist/images/core-contributors/JP-Escobari.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/dist/images/core-contributors/Jason-Houn.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Kate-McElhaney.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Lisa-Young.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Mel-Boyajian.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Nakita-Strangeways.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Parker-Machemer.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Paul-Santos.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Placeholder-image.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Renna-Carver.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Sarma-Akondi.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Seanna-Arnold.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/core-contributors/Zephyr-Worthington.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/github-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/horizontal-logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/landing-image.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/linkedin-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/portfolio-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/square-logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/images/transparent-square-logo.png
View file
Open in desktop
Binary file not shown.
39 changes: 0 additions & 39 deletions client/dist/index.html
View file
Open in desktop

This file was deleted.

Loading