Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

ntnu-beta-web
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

66432d50

Commit 66432d50 authored 5 years ago by Simen Vevik

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

See merge request !4

parents 90345db1 f265f017

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
client/Dockerfile 21 additions, 4 deletions

client/Dockerfile
client/src/App.js 4 additions, 2 deletions

client/src/App.js
client/src/authentication.js 2 additions, 0 deletions

client/src/authentication.js
client/src/utils/api.js 1 addition, 1 deletion

client/src/utils/api.js
docker-compose.yml 1 addition, 0 deletions

docker-compose.yml
server/middleware/auth.js 3 additions, 3 deletions

server/middleware/auth.js
server/middleware/db.js 21 additions, 4 deletions

server/middleware/db.js
server/middleware/passport.js 6 additions, 1 deletion

server/middleware/passport.js
server/package.json 1 addition, 1 deletion

server/package.json
server/routes/api/auth.js 18 additions, 8 deletions

server/routes/api/auth.js
server/routes/api/logged-in.js 1 addition, 0 deletions

server/routes/api/logged-in.js
server/routes/api/login.js 57 additions, 64 deletions

server/routes/api/login.js
server/server.js 31 additions, 8 deletions

server/server.js

with 168 additions and 96 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment