Merge pull request 'SES-68 Added Basic ViewModels' (#7) from SES-68 into master

Reviewed-on: #7

SessionCompanion/SessionCompanion.Database/SessionCompanion.Database.csproj

@@ -17,8 +17,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Repositories\" />
-  </ItemGroup>
-
 </Project>

SessionCompanion/SessionCompanion.ViewModels/AlignmentViewModels/AlignmentViewModel.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.AlignmentViewModels
+{
+    public class AlignmentViewModel
+    {
+        public int Id { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/BackgroundViewModels/BackgroundViewModel.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.BackgroundViewModels
+{
+    public class BackgroundViewModel
+    {
+        public int Id { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/BiographyViewModels/BiographyViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.BiographyViewModels
+{
+    public class BiographyViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public string Name { get; set; }
+        public int ClassId { get; set; }
+        public int AlignmentId { get; set; }
+        public int BackgroundId { get; set; }
+        public string Sex { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterViewModels/CharacterBasicStatsViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterViewModels
+{
+    public class CharacterBasicStatsViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public int Level { get; set; }
+        public int CurrentHealthPoints { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterViewModels/CharacterForLoginViewModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterViewModels
+{
+    public class CharacterForLoginViewModel
+    {
+        public int Id { get; set; }
+        public int UserId { get; set; }
+        public string Name { get; set; }
+        public string ClassName { get; set; }
+        public int Level { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterViewModels/CharacterViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterViewModels
+{
+    public class CharacterViewModel
+    {
+        public int Id { get; set; }
+        public int UserId { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/ClassViewModels/ClassViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.ClassViewModels
+{
+    public class ClassViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/RaceViewModels/RaceViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.RaceViewModels
+{
+    public class RaceViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/SessionCompanion.ViewModels.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+</Project>

SessionCompanion/SessionCompanion.ViewModels/StatisticsViewModels/StatisticsViewModel.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.StatisticsViewModels
+{
+    public class StatisticsViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        [Range(0, int.MaxValue)]
+        public int ExperiencePoints { get; set; }
+        [Range(0, int.MaxValue)]
+        public int Level { get; set; }
+        [Range(0, int.MaxValue)]
+        public int Speed { get; set; }
+        [Range(0, int.MaxValue)]
+        public int Initiative { get; set; }
+        [Range(0, int.MaxValue)]
+        public int HealthPoints { get; set; }
+        [Range(0, int.MaxValue)]
+        public int CurrentHealthPoints { get; set; }
+        [Range(0, int.MaxValue)]
+        public int ArmorClass { get; set; }
+        [Range(0, int.MaxValue)]
+        public int Proficiency { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/UserViewModels/UserViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.UserViewModels
+{
+    public class UserViewModel
+    {
+        public int Id { get; set; }
+        public string Nickname { get; set; }
+        public string Password { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.sln

@@ -5,7 +5,9 @@ VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionCompanion", "SessionCompanion\SessionCompanion.csproj", "{C646135F-16CE-4B16-B041-252D343D4E01}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionCompanion.Database", "SessionCompanion.Database\SessionCompanion.Database.csproj", "{CA05189B-A4AB-4946-80DC-EFA075A10F09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionCompanion.Database", "SessionCompanion.Database\SessionCompanion.Database.csproj", "{CA05189B-A4AB-4946-80DC-EFA075A10F09}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionCompanion.ViewModels", "SessionCompanion.ViewModels\SessionCompanion.ViewModels.csproj", "{7762AA75-7B60-4F28-B80A-B03E39140F89}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{CA05189B-A4AB-4946-80DC-EFA075A10F09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA05189B-A4AB-4946-80DC-EFA075A10F09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA05189B-A4AB-4946-80DC-EFA075A10F09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7762AA75-7B60-4F28-B80A-B03E39140F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7762AA75-7B60-4F28-B80A-B03E39140F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7762AA75-7B60-4F28-B80A-B03E39140F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7762AA75-7B60-4F28-B80A-B03E39140F89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SessionCompanion/SessionCompanion/SessionCompanion.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SessionCompanion.Database\SessionCompanion.Database.csproj" />
+    <ProjectReference Include="..\SessionCompanion.ViewModels\SessionCompanion.ViewModels.csproj" />
   </ItemGroup>
 
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">

SessionCompanion/SessionCompanion/Startup.cs

@@ -1,86 +1,86 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
+using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.SpaServices.AngularCli;
+using Microsoft.AspNetCore.SpaServices.AngularCli;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
 using SessionCompanion.Database;
 
-namespace SessionCompanion
+namespace SessionCompanion
-{
+{
-    public class Startup
+    public class Startup
-    {
+    {
-
+
-        public Startup(IConfiguration configuration)
+        public Startup(IConfiguration configuration)
-        {
+        {
-            Configuration = configuration;
+            Configuration = configuration;
-        }
+        }
-
+
-        public IConfiguration Configuration { get; }
+        public IConfiguration Configuration { get; }
-
+
-        // This method gets called by the runtime. Use this method to add services to the container.
+        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
-        {
+        {
-            services.AddControllersWithViews();
+            services.AddControllersWithViews();
-            services.AddDbContext<ApplicationDbContext>(options =>
+            services.AddDbContext<ApplicationDbContext>(options =>
-                options.UseSqlServer(
+                options.UseSqlServer(
-                    Configuration.GetConnectionString("DefaultConnection")));
+                    Configuration.GetConnectionString("DefaultConnection")));
-            // In production, the Angular files will be served from this directory
+            // In production, the Angular files will be served from this directory
-            services.AddSpaStaticFiles(configuration =>
+            services.AddSpaStaticFiles(configuration =>
-            {
+            {
-                configuration.RootPath = "ClientApp/dist";
+                configuration.RootPath = "ClientApp/dist";
-            });
+            });
-            
+            
-        }
+        }
-
+
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
+        {
             using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
             {
                 serviceScope.ServiceProvider.GetService<ApplicationDbContext>().Database.Migrate();
-            }
+            }
-            if (env.IsDevelopment())
+            if (env.IsDevelopment())
-            {
+            {
-                app.UseDeveloperExceptionPage();
+                app.UseDeveloperExceptionPage();
-            }
+            }
-            else
+            else
-            {
+            {
-                app.UseExceptionHandler("/Error");
+                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
+                app.UseHsts();
-            }
+            }
-
+
-            app.UseHttpsRedirection();
+            app.UseHttpsRedirection();
-            app.UseStaticFiles();
+            app.UseStaticFiles();
-            if (!env.IsDevelopment())
+            if (!env.IsDevelopment())
-            {
+            {
-                app.UseSpaStaticFiles();
+                app.UseSpaStaticFiles();
-            }
+            }
-
+
-            app.UseRouting();
+            app.UseRouting();
-
+
-            app.UseEndpoints(endpoints =>
+            app.UseEndpoints(endpoints =>
-            {
+            {
-                endpoints.MapControllerRoute(
+                endpoints.MapControllerRoute(
-                    name: "default",
+                    name: "default",
-                    pattern: "{controller}/{action=Index}/{id?}");
+                    pattern: "{controller}/{action=Index}/{id?}");
-            });
+            });
-
+
-            app.UseSpa(spa =>
+            app.UseSpa(spa =>
-            {
+            {
-                // To learn more about options for serving an Angular SPA from ASP.NET Core,
+                // To learn more about options for serving an Angular SPA from ASP.NET Core,
-                // see https://go.microsoft.com/fwlink/?linkid=864501
+                // see https://go.microsoft.com/fwlink/?linkid=864501
-
+
-                spa.Options.SourcePath = "ClientApp";
+                spa.Options.SourcePath = "ClientApp";
-
+
-                if (env.IsDevelopment())
+                if (env.IsDevelopment())
-                {
+                {
-                    spa.UseAngularCliServer(npmScript: "start");
+                    spa.UseAngularCliServer(npmScript: "start");
-                }
+                }
-            });
+            });
-        }
+        }
-    }
+    }
-}
+}