zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into henrique 

# Conflicts:
#	api/bin/Debug/netcoreapp2.1/api.Views.dll
#	api/bin/Debug/netcoreapp2.1/api.Views.pdb
#	api/bin/Debug/netcoreapp2.1/api.dll
#	api/bin/Debug/netcoreapp2.1/api.pdb
#	api/obj/Debug/netcoreapp2.1/Razor/Views/Landing/index.g.cshtml.cs
#	api/obj/Debug/netcoreapp2.1/api.RazorCoreGenerate.cache
#	api/obj/Debug/netcoreapp2.1/api.Views.dll
#	api/obj/Debug/netcoreapp2.1/api.Views.pdb
#	api/obj/Debug/netcoreapp2.1/api.csproj.CoreCompileInputs.cache
#	api/obj/Debug/netcoreapp2.1/api.csproj.FileListAbsolute.txt
#	api/obj/Debug/netcoreapp2.1/api.dll
#	api/obj/Debug/netcoreapp2.1/api.pdb
This commit is contained in:
henrydays 2018-12-14 17:02:05 +00:00
parent 7db2a484bc f77a7e6350
commit 3fd9ef450d
27 changed files with 89 additions and 19997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -80,4 +80,8 @@ typings/
#DynamoDB Local files
.dynamodb/
# dotNet core build
bin/
obj/
.vscode/

12
api/Models/Event.cs Normal file
View File

@ -0,0 +1,12 @@
using System;
namespace api.Models
{
public class Event
{
public int Id{get;set;}
public string Nome{get;set;}
public string Desc{get;set;}
}
}

17
api/Models/EventLoc.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
namespace api.Models
{
public class EventLoc
{
public int Id{get;set;}
public int Event{get;set;}
public string Nome{get;set;}
public double Lat{get;set;}
public double Long{get;set;}
public string Desc{get;set;}
public int PhotoId{get;set;}
}
}

16
api/Models/EventLocVisited.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
namespace api.Models
{
public class EventLocVisited
{
public int Id{get;set;}
public int Event{get;set;}
public int TeamId{get;set;}
public int UserId{get;set;}
public int QRId{get;set;}
public DateTime Time{get;set;}
}
}

18
api/Models/EventQR.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
namespace api.Models
{
public class EventQR
{
public int Id{get;set;}
public int Event{get;set;}
public int TeamId{get;set;}
public int EventLocId{get;set;}
public int Pontos{get;set;}
public DateTime TimeGen{get;set;}
public string QRData{get;set;}
}
}

22
api/Models/Team.cs Normal file
View File

@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
namespace api.Models
{
public class Team
{
public int Id{get;set;}
public string Nome{get;set;}
public int Event{get;set;}
public ICollection<int> Users{get;set;}
public int NumMemb{get;set;}
public int VisitedNum{get;set;}
public int Pontos{get;set;}
public ICollection<EventQR> QRs{get;set;}
}
}

6157
api/bin/Debug/netcoreapp2.1/api.deps.json
View File

File diff suppressed because it is too large Load Diff

9
api/bin/Debug/netcoreapp2.1/api.runtimeconfig.dev.json
View File

@ -1,9 +0,0 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
"/Users/henrique/.dotnet/store/|arch|/|tfm|",
"/Users/henrique/.nuget/packages",
"/usr/local/share/dotnet/sdk/NuGetFallbackFolder"
]
}
}

12
api/bin/Debug/netcoreapp2.1/api.runtimeconfig.json
View File

@ -1,12 +0,0 @@
{
"runtimeOptions": {
"tfm": "netcoreapp2.1",
"framework": {
"name": "Microsoft.AspNetCore.All",
"version": "2.1.0"
},
"configProperties": {
"System.GC.Server": true
}
}
}

16
api/obj/Debug/netcoreapp2.1/api.AssemblyInfo.cs
View File

