Merge branch 'FE-10-Configuration-api-integration' into 'main' (95209302) · Commits · MiARS / MiARS Frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

MiARS Frontend
- Activity
- Members
- Labels
- Issues
  3
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

MiARS
MiARS Frontend
Commits
95209302

Commit 95209302 authored 5 days ago by

Ruslan Rabadanov

Downloads
- Plain Diff

Merge branch 'FE-10-Configuration-api-integration' into 'main'

FE-10 Integrate configuration page with API

Closes #10

See merge request !10

parents 89f79edd 455eed1e

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

docker-compose.yml 2 additions, 3 deletions

docker-compose.yml
src/app/api/configuration.api.ts 14 additions, 6 deletions

src/app/api/configuration.api.ts
src/app/components/configuration/configuration.component.html 19 additions, 17 deletions

...app/components/configuration/configuration.component.html
src/app/components/configuration/configuration.component.ts 41 additions, 11 deletions

src/app/components/configuration/configuration.component.ts
src/app/interceptor/interceptor.ts 0 additions, 15 deletions

src/app/interceptor/interceptor.ts
src/app/interceptor/mocks/configuration-1.json 0 additions, 24 deletions

src/app/interceptor/mocks/configuration-1.json
src/app/interceptor/mocks/configuration-2.json 0 additions, 11 deletions

src/app/interceptor/mocks/configuration-2.json
src/app/interceptor/mocks/configurations.json 0 additions, 35 deletions

src/app/interceptor/mocks/configurations.json
src/app/models/configuration.ts 21 additions, 5 deletions

src/app/models/configuration.ts
src/proxy.conf.json 10 additions, 0 deletions

src/proxy.conf.json

with 107 additions and 127 deletions

0% 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