start

alex-wolf-ps · Nov 24, 2019 · 445cd48 · 445cd48
1 parent 3ec8d8a
commit 445cd48
Show file tree

Hide file tree

Showing 87 changed files with 72 additions and 53 deletions.
diff --git a/BethanysPieShopHRM.Api/BethanysPieShopHRM.Api.csproj b/BethanysPieShopHRM.Api/BethanysPieShopHRM.Api.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BethanysPieShopHRM.Data\BethanysPieShopHRM.Data.csproj" />
     <ProjectReference Include="..\BethanysPieShopHRM.Shared\BethanysPieShopHRM.Shared.csproj" />
   </ItemGroup>
 

diff --git a/...anysPieShopHRM.Api/Models/AppDbContext.cs → BethanysPieShopHRM.Data/AppDbContext.cs b/...anysPieShopHRM.Api/Models/AppDbContext.cs → BethanysPieShopHRM.Data/AppDbContext.cs
@@ -140,9 +140,16 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 new HRTask()
                 {
                     HRTaskId = 3,
-                    Description = "Plan a welcome lunch for our new employees",
+                    Description = "Schedule a welcome lunch for our new employees",
                     Title = "Welcome Lunch",
                     Status = HRTaskStatus.Open
+                },
+                new HRTask()
+                {
+                    HRTaskId = 4,
+                    Description = "We need to schedule intern interviews for the fall semester.",
+                    Title = "Intern interviews",
+                    Status = HRTaskStatus.Open
                 }
             });
         }

diff --git a/BethanysPieShopHRM.Data/BethanysPieShopHRM.Data.csproj b/BethanysPieShopHRM.Data/BethanysPieShopHRM.Data.csproj
@@ -4,4 +4,12 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BethanysPieShopHRM.Shared\BethanysPieShopHRM.Shared.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ieShopHRM.Api/Models/CountryRepository.cs → ...RM.Data/Repositories/CountryRepository.cs b/...ieShopHRM.Api/Models/CountryRepository.cs → ...RM.Data/Repositories/CountryRepository.cs
diff --git a/...eShopHRM.Api/Models/CurrencyRepository.cs → ...M.Data/Repositories/CurrencyRepository.cs b/...eShopHRM.Api/Models/CurrencyRepository.cs → ...M.Data/Repositories/CurrencyRepository.cs
diff --git a/...eShopHRM.Api/Models/EmployeeRepository.cs → ...M.Data/Repositories/EmployeeRepository.cs b/...eShopHRM.Api/Models/EmployeeRepository.cs → ...M.Data/Repositories/EmployeeRepository.cs
diff --git a/...ieShopHRM.Api/Models/ExpenseRepository.cs → ...RM.Data/Repositories/ExpenseRepository.cs b/...ieShopHRM.Api/Models/ExpenseRepository.cs → ...RM.Data/Repositories/ExpenseRepository.cs
diff --git a/...eShopHRM.Api/Models/ICountryRepository.cs → ...M.Data/Repositories/ICountryRepository.cs b/...eShopHRM.Api/Models/ICountryRepository.cs → ...M.Data/Repositories/ICountryRepository.cs
diff --git a/...ShopHRM.Api/Models/ICurrencyRepository.cs → ....Data/Repositories/ICurrencyRepository.cs b/...ShopHRM.Api/Models/ICurrencyRepository.cs → ....Data/Repositories/ICurrencyRepository.cs
diff --git a/...ShopHRM.Api/Models/IEmployeeRepository.cs → ....Data/Repositories/IEmployeeRepository.cs b/...ShopHRM.Api/Models/IEmployeeRepository.cs → ....Data/Repositories/IEmployeeRepository.cs
diff --git a/...eShopHRM.Api/Models/IExpenseRepository.cs → ...M.Data/Repositories/IExpenseRepository.cs b/...eShopHRM.Api/Models/IExpenseRepository.cs → ...M.Data/Repositories/IExpenseRepository.cs
diff --git a/...pHRM.Api/Models/IJobCategoryRepository.cs → ...ta/Repositories/IJobCategoryRepository.cs b/...pHRM.Api/Models/IJobCategoryRepository.cs → ...ta/Repositories/IJobCategoryRepository.cs
diff --git a/...ieShopHRM.Api/Models/ISurveyRepository.cs → ...RM.Data/Repositories/ISurveyRepository.cs b/...ieShopHRM.Api/Models/ISurveyRepository.cs → ...RM.Data/Repositories/ISurveyRepository.cs
diff --git a/...sPieShopHRM.Api/Models/ITaskRepository.cs → ...pHRM.Data/Repositories/ITaskRepository.cs b/...sPieShopHRM.Api/Models/ITaskRepository.cs → ...pHRM.Data/Repositories/ITaskRepository.cs
diff --git a/...opHRM.Api/Models/JobCategoryRepository.cs → ...ata/Repositories/JobCategoryRepository.cs b/...opHRM.Api/Models/JobCategoryRepository.cs → ...ata/Repositories/JobCategoryRepository.cs
diff --git a/...PieShopHRM.Api/Models/SurveyRepository.cs → ...HRM.Data/Repositories/SurveyRepository.cs b/...PieShopHRM.Api/Models/SurveyRepository.cs → ...HRM.Data/Repositories/SurveyRepository.cs
diff --git a/...ysPieShopHRM.Api/Models/TaskRepository.cs → ...opHRM.Data/Repositories/TaskRepository.cs b/...ysPieShopHRM.Api/Models/TaskRepository.cs → ...opHRM.Data/Repositories/TaskRepository.cs
diff --git a/BethanysPieShopHRM.Server/App.razor → BethanysPieShopHRM.UI/App.razor b/BethanysPieShopHRM.Server/App.razor → BethanysPieShopHRM.UI/App.razor
diff --git a/...M.Server/BethanysPieShopHRM.Server.csproj → ...ieShopHRM.UI/BethanysPieShopHRM.UI.csproj b/...M.Server/BethanysPieShopHRM.Server.csproj → ...ieShopHRM.UI/BethanysPieShopHRM.UI.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Blazor.ContextMenu" Version="1.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview3.19555.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 

