Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

667bd53d

Commit 667bd53d authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'recette'

Dev

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!13

parents 9a30b66c c0f25b1a

No related branches found

No related tags found

2 merge requests!14Recette,!13Dev

Changes 48

Hide whitespace changes

Inline Side-by-side

Showing

angular.json 2 additions, 2 deletions

angular.json
api/Dockerfile 4 additions, 7 deletions

api/Dockerfile
api/package.json 2 additions, 2 deletions

api/package.json
api/routes.json 0 additions, 3 deletions

api/routes.json
api/server.js 71 additions, 0 deletions

api/server.js
src/app/app.component.scss 1 addition, 1 deletion

src/app/app.component.scss
src/app/app.module.ts 15 additions, 3 deletions

src/app/app.module.ts
src/app/home/home.component.html 1 addition, 0 deletions

src/app/home/home.component.html
src/app/home/home.component.scss 7 additions, 4 deletions

src/app/home/home.component.scss
src/app/home/home.component.spec.ts 0 additions, 1 deletion

src/app/home/home.component.spec.ts
src/app/home/home.component.ts 9 additions, 5 deletions

src/app/home/home.component.ts
src/app/map/components/map.component.html 4 additions, 2 deletions

src/app/map/components/map.component.html
src/app/map/components/map.component.scss 8 additions, 2 deletions

src/app/map/components/map.component.scss
src/app/map/components/map.component.ts 9 additions, 1 deletion

src/app/map/components/map.component.ts
src/app/map/models/geoJsonProperties.model.ts 7 additions, 0 deletions

src/app/map/models/geoJsonProperties.model.ts
src/app/map/models/geojson.model.ts 2 additions, 1 deletion

src/app/map/models/geojson.model.ts
src/app/models/structure.model.ts 1 addition, 0 deletions

src/app/models/structure.model.ts
src/app/services/structure-list.service.spec.ts 6 additions, 6 deletions

src/app/services/structure-list.service.spec.ts
src/app/services/structure-list.service.ts 30 additions, 2 deletions

src/app/services/structure-list.service.ts
src/app/structure-list/components/modal-filter/modal-filter.component.html 33 additions, 0 deletions

...-list/components/modal-filter/modal-filter.component.html

with 212 additions and 42 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