Big daddy refactor

57 files changed, 162 insertions, 73 deletions

diff --git a/ExamTemplate/Common/ErrorMessages.cs b/ExamTemplate/Common/ExamTemplate.Common/ErrorMessages.cs
index fa15b8c..fa15b8c 100644
--- a/ExamTemplate/Common/ErrorMessages.cs
+++ b/ExamTemplate/Common/ExamTemplate.Common/ErrorMessages.cs
diff --git a/ExamTemplate/Common/Common.csproj b/ExamTemplate/Common/ExamTemplate.Common/ExamTemplate.Common.csproj
index 563e6f9..563e6f9 100644
--- a/ExamTemplate/Common/Common.csproj
+++ b/ExamTemplate/Common/ExamTemplate.Common/ExamTemplate.Common.csproj
diff --git a/ExamTemplate/Common/RoleConst.cs b/ExamTemplate/Common/ExamTemplate.Common/RoleConst.cs
index 7d72fea..7d72fea 100644
--- a/ExamTemplate/Common/RoleConst.cs
+++ b/ExamTemplate/Common/ExamTemplate.Common/RoleConst.cs
diff --git a/ExamTemplate/Data/Models/BaseModel.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs
index 5e7b75c..5e7b75c 100644
--- a/ExamTemplate/Data/Models/BaseModel.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs
diff --git a/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj
new file mode 100644
index 0000000..7e76cb8
--- /dev/null
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">

+

+  <PropertyGroup>

+    <TargetFramework>net5.0</TargetFramework>

+  </PropertyGroup>

+

+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.5" />
+  </ItemGroup>

+

+</Project>

diff --git a/ExamTemplate/Data/Models/User.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs
index 8fa698d..8fa698d 100644
--- a/ExamTemplate/Data/Models/User.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs
diff --git a/ExamTemplate/Data/Data.csproj b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj
index 098f532..0e2657c 100644
--- a/ExamTemplate/Data/Data.csproj
+++ b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">

 

   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
   </ItemGroup>

 

   <ItemGroup>
diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
index d15b462..d15b462 100644
--- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs
index a2f78ad..a2f78ad 100644
--- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs
diff --git a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs
index 3286121..3286121 100644
--- a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs
diff --git a/ExamTemplate/Data/TemplateContext.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs
index 268812d..268812d 100644
--- a/ExamTemplate/Data/TemplateContext.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs
diff --git a/ExamTemplate/Data/TemplateContextFactory.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs
index dff2e9e..dff2e9e 100644
--- a/ExamTemplate/Data/TemplateContextFactory.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs
diff --git a/ExamTemplate/ExamTemplate.sln b/ExamTemplate/ExamTemplate.sln
index 9dcfe98..249c0fe 100644
--- a/ExamTemplate/ExamTemplate.sln
+++ b/ExamTemplate/ExamTemplate.sln
@@ -3,13 +3,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16

 VisualStudioVersion = 16.6.30114.105

 MinimumVisualStudioVersion = 10.0.40219.1

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{5676382D-F650-45BF-96CD-1E99F4965233}"

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2F58A03C-503A-4912-BF1D-DFFF130216C7}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "Services\Services.csproj", "{4BA16964-42F1-4481-8A47-1610B04398AE}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Common", "Common\ExamTemplate.Common\ExamTemplate.Common.csproj", "{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Web\Web.csproj", "{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}"

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{D9C12024-427F-4932-A0DF-BC855919EB95}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{E182AE4B-1240-4AA7-A91C-29EC71C5C818}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Data", "Data\ExamTemplate.Data\ExamTemplate.Data.csproj", "{EADFEE4F-C3F7-4826-865D-CEC88305C224}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Models", "Data\ExamTemplate.Models\ExamTemplate.Models.csproj", "{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{595C13E8-3295-4D1F-8154-258C50302233}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Models", "Services\ExamTemplate.Models\ExamTemplate.Models.csproj", "{51146FC9-8D89-4D68-A932-8ECEA224F024}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Services", "Services\ExamTemplate.Services\ExamTemplate.Services.csproj", "{010DCE68-373D-4E45-A220-6B3EA8A8C83A}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{E298F85E-443F-48F6-8218-A5BAEB3AAAA2}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Models", "Web\ExamTemplate.Models\ExamTemplate.Models.csproj", "{E316C321-2408-4AB6-B216-06A9779CE650}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Web", "Web\ExamTemplate.Web\ExamTemplate.Web.csproj", "{5184499B-5F09-42F0-819C-4CD927A73C55}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -24,53 +38,98 @@ Global
 		HideSolutionNode = FALSE

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x64.Build.0 = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x86.Build.0 = Debug|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|Any CPU.Build.0 = Release|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x64.ActiveCfg = Release|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x64.Build.0 = Release|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x86.ActiveCfg = Release|Any CPU

-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x86.Build.0 = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x64.Build.0 = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x86.Build.0 = Debug|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|Any CPU.Build.0 = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x64.ActiveCfg = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x64.Build.0 = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x86.ActiveCfg = Release|Any CPU

-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x86.Build.0 = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x64.Build.0 = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x86.Build.0 = Debug|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|Any CPU.Build.0 = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x64.ActiveCfg = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x64.Build.0 = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x86.ActiveCfg = Release|Any CPU

-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x86.Build.0 = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x64.Build.0 = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x86.Build.0 = Debug|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|Any CPU.Build.0 = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x64.ActiveCfg = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x64.Build.0 = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x86.ActiveCfg = Release|Any CPU

-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x86.Build.0 = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|x64.Build.0 = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Debug|x86.Build.0 = Debug|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|Any CPU.Build.0 = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|x64.ActiveCfg = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|x64.Build.0 = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|x86.ActiveCfg = Release|Any CPU

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D}.Release|x86.Build.0 = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|x64.Build.0 = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Debug|x86.Build.0 = Debug|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|Any CPU.Build.0 = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|x64.ActiveCfg = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|x64.Build.0 = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|x86.ActiveCfg = Release|Any CPU

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224}.Release|x86.Build.0 = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|x64.Build.0 = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Debug|x86.Build.0 = Debug|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|Any CPU.Build.0 = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|x64.ActiveCfg = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|x64.Build.0 = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|x86.ActiveCfg = Release|Any CPU

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8}.Release|x86.Build.0 = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|x64.Build.0 = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Debug|x86.Build.0 = Debug|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|Any CPU.Build.0 = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|x64.ActiveCfg = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|x64.Build.0 = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|x86.ActiveCfg = Release|Any CPU

+		{51146FC9-8D89-4D68-A932-8ECEA224F024}.Release|x86.Build.0 = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|x64.Build.0 = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Debug|x86.Build.0 = Debug|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|Any CPU.Build.0 = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|x64.ActiveCfg = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|x64.Build.0 = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|x86.ActiveCfg = Release|Any CPU

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A}.Release|x86.Build.0 = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|x64.Build.0 = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Debug|x86.Build.0 = Debug|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|x64.ActiveCfg = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|x64.Build.0 = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|x86.ActiveCfg = Release|Any CPU

+		{E316C321-2408-4AB6-B216-06A9779CE650}.Release|x86.Build.0 = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|x64.Build.0 = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Debug|x86.Build.0 = Debug|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|Any CPU.Build.0 = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|x64.ActiveCfg = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|x64.Build.0 = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|x86.ActiveCfg = Release|Any CPU

+		{5184499B-5F09-42F0-819C-4CD927A73C55}.Release|x86.Build.0 = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(NestedProjects) = preSolution

+		{20BE6F45-CA5D-484B-B48C-D3DFA10B8B0D} = {2F58A03C-503A-4912-BF1D-DFFF130216C7}

+		{EADFEE4F-C3F7-4826-865D-CEC88305C224} = {D9C12024-427F-4932-A0DF-BC855919EB95}

