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

Jump to bottom

Merge ReadySetCyber branch for login testing #149

Merged
merged 30 commits into from
Apr 9, 2024
Merged

Merge ReadySetCyber branch for login testing #149

merged 30 commits into from
Apr 9, 2024

Conversation

chrtorres
Copy link
Collaborator

@chrtorres chrtorres commented Apr 3, 2024 •
edited
Loading

🗣 Description

  • Created ReadySetCyber dashboard component.
  • Created ReadySetCyber Login component.
  • Created protected routes for login and dashboard.

💭 Motivation and context

This changes aims to integrate ReadySetCyber users with the Crossfeed platform with limited permissions.

🧪 Testing

📷 Screenshots (if appropriate)

image
image

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced
    in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release.

Matthew-Grayson and others added 23 commits March 21, 2024 16:02
@Matthew-Grayson
Add rsc question and resource tables and indexes; add rsc user type; …
b3d4aff 
…alpahbetized table names.
@hawkishpolicy
added RSC Header, Footer, Dashboard. Built rsc route. Added logic to …
1a3cf54 
…display RSC routes in Layout.
updated usertype and removed index.ts
c2c3826
@Matthew-Grayson
Model rsc assessment and category tables; add OneToMany relation betw…
8e654b5 
…een user and assessment; update question and resource column names.
@hawkishpolicy
Merge remote-tracking branch 'origin/develop' into RSC-Dashboard
932736f
@hawkishpolicy
merge latest from develop
b175e0c
@Matthew-Grayson
Add response table; add indexes for query speed; adjust relation betw…
1785f21 
…een assessment and question; refactor rsc table names.
@hawkishpolicy
Built Detail, SideNav, NavItem, Result, Question components. Amended …
bd70588 
…Dashboard. Added route for detailed view. Built dummy data. Added home link to header.
@hawkishpolicy
cleaned up Detail
bb01d4c
@Matthew-Grayson
Add poosibleResponses to assessment table; add type to resource table.
3a01a05
@Matthew-Grayson
Convert question/resource relationship from OneToMany to ManyToMany.
c8304a9
@hawkishpolicy
Added route for RSC Login, built Login component placeholder, polishe…
b973f77 
…d Detail and Question component UI.
@hawkishpolicy
Merge branch 'feature/rsc' into rsc-dashboard
e2603fe
@Matthew-Grayson
Add rough draft API endpoints for assessments; add shortName to categ…
0cc46ef 
…ory table.
@chrtorres
ROUTE RSC USER TO LOGIN
649eda2 
Implemented Login page and logic to redirect unauthorized users
@Matthew-Grayson
Add category number; clean up imports in assessments.ts.
b6b3f52
@Matthew-Grayson
Merge feature/rsc into 113-create-models-for-readysetcyber-data.
3f7947d
@hawkishpolicy
Edited RegisterForm, Register, RSCLogin.
ed4b802
@Matthew-Grayson
Merge branch 'feature/rsc' of github.com:cisagov/XFD into RSC-Dashboard
dbc3b05
@hawkishpolicy
Removed state value from RegisterFormValues
1faea44
@hawkishpolicy
Created new RSC Create Account component.
3a8712e 
Created new RSC Register Form component.
Created new RSC Register Form Style component.
Reverted Register Form component.
Updated App.tsx to include new RSC components and routes.
Updated app.ts to include new register route.
Updated users.ts with amended RSC Register end point.
@hawkishpolicy
Cleaned up unused & commented out code in
5cfd47a 
- backend/src/api/users.ts
- frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx
@hawkishpolicy
Removed console.logs from:
675bbb3 
- backend/src/api/users.ts
- frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 3, 2024
View reviewed changes
backend/src/api/users.ts Fixed Show fixed Hide fixed
backend/src/api/users.ts Fixed Show fixed Hide fixed
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 4, 2024
View reviewed changes
backend/src/api/users.ts Fixed Show fixed Hide fixed
@michaelsaki michaelsaki mentioned this pull request Apr 4, 2024
Closed
@michaelsaki michaelsaki linked an issue Apr 4, 2024 that may be closed by this pull request
Develop Login Page for ReadySetCyber #151
Closed
@hawkishpolicy hawkishpolicy marked this pull request as ready for review April 4, 2024 17:29
@michaelsaki michaelsaki linked an issue Apr 4, 2024 that may be closed by this pull request
Create Models for ReadySetCyber Data #113
Closed
3 tasks
@michaelsaki michaelsaki mentioned this pull request Apr 4, 2024
Closed
@michaelsaki michaelsaki linked an issue Apr 4, 2024 that may be closed by this pull request
Develop Routes in XFD for ReadySetCyber #152
Closed
nickviola
nickviola approved these changes Apr 9, 2024
View reviewed changes
Copy link
Collaborator

@nickviola nickviola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@schmelz21 schmelz21 merged commit 8ff7790 into develop Apr 9, 2024
20 of 22 checks passed
cisagovbot pushed a commit that referenced this pull request Apr 30, 2024
@mcdonnnj
Merge pull request #149 from cisagov/dependabot/github_actions/crazy-…
9a0e7c3 
…max/ghaction-github-status-4

Bump crazy-max/ghaction-github-status from 3 to 4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickviola nickviola nickviola approved these changes

@rapidray12 rapidray12 rapidray12 approved these changes

@aloftus23 aloftus23 Awaiting requested review from aloftus23 aloftus23 is a code owner

@cduhn17 cduhn17 Awaiting requested review from cduhn17 cduhn17 is a code owner

@Matthew-Grayson Matthew-Grayson Awaiting requested review from Matthew-Grayson Matthew-Grayson is a code owner

@schmelz21 schmelz21 Awaiting requested review from schmelz21 schmelz21 is a code owner

Assignees

@Matthew-Grayson Matthew-Grayson

@hawkishpolicy hawkishpolicy

@chrtorres chrtorres

Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@chrtorres @nickviola @rapidray12 @schmelz21 @Matthew-Grayson @hawkishpolicy