diff --git a/api/Controllers/CromosController.cs b/api/Controllers/CromosController.cs
index 4c1d2d63..7b5a5b6a 100755
--- a/api/Controllers/CromosController.cs
+++ b/api/Controllers/CromosController.cs
@@ -45,7 +45,7 @@ namespace api.Controllers
if(Int32.Parse(usrCromos[i])==c.Id){
- Cromos toAdd = new Cromos{Id = c.Id,Nome=c.Nome,DescMostrar=c.DescUnlocked,QRCode=c.QRCode,img=c.img, unlocked=true, websiteCromo=c.websiteCromo,pontos=c.pontos};
+ Cromos toAdd = new Cromos{Id = c.Id,Nome=c.Nome,DescMostrar=c.DescUnlocked,QRCode=c.QRCode,img=c.img, unlocked=true, websiteCromo=c.websiteCromo,pontos=c.pontos, logo=c.logo};
rList.Add(toAdd);
}else{
diff --git a/api/Migrations/20190319005102_imagelogo.Designer.cs b/api/Migrations/20190319005102_imagelogo.Designer.cs
new file mode 100644
index 00000000..29aa3935
--- /dev/null
+++ b/api/Migrations/20190319005102_imagelogo.Designer.cs
@@ -0,0 +1,495 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using api.Data;
+
+namespace api.Migrations
+{
+ [DbContext(typeof(DataContext))]
+ [Migration("20190319005102_imagelogo")]
+ partial class imagelogo
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ClaimType");
+
+ b.Property("ClaimValue");
+
+ b.Property("RoleId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetRoleClaims");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ClaimType");
+
+ b.Property("ClaimValue");
+
+ b.Property("UserId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserClaims");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider");
+
+ b.Property("ProviderKey");
+
+ b.Property("ProviderDisplayName");
+
+ b.Property("UserId");
+
+ b.HasKey("LoginProvider", "ProviderKey");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserLogins");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId");
+
+ b.Property("LoginProvider");
+
+ b.Property("Name");
+
+ b.Property("Value");
+
+ b.HasKey("UserId", "LoginProvider", "Name");
+
+ b.ToTable("AspNetUserTokens");
+ });
+
+ modelBuilder.Entity("api.Models.Cromos", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("DescLocked");
+
+ b.Property("DescMostrar");
+
+ b.Property("DescUnlocked");
+
+ b.Property("Nome");
+
+ b.Property("QRCode");
+
+ b.Property("img");
+
+ b.Property("logo");
+
+ b.Property("pontos");
+
+ b.Property("unlocked");
+
+ b.Property("websiteCromo");
+
+ b.HasKey("Id");
+
+ b.ToTable("Cromos");
+ });
+
+ modelBuilder.Entity("api.Models.Event", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Desc");
+
+ b.Property("Nome");
+
+ b.Property("aDecorrer");
+
+ b.Property("custo");
+
+ b.Property("horas");
+
+ b.Property("imagem");
+
+ b.Property("localizacao");
+
+ b.Property("notas");
+
+ b.HasKey("Id");
+
+ b.ToTable("Events");
+ });
+
+ modelBuilder.Entity("api.Models.EventLoc", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Desc");
+
+ b.Property("EventId");
+
+ b.Property("ImgId");
+
+ b.Property("Lat");
+
+ b.Property("Long");
+
+ b.Property("Nome");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ImgId");
+
+ b.ToTable("EventLocs");
+ });
+
+ modelBuilder.Entity("api.Models.EventLocVisited", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("LocationId");
+
+ b.Property("TeamId");
+
+ b.Property("complete");
+
+ b.Property("timestamp");
+
+ b.HasKey("Id");
+
+ b.HasIndex("LocationId");
+
+ b.HasIndex("TeamId");
+
+ b.ToTable("EventLocsVisited");
+ });
+
+ modelBuilder.Entity("api.Models.Log", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("UserId");
+
+ b.Property("UserId1");
+
+ b.Property("amount");
+
+ b.Property("available");
+
+ b.Property("logType");
+
+ b.Property("productId");
+
+ b.Property("transactionId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.HasIndex("UserId1");
+
+ b.HasIndex("productId");
+
+ b.ToTable("Logs");
+ });
+
+ modelBuilder.Entity("api.Models.Photo", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("DateAdded");
+
+ b.Property("Description");
+
+ b.Property("IsMain");
+
+ b.Property("Url");
+
+ b.Property("UserId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Photos");
+ });
+
+ modelBuilder.Entity("api.Models.Product", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("basePrice");
+
+ b.Property("name");
+
+ b.Property("revenue");
+
+ b.Property("sold");
+
+ b.HasKey("Id");
+
+ b.ToTable("Products");
+ });
+
+ modelBuilder.Entity("api.Models.Role", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken();
+
+ b.Property("Name")
+ .HasMaxLength(256);
+
+ b.Property("NormalizedName")
+ .HasMaxLength(256);
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasName("RoleNameIndex");
+
+ b.ToTable("AspNetRoles");
+ });
+
+ modelBuilder.Entity("api.Models.Team", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("CapQR");
+
+ b.Property("EventId");
+
+ b.Property("NMembros");
+
+ b.Property("Nome");
+
+ b.Property("Pontos");
+
+ b.Property("pagamento");
+
+ b.Property("pagamentoVerifyCode");
+
+ b.HasKey("Id");
+
+ b.ToTable("Teams");
+ });
+
+ modelBuilder.Entity("api.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("AccessFailedCount");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken();
+
+ b.Property("Email")
+ .HasMaxLength(256);
+
+ b.Property("EmailConfirmed");
+
+ b.Property("LockoutEnabled");
+
+ b.Property("LockoutEnd");
+
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256);
+
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256);
+
+ b.Property("PasswordHash");
+
+ b.Property("PhoneNumber");
+
+ b.Property("PhoneNumberConfirmed");
+
+ b.Property("QRcode");
+
+ b.Property("SecurityStamp");
+
+ b.Property("TwoFactorEnabled");
+
+ b.Property("UserName")
+ .HasMaxLength(256);
+
+ b.Property("cromos");
+
+ b.Property("drinks");
+
+ b.Property("food");
+
+ b.Property("fullName");
+
+ b.Property("teamID");
+
+ b.Property("university");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedEmail")
+ .HasName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasName("UserNameIndex");
+
+ b.HasIndex("teamID");
+
+ b.ToTable("AspNetUsers");
+ });
+
+ modelBuilder.Entity("api.Models.UserRole", b =>
+ {
+ b.Property("UserId");
+
+ b.Property("RoleId");
+
+ b.HasKey("UserId", "RoleId");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetUserRoles");
+ });
+
+ modelBuilder.Entity("api.Models.Value", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Name");
+
+ b.HasKey("id");
+
+ b.ToTable("Values");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.HasOne("api.Models.Role")
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.HasOne("api.Models.User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.HasOne("api.Models.User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.HasOne("api.Models.User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("api.Models.EventLoc", b =>
+ {
+ b.HasOne("api.Models.Photo", "Img")
+ .WithMany()
+ .HasForeignKey("ImgId");
+ });
+
+ modelBuilder.Entity("api.Models.EventLocVisited", b =>
+ {
+ b.HasOne("api.Models.EventLoc", "Location")
+ .WithMany()
+ .HasForeignKey("LocationId");
+
+ b.HasOne("api.Models.Team", "Team")
+ .WithMany()
+ .HasForeignKey("TeamId");
+ });
+
+ modelBuilder.Entity("api.Models.Log", b =>
+ {
+ b.HasOne("api.Models.User")
+ .WithMany("logsFebrada")
+ .HasForeignKey("UserId");
+
+ b.HasOne("api.Models.User")
+ .WithMany("logsFestarola")
+ .HasForeignKey("UserId1");
+
+ b.HasOne("api.Models.Product", "product")
+ .WithMany()
+ .HasForeignKey("productId");
+ });
+
+ modelBuilder.Entity("api.Models.Photo", b =>
+ {
+ b.HasOne("api.Models.User", "User")
+ .WithMany("Photos")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("api.Models.User", b =>
+ {
+ b.HasOne("api.Models.Team", "team")
+ .WithMany()
+ .HasForeignKey("teamID");
+ });
+
+ modelBuilder.Entity("api.Models.UserRole", b =>
+ {
+ b.HasOne("api.Models.Role", "Role")
+ .WithMany("UserRoles")
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("api.Models.User", "User")
+ .WithMany("UserRoles")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/api/Migrations/20190319005102_imagelogo.cs b/api/Migrations/20190319005102_imagelogo.cs
new file mode 100644
index 00000000..57377749
--- /dev/null
+++ b/api/Migrations/20190319005102_imagelogo.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace api.Migrations
+{
+ public partial class imagelogo : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "logo",
+ table: "Cromos",
+ nullable: true);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "logo",
+ table: "Cromos");
+ }
+ }
+}
diff --git a/api/Migrations/DataContextModelSnapshot.cs b/api/Migrations/DataContextModelSnapshot.cs
index 6485c4de..3db41475 100755
--- a/api/Migrations/DataContextModelSnapshot.cs
+++ b/api/Migrations/DataContextModelSnapshot.cs
@@ -102,6 +102,8 @@ namespace api.Migrations
b.Property("img");
+ b.Property("logo");
+
b.Property("pontos");
b.Property("unlocked");
diff --git a/api/Models/Cromos.cs b/api/Models/Cromos.cs
index f7bfb14d..2a41de59 100755
--- a/api/Models/Cromos.cs
+++ b/api/Models/Cromos.cs
@@ -16,6 +16,7 @@ namespace api.Models
public string websiteCromo{get;set;}
public Boolean unlocked{get;set;} // se está desbloqueado ou não
+ public string logo{get;set;} //logotipo para os detalhes
public int pontos{get;set;} //pontos que este cromo concede
}