Chris/RaceLapTimer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move project to use NancyFx as Api controller in order to use the core dependency injection ability across the whole app.

Browse Source 
should also make routing a damned sight easier!!!
This commit is contained in:
chris.watts90@outlook.com 2017-04-30 22:00:24 +01:00
parent ba91962eac
commit 834875aa5f
26 changed files with 212 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RaceLapTimer/Interfaces/CompetitionRace.cs Normal file
View File

@ -0,0 +1,15 @@
using System.Collections.Generic;
namespace Interfaces
{
public class CompetitionRace
{
public List<Pilot> Pilots { get; set; }
public string Title { get; set; }
public int MaxLaps { get; set; }
public int NumberOfSatellites { get; set; }
public int SatelliteTimePenaltyMicroS { get; set; }
public bool HotSeatEnabled { get; set; }
public int IdleTime { get; set; }
}
}

13
RaceLapTimer/Interfaces/ConfigurationSetting.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Interfaces
{
public class ConfigurationSetting
{
public string ConfigurationName { get; set; }
public string ConfigurationValue { get; set; }
}
}

5
RaceLapTimer/Interfaces/Interfaces.csproj
View File

@ -40,8 +40,13 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConfigurationSetting.cs" />
<Compile Include="CompetitionRace.cs" />
<Compile Include="Pilot.cs" />
<Compile Include="RaceSession.cs" />
<Compile Include="IUserStorage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RaceMode.cs" />
<Compile Include="User.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

10
RaceLapTimer/Interfaces/Pilot.cs Normal file
View File

@ -0,0 +1,10 @@
namespace Interfaces
{
public class Pilot
{
public string Name { get; set; }
public int TransponderToken { get; set; }
public string ThingyName { get; set; }
public string TeamName { get; set; }
}
}

8
RaceLapTimer/Interfaces/RaceMode.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Interfaces
{
public enum RaceMode
{
STANDARD = 1,
COMPETITION = 2
}
}

24
RaceLapTimer/Interfaces/RaceSession.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Interfaces
{
public class RaceSession
{
public int Id { get; set; }
public DateTime CreatedAt { get; set; }
public DateTime UpdatedAt { get; set; }
public string Title { get; set; }
public bool Active { get; set; }
public RaceMode Mode { get; set; }
public int MaxLaps { get; set; }
public DateTime DeletedAt { get; set; }
public int SatelliteCount { get; set; }
public int TimePenaltyPerSatellite { get; set; }
public bool HotSeatEnabled { get; set; }
public int IdleTimeSeconds { get; set; }
}
}

12
RaceLapTimer/RaceLapTimer/ApiControllers/InfoApiModule.cs Normal file
View File

@ -0,0 +1,12 @@
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class InfoApiModule:NancyModule
{
public InfoApiModule() : base("/api/info")
{
}
}
}

18
RaceLapTimer/RaceLapTimer/ApiControllers/InfoController.cs
View File

@ -1,18 +0,0 @@
using System;
using System.Web.Http;
namespace RaceLapTimer
{
public class InfoController:ApiController
{
/// <summary>
/// returns the last transponder Id from the ir daemon.
/// </summary>
/// <returns></returns>
[HttpGet]
public IHttpActionResult LastScannedId()
{
throw new NotImplementedException();
}
}
}

12
RaceLapTimer/RaceLapTimer/ApiControllers/LapTrackApiModule.cs Normal file
View File

@ -0,0 +1,12 @@
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class LapTrackApiModule:NancyModule
{
public LapTrackApiModule() : base("/api/laptrack")
{
}
}
}

8
RaceLapTimer/RaceLapTimer/ApiControllers/LapTrackController.cs
View File

@ -1,8 +0,0 @@
using System.Web.Http;
namespace RaceLapTimer
{
public class LapTrackController:ApiController
{
}
}

12
RaceLapTimer/RaceLapTimer/ApiControllers/MonitorApiModule.cs Normal file
View File

@ -0,0 +1,12 @@
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class MonitorApiModule:NancyModule
{
public MonitorApiModule() : base("api/monitor")
{
}
}
}

8
RaceLapTimer/RaceLapTimer/ApiControllers/MonitorController.cs
View File

@ -1,8 +0,0 @@
using System.Web.Http;
namespace RaceLapTimer
{
public class MonitorController:ApiController
{
}
}

13
RaceLapTimer/RaceLapTimer/ApiControllers/PilotApiModule.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Web.Http;
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class PilotApiModule:NancyModule
{
public PilotApiModule() : base("/api/pilot")
{
}
}
}

8
RaceLapTimer/RaceLapTimer/ApiControllers/PilotController.cs
View File

@ -1,8 +0,0 @@
using System.Web.Http;
namespace RaceLapTimer
{
public class PilotController:ApiController
{
}
}

20
RaceLapTimer/RaceLapTimer/ApiControllers/RaceSessionApiModule.cs Normal file
View File

@ -0,0 +1,20 @@
using Interfaces;
using Nancy;
using Nancy.ModelBinding;
namespace RaceLapTimer.ApiControllers
{
public class RaceSessionApiModule:NancyModule
{
public RaceSessionApiModule() : base("/api/racesession")
{
Post["/create"] = args => CreateRaceSession(args);
}
private dynamic CreateRaceSession(dynamic args)
{
var postObject = this.Bind<RaceSession>();
return Response.AsRedirect("/racedirector");
}
}
}

