Merge 6874802 into 86bf065

.coveragerc-mc1

@@ -0,0 +1,4 @@
+[paths]
+source =
+    service/mc1
+    /code

.coveragerc-mc2

@@ -0,0 +1,4 @@
+[paths]
+source =
+    service/mc2
+    /code

.coveragerc-mc3

@@ -0,0 +1,4 @@
+[paths]
+source =
+    service/mc3
+    /code

.travis.yml

@@ -1,4 +1,6 @@
-language: generic
+language: python
+python:
+  - "3.4"
 sudo: required
 services:
   - docker
@@ -10,13 +12,25 @@ before_install:
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
 before_script:
-  - cp env.tmpl .env
+  - pip3 install coveralls
 script:
   - docker-compose up -d
+  - docker-compose run web1 coverage run --omit="*/migrations/*,manage.py" manage.py test
+  - docker-compose run web1 coverage report
+  - docker-compose run web2 coverage run --omit="*/migrations/*,manage.py" manage.py test
+  - docker-compose run web2 coverage report
+  - docker-compose run web3 coverage run --omit="*/migrations/*,manage.py" manage.py test
+  - docker-compose run web3 coverage report
   - cd front-end/pret-event && docker build -f Dockerfile-prod -t pretevent/app . && cd ../..
   - zip -r latest appspec.yml prod-update.sh docker-compose-prod.yml
   - mkdir -p prod_scripts
   - mv latest.zip prod_scripts/latest.zip
+after_script:
+  - coverage combine --append --rcfile=.coveragerc-mc1 service/mc1/.coverage
+  - coverage combine --append --rcfile=.coveragerc-mc2 service/mc2/.coverage
+  - coverage combine --append --rcfile=.coveragerc-mc3 service/mc3/.coverage
+  - coverage report
+  - coveralls
 notifications:
   email:
     recipients:
@@ -34,14 +48,14 @@ deploy:
   script: bash docker-push.sh
   skip_cleanup: true
   on:
-    branch: development
+    branch: master
 - provider: s3
   access_key_id: $AWS_ACCESS_KEY
   secret_access_key: $AWS_SECRET_KEY
   local_dir: prod_scripts
   skip_cleanup: true
   on:
-    branch: development
+    branch: master
   bucket: preteventbucket
   region: us-east-2
 - provider: codedeploy
@@ -54,4 +68,4 @@ deploy:
   deployment_group: deploypretevent
   region: us-east-2
   on:
-    branch: development
+    branch: master

README.md

