Merge branch 'issue/2' into 'development' (57e3f9ce) · Commits · pinsis-dev / pinsis-portal · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

pinsis-portal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

57e3f9ce

Commit 57e3f9ce authored 7 years ago by Luiz Vasconcellos

Downloads
- Plain Diff

Merge branch 'issue/2' into 'development'

SCRUM#2 - Added the main page element.

See merge request PInSIS/pinsis-portal!3

parents ef097b43 464c7ae3

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/app/app.component.html 1 addition, 1 deletion

src/app/app.component.html
src/app/app.module.ts 3 additions, 1 deletion

src/app/app.module.ts
src/app/main-page/main-page.component.html 9 additions, 0 deletions

src/app/main-page/main-page.component.html
src/app/main-page/main-page.component.scss 24 additions, 0 deletions

src/app/main-page/main-page.component.scss
src/app/main-page/main-page.component.spec.ts 25 additions, 0 deletions

src/app/main-page/main-page.component.spec.ts
src/app/main-page/main-page.component.ts 16 additions, 0 deletions

src/app/main-page/main-page.component.ts
src/assets/images/graphs.png 0 additions, 0 deletions

src/assets/images/graphs.png
src/assets/images/maps.png 0 additions, 0 deletions

src/assets/images/maps.png

with 78 additions and 2 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