Skip to content
Open
Show file tree
Hide file tree
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 Nov 25, 2020
ae7b02a
Merge pull request #98 from NawalC/dev
Iman-feisali Dec 8, 2020
2b23dbc
Merge pull request #99 from NawalC/dev
AltomHussain Jan 18, 2021
29f39c6
Replaced all options with the map
AltomHussain Jan 24, 2021
89e53b5
Removed all logs
AltomHussain Jan 24, 2021
ca60ea8
Add initial deploy-staging circleci workflow
petemcfarlane Jan 27, 2021
3d8ec33
renamed editBox coponent to MentorEditLearningObj and cleaned some un…
SULAIMAN-100 Jan 31, 2021
fedcc96
Remaned BtnContainer to ProgressTrackingButtons
AltomHussain Feb 3, 2021
2027646
Added cookieSession Library
AltomHussain Feb 3, 2021
47c0cd0
Added cookie session in the login and register api
AltomHussain Feb 3, 2021
224ea9b
refactoring(removed user from the req and used req.session.user instead)
AltomHussain Feb 3, 2021
a2de4e7
Merge pull request #1 from CodeYourFuture/feature/deploy-staging
petemcfarlane Feb 3, 2021
61d7c25
Merge branch 'dev' into Refactor-AddForm
AltomHussain Feb 3, 2021
03b5d45
Remove all jwt tokens from some files where is not required
AltomHussain Feb 3, 2021
17b0be2
Refactored the MentorEdit component
AltomHussain Feb 3, 2021
c368d0b
Merge pull request #7 from CodeYourFuture/Refactor-mentor-edit
SULAIMAN-100 Feb 7, 2021
f06378e
Merge pull request #4 from CodeYourFuture/Refactor-AddForm
SULAIMAN-100 Feb 7, 2021
b799e3d
resolved the conflects
SULAIMAN-100 Feb 7, 2021
8b42d36
merged remove-jwt-tokens branch into dev
SULAIMAN-100 Feb 7, 2021
2511296
modified logo to be clickable used to back to the default page of the…
SULAIMAN-100 Feb 7, 2021
e4829e3
removed useState and useEffect
SULAIMAN-100 Feb 7, 2021
7126515
added the first stage of github authintication
SULAIMAN-100 Feb 9, 2021
47d713e
altered user table(added github_id)
AltomHussain Feb 11, 2021
19d4071
Added some changes in api.js(create githubAuth endpoint for login)
AltomHussain Feb 11, 2021
7cc62ab
changed the logout flow(removed the logout icon from all files and just
AltomHussain Feb 11, 2021
6fb0698
updated the mentorsView page(extracted the useQuery into reusable file
AltomHussain Feb 11, 2021
b188809
updated the logingForm.js(removed the emial and password fields from the
AltomHussain Feb 11, 2021
46e0f45
Displayed the user name in the front-end from the DB instead of the
AltomHussain Feb 13, 2021
358433f
got the username form the db instead of the localstorage
AltomHussain Feb 13, 2021
b7e7ee7
used the file for testing
AltomHussain Feb 13, 2021
e4ff670
Removed the login form and its functionality and only left a button …
AltomHussain Feb 13, 2021
b151f91
Replaced password with the gitId
AltomHussain Feb 13, 2021
0aeca0d
Removed password validation
AltomHussain Feb 13, 2021
da1ecf2
Added axios package
AltomHussain Feb 13, 2021
a3bf6fa
Replaced password with github_id and removed the login endpoint
AltomHussain Feb 13, 2021
80621c4
Removed unused code
AltomHussain Feb 13, 2021
894bd60
added and removed log
AltomHussain Feb 13, 2021
c9cfdec
Created the reuable component for uselocation
AltomHussain Feb 13, 2021
94a10a3
Styled the Btn in the login form
AltomHussain Feb 14, 2021
b342b3d
added css for the login btn
AltomHussain Feb 14, 2021
86d4b81
removed commented code
AltomHussain Feb 14, 2021
d4e4f7b
fixed logo link path
SULAIMAN-100 Feb 16, 2021
9c97f8a
added bootstrap navbar
SULAIMAN-100 Feb 17, 2021
c9f1e7e
final version of the logo
SULAIMAN-100 Feb 17, 2021
2418c13
Merge pull request #8 from CodeYourFuture/clickable-logo
AltomHussain Feb 17, 2021
41cf124
got the the user name from the verify end-point and deisplayed on the…
AltomHussain Feb 18, 2021
a46ad5d
Removed the the usage of the localstorage
AltomHussain Feb 18, 2021
414976c
Made the useState initiacl val to null so the data will be fetched co…
AltomHussain Feb 18, 2021
9273959
Removed the functionality of clearing the localStorage
AltomHussain Feb 18, 2021
2853aa2
Removed the usage of localstorage
AltomHussain Feb 18, 2021
a1fa19f
Removed the usage of the localStorage
AltomHussain Feb 18, 2021
ae4121f
Removed the usage of the localStorage
AltomHussain Feb 18, 2021
150b085
Removed the userid from the learningobjectives endpoint
AltomHussain Feb 18, 2021
541cae4
Adjusted the cdn
AltomHussain Feb 18, 2021
08ade93
added bootstrap navbar
SULAIMAN-100 Feb 18, 2021
91b558a
removed button and removed spaces
Feb 20, 2021
36d2fc8
checked bootstrap version - discussion needed
Feb 20, 2021
6728f57
Merge branch 'dev' into bootstrap-navbar
AltomHussain Feb 20, 2021
077a91a
Merge pull request #10 from CodeYourFuture/bootstrap-navbar
AltomHussain Feb 20, 2021
0a8be91
created select options for city and class in progress
Feb 20, 2021
a24b785
we changed the initial state of the user name from null to empty object
Iman-feisali Feb 21, 2021
5d08309
created city object and looped them
Feb 21, 2021
5d08269
Removed the usage of jwt from the server side
AltomHussain Feb 21, 2021
cb39be7
fixed conflects
AltomHussain Feb 21, 2021
182e021
updated based on the feedback
AltomHussain Feb 22, 2021
c3f393f
added styling to select fields
Feb 22, 2021
06ca1c4
completed if block and added all the locations
Feb 23, 2021
7c3c1bc
Merge pull request #11 from CodeYourFuture/signup-dropdown
AltomHussain Feb 23, 2021
4949aeb
setup github locally
Feb 23, 2021
04eec12
merged github-signUp to dev
Feb 23, 2021
afefaa9
got update and merged again
Feb 23, 2021
12c5211
resolved conflicts
Feb 23, 2021
1b0fb57
resolved more conflicts
Feb 23, 2021
47d51b6
Merge pull request #12 from CodeYourFuture/signup-dropdown
AltomHussain Feb 23, 2021
ef10e93
added axios to dependencies
Feb 24, 2021
4054f5b
fixing current deployment issues
Feb 24, 2021
ac00981
fixing deployment
Feb 24, 2021
9ea0b76
created a callback to fetch client id
Feb 24, 2021
0d52f66
Merge branch 'master' of https://github.com/CodeYourFuture/knowledge-…
SULAIMAN-100 Mar 1, 2021
a2c10b9
created deselect endpoint
SULAIMAN-100 Mar 1, 2021
6625e7a
added deselect function
SULAIMAN-100 Mar 1, 2021
40aab02
modified CSS
SULAIMAN-100 Mar 1, 2021
5358965
created deselect function to update ability
SULAIMAN-100 Mar 1, 2021
8715d6e
created dir for learning obj data
Mar 2, 2021
bb6807f
created db tables using node js
Mar 2, 2021
d0f41d9
created pg query using db config
Mar 2, 2021
990d1a6
added highlight student feature
SULAIMAN-100 Mar 3, 2021
e0af7f9
fixed deselect logic
SULAIMAN-100 Mar 3, 2021
ed6a8f1
fixed deselect logic2
SULAIMAN-100 Mar 3, 2021
380378f
modified css
SULAIMAN-100 Mar 3, 2021
5f3d82d
added git React-client-github-id
AltomHussain Mar 3, 2021
1f14781
Cleared all logs and sorted the security of the mentorEditLearningObj…
AltomHussain Mar 3, 2021
aa3669d
added db migration scripts to staging
Mar 6, 2021
91beb4b
added db migration scripts for production
Mar 6, 2021
0dd1fb9
Deleted the deselect endpoint and amended set ability using Pete's su…
AltomHussain Mar 6, 2021
3161888
Merge pull request #15 from CodeYourFuture/secure-learningOb-page
NawalC Mar 6, 2021
4cf8717
Merge pull request #13 from CodeYourFuture/deselect-btns
NawalC Mar 7, 2021
c67d9a3
Merge pull request #14 from CodeYourFuture/highlight-student
NawalC Mar 7, 2021
49f25cc
corrected spelling error of user_github
Mar 7, 2021
521dcfe
added column cyf_city
Mar 7, 2021
4937070
corrected spelling errors
Mar 8, 2021
3c45a63
new migration script to add a new column and rename column
Mar 8, 2021
f87fa66
fixed error msg by added a return in /gitAuth
Mar 8, 2021
e58629e
Merge pull request #16 from CodeYourFuture/db-migrate
AltomHussain Mar 8, 2021
50240b7
identified ununderstandable issue
AltomHussain Mar 8, 2021
8a5b503
edited github ud variable to fix staging link
Mar 8, 2021
5b66c16
Merge pull request #17 from CodeYourFuture/db-migrate
AltomHussain Mar 8, 2021
792b2ff
still trying to fix staging link id undefined
Mar 8, 2021
8ad0ef9
Merge pull request #18 from CodeYourFuture/db-migrate
AltomHussain Mar 8, 2021
528d275
added learning objectives from cyf syllabus
Mar 10, 2021
0b495c8
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain Mar 14, 2021
04b51c8
Updated the ReadME.md file
AltomHussain Mar 14, 2021
02d347e
added learning objectives inline with syllabus
Mar 14, 2021
c99b610
delete the id from
AltomHussain Mar 18, 2021
2be06c2
Merge pull request #19 from CodeYourFuture/addlearningobjective
AltomHussain Mar 18, 2021
2060098
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain Mar 18, 2021
f2e22bb
Modified the desect
AltomHussain Mar 18, 2021
d0e0a0e
Merge pull request #21 from CodeYourFuture/deselect-btns
AltomHussain Mar 18, 2021
7615458
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain Mar 18, 2021
a4eec29
Merge pull request #20 from CodeYourFuture/update-doc-md
SULAIMAN-100 Mar 18, 2021
c1423b2
Merge branch 'dev' of https://github.com/CodeYourFuture/knowledge-che…
AltomHussain Mar 18, 2021
cc5687e
Resolved conflicts
AltomHussain Mar 18, 2021
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
6 changes: 3 additions & 3 deletions client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ li {
.default-skill-display {
color: rgb(255, 255, 255);
font-size: 24px;
line-height: 50px;
}

.default-skill-display:hover {
Expand All @@ -199,6 +198,7 @@ li {
background-color: rgb(255, 255, 255);
padding: 8px;
border-radius: 5px;
padding-right: 0px;
}
.skills-container A {
display: flex;
Expand All @@ -214,14 +214,14 @@ li {
border-radius: 4px;
text-decoration: none;
} */

/*
.skills-container .edit-btn:not A:hover {
border-radius: 4px;
color: white;
text-decoration: none;
border-bottom: 1px solid whites;
text-align: center;
}
} */

Copy link
Copy Markdown
Collaborator

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?


.skills-container {
background-color: #495464;
Expand Down
7 changes: 5 additions & 2 deletions client/src/Pages/MentorsEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Route,
NavLink,
} from "react-router-dom";
import EditBox from "../components/EditBox";
import MentorEditLearningObj from "../components/MentorEditLearningObj";
import Header from "../components/Header";
import Footer from "../components/Footer";
// import { skills, skillLabel } from "../components/consts/skillsConst";
Expand Down Expand Up @@ -96,7 +96,10 @@ export default function MentorsEdit() {
</div>

<Switch>
<Route path="/mentorsedit/:id" children={<EditBox />} />
<Route
path="/mentorsedit/:skill"
children={<MentorEditLearningObj />}
/>
</Switch>
</div>
<Footer />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import React, { useState, useEffect } from "react";
// import fakeData from "../fakeData.json";
import AddForm from "./AddForm";
import { useParams } from "react-router-dom";
import { skills } from "../components/consts/skillsConst";
import { skills } from "./consts/skillsConst";

export default function EditBox() {
let { id } = useParams();
// const skills = fakeData[id];
const [deleted, setDeleted] = useState(skills);
export default function MentorEditLearningObj() {
let { skill } = useParams();
const [learningObj, setLearningObj] = useState([]);
const [updateLO, setUpdateLO] = useState("");
const [text, setText] = useState("");

const token = window.localStorage.getItem("token");

const getLearningObj = () => {
fetch(`/api/learningobjectives/${id}`, { headers: { token } })
fetch(`/api/learningobjectives/${skill}`, { headers: { token } })
.then((response) => response.json())
.then((data) => {
if (data.error) {
Expand All @@ -27,7 +24,7 @@ export default function EditBox() {
};
useEffect(() => {
getLearningObj();
}, [id]);
}, [skill]);

const deleteLearningOb = (LearningID) => {
fetch(`/api/learningobjectives/${LearningID}`, {
Expand Down
24 changes: 11 additions & 13 deletions client/src/components/consts/skillsConst.js
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];