forked from csfilipinyi/cyf-final-project-pgsql-starter-kit
-
Notifications
You must be signed in to change notification settings - Fork 3
renamed editBox coponent to MentorEditLearningObj #107
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
SULAIMAN-100
wants to merge
122
commits into
dev
Choose a base branch
from
refactor-edit-box
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
122 commits
Select commit
Hold shift + click to select a range
b7f914e
Merge pull request #97 from NawalC/dev
AltomHussain ae7b02a
Merge pull request #98 from NawalC/dev
Iman-feisali 2b23dbc
Merge pull request #99 from NawalC/dev
AltomHussain 29f39c6
Replaced all options with the map
AltomHussain 89e53b5
Removed all logs
AltomHussain ca60ea8
Add initial deploy-staging circleci workflow
petemcfarlane 3d8ec33
renamed editBox coponent to MentorEditLearningObj and cleaned some un…
SULAIMAN-100 fedcc96
Remaned BtnContainer to ProgressTrackingButtons
AltomHussain 2027646
Added cookieSession Library
AltomHussain 47c0cd0
Added cookie session in the login and register api
AltomHussain 224ea9b
refactoring(removed user from the req and used req.session.user instead)
AltomHussain a2de4e7
Merge pull request #1 from CodeYourFuture/feature/deploy-staging
petemcfarlane 61d7c25
Merge branch 'dev' into Refactor-AddForm
AltomHussain 03b5d45
Remove all jwt tokens from some files where is not required
AltomHussain 17b0be2
Refactored the MentorEdit component
AltomHussain c368d0b
Merge pull request #7 from CodeYourFuture/Refactor-mentor-edit
SULAIMAN-100 f06378e
Merge pull request #4 from CodeYourFuture/Refactor-AddForm
SULAIMAN-100 b799e3d
resolved the conflects
SULAIMAN-100 8b42d36
merged remove-jwt-tokens branch into dev
SULAIMAN-100 2511296
modified logo to be clickable used to back to the default page of the…
SULAIMAN-100 e4829e3
removed useState and useEffect
SULAIMAN-100 7126515
added the first stage of github authintication
SULAIMAN-100 47d713e
altered user table(added github_id)
AltomHussain 19d4071
Added some changes in api.js(create githubAuth endpoint for login)
AltomHussain 7cc62ab
changed the logout flow(removed the logout icon from all files and just
AltomHussain 6fb0698
updated the mentorsView page(extracted the useQuery into reusable file
AltomHussain b188809
updated the logingForm.js(removed the emial and password fields from the
AltomHussain 46e0f45
Displayed the user name in the front-end from the DB instead of the
AltomHussain 358433f
got the username form the db instead of the localstorage
AltomHussain b7e7ee7
used the file for testing
AltomHussain e4ff670
Removed the login form and its functionality and only left a button …
AltomHussain b151f91
Replaced password with the gitId
AltomHussain 0aeca0d
Removed password validation
AltomHussain da1ecf2
Added axios package
AltomHussain a3bf6fa
Replaced password with github_id and removed the login endpoint
AltomHussain 80621c4
Removed unused code
AltomHussain 894bd60
added and removed log
AltomHussain c9cfdec
Created the reuable component for uselocation
AltomHussain 94a10a3
Styled the Btn in the login form
AltomHussain b342b3d
added css for the login btn
AltomHussain 86d4b81
removed commented code
AltomHussain d4e4f7b
fixed logo link path
SULAIMAN-100 9c97f8a
added bootstrap navbar
SULAIMAN-100 c9f1e7e
final version of the logo
SULAIMAN-100 2418c13
Merge pull request #8 from CodeYourFuture/clickable-logo
AltomHussain 41cf124
got the the user name from the verify end-point and deisplayed on the…
AltomHussain a46ad5d
Removed the the usage of the localstorage
AltomHussain 414976c
Made the useState initiacl val to null so the data will be fetched co…
AltomHussain 9273959
Removed the functionality of clearing the localStorage
AltomHussain 2853aa2
Removed the usage of localstorage
AltomHussain a1fa19f
Removed the usage of the localStorage
AltomHussain ae4121f
Removed the usage of the localStorage
AltomHussain 150b085
Removed the userid from the learningobjectives endpoint
AltomHussain 541cae4
Adjusted the cdn
AltomHussain 08ade93
added bootstrap navbar
SULAIMAN-100 91b558a
removed button and removed spaces
36d2fc8
checked bootstrap version - discussion needed
6728f57
Merge branch 'dev' into bootstrap-navbar
AltomHussain 077a91a
Merge pull request #10 from CodeYourFuture/bootstrap-navbar
AltomHussain 0a8be91
created select options for city and class in progress
a24b785
we changed the initial state of the user name from null to empty object
Iman-feisali 5d08309
created city object and looped them
5d08269
Removed the usage of jwt from the server side
AltomHussain cb39be7
fixed conflects
AltomHussain 182e021
updated based on the feedback
AltomHussain c3f393f
added styling to select fields
06ca1c4
completed if block and added all the locations
7c3c1bc
Merge pull request #11 from CodeYourFuture/signup-dropdown
AltomHussain 4949aeb
setup github locally
04eec12
merged github-signUp to dev
afefaa9
got update and merged again
12c5211
resolved conflicts
1b0fb57
resolved more conflicts
47d51b6
Merge pull request #12 from CodeYourFuture/signup-dropdown
AltomHussain ef10e93
added axios to dependencies
4054f5b
fixing current deployment issues
ac00981
fixing deployment
9ea0b76
created a callback to fetch client id
0d52f66
Merge branch 'master' of https://github.com/CodeYourFuture/knowledge-…
SULAIMAN-100 a2c10b9
created deselect endpoint
SULAIMAN-100 6625e7a
added deselect function
SULAIMAN-100 40aab02
modified CSS
SULAIMAN-100 5358965
created deselect function to update ability
SULAIMAN-100 8715d6e
created dir for learning obj data
bb6807f
created db tables using node js
d0f41d9
created pg query using db config
990d1a6
added highlight student feature
SULAIMAN-100 e0af7f9
fixed deselect logic
SULAIMAN-100 ed6a8f1
fixed deselect logic2
SULAIMAN-100 380378f
modified css
SULAIMAN-100 5f3d82d
added git React-client-github-id
AltomHussain 1f14781
Cleared all logs and sorted the security of the mentorEditLearningObj…
AltomHussain aa3669d
added db migration scripts to staging
91beb4b
added db migration scripts for production
0dd1fb9
Deleted the deselect endpoint and amended set ability using Pete's su…
AltomHussain 3161888
Merge pull request #15 from CodeYourFuture/secure-learningOb-page
NawalC 4cf8717
Merge pull request #13 from CodeYourFuture/deselect-btns
NawalC c67d9a3
Merge pull request #14 from CodeYourFuture/highlight-student
NawalC 49f25cc
corrected spelling error of user_github
521dcfe
added column cyf_city
4937070
corrected spelling errors
3c45a63
new migration script to add a new column and rename column
f87fa66
fixed error msg by added a return in /gitAuth
e58629e
Merge pull request #16 from CodeYourFuture/db-migrate
AltomHussain 50240b7
identified ununderstandable issue
AltomHussain 8a5b503
edited github ud variable to fix staging link
5b66c16
Merge pull request #17 from CodeYourFuture/db-migrate
AltomHussain 792b2ff
still trying to fix staging link id undefined
8ad0ef9
Merge pull request #18 from CodeYourFuture/db-migrate
AltomHussain 528d275
added learning objectives from cyf syllabus
0b495c8
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain 04b51c8
Updated the ReadME.md file
AltomHussain 02d347e
added learning objectives inline with syllabus
c99b610
delete the id from
AltomHussain 2be06c2
Merge pull request #19 from CodeYourFuture/addlearningobjective
AltomHussain 2060098
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain f2e22bb
Modified the desect
AltomHussain d0e0a0e
Merge pull request #21 from CodeYourFuture/deselect-btns
AltomHussain 7615458
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain a4eec29
Merge pull request #20 from CodeYourFuture/update-doc-md
SULAIMAN-100 c1423b2
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain cc5687e
Resolved conflicts
AltomHussain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,11 @@ | ||
| export const skillsLabelsBySkill = { | ||
| html: "HTML", | ||
| css: "CSS", | ||
| git: "Git", | ||
| javascript: "JavaScript", | ||
| react: "React", | ||
| node: "Node.js", | ||
| sql: "SQL", | ||
| }; | ||
| export const skills = Object.keys(skillsLabelsBySkill); | ||
| export const skillLabel = (skill) => skillsLabelsBySkill[skill]; | ||
|
|
||
|
|
||
| export const skillsLabelsBySkill = { | ||
| html: "HTML", | ||
| css: "CSS", | ||
| git: "Git", | ||
| javascript: "JavaScript", | ||
| react: "React", | ||
| node: "Node.js", | ||
| sql: "SQL", | ||
| }; | ||
| export const skills = Object.keys(skillsLabelsBySkill); | ||
| export const skillLabel = (skill) => skillsLabelsBySkill[skill]; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it worth deleting this, rather than simply commenting out?