+		{B5AB51F6-0807-4853-8B70-4CF56EFBF2E8} = {D9C12024-427F-4932-A0DF-BC855919EB95}

+		{51146FC9-8D89-4D68-A932-8ECEA224F024} = {595C13E8-3295-4D1F-8154-258C50302233}

+		{010DCE68-373D-4E45-A220-6B3EA8A8C83A} = {595C13E8-3295-4D1F-8154-258C50302233}

+		{E316C321-2408-4AB6-B216-06A9779CE650} = {E298F85E-443F-48F6-8218-A5BAEB3AAAA2}

+		{5184499B-5F09-42F0-819C-4CD927A73C55} = {E298F85E-443F-48F6-8218-A5BAEB3AAAA2}

 	EndGlobalSection

 EndGlobal

diff --git a/ExamTemplate/Services/Models/BaseServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/BaseServiceModel.cs
index 62d0da3..62d0da3 100644
--- a/ExamTemplate/Services/Models/BaseServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/BaseServiceModel.cs
diff --git a/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj b/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj
new file mode 100644
index 0000000..563e6f9
--- /dev/null
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">

+

+  <PropertyGroup>

+    <TargetFramework>net5.0</TargetFramework>

+  </PropertyGroup>

+

+</Project>

diff --git a/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/LoginUserServiceModel.cs
index 20aaaeb..20aaaeb 100644
--- a/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/LoginUserServiceModel.cs
diff --git a/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/RegisterUserServiceModel.cs
index b08d5ba..b08d5ba 100644
--- a/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/RegisterUserServiceModel.cs
diff --git a/ExamTemplate/Services/Models/User/UserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/UserServiceModel.cs
index 0e8b939..0e8b939 100644
--- a/ExamTemplate/Services/Models/User/UserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/UserServiceModel.cs
diff --git a/ExamTemplate/Services/Configurations/ServiceUserMappings.cs b/ExamTemplate/Services/ExamTemplate.Services/Configurations/ServiceUserMappings.cs
index 787b90f..787b90f 100644
--- a/ExamTemplate/Services/Configurations/ServiceUserMappings.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Configurations/ServiceUserMappings.cs
diff --git a/ExamTemplate/Services/Services.csproj b/ExamTemplate/Services/ExamTemplate.Services/ExamTemplate.Services.csproj
index eb60f3d..b84928f 100644
--- a/ExamTemplate/Services/Services.csproj
+++ b/ExamTemplate/Services/ExamTemplate.Services/ExamTemplate.Services.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">

 

   <ItemGroup>
-    <ProjectReference Include="..\Data\Data.csproj" />
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\ExamTemplate.Services.Models\ExamTemplate.Services.Models.csproj" />
+    <ProjectReference Include="..\..\Data\ExamTemplate.Data\ExamTemplate.Data.csproj" />
+    <ProjectReference Include="..\..\Data\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
   </ItemGroup>

 

   <ItemGroup>
diff --git a/ExamTemplate/Services/Interfaces/IBaseService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IBaseService.cs
index 66de7b8..66de7b8 100644
--- a/ExamTemplate/Services/Interfaces/IBaseService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IBaseService.cs
diff --git a/ExamTemplate/Services/Interfaces/ICloudinaryService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/ICloudinaryService.cs
index 9c4d884..9c4d884 100644
--- a/ExamTemplate/Services/Interfaces/ICloudinaryService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/ICloudinaryService.cs
diff --git a/ExamTemplate/Services/Interfaces/IUserService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IUserService.cs
index 35f14e3..35f14e3 100644
--- a/ExamTemplate/Services/Interfaces/IUserService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IUserService.cs
diff --git a/ExamTemplate/Services/Services/BaseService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/BaseService.cs
index b1b823e..b1b823e 100644
--- a/ExamTemplate/Services/Services/BaseService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/BaseService.cs
diff --git a/ExamTemplate/Services/Services/CloudinaryService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/CloudinaryService.cs
index 40772d9..40772d9 100644
--- a/ExamTemplate/Services/Services/CloudinaryService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/CloudinaryService.cs
diff --git a/ExamTemplate/Services/Services/UserService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/UserService.cs
index 4e85688..4e85688 100644
--- a/ExamTemplate/Services/Services/UserService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/UserService.cs
diff --git a/ExamTemplate/Web/Models/BaseWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/BaseWebModel.cs
index 1b662af..1b662af 100644
--- a/ExamTemplate/Web/Models/BaseWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/BaseWebModel.cs
diff --git a/ExamTemplate/Web/Models/ErrorViewModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/ErrorViewModel.cs
index af40d4c..af40d4c 100644
--- a/ExamTemplate/Web/Models/ErrorViewModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/ErrorViewModel.cs
diff --git a/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj b/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj
new file mode 100644
index 0000000..563e6f9
--- /dev/null
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">

