();
+ public int Leeftijd { get; set; }
+ public int Dispuutsleeftijd { get; set; }
+ public string Opmerking { get; set; }
+
+ //Credentials
+ public string Email { get; set; }
+ public int[] PasswordHash { get; set; }
+ public int[] PasswordSalt { get; set; }
+ //End Credentials
+
+ public StudieInfo StudieInfo { get; set; }
+ public Sex Geslacht { get; set; }
+ public Rechten Rechten { get; set; } = 0;
+ public DateTime Verjaardag { get; set; }
+ public bool OudLid { get; set; } = false;
+ }
+
+ public enum Sex
+ {
+ Man = 0,
+ Vrouw = 1
+ }
+
+ public enum Rechten
+ {
+ Gebruiker = 0,
+ Moderator = 1,
+ Admin = 2
+ }
+
+ public class StudieInfo
+ {
+ public int ID { get; set; }
+ public string StudieNaam { get; set; }
+ public string StudieOmschrijving { get; set; }
+ public int StudieJaar { get; set; }
+ public string Opmerking { get; set; }
+ }
+
+ public class Token
+ {
+ public int ID { get; set; }
+ public Guid Session { get; set; }
+ public string ServiceName { get; set; }
+ public DateTime Expiration { get; set; }
+ public TokenPermissions Permissions { get; set; }
+ }
+
+ public class TokenPermissions
+ {
+ public int ID { get; set; }
+ public bool ViewName { get; set; } = true; //first and last name
+ public bool ViewEmail { get; set; } = false; //email address
+ public bool ViewData { get; set; } = false; //age, dispuut age, address etc.
+ public bool ChangePassword { get; set; } = false;
+ }
+}
diff --git a/Website/Website/Pages/Error.cshtml b/Website/Website/Pages/Error.cshtml
index b1f3143..4913341 100644
--- a/Website/Website/Pages/Error.cshtml
+++ b/Website/Website/Pages/Error.cshtml
@@ -1,23 +1,23 @@
-@page
-@model ErrorModel
-@{
- ViewData["Title"] = "Error";
-}
-
-Error.
-An error occurred while processing your request.
-
-@if (Model.ShowRequestId)
-{
-
- Request ID: @Model.RequestId
-
-}
-
-Development Mode
-
- Swapping to Development environment will display more detailed information about the error that occurred.
-
-
- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application.
-
+@page
+@model ErrorModel
+@{
+ ViewData["Title"] = "Error";
+}
+
+Error.
+An error occurred while processing your request.
+
+@if (Model.ShowRequestId)
+{
+
+ Request ID: @Model.RequestId
+
+}
+
+Development Mode
+
+ Swapping to Development environment will display more detailed information about the error that occurred.
+
+
+ Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application.
+
diff --git a/Website/Website/Pages/Error.cshtml.cs b/Website/Website/Pages/Error.cshtml.cs
index 2ae1cea..f78cb0e 100644
--- a/Website/Website/Pages/Error.cshtml.cs
+++ b/Website/Website/Pages/Error.cshtml.cs
@@ -1,23 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace Website.Pages
-{
- [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
- public class ErrorModel : PageModel
- {
- public string RequestId { get; set; }
-
- public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-
- public void OnGet()
- {
- RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Website.Pages
+{
+ [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+ public class ErrorModel : PageModel
+ {
+ public string RequestId { get; set; }
+
+ public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+ public void OnGet()
+ {
+ RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+ }
+ }
+}
diff --git a/Website/Website/Pages/_ViewImports.cshtml b/Website/Website/Pages/_ViewImports.cshtml
index 664346e..f82d6e4 100644
--- a/Website/Website/Pages/_ViewImports.cshtml
+++ b/Website/Website/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using Website
-@namespace Website.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using Website
+@namespace Website.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Website/Website/Program.cs b/Website/Website/Program.cs
index 1ec2b40..0cc8e03 100644
--- a/Website/Website/Program.cs
+++ b/Website/Website/Program.cs
@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Website
-{
- public class Program
- {
- public static void Main(string[] args)
- {
- CreateWebHostBuilder(args).Build().Run();
- }
-
- public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
- WebHost.CreateDefaultBuilder(args)
- .UseStartup();
- }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Website
+{
+ public class Program
+ {
+ public static void Main(string[] args)
+ {
+ CreateWebHostBuilder(args).Build().Run();
+ }
+
+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+ WebHost.CreateDefaultBuilder(args)
+ .UseStartup();
+ }
+}
diff --git a/Website/Website/Startup.cs b/Website/Website/Startup.cs
index 5ecc32d..24f2558 100644
--- a/Website/Website/Startup.cs
+++ b/Website/Website/Startup.cs
@@ -1,67 +1,74 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Website
-{
- public class Startup
- {
- public Startup(IConfiguration configuration)
- {
- Configuration = configuration;
- }
-
- public IConfiguration Configuration { get; }
-
- // This method gets called by the runtime. Use this method to add services to the container.
- public void ConfigureServices(IServiceCollection services)
- {
- services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
-
- // In production, the React files will be served from this directory
- services.AddSpaStaticFiles(configuration =>
- {
- configuration.RootPath = "ClientApp/build";
- });
- }
-
- // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public void Configure(IApplicationBuilder app, IHostingEnvironment env)
- {
- if (env.IsDevelopment())
- {
- app.UseDeveloperExceptionPage();
- }
- else
- {
- app.UseExceptionHandler("/Error");
- app.UseHsts();
- }
-
- app.UseHttpsRedirection();
- app.UseStaticFiles();
- app.UseSpaStaticFiles();
-
- app.UseMvc(routes =>
- {
- routes.MapRoute(
- name: "default",
- template: "{controller}/{action=Index}/{id?}");
- });
-
- app.UseSpa(spa =>
- {
- spa.Options.SourcePath = "ClientApp";
-
- if (env.IsDevelopment())
- {
- spa.UseReactDevelopmentServer(npmScript: "start");
- }
- });
- }
- }
-}
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpsPolicy;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer;
+using Microsoft.EntityFrameworkCore;
+using Website.Models;
+
+namespace Website
+{
+ public class Startup
+ {
+ public Startup(IConfiguration configuration)
+ {
+ Configuration = configuration;
+ }
+
+ public IConfiguration Configuration { get; }
+
+ // This method gets called by the runtime. Use this method to add services to the container.
+ public void ConfigureServices(IServiceCollection services)
+ {
+ services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+
+ //Add database
+ services.AddDbContext(options => options.UseNpgsql(Configuration.GetConnectionString("DefaultConnection")));
+
+
+ // In production, the React files will be served from this directory
+ services.AddSpaStaticFiles(configuration =>
+ {
+ configuration.RootPath = "ClientApp/build";
+ });
+ }
+
+ // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+ {
+ if (env.IsDevelopment())
+ {
+ app.UseDeveloperExceptionPage();
+ }
+ else
+ {
+ app.UseExceptionHandler("/Error");
+ app.UseHsts();
+ }
+
+ app.UseHttpsRedirection();
+ app.UseStaticFiles();
+ app.UseSpaStaticFiles();
+
+ app.UseMvc(routes =>
+ {
+ routes.MapRoute(
+ name: "default",
+ template: "{controller}/{action=Index}/{id?}");
+ });
+
+ app.UseSpa(spa =>
+ {
+ spa.Options.SourcePath = "ClientApp";
+
+ if (env.IsDevelopment())
+ {
+ spa.UseReactDevelopmentServer(npmScript: "start");
+ }
+ });
+ }
+ }
+}
diff --git a/Website/Website/Website.csproj b/Website/Website/Website.csproj
index d743723..ca3728b 100644
--- a/Website/Website/Website.csproj
+++ b/Website/Website/Website.csproj
@@ -1,49 +1,50 @@
-
-
-
- netcoreapp2.1
- true
- Latest
- false
- ClientApp\
- $(DefaultItemExcludes);$(SpaRoot)node_modules\**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %(DistFiles.Identity)
- PreserveNewest
-
-
-
-
-
+
+
+
+ netcoreapp2.1
+ true
+ Latest
+ false
+ ClientApp\
+ $(DefaultItemExcludes);$(SpaRoot)node_modules\**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(DistFiles.Identity)
+ PreserveNewest
+
+
+
+
+
diff --git a/Website/Website/appsettings.Development.json b/Website/Website/appsettings.Development.json
index e203e94..a2880cb 100644
--- a/Website/Website/appsettings.Development.json
+++ b/Website/Website/appsettings.Development.json
@@ -1,9 +1,9 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Debug",
- "System": "Information",
- "Microsoft": "Information"
- }
- }
-}
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Debug",
+ "System": "Information",
+ "Microsoft": "Information"
+ }
+ }
+}
diff --git a/Website/Website/appsettings.json b/Website/Website/appsettings.json
index def9159..8cff950 100644
--- a/Website/Website/appsettings.json
+++ b/Website/Website/appsettings.json
@@ -1,8 +1,11 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Warning"
- }
- },
- "AllowedHosts": "*"
-}
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Warning"
+ }
+ },
+ "AllowedHosts": "*",
+ "ConnectionStrings": {
+ "DefaultConnection": "Server=localhost;Port=5432;Database=Website_Ichthus;User Id=postgres;Password=password;"
+ }
+}