@@ -1,4 +1,5 @@
 ![TRAVIS BUILD](https://travis-ci.com/fga-eps-mds/2019.1-PretEvent.svg?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/fga-eps-mds/2019.1-PretEvent/badge.svg)](https://coveralls.io/github/fga-eps-mds/2019.1-PretEvent)
 
 # PretEvent
 
@@ -21,7 +22,7 @@ git clone https://github.com/fga-eps-mds/2019.1-PretEvent.git
 ```
 Instale o docker
 ```
-https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04
+curl -fsSL https://get.docker.com | bash
 ```
 
 Instale o docker-compose
@@ -45,7 +46,7 @@ A aplicação estará disponível em localhost:4500
 | Gustavo Carvahlo      | Tech Lider| gustavocarvalho1002@gmail.com |
 | Rodrigo Dadamos   | DevOps | rodrigodadamos@gmail.com |
 | Djorkaeff Alexandre | Product Owner |djorkaeff.unb@gmail.com|
-| André Bargas| Arquiteto | andrebargas@gmail.com| 
+| André Bargas| Arquiteto | andrebargas@gmail.com|
 | Ian Rocha | Desenvolvedor| ianrocha.df@gmail.com|
 | Murilo Loiola | Desenvolvedor | messhman.dmc@gmail.com |
 | André Goretti| Desenvolvedor | andremotta96@gmail.com |
@@ -56,6 +57,3 @@ A aplicação estará disponível em localhost:4500
 ## Documentação
 
 Todos os documentos podem ser encontrados na pagina:  https://fga-eps-mds.github.io/2019.1-PretEvent/
-
-
-

docker-compose.yml

@@ -2,12 +2,6 @@ version: '3'
 services:
   db:
     image: postgres
-    environment:
-        POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
-        POSTGRES_DB: "${POSTGRES_DB}"
-        POSTGRES_USER: "${POSTGRES_USER}"
-    ports:
-      - 5000:5432
   app:
     build: ./front-end/pret-event
     volumes:

front-end/pret-event/nginx-custom.conf

@@ -8,6 +8,9 @@ server {
   location /rest-auth/login {
     proxy_pass http://web1:8000;
   }
+  location /rest-auth/logout {
+    proxy_pass http://web1:8000;
+  }
   location /api/players {
     proxy_pass http://web1:8000;
   }

front-end/pret-event/package.json

@@ -15,11 +15,11 @@
     "@angular/common": "~7.2.0",
     "@angular/compiler": "~7.2.0",
     "@angular/core": "~7.2.0",
+    "@angular/fire": "^5.1.3",
     "@angular/forms": "~7.2.0",
     "@angular/platform-browser": "~7.2.0",
     "@angular/platform-browser-dynamic": "~7.2.0",
     "@angular/router": "~7.2.0",
-    "angularfire2": "^5.1.2",
     "bootstrap": "^4.2.1",
     "core-js": "^2.5.4",
     "firebase": "5.10.0",

front-end/pret-event/proxy.config.json

@@ -5,6 +5,12 @@
     "logLevel": "debug",
     "changeOrigin": true
   },
+  "/rest-auth/logout": {
+    "target": "http://web1:8000",
+    "secure": false,
+    "logLevel": "debug",
+    "changeOrigin": true
+  },
   "/api/players": {
     "target": "http://web1:8000",
     "secure": false,

front-end/pret-event/src/app/app-routing.module.ts

@@ -4,12 +4,21 @@ import { HomeComponent } from './screens/home/home.component';
 import { PlayerProfileComponent } from './screens/player-profile/player-profile.component';
 import { NewEventComponent } from './screens/new-event/new-event.component';
 import { NewRewardComponent } from './screens/new-reward/new-reward.component';
+import { EventDetailComponent } from './screens/event-detail/event-detail.component';
+import { SeeRewardComponent } from './screens/see-reward/see-reward.component';
+import { RankingComponent } from './screens/ranking/ranking.component';
+import { ListEventComponent } from './screens/list-event/list-event.component';
 
 const routes: Routes = [
-  { path: '', component: HomeComponent },
+  { path: 'home', component: HomeComponent },
+  { path: '', redirectTo: 'home', pathMatch: 'full' },
   { path: 'perfil', component: PlayerProfileComponent },
   { path: 'evento/criar', component: NewEventComponent },
   { path: 'recompensa/criar', component: NewRewardComponent },
+  { path: 'evento/:id', component: EventDetailComponent},
+  { path: 'recompensa/visualizar', component: SeeRewardComponent },
+  { path: 'ranking', component: RankingComponent },
+  { path: 'evento', component: ListEventComponent },
 ];
 
 @NgModule({

front-end/pret-event/src/app/app.component.html

@@ -1,3 +1,6 @@
-<app-navbar></app-navbar>
-<router-outlet></router-outlet>
-<!-- <app-footer></app-footer> -->
+<div class="myWrapper">
+  <app-navbar></app-navbar>
+  <router-outlet></router-outlet>
+  <div class="push"></div>
+</div>
+<app-footer *ngIf="router.url != '/home'"></app-footer>

front-end/pret-event/src/app/app.component.ts

@@ -1,8 +1,12 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html'
 })
 export class AppComponent {
+  constructor(private router: Router) {
+
+  }
 }

front-end/pret-event/src/app/app.module.ts

@@ -22,8 +22,12 @@ import { CarouselModule } from 'ngx-bootstrap/carousel';
 import { ModalModule } from 'ngx-bootstrap/modal';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { NewRewardComponent } from './screens/new-reward/new-reward.component';
+import { SeeRewardComponent } from './screens/see-reward/see-reward.component';
 import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
 import { AlertModule } from 'ngx-bootstrap/alert';
+import { EventDetailComponent } from './screens/event-detail/event-detail.component';
+import { RankingComponent } from './screens/ranking/ranking.component';
+import { ListEventComponent } from './screens/list-event/list-event.component';
 
 
 @NgModule({
@@ -35,7 +39,11 @@ import { AlertModule } from 'ngx-bootstrap/alert';
     SignModalComponent,
     FooterComponent,
     NewEventComponent,
-    NewRewardComponent
+    NewRewardComponent,
+    EventDetailComponent,
+    SeeRewardComponent,
+    RankingComponent,
+    ListEventComponent,
   ],
   imports: [
     BrowserModule,