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

Select class #14

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

Select class #14

wants to merge 59 commits into from

Conversation

NihalAli2
Copy link

Select class from drop down

button

mszczot and others added 30 commits December 7, 2020 17:47
@mszczot
updated the structure of the project
4c2c31c
@mszczot
Merge pull request #1 from osagiestar/starter-kit
86b0905 
updated the structure of the project
@NihalAli2
new start
89a4788
@osagiestar
set up branch user-logout-page
aeae894
@nos6
Merge pull request #2 from osagiestar/welcome-page
b532a5e 
new start
@NihalAli2
Add headings
f2735e3
@NihalAli2
Merge pull request #4 from osagiestar/welcome-page
d8179b0 
Add headings
@osagiestar
created the components file, UserLogoutPage component and rendered it…
a8b69a2 
… on the App.js
@osagiestar
created the component folder, the UserLogoutPage Component and render…
92c2671 
…ed it on the App.js
@osagiestar
resolved git merge conflicts
942a153
@osagiestar
install packages for routes, switches and other dependencies, created…
c50bd92 
… components folder, UserLogoutPage and WelcomePage files
@osagiestar
created the link that takes the user back to the WelcomePage after th…
32567c8 
…ey logout
@osagiestar
Merge pull request #5 from osagiestar/user-logout-page
937a018 
User logout page
@bireworld
database created
3adbaf6
@bireworld
server update
5a8e143
@bireworld
data inserted
0710f67
@bireworld
Merge pull request #6 from osagiestar/tech-pirate/berhane
50ca302 
Add FakeData to DataBase/berhane
@nos6
Welcome-screen
4c8cfd7
@nos6
Merge pull request #7 from osagiestar/welcome-screen
a7a3afe 
Welcome-screen
@bireworld
login back end
a408579
@bireworld
back end login update
8349935
@osagiestar
organised the components, modified headings and setup component links
7ca559d
@bireworld
front and backend connection tested
22bc355
@bireworld
cors installed
17182e8
@bireworld
gitignore updated
ebdce7c
@bireworld
port updated
5d8de7f
@bireworld
heroku ready
ac5a9d6
@bireworld
Merge pull request #8 from osagiestar/user-login-back-end
68cc077 
User login back end
@bireworld
Merge branch 'master' of https://github.com/osagiestar/cyf-final-proj…
39f1b3f 
…ect-tech-pirates
@bireworld
package update
f05417b
osagiestar and others added 29 commits December 14, 2020 01:21
@osagiestar
Merge branch 'master' into user-logout-page
84d9123
@osagiestar
Merge pull request #9 from osagiestar/user-logout-page
c77cf59 
organised the components, modified headings and setup component links
@osagiestar
package-lock.json
f1f090f
@osagiestar
resolving pull conflicts
9e168d4
@osagiestar
tidies up App.css code - removed comments
efb9c3b
@osagiestar
created env file, loaded DB and connected to server
487abcd
@bireworld
Merge branch 'master' of https://github.com/osagiestar/cyf-final-proj…
4e8100f 
…ect-tech-pirates
@bireworld
class root added to the back-end
a64d54b
@osagiestar
removed the BrowserRouter and added Header component instead and chan…
db7434a 
…ged the WelcomePage component to Login
@osagiestar
removed the BrowserRouter and added Header component instead and chan…
ea3194c 
…ged the WelcomePage component to Login
@bireworld
back-end update
5985d15
@osagiestar
Merge pull request #10 from osagiestar/student-selects-a-class-backend
d7d5f26 
Student selects a class backend
@bireworld
Merge branch 'master' into class-select
77de309
@bireworld
Merge pull request #11 from osagiestar/class-select
da55e90 
Class select
@osagiestar
updated master branch
f5fdcc3
@osagiestar
Merge branch 'master' into student-selects-a-class-backend
5b9e52c
@osagiestar
Merge pull request #12 from osagiestar/student-selects-a-class-backend
4fbc878 
updated master branch
@NihalAli2
add componant with silict button
820faa4
@nos6
headerStyle
6c49cda
@NihalAli2
add button
2a813ab
@NihalAli2
spiling
4e02a24
@osagiestar
Merge pull request #13 from osagiestar/Select-class
8bb9b50 
add component with select button
@osagiestar
API for sutdent can select a session
f67f87e
@osagiestar
Merge pull request #14 from osagiestar/student-selects-a-class-backend
5a4a83c 
API for student can select a session
@NihalAli2
add header to UserCan Select class
a7ac16b
@osagiestar
Merge branch 'master' into Select-class
bf65774
@NihalAli2
import
1fcd915
@NihalAli2
update UserCanSelectClass
42047f9
@NihalAli2
change PORT
0e27ecc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@NihalAli2 @mszczot @osagiestar @nos6 @bireworld