Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

App et archi Web TP 2020
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

2f5c5adb

Commit 2f5c5adb authored 4 years ago by jeremy.gobet

Downloads
- Plain Diff

Merge branch 'new-features' into 'master'

Backend and API

See merge request jeremy.gobet/app-et-archi-web-tp-2020!8

parents 01922b70 12f40a50

No related branches found

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

README.md 10 additions, 10 deletions

README.md
backend/modules/jokes.js 21 additions, 0 deletions

backend/modules/jokes.js
backend/modules/persist.js 66 additions, 0 deletions

backend/modules/persist.js
backend/server.js 118 additions, 2 deletions

backend/server.js
frontend/index.html 21 additions, 20 deletions

frontend/index.html
frontend/res/css/style.css 69 additions, 3 deletions

frontend/res/css/style.css
frontend/res/js/display.js 132 additions, 0 deletions

frontend/res/js/display.js
frontend/res/js/events.js 57 additions, 0 deletions

frontend/res/js/events.js
frontend/res/js/jokes.js 110 additions, 0 deletions

frontend/res/js/jokes.js
frontend/res/js/login.js 42 additions, 0 deletions

frontend/res/js/login.js
frontend/res/js/main.js 23 additions, 0 deletions

frontend/res/js/main.js

with 669 additions and 35 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