From ec89c33656091b082a95a72d4664f24a8aafbd9f Mon Sep 17 00:00:00 2001 From: henrydays Date: Thu, 11 Apr 2019 05:35:49 +0100 Subject: [PATCH] up --- api/.DS_Store | Bin 12292 -> 12292 bytes api/Controllers/CromosController.cs | 22 +++++++- api/Controllers/UsersController.cs | 2 + api/Controllers/mvcController.cs | 32 +++++++++++- api/Views/Landing/ctf.cshtml | 75 +++++++++++++++++++++++++++- api/wwwroot/.DS_Store | Bin 20484 -> 20484 bytes api/wwwroot/imgs/.DS_Store | Bin 12292 -> 12292 bytes api/wwwroot/imgs/ctf/11.png | Bin 0 -> 4850 bytes 8 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 api/wwwroot/imgs/ctf/11.png diff --git a/api/.DS_Store b/api/.DS_Store index bbac15d77a736f3896e13c9f884a920dcbe394eb..ea3bf5f5913c7505208e1b804554a9c5e8930578 100755 GIT binary patch delta 76 zcmZokXi3zb`L(c{wve<;ynt|0 zVsdtRQGRJ&igSKWevwm7X==Oxe{n{Bxo2{IUO-W5S!QbaPP8sgvbJ zMHx9KZ%`GB%2Qwf0S*Diki7i7R8D1w0I&dqvV%8-!N9?w&EUuo%n-v+$k4zronbM< zR)&KN=NKL{d}a90$jd0ksKltvsKaQ=XwK-s=*j5C=))Mu7&KWzO= GetCromos(string QR) { int soma = 0; + int somaCTF=0; var usr = await context.Users.FirstOrDefaultAsync(u => u.QRcode == QR); string[] usrCromos = usr.cromos.Substring(1).Split(","); Console.WriteLine(usrCromos[0]); @@ -58,6 +62,9 @@ namespace api.Controllers continue; else { + if(c.Id == 4 || c.Id==5 || c.Id==6 || c.Id==7 || c.Id==8 || c.Id==9 || c.Id==10 || c.Id==11 || c.Id==12 || c.Id==13 || c.Id==14 || c.Id==16){ + somaCTF += c.pontos; + } soma += c.pontos; rList.Add(toAdd); found = true; @@ -80,6 +87,17 @@ namespace api.Controllers cromosToReturn a = new cromosToReturn(); a.cromos = rList; a.pontuacao = soma; + + + var userFromRepo = await _repo.GetUser(usr.Id); + + userFromRepo.food = somaCTF; + userFromRepo.drinks = soma; + + + if (await _repo.SaveAll()){} + + return Ok(a); } diff --git a/api/Controllers/UsersController.cs b/api/Controllers/UsersController.cs index e410bd36..c59aed6f 100755 --- a/api/Controllers/UsersController.cs +++ b/api/Controllers/UsersController.cs @@ -77,6 +77,8 @@ namespace api.Controllers [Authorize(Policy = "RequireAdminRole")] [HttpGet] + + //[AllowAnonymous] public async Task GetUsers() { var users = await _repo.GetUsers(); diff --git a/api/Controllers/mvcController.cs b/api/Controllers/mvcController.cs index 80fe8465..d6da8505 100755 --- a/api/Controllers/mvcController.cs +++ b/api/Controllers/mvcController.cs @@ -8,6 +8,8 @@ using api.Dtos; using Microsoft.AspNetCore.Identity; using api.Models; using System.Net.Http; +using AutoMapper; +using System.Collections.Generic; namespace api.Controllers { @@ -15,13 +17,17 @@ namespace api.Controllers [Route("/")] public class mvcController : Controller { + + private readonly IUsersRepository _repo; private readonly DataContext _context; private readonly UserManager _userManager; - - public mvcController(DataContext context, UserManager userManager) + private readonly IMapper _mapper; + public mvcController(IUsersRepository repo, DataContext context, IMapper mapper, UserManager userManager) { + _mapper = mapper; _context = context; _userManager = userManager; + _repo = repo; } [HttpGet("/cp-ia")] [AllowAnonymous] @@ -67,6 +73,28 @@ namespace api.Controllers return View("Views/Landing/jogo.cshtml"); } + [AllowAnonymous] + [HttpGet("/ctf/top")] + public async Task getTop() + { + //para cada user calcular pontos, fazer update e devolver top 5 + + + // var users = await _repo.GetUsers(); + + // var usersToReturn = _mapper.Map>(users); + + var users = _context.Users.Select(user => new {Nome = user.fullName, Pontos = user.food }).OrderByDescending(x => x.Pontos).Take(10);; + + + + //food = soma ctf + + //drinks = soma geral + + return Ok(users); + } + [HttpGet("/level1ctf")] [AllowAnonymous] public IActionResult level1() diff --git a/api/Views/Landing/ctf.cshtml b/api/Views/Landing/ctf.cshtml index 46f81e37..28e85c45 100644 --- a/api/Views/Landing/ctf.cshtml +++ b/api/Views/Landing/ctf.cshtml @@ -61,8 +61,8 @@

Melhores classificados CTF

-

Revelados em breve

- + +

Estas pontuações refletem o somatório das pontuações dos níveis cumpridos.

@@ -327,9 +327,80 @@
+ + + + diff --git a/api/wwwroot/.DS_Store b/api/wwwroot/.DS_Store index 8c6ceff23e608c48c75c76df9b8ce6f114c658a8..4ba4fa85868614899be703b76e977d0b6aaf420d 100755 GIT binary patch delta 26 icmZo!z}T{YaRa9*yMcv{f}w%= delta 26 icmZo!z}T{YaRa9*ySasqf}y$LTYD delta 66 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 SCY)W^OtN#_%iiPl^FIL|NOj== literal 0 HcmV?d00001