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

Feature/us23 adding resources #178

Merged
merged 29 commits into from
Feb 9, 2020
Merged

Feature/us23 adding resources #178

merged 29 commits into from
Feb 9, 2020

Conversation

jaslatendresse
Copy link
Collaborator

@jaslatendresse jaslatendresse commented Feb 7, 2020 •
edited by cynthiac3
Loading

This PR contains the Add Resource feature which enables a user logged in as a tutor to add a resource. Upon adding the resource, it will be visible to all students.

us23-adding-resources

Issue #165

cynthiac3 and others added 26 commits February 1, 2020 15:35
@cynthiac3
#165 added backend controller and routes for getting and adding resou…
cceef87 
…rces
@cynthiac3
#165 added education level to resource model
b65d8bf
@jaslatendresse
#165 added resources to tutor side bar
83ec7b7
@jaslatendresse
Merge branch 'feature/us23-adding-resources' of https://github.com/co…
4044f6a 
…mpgirl123/TutifySoen490 into feature/us23-adding-resources
@jaslatendresse
#165 added add resource component with conditional rendering
84e154f
@cynthiac3
#165 moved all the resources to the database and fetched them, remove…
ecca0a7 
…d duplicate Title.js component for cleanup
@cynthiac3
Merge branch 'feature/us23-adding-resources' of https://github.com/co…
3a65402 
…mpgirl123/TutifySoen490 into feature/us23-adding-resources
@jaslatendresse
#165 added component AddResource as a modal window
1ac695f
@jaslatendresse
#165 added functional close button for modal window
cc7395c
@cynthiac3
#165 added function in frontend to save the new resource to the db
bef799b
@jaslatendresse
#165 added options for user input to add a resource
b936dbb
@jaslatendresse
#165 merge conflict fix
b24cca8
@jaslatendresse
#165 missing import
dd4191a
@jaslatendresse
#165 added drop down components for education level and category
f5991f0
@cynthiac3
#165 added function to add button in dialog box
7b3d2f2
@cynthiac3
Merge branch 'feature/us23-adding-resources' of https://github.com/co…
b2461a4 
…mpgirl123/TutifySoen490 into feature/us23-adding-resources
@cynthiac3
#165 added current value to dropdown menu, state is updated when valu…
b03e671 
…e is selected in menu
@jaslatendresse
#165 Removed unused code and fixed the frontend for the add resource …
0754a4b 
…button. Modified description textfield
@jaslatendresse
#165 added input validation to the add resource component
485f7b7
@jaslatendresse
#165 added default image if provided url is not reachable
0fa494e
@jaslatendresse
#165 added descriptive comments for the functions
95ab496
@cynthiac3
Merge branch 'master' into feature/us23-adding-resources
f9bdb8e
@jaslatendresse
#165 reset fields to default value after closing dialog window
0c4c0fe
@jaslatendresse
#165 trying to close modal window upon adding resource
b6e3c9a
@cynthiac3
#165 fixed handleClose for modal window
04f1f6e
@jaslatendresse
#165 made fields required and provided feedback to user regarding ima…
45c2757 
…ge link
@kasthurie kasthurie linked an issue Feb 7, 2020 that may be closed by this pull request
US 23 - Adding new Resources #165
Closed
@kasthurie kasthurie added this to the Iteration 9 milestone Feb 7, 2020
@cynthiac3 cynthiac3 added the not ready For a PR that is not ready to be reviewed or merged label Feb 7, 2020
@cynthiac3 cynthiac3 added resources Student resources page back-end front-end and removed not ready For a PR that is not ready to be reviewed or merged labels Feb 8, 2020
kasthurie
kasthurie requested changes Feb 8, 2020
View reviewed changes
Copy link
Collaborator

@kasthurie kasthurie left a comment

Choose a reason for hiding this comment

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

Looks really cool and works smoothly, Good Job!
The only small fix would be to maybe change how the card components and the button are displayed in this page. In the gif(demo) it looks perfect, so I'm not sure if this is something on my end. Let me know!
Screen Shot 2020-02-07 at 9 37 55 PM

kasthurie
kasthurie approved these changes Feb 8, 2020
View reviewed changes
Copy link
Collaborator

@kasthurie kasthurie left a comment

Choose a reason for hiding this comment

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

Its perfect now! I approve it

compgirl123
compgirl123 approved these changes Feb 8, 2020
View reviewed changes
Copy link
Owner

@compgirl123 compgirl123 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Works like a charm. Also i like the ability to add image links, check out my latest additions on university and secondary

@cynthiac3 cynthiac3 merged commit af12147 into master Feb 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kasthurie kasthurie kasthurie approved these changes

@compgirl123 compgirl123 compgirl123 approved these changes

@PWatine PWatine Awaiting requested review from PWatine

Assignees
No one assigned
Labels
back-end front-end resources Student resources page
Projects
None yet
Milestone
Iteration 9
Development

Successfully merging this pull request may close these issues.

US 23 - Adding new Resources
4 participants
@jaslatendresse @compgirl123 @kasthurie @cynthiac3