9
RaceLapTimer/RaceLapTimer/ApiControllers/RaceSessionController.cs
View File

@ -1,9 +0,0 @@
using System.Web.Http;
namespace RaceLapTimer
{
public class RaceSessionController:ApiController
{
}
}

12
RaceLapTimer/RaceLapTimer/ApiControllers/SatelliteApiModule.cs Normal file
View File

@ -0,0 +1,12 @@
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class SatelliteApiModule:NancyModule
{
public SatelliteApiModule() : base("/api/satellite")
{
}
}
}

6
RaceLapTimer/RaceLapTimer/ApiControllers/SatelliteController.cs
View File

@ -1,6 +0,0 @@
namespace RaceLapTimer
{
public class SatelliteController
{
}
}

13
RaceLapTimer/RaceLapTimer/ApiControllers/SoundApiModule.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Web.Http;
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class SoundApiModule:NancyModule
{
public SoundApiModule() : base("/api/sound")
{
}
}
}

8
RaceLapTimer/RaceLapTimer/ApiControllers/SoundController.cs
View File

@ -1,8 +0,0 @@
using System.Web.Http;
namespace RaceLapTimer
{
public class SoundController:ApiController
{
}
}

17
RaceLapTimer/RaceLapTimer/ApiControllers/SystemApiModule.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Nancy;
namespace RaceLapTimer.ApiControllers
{
public class SystemApiModule:NancyModule
{
public SystemApiModule() : base("/api/system")
{
}
}
}

15
RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj
View File

@ -98,20 +98,21 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ApiControllers\InfoController.cs" />
<Compile Include="ApiControllers\LapTrackController.cs" />
<Compile Include="ApiControllers\MonitorController.cs" />
<Compile Include="ApiControllers\PilotController.cs" />
<Compile Include="ApiControllers\RaceSessionController.cs" />
<Compile Include="ApiControllers\SatelliteController.cs" />
<Compile Include="ApiControllers\SoundController.cs" />
<Compile Include="ApiControllers\LapTrackApiModule.cs" />
<Compile Include="ApiControllers\MonitorApiModule.cs" />
<Compile Include="ApiControllers\PilotApiModule.cs" />
<Compile Include="ApiControllers\SatelliteApiModule.cs" />
<Compile Include="ApiControllers\SoundApiModule.cs" />
<Compile Include="ApiControllers\SystemApiModule.cs" />
<Compile Include="AuthenticationBootstrapper.cs" />
<Compile Include="Modules\HistoryModule.cs" />
<Compile Include="ApiControllers\InfoApiModule.cs" />
<Compile Include="Modules\LoginModule.cs" />
<Compile Include="Modules\MonitorModule.cs" />
<Compile Include="Modules\PilotModule.cs" />
<Compile Include="Modules\PilotsModule.cs" />
<Compile Include="Modules\RaceDirectorModule.cs" />
<Compile Include="ApiControllers\RaceSessionApiModule.cs" />
<Compile Include="Modules\SoundfileModule.cs" />
<Compile Include="Modules\SystemModule.cs" />
<Compile Include="Modules\UserModule.cs" />

2
RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj.DotSettings
View File

@ -1,2 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=apicontrollers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=apicontrollers/@EntryIndexedValue">False</s:Boolean></wpf:ResourceDictionary>

4
RaceLapTimer/RaceLapTimer/Startup.cs
View File

@ -13,12 +13,12 @@ namespace RaceLapTimer
config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
config.Routes.MapHttpRoute(
name: "DefaultApi",
routeTemplate: "api/{controller}/{id}",
routeTemplate: "api/{controller}/{action}/{id}",
defaults: new { id = RouteParameter.Optional }
);
config.EnsureInitialized();
app.UseWebApi(config);
//app.UseWebApi(config);
app.UseNancy();
}

18
RaceLapTimer/RaceLapTimer/www/Views/login.cshtml
View File

@ -2,13 +2,7 @@
@{
Layout = "razor-layout.cshtml";
}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Login</title>
</head>
<body>
<form method="POST">
<form method="POST">
Username <input type="text" name="Username" />
<br />
Password <input name="Password" type="password" />
@ -16,10 +10,8 @@
Remember Me <input name="RememberMe" type="checkbox" value="True" />
<br />
<input type="submit" value="Login" />
</form>
@if (Model.Errored)
{
</form>
@if (Model.Errored)
{
<div id="errorBox" class="floatingError">Invalid Username or Password</div>
}
</body>
</html>
}

4
RaceLapTimer/RaceLapTimer/www/Views/razor-layout.cshtml
View File

@ -26,7 +26,7 @@
<div class='collapse navbar-collapse' id='navbar'>
<ul class='nav navbar-nav navbar-right'>
<li>
<a href="/race_director">Race Director</a>
<a href="/racedirector">Race Director</a>
</li>
<li class='dropdown'>
<a aria-expanded='false' aria-haspopup='true' class='dropdown-toggle' data-toggle='dropdown' href='#' role='button'>
@ -55,7 +55,7 @@
<a href="/history">History</a>
</li>
<li>
<a href='#'>
<a href="#">
Version
0.5.1
</a>