@ -1,16 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Generated by the MSBuild WriteCodeFragment class.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("api")]
[assembly: System.Reflection.AssemblyTitleAttribute("api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

1
api/obj/Debug/netcoreapp2.1/api.AssemblyInfoInputs.cache
View File

@ -1 +0,0 @@
9f2c22d9dbbfb3187a717a253ae3cd497f2f7c77

1
api/obj/Debug/netcoreapp2.1/api.RazorAssemblyInfo.cache
View File

@ -1 +0,0 @@
be6c2f1957e37581aa7c268c3491629cc5b53cc0

13
api/obj/Debug/netcoreapp2.1/api.RazorAssemblyInfo.cs
View File

@ -1,13 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Generated by the MSBuild WriteCodeFragment class.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute("api.Views")]
[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute("2.1")]
[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute("MVC-2.1")]
[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute("MVC-2.1", "Microsoft.AspNetCore.Mvc.Razor.Extensions")]

1
api/obj/Debug/netcoreapp2.1/api.RazorTargetAssemblyInfo.cache
View File

@ -1 +0,0 @@
f371bf350f1693230a2f85e8f0a8e7cb3e2deca4

18
api/obj/Debug/netcoreapp2.1/api.RazorTargetAssemblyInfo.cs
View File

@ -1,18 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Generated by the MSBuild WriteCodeFragment class.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute("Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFac" +
"tory, Microsoft.AspNetCore.Mvc.Razor")]
[assembly: System.Reflection.AssemblyCompanyAttribute("api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyProductAttribute("api")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyTitleAttribute("api.Views")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

0
api/obj/Debug/netcoreapp2.1/api.TagHelpers.input.cache
View File

1
api/obj/Debug/netcoreapp2.1/api.TagHelpers.output.cache
View File

File diff suppressed because one or more lines are too long

BIN
api/obj/Debug/netcoreapp2.1/api.assets.cache
View File

Binary file not shown.

0
api/obj/Debug/netcoreapp2.1/api.csproj.CopyComplete
View File

BIN
api/obj/Debug/netcoreapp2.1/api.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
api/obj/Debug/netcoreapp2.1/api.csprojResolveAssemblyReference.cache
View File

Binary file not shown.

14
api/obj/Debug/netcoreapp2.1/project.razor.json
View File

@ -1,14 +0,0 @@
{
"ProjectFilePath": "/Users/henrique/enei2019/api/api.csproj",
"TargetFramework": "netcoreapp2.1",
"TagHelpers": [],
"Configuration": {
"ConfigurationName": "MVC-2.1",
"LanguageVersion": "2.1",
"Extensions": [
{
"ExtensionName": "MVC-2.1"
}
]
}
}

25
api/obj/api.csproj.EntityFrameworkCore.targets
View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GetEFProjectMetadata" Condition="">
<MSBuild Condition=" '$(TargetFramework)' == '' "
Projects="$(MSBuildProjectFile)"
Targets="GetEFProjectMetadata"
Properties="TargetFramework=$(TargetFrameworks.Split(';')[0]);EFProjectMetadataFile=$(EFProjectMetadataFile)" />
<ItemGroup Condition=" '$(TargetFramework)' != '' ">
<EFProjectMetadata Include="AssemblyName: $(AssemblyName)" />
<EFProjectMetadata Include="Language: $(Language)" />
<EFProjectMetadata Include="OutputPath: $(OutputPath)" />
<EFProjectMetadata Include="Platform: $(Platform)" />
<EFProjectMetadata Include="PlatformTarget: $(PlatformTarget)" />
<EFProjectMetadata Include="ProjectAssetsFile: $(ProjectAssetsFile)" />
<EFProjectMetadata Include="ProjectDir: $(ProjectDir)" />
<EFProjectMetadata Include="RootNamespace: $(RootNamespace)" />
<EFProjectMetadata Include="RuntimeFrameworkVersion: $(RuntimeFrameworkVersion)" />
<EFProjectMetadata Include="TargetFileName: $(TargetFileName)" />
<EFProjectMetadata Include="TargetFrameworkMoniker: $(TargetFrameworkMoniker)" />
</ItemGroup>
<WriteLinesToFile Condition=" '$(TargetFramework)' != '' "
File="$(EFProjectMetadataFile)"
Lines="@(EFProjectMetadata)" />
</Target>
</Project>

5
api/obj/api.csproj.nuget.cache
View File

@ -1,5 +0,0 @@
{
"version": 1,
"dgSpecHash": "WgSIDO2aNXJM3+NVsQN85bnSYTnN+GLKLvAZ05u5LdW96kSbgEgrqrUsZF3u6AYOsqfgGrFItAR2SJyFsa6KKA==",
"success": true
}

24
api/obj/api.csproj.nuget.g.props
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/henrique/enei2019/api/obj/project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/henrique/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/henrique/.nuget/packages/;/usr/local/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.7.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.1.0/build/netcoreapp2.1/Microsoft.NETCore.App.props" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.1.0/build/netcoreapp2.1/Microsoft.NETCore.App.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.embedded/2.1.0/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.embedded/2.1.0/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets/2.1.0/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets/2.1.0/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design/2.1.0/build/netcoreapp2.0/Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design/2.1.0/build/netcoreapp2.0/Microsoft.EntityFrameworkCore.Design.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.razor.design/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.razor.design/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.all/2.1.0/build/netcoreapp2.1/Microsoft.AspNetCore.All.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.all/2.1.0/build/netcoreapp2.1/Microsoft.AspNetCore.All.props')" />
</ImportGroup>
</Project>

15
api/obj/api.csproj.nuget.g.targets
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets')" />
<Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.1.0/build/netcoreapp2.1/Microsoft.NETCore.App.targets" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.1.0/build/netcoreapp2.1/Microsoft.NETCore.App.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.embedded/2.1.0/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.embedded/2.1.0/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets/2.1.0/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.usersecrets/2.1.0/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.viewcompilation/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.viewcompilation/2.1.0/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.all/2.1.0/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.all/2.1.0/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets')" />
</ImportGroup>
</Project>

13685
api/obj/project.assets.json
View File

File diff suppressed because it is too large Load Diff