Merge branch 'fuckoff' into 'master'

New structure

See merge request Syndamia/it-kariera-exam-template!2

30 files changed, 11 insertions, 2 deletions

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/Web.csproj b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
index 44c6a7a..b3e1542 100644
--- a/ExamTemplate/Web/Web.csproj
+++ b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

 

   <ItemGroup>
-    <ProjectReference Include="..\Services\Services.csproj" />
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <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>
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