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.

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

Select class #14

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
4c2c31c
updated the structure of the project
mszczot Dec 7, 2020
86b0905
Merge pull request #1 from osagiestar/starter-kit
mszczot Dec 7, 2020
89a4788
new start
NihalAli2 Dec 7, 2020
aeae894
set up branch user-logout-page
osagiestar Dec 8, 2020
b532a5e
Merge pull request #2 from osagiestar/welcome-page
nos6 Dec 8, 2020
f2735e3
Add headings
NihalAli2 Dec 9, 2020
d8179b0
Merge pull request #4 from osagiestar/welcome-page
NihalAli2 Dec 9, 2020
a8b69a2
created the components file, UserLogoutPage component and rendered it…
osagiestar Dec 10, 2020
92c2671
created the component folder, the UserLogoutPage Component and render…
osagiestar Dec 10, 2020
942a153
resolved git merge conflicts
osagiestar Dec 10, 2020
c50bd92
install packages for routes, switches and other dependencies, created…
osagiestar Dec 10, 2020
32567c8
created the link that takes the user back to the WelcomePage after th…
osagiestar Dec 10, 2020
937a018
Merge pull request #5 from osagiestar/user-logout-page
osagiestar Dec 10, 2020
3adbaf6
database created
bireworld Dec 10, 2020
5a8e143
server update
bireworld Dec 10, 2020
0710f67
data inserted
bireworld Dec 10, 2020
50ca302
Merge pull request #6 from osagiestar/tech-pirate/berhane
bireworld Dec 10, 2020
4c8cfd7
Welcome-screen
nos6 Dec 11, 2020
a7a3afe
Merge pull request #7 from osagiestar/welcome-screen
nos6 Dec 11, 2020
a408579
login back end
bireworld Dec 11, 2020
8349935
back end login update
bireworld Dec 12, 2020
7ca559d
organised the components, modified headings and setup component links
osagiestar Dec 12, 2020
22bc355
front and backend connection tested
bireworld Dec 12, 2020
17182e8
cors installed
bireworld Dec 12, 2020
ebdce7c
gitignore updated
bireworld Dec 13, 2020
5d8de7f
port updated
bireworld Dec 13, 2020
ac5a9d6
heroku ready
bireworld Dec 13, 2020
68cc077
Merge pull request #8 from osagiestar/user-login-back-end
bireworld Dec 13, 2020
39f1b3f
Merge branch 'master' of https://github.com/osagiestar/cyf-final-proj…
bireworld Dec 13, 2020
f05417b
package update
bireworld Dec 13, 2020
84d9123
Merge branch 'master' into user-logout-page
osagiestar Dec 14, 2020
c77cf59
Merge pull request #9 from osagiestar/user-logout-page
osagiestar Dec 14, 2020
f1f090f
package-lock.json
osagiestar Dec 14, 2020
9e168d4
resolving pull conflicts
osagiestar Dec 14, 2020
efb9c3b
tidies up App.css code - removed comments
osagiestar Dec 14, 2020
487abcd
created env file, loaded DB and connected to server
osagiestar Dec 14, 2020
4e8100f
Merge branch 'master' of https://github.com/osagiestar/cyf-final-proj…
bireworld Dec 14, 2020
a64d54b
class root added to the back-end
bireworld Dec 14, 2020
db7434a
removed the BrowserRouter and added Header component instead and chan…
osagiestar Dec 16, 2020
ea3194c
removed the BrowserRouter and added Header component instead and chan…
osagiestar Dec 16, 2020
5985d15
back-end update
bireworld Dec 16, 2020
d7d5f26
Merge pull request #10 from osagiestar/student-selects-a-class-backend
osagiestar Dec 16, 2020
77de309
Merge branch 'master' into class-select
bireworld Dec 16, 2020
da55e90
Merge pull request #11 from osagiestar/class-select
bireworld Dec 16, 2020
f5fdcc3
updated master branch
osagiestar Dec 16, 2020
5b9e52c
Merge branch 'master' into student-selects-a-class-backend
osagiestar Dec 16, 2020
4fbc878
Merge pull request #12 from osagiestar/student-selects-a-class-backend
osagiestar Dec 16, 2020
820faa4
add componant with silict button
NihalAli2 Dec 16, 2020
6c49cda
headerStyle
nos6 Dec 16, 2020
2a813ab
add button
NihalAli2 Dec 16, 2020
4e02a24
spiling
NihalAli2 Dec 16, 2020
8bb9b50
Merge pull request #13 from osagiestar/Select-class
osagiestar Dec 17, 2020
f67f87e
API for sutdent can select a session
osagiestar Dec 17, 2020
5a4a83c
Merge pull request #14 from osagiestar/student-selects-a-class-backend
osagiestar Dec 17, 2020
a7ac16b
add header to UserCan Select class
NihalAli2 Dec 17, 2020
bf65774
Merge branch 'master' into Select-class
osagiestar Dec 17, 2020
1fcd915
import
NihalAli2 Dec 17, 2020
42047f9
update UserCanSelectClass
NihalAli2 Dec 17, 2020
0e27ecc
change PORT
NihalAli2 Dec 17, 2020
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
9 changes: 0 additions & 9 deletions .babelrc

This file was deleted.

6 changes: 0 additions & 6 deletions .cfignore

This file was deleted.

7 changes: 0 additions & 7 deletions .dockerignore

This file was deleted.

4 changes: 0 additions & 4 deletions .envrc

This file was deleted.

1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

10 changes: 0 additions & 10 deletions .eslintrc.json

This file was deleted.

121 changes: 118 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,119 @@
.idea/
dist/
node_modules
.env

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
.DS_Store
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

3 changes: 0 additions & 3 deletions .slugignore

This file was deleted.

6 changes: 0 additions & 6 deletions .vscode/extensions.json

This file was deleted.

21 changes: 0 additions & 21 deletions .vscode/launch.json

This file was deleted.

12 changes: 0 additions & 12 deletions .vscode/settings.json

This file was deleted.

41 changes: 0 additions & 41 deletions Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions LICENSE

This file was deleted.

69 changes: 0 additions & 69 deletions README.md

This file was deleted.

4 changes: 0 additions & 4 deletions app.json

This file was deleted.

2 changes: 2 additions & 0 deletions back-end/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.env
/node_modules
1 change: 1 addition & 0 deletions back-end/Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node server.js
Loading