+

+  <PropertyGroup>

+    <TargetFramework>net5.0</TargetFramework>

+  </PropertyGroup>

+

+</Project>

diff --git a/ExamTemplate/Web/Models/User/EditUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/EditUserWebModel.cs
index 119a585..119a585 100644
--- a/ExamTemplate/Web/Models/User/EditUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/EditUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/LoginUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/LoginUserWebModel.cs
index 0f4ef73..0f4ef73 100644
--- a/ExamTemplate/Web/Models/User/LoginUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/LoginUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/RegisterUserWebModel.cs
index c443dd2..c443dd2 100644
--- a/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/RegisterUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/UserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/UserWebModel.cs
index af8d6c7..af8d6c7 100644
--- a/ExamTemplate/Web/Models/User/UserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/UserWebModel.cs
diff --git a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs b/ExamTemplate/Web/ExamTemplate.Web/Configurations/ControllerUserMappings.cs
index 05c57e2..05c57e2 100644
--- a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Configurations/ControllerUserMappings.cs
diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/ExamTemplate.Web/Controllers/AccountController.cs
index 2c2eb32..2c2eb32 100644
--- a/ExamTemplate/Web/Controllers/AccountController.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Controllers/AccountController.cs
diff --git a/ExamTemplate/Web/Controllers/HomeController.cs b/ExamTemplate/Web/ExamTemplate.Web/Controllers/HomeController.cs
index d9cfc45..d9cfc45 100644
--- a/ExamTemplate/Web/Controllers/HomeController.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Controllers/HomeController.cs
diff --git a/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
new file mode 100644
index 0000000..d2c2de4
--- /dev/null
+++ b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">

+

+  <ItemGroup>
+    <ProjectReference Include="..\ExamTemplate.Web.Models\ExamTemplate.Web.Models.csproj" />
+    <ProjectReference Include="..\..\Services\ExamTemplate.Services\ExamTemplate.Services.csproj" />
+    <ProjectReference Include="..\..\Services\ExamTemplate.Services.Models\ExamTemplate.Services.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
+  </ItemGroup>

+

+  <ItemGroup>
+    <PackageReference Include="Automapper" Version="10.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+	<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" />
+  </ItemGroup>

+

+  <PropertyGroup>

+    <TargetFramework>net5.0</TargetFramework>

+  </PropertyGroup>

+

+</Project>

diff --git a/ExamTemplate/Web/Program.cs b/ExamTemplate/Web/ExamTemplate.Web/Program.cs
index be33374..be33374 100644
--- a/ExamTemplate/Web/Program.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Program.cs
diff --git a/ExamTemplate/Web/Properties/launchSettings.json b/ExamTemplate/Web/ExamTemplate.Web/Properties/launchSettings.json
index 080115b..080115b 100644
--- a/ExamTemplate/Web/Properties/launchSettings.json
+++ b/ExamTemplate/Web/ExamTemplate.Web/Properties/launchSettings.json
diff --git a/ExamTemplate/Web/Startup.cs b/ExamTemplate/Web/ExamTemplate.Web/Startup.cs
index c18bca6..c18bca6 100644
--- a/ExamTemplate/Web/Startup.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Startup.cs
diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Edit.cshtml
index a088742..a088742 100644
--- a/ExamTemplate/Web/Views/Account/Edit.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Edit.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Login.cshtml
index daa3f3e..daa3f3e 100644
--- a/ExamTemplate/Web/Views/Account/Login.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Login.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Profile.cshtml
index 33fc882..33fc882 100644
--- a/ExamTemplate/Web/Views/Account/Profile.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Profile.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Register.cshtml
index e436d72..e436d72 100644
--- a/ExamTemplate/Web/Views/Account/Register.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Register.cshtml
diff --git a/ExamTemplate/Web/Views/Home/Index.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Home/Index.cshtml
index 56ea950..56ea950 100644
--- a/ExamTemplate/Web/Views/Home/Index.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Home/Index.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/Error.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/Error.cshtml
index 5a7ce95..5a7ce95 100644
--- a/ExamTemplate/Web/Views/Shared/Error.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/Error.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/ErrorNotFound.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/ErrorNotFound.cshtml
index 39fc5ca..39fc5ca 100644
--- a/ExamTemplate/Web/Views/Shared/ErrorNotFound.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/ErrorNotFound.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_FooterContent.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_FooterContent.cshtml
index 60a21aa..60a21aa 100644
--- a/ExamTemplate/Web/Views/Shared/_FooterContent.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_FooterContent.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_Layout.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Layout.cshtml
index dd7bf82..dd7bf82 100644
--- a/ExamTemplate/Web/Views/Shared/_Layout.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Layout.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Navbar.cshtml
index 0ec5c4d..0ec5c4d 100644
--- a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Navbar.cshtml
diff --git a/ExamTemplate/Web/Views/_ViewImports.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewImports.cshtml
index 18502e4..18502e4 100644
--- a/ExamTemplate/Web/Views/_ViewImports.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewImports.cshtml
diff --git a/ExamTemplate/Web/Views/_ViewStart.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewStart.cshtml
index 3a04d05..3a04d05 100644
--- a/ExamTemplate/Web/Views/_ViewStart.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewStart.cshtml
diff --git a/ExamTemplate/Web/appsettings.json b/ExamTemplate/Web/ExamTemplate.Web/appsettings.json
index f1b58be..f1b58be 100644
--- a/ExamTemplate/Web/appsettings.json
+++ b/ExamTemplate/Web/ExamTemplate.Web/appsettings.json
diff --git a/ExamTemplate/Web/wwwroot/css/site.css b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/site.css
index 5923427..5923427 100644
--- a/ExamTemplate/Web/wwwroot/css/site.css
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/site.css
diff --git a/ExamTemplate/Web/wwwroot/css/styles.css b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/styles.css
index e7fc7b3..e7fc7b3 100644
--- a/ExamTemplate/Web/wwwroot/css/styles.css
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/styles.css
diff --git a/ExamTemplate/Web/wwwroot/favicon.ico b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/favicon.ico
index a3a7999..a3a7999 100644
--- a/ExamTemplate/Web/wwwroot/favicon.ico
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/favicon.ico
diff --git a/ExamTemplate/Web/Web.csproj b/ExamTemplate/Web/Web.csproj
deleted file mode 100644
index 44c6a7a..0000000
--- a/ExamTemplate/Web/Web.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">

-

-  <ItemGroup>
-    <ProjectReference Include="..\Services\Services.csproj" />
-    <ProjectReference Include="..\Common\Common.csproj" />
-  </ItemGroup>

-

-  <ItemGroup>
-    <PackageReference Include="Automapper" Version="10.1.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" />
-  </ItemGroup>

-

-  <PropertyGroup>

-    <TargetFramework>net5.0</TargetFramework>

-  </PropertyGroup>

-

-</Project>