[BUG] Issue #188 - fix conflitos

fga-eps-mds · Jun 23, 2019 · 6d87f59 · 6d87f59
1 parent ccfc401
commit 6d87f59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/front-end/pret-event/src/app/common/navbar/navbar.component.ts b/front-end/pret-event/src/app/common/navbar/navbar.component.ts
@@ -1,17 +1,15 @@
 import { Component, OnInit, TemplateRef } from '@angular/core';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { AlertComponent } from 'ngx-bootstrap/alert/alert.component';
-import { Alert } from 'src/app/models/alert';
 import { AlertService } from '../../services/alert.service';
-import { PlayerService } from '../../services/player.service';
+import { Alert } from 'src/app/models/alert';
 import { getToken, removeToken } from '../../helpers/token';
 import { removeId, getId } from 'src/app/helpers/id';
 import { Player } from 'src/app/models/player';
 import { PlayerService } from 'src/app/services/player.service';
 import { Router } from '@angular/router';
 
 
-
 @Component({
   selector: 'app-navbar ',
   templateUrl: './navbar.component.html',
@@ -73,27 +71,23 @@ export class NavbarComponent implements OnInit {
   login = () => {
     let msg = '';
     if (this.logged) {
-      this.service.logoutPlayer()
+      this.playerservice.logoutPlayer()
         .then( () => {
           removeToken();
           removeId();
           this.account = 'Entrar/Cadastrar';
           this.data.addAlert(new Alert('success', 'Logout realizado!', 3000));
-          this.logged = !this.logged;
         })
         .catch((x: { error: {} }) => {
           console.log(x);
         });
     }
     if (!this.logged) {
       this.account = 'Sair';
-<<<<<<< HEAD
-      this.logged = !this.logged;
-=======
       msg = 'Login realizado!';
       this.getName(+getId());
->>>>>>> 9a72afe55d2f0f86be4fd6469f216f8652f441e4
     }
+    this.logged = !this.logged;
     return false;
   }
 }
diff --git a/service/mc2/eventos/migrations/0002_auto_20190413_1819.py b/service/mc2/eventos/migrations/0002_auto_20190413_1819.py
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='evento',
             name='date',
-            field=models.IntegerField(),
+            field=models.DateField(),
         ),
     ]
diff --git a/service/mc2/eventos/migrations/0013_auto_20190608_1949.py b/service/mc2/eventos/migrations/0013_auto_20190608_1949.py
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='evento',
             name='time',
-            field=models.DateField(),
+            field=models.TimeField(),
         ),
     ]