diff --git a/...Server/Components/AddEmployeeDialog.razor → ...HRM.UI/Components/AddEmployeeDialog.razor b/...Server/Components/AddEmployeeDialog.razor → ...HRM.UI/Components/AddEmployeeDialog.razor
diff --git a/...erver/Components/AddEmployeeDialogBase.cs → ...RM.UI/Components/AddEmployeeDialogBase.cs b/...erver/Components/AddEmployeeDialogBase.cs → ...RM.UI/Components/AddEmployeeDialogBase.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Components
+namespace BethanysPieShopHRM.UI.Components
 {
     public class AddEmployeeDialogBase : ComponentBase
     {

diff --git a/...erver/Components/NewEmployeesWidget.razor → ...RM.UI/Components/NewEmployeesWidget.razor b/...erver/Components/NewEmployeesWidget.razor → ...RM.UI/Components/NewEmployeesWidget.razor
diff --git a/...rver/Components/NewEmployeesWidgetBase.cs → ...M.UI/Components/NewEmployeesWidgetBase.cs b/...rver/Components/NewEmployeesWidgetBase.cs → ...M.UI/Components/NewEmployeesWidgetBase.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Components
+namespace BethanysPieShopHRM.UI.Components
 {
     public class NewEmployeesWidgetBase : ComponentBase
     {

diff --git a/...hopHRM.Server/Components/NewsWidget.razor → ...PieShopHRM.UI/Components/NewsWidget.razor b/...hopHRM.Server/Components/NewsWidget.razor → ...PieShopHRM.UI/Components/NewsWidget.razor
diff --git a/....Server/Interfaces/ICountryDataService.cs → ...pHRM.UI/Interfaces/ICountryDataService.cs b/....Server/Interfaces/ICountryDataService.cs → ...pHRM.UI/Interfaces/ICountryDataService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface ICountryDataService
     {

diff --git a/...hopHRM.Server/Interfaces/IEmailService.cs → ...PieShopHRM.UI/Interfaces/IEmailService.cs b/...hopHRM.Server/Interfaces/IEmailService.cs → ...PieShopHRM.UI/Interfaces/IEmailService.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface IEmailService
     {

diff --git a/...Server/Interfaces/IEmployeeDataService.cs → ...HRM.UI/Interfaces/IEmployeeDataService.cs b/...Server/Interfaces/IEmployeeDataService.cs → ...HRM.UI/Interfaces/IEmployeeDataService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface IEmployeeDataService
     {

diff --git a/....Server/Interfaces/IExpenseDataService.cs → ...pHRM.UI/Interfaces/IExpenseDataService.cs b/....Server/Interfaces/IExpenseDataService.cs → ...pHRM.UI/Interfaces/IExpenseDataService.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 { 
     public interface IExpenseDataService
     {

diff --git a/...ver/Interfaces/IJobCategoryDataService.cs → ....UI/Interfaces/IJobCategoryDataService.cs b/...ver/Interfaces/IJobCategoryDataService.cs → ....UI/Interfaces/IJobCategoryDataService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface IJobCategoryDataService
     {

diff --git a/...M.Server/Interfaces/ISurveyDataService.cs → ...opHRM.UI/Interfaces/ISurveyDataService.cs b/...M.Server/Interfaces/ISurveyDataService.cs → ...opHRM.UI/Interfaces/ISurveyDataService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface ISurveyDataService
     {

diff --git a/...HRM.Server/Interfaces/ITaskDataService.cs → ...ShopHRM.UI/Interfaces/ITaskDataService.cs b/...HRM.Server/Interfaces/ITaskDataService.cs → ...ShopHRM.UI/Interfaces/ITaskDataService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public interface ITaskDataService
     {

diff --git a/...ShopHRM.Server/Pages/EmployeeDetail.razor → ...sPieShopHRM.UI/Pages/EmployeeDetail.razor b/...ShopHRM.Server/Pages/EmployeeDetail.razor → ...sPieShopHRM.UI/Pages/EmployeeDetail.razor
diff --git a/...hopHRM.Server/Pages/EmployeeDetailBase.cs → ...PieShopHRM.UI/Pages/EmployeeDetailBase.cs b/...hopHRM.Server/Pages/EmployeeDetailBase.cs → ...PieShopHRM.UI/Pages/EmployeeDetailBase.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using BethanysPieShopHRM.ComponentsLibrary.Map;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class EmployeeDetailBase : ComponentBase
     {

diff --git a/...ieShopHRM.Server/Pages/EmployeeEdit.razor → ...nysPieShopHRM.UI/Pages/EmployeeEdit.razor b/...ieShopHRM.Server/Pages/EmployeeEdit.razor → ...nysPieShopHRM.UI/Pages/EmployeeEdit.razor
diff --git a/...eShopHRM.Server/Pages/EmployeeEditBase.cs → ...ysPieShopHRM.UI/Pages/EmployeeEditBase.cs b/...eShopHRM.Server/Pages/EmployeeEditBase.cs → ...ysPieShopHRM.UI/Pages/EmployeeEditBase.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class EmployeeEditBase : ComponentBase
     {

diff --git a/...opHRM.Server/Pages/EmployeeOverview.razor → ...ieShopHRM.UI/Pages/EmployeeOverview.razor b/...opHRM.Server/Pages/EmployeeOverview.razor → ...ieShopHRM.UI/Pages/EmployeeOverview.razor
diff --git a/...pHRM.Server/Pages/EmployeeOverviewBase.cs → ...eShopHRM.UI/Pages/EmployeeOverviewBase.cs b/...pHRM.Server/Pages/EmployeeOverviewBase.cs → ...eShopHRM.UI/Pages/EmployeeOverviewBase.cs
@@ -3,13 +3,14 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Components;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Components;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
+using BethanysPieShopHRM.UI.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Logging;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class EmployeeOverviewBase: ComponentBase
     {

diff --git a/BethanysPieShopHRM.Server/Pages/Error.razor → BethanysPieShopHRM.UI/Pages/Error.razor b/BethanysPieShopHRM.Server/Pages/Error.razor → BethanysPieShopHRM.UI/Pages/Error.razor
diff --git a/...PieShopHRM.Server/Pages/ExpenseEdit.razor → ...anysPieShopHRM.UI/Pages/ExpenseEdit.razor b/...PieShopHRM.Server/Pages/ExpenseEdit.razor → ...anysPieShopHRM.UI/Pages/ExpenseEdit.razor
diff --git a/...ieShopHRM.Server/Pages/ExpenseEditBase.cs → ...nysPieShopHRM.UI/Pages/ExpenseEditBase.cs b/...ieShopHRM.Server/Pages/ExpenseEditBase.cs → ...nysPieShopHRM.UI/Pages/ExpenseEditBase.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Components;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Components;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class ExpenseEditBase : ComponentBase
     {

diff --git a/...hopHRM.Server/Pages/ExpenseOverview.razor → ...PieShopHRM.UI/Pages/ExpenseOverview.razor b/...hopHRM.Server/Pages/ExpenseOverview.razor → ...PieShopHRM.UI/Pages/ExpenseOverview.razor
diff --git a/...opHRM.Server/Pages/ExpenseOverviewBase.cs → ...ieShopHRM.UI/Pages/ExpenseOverviewBase.cs b/...opHRM.Server/Pages/ExpenseOverviewBase.cs → ...ieShopHRM.UI/Pages/ExpenseOverviewBase.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Components;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Components;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class ExpenseOverviewBase: ComponentBase
     {

diff --git a/BethanysPieShopHRM.Server/Pages/Index.razor → BethanysPieShopHRM.UI/Pages/Index.razor b/BethanysPieShopHRM.Server/Pages/Index.razor → BethanysPieShopHRM.UI/Pages/Index.razor
@@ -1,6 +1,6 @@
 @page "/"
 @using BethanysPieShopHRM.Shared
-@using BethanysPieShopHRM.Server.Services
+@using BethanysPieShopHRM.UI.Services
 
 <div class="row">
     <div class="col-md-8">

diff --git a/...ShopHRM.Server/Pages/StaffDirectory.razor → ...sPieShopHRM.UI/Pages/StaffDirectory.razor b/...ShopHRM.Server/Pages/StaffDirectory.razor → ...sPieShopHRM.UI/Pages/StaffDirectory.razor
diff --git a/...hopHRM.Server/Pages/StaffDirectoryBase.cs → ...PieShopHRM.UI/Pages/StaffDirectoryBase.cs b/...hopHRM.Server/Pages/StaffDirectoryBase.cs → ...PieShopHRM.UI/Pages/StaffDirectoryBase.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BethanysPieShopHRM.Server.Components;
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Components;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Pages
+namespace BethanysPieShopHRM.UI.Pages
 {
     public class StaffDirectoryBase: ComponentBase
     {

diff --git a/...eShopHRM.Server/Pages/SurveyDetails.razor → ...ysPieShopHRM.UI/Pages/SurveyDetails.razor b/...eShopHRM.Server/Pages/SurveyDetails.razor → ...ysPieShopHRM.UI/Pages/SurveyDetails.razor
@@ -2,7 +2,7 @@
 @page "/survey/{SurveyId}"
 
 @using BethanysPieShopHRM.Shared
-@using BethanysPieShopHRM.Server.Services
+@using BethanysPieShopHRM.UI.Services
 
 <div class="entity-edit">
     @if (Survey == null)

diff --git a/...sPieShopHRM.Server/Pages/SurveyEdit.razor → BethanysPieShopHRM.UI/Pages/SurveyEdit.razor b/...sPieShopHRM.Server/Pages/SurveyEdit.razor → BethanysPieShopHRM.UI/Pages/SurveyEdit.razor
@@ -2,7 +2,7 @@
 @page "/surveyedit/{surveyId}"
 
 @using BethanysPieShopHRM.Shared
-@using BethanysPieShopHRM.Server.Services
+@using BethanysPieShopHRM.UI.Services
 
 <div class="entity-edit">
     <h1 class="page-title">Survey Details</h1>

diff --git a/...hopHRM.Server/Pages/SurveysOverview.razor → ...PieShopHRM.UI/Pages/SurveysOverview.razor b/...hopHRM.Server/Pages/SurveysOverview.razor → ...PieShopHRM.UI/Pages/SurveysOverview.razor
@@ -1,7 +1,7 @@
 @page "/surveys"
 
 @using BethanysPieShopHRM.Shared
-@using BethanysPieShopHRM.Server.Services
+@using BethanysPieShopHRM.UI.Services
 
     <div class="entity-edit">
         @if (Surveys == null)

diff --git a/...nysPieShopHRM.Server/Pages/TaskEdit.razor → BethanysPieShopHRM.UI/Pages/TaskEdit.razor b/...nysPieShopHRM.Server/Pages/TaskEdit.razor → BethanysPieShopHRM.UI/Pages/TaskEdit.razor
@@ -1,7 +1,7 @@
 @page "/taskedit"
 
 @using BethanysPieShopHRM.Shared
-@using BethanysPieShopHRM.Server.Services
+@using BethanysPieShopHRM.UI.Services
 
 <div class="entity-edit">
     <h1 class="page-title">Task Details</h1>

diff --git a/BethanysPieShopHRM.Server/Pages/_Host.cshtml → BethanysPieShopHRM.UI/Pages/_Host.cshtml b/BethanysPieShopHRM.Server/Pages/_Host.cshtml → BethanysPieShopHRM.UI/Pages/_Host.cshtml
@@ -1,5 +1,5 @@
 @page "/"
-@namespace BethanysPieShopHRM.Server.Pages
+@namespace BethanysPieShopHRM.UI.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <!DOCTYPE html>

diff --git a/BethanysPieShopHRM.Server/Program.cs → BethanysPieShopHRM.UI/Program.cs b/BethanysPieShopHRM.Server/Program.cs → BethanysPieShopHRM.UI/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace BethanysPieShopHRM.Server
+namespace BethanysPieShopHRM.UI
 {
     public class Program
     {

diff --git a/...HRM.Server/Properties/launchSettings.json → ...ShopHRM.UI/Properties/launchSettings.json b/...HRM.Server/Properties/launchSettings.json → ...ShopHRM.UI/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "BethanysPieShopHRM.Server": {
+    "BethanysPieShopHRM.UI": {
       "commandName": "Project",
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5001;http://localhost:5000",

diff --git a/...ShopHRM.Server/Data/CountryDataService.cs → ...ShopHRM.UI/Services/CountryDataService.cs b/...ShopHRM.Server/Data/CountryDataService.cs → ...ShopHRM.UI/Services/CountryDataService.cs
@@ -4,7 +4,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class CountryDataService : ICountryDataService
     {

diff --git a/...ieShopHRM.Server/Services/EmailService.cs → ...nysPieShopHRM.UI/Services/EmailService.cs b/...ieShopHRM.Server/Services/EmailService.cs → ...nysPieShopHRM.UI/Services/EmailService.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class EmailService : IEmailService
     {

diff --git a/...hopHRM.Server/Data/EmployeeDataService.cs → ...hopHRM.UI/Services/EmployeeDataService.cs b/...hopHRM.Server/Data/EmployeeDataService.cs → ...hopHRM.UI/Services/EmployeeDataService.cs
@@ -4,8 +4,9 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
+using Microsoft.AspNetCore.Components;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class EmployeeDataService: IEmployeeDataService
     {

diff --git a/...ShopHRM.Server/Data/ExpenseDataService.cs → ...ShopHRM.UI/Services/ExpenseDataService.cs b/...ShopHRM.Server/Data/ExpenseDataService.cs → ...ShopHRM.UI/Services/ExpenseDataService.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class ExpenseDataService : IExpenseDataService
     {

diff --git a/...HRM.Server/Data/JobCategoryDataService.cs → ...HRM.UI/Services/JobCategoryDataService.cs b/...HRM.Server/Data/JobCategoryDataService.cs → ...HRM.UI/Services/JobCategoryDataService.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class JobCategoryDataService : IJobCategoryDataService
     {

diff --git a/...RM.Server/Data/MockEmployeeDataService.cs → ...RM.UI/Services/MockEmployeeDataService.cs b/...RM.Server/Data/MockEmployeeDataService.cs → ...RM.UI/Services/MockEmployeeDataService.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using BethanysPieShopHRM.Shared;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class MockEmployeeDataService : IEmployeeDataService
     {

diff --git a/...eShopHRM.Server/Data/SurveyDataService.cs → ...eShopHRM.UI/Services/SurveyDataService.cs b/...eShopHRM.Server/Data/SurveyDataService.cs → ...eShopHRM.UI/Services/SurveyDataService.cs
@@ -1,4 +1,4 @@
-using BethanysPieShopHRM.Server.Services;
+using BethanysPieShopHRM.UI.Services;
 using BethanysPieShopHRM.Shared;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace BethanysPieShopHRM.Server.Data
+namespace BethanysPieShopHRM.UI.Data
 {
     public class SurveyDataService : ISurveyDataService
     {

diff --git a/...PieShopHRM.Server/Data/TaskDataService.cs → ...PieShopHRM.UI/Services/TaskDataService.cs b/...PieShopHRM.Server/Data/TaskDataService.cs → ...PieShopHRM.UI/Services/TaskDataService.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace BethanysPieShopHRM.Server.Services
+namespace BethanysPieShopHRM.UI.Services
 {
     public class TaskDataService : ITaskDataService
     {

diff --git a/...nysPieShopHRM.Server/Shared/LeftNav.razor → BethanysPieShopHRM.UI/Shared/LeftNav.razor b/...nysPieShopHRM.Server/Shared/LeftNav.razor → BethanysPieShopHRM.UI/Shared/LeftNav.razor
diff --git a/...PieShopHRM.Server/Shared/MainLayout.razor → ...anysPieShopHRM.UI/Shared/MainLayout.razor b/...PieShopHRM.Server/Shared/MainLayout.razor → ...anysPieShopHRM.UI/Shared/MainLayout.razor