BCIT-COMP-4976-Term-Project · YashsviG · Dec 1, 2020 · Dec 2, 2020 · Dec 2, 2020
diff --git a/BackEndTests/EmailConfigurationTests.cs b/BackEndTests/EmailConfigurationTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Xunit;
 
 namespace BackEndTests

diff --git a/BackEndTests/EmailTests.cs b/BackEndTests/EmailTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using System;
 using Web.Controllers;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Xunit;
 
 

diff --git a/OpenVoting.sln b/OpenVoting.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "Web\Web.csproj", "{A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BackEndTests", "BackEndTests\BackEndTests.csproj", "{B89D3B6C-980D-40D8-A716-27E4B066E444}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanYourVoteLibrary2", "PlanYourVoteLibrary2\PlanYourVoteLibrary2.csproj", "{93C0CF7E-E504-424D-9E06-378C7EADCEF4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{B89D3B6C-980D-40D8-A716-27E4B066E444}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B89D3B6C-980D-40D8-A716-27E4B066E444}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B89D3B6C-980D-40D8-A716-27E4B066E444}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93C0CF7E-E504-424D-9E06-378C7EADCEF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93C0CF7E-E504-424D-9E06-378C7EADCEF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93C0CF7E-E504-424D-9E06-378C7EADCEF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93C0CF7E-E504-424D-9E06-378C7EADCEF4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Web/Models/BallotIssue.cs → PlanYourVoteLibrary2/BallotIssue.cs b/Web/Models/BallotIssue.cs → PlanYourVoteLibrary2/BallotIssue.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class BallotIssue
     {

diff --git a/Web/Models/Candidate.cs → PlanYourVoteLibrary2/Candidate.cs b/Web/Models/Candidate.cs → PlanYourVoteLibrary2/Candidate.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class Candidate
     {

diff --git a/Web/Models/CandidateDetail.cs → PlanYourVoteLibrary2/CandidateDetail.cs b/Web/Models/CandidateDetail.cs → PlanYourVoteLibrary2/CandidateDetail.cs
@@ -5,7 +5,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public enum CandidateDetailFormat
     {

diff --git a/Web/Models/CandidateRace.cs → PlanYourVoteLibrary2/CandidateRace.cs b/Web/Models/CandidateRace.cs → PlanYourVoteLibrary2/CandidateRace.cs
@@ -2,7 +2,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class CandidateRace
     {

diff --git a/Web/Models/Contact.cs → PlanYourVoteLibrary2/Contact.cs b/Web/Models/Contact.cs → PlanYourVoteLibrary2/Contact.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public enum ContactMethod
     {

diff --git a/Web/Models/Election.cs → PlanYourVoteLibrary2/Election.cs b/Web/Models/Election.cs → PlanYourVoteLibrary2/Election.cs
@@ -3,7 +3,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class Election
     {

diff --git a/Web/Models/Email.cs → PlanYourVoteLibrary2/Email.cs b/Web/Models/Email.cs → PlanYourVoteLibrary2/Email.cs
@@ -1,4 +1,5 @@
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class Email
     {

diff --git a/Web/Models/EmailConfiguration.cs → PlanYourVoteLibrary2/EmailConfiguration.cs b/Web/Models/EmailConfiguration.cs → PlanYourVoteLibrary2/EmailConfiguration.cs
@@ -1,4 +1,7 @@
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
+>>>>>>> e052836aeeba1471d7e823423ddcd29a2b74fee1
 {
     public class EmailConfiguration
     {

diff --git a/Web/Models/Image.cs → PlanYourVoteLibrary2/Image.cs b/Web/Models/Image.cs → PlanYourVoteLibrary2/Image.cs
@@ -3,7 +3,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class Image
     {

diff --git a/Web/Models/IssueOption.cs → PlanYourVoteLibrary2/IssueOption.cs b/Web/Models/IssueOption.cs → PlanYourVoteLibrary2/IssueOption.cs
@@ -1,6 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class IssueOption
     {

diff --git a/Web/Models/JSONCandidate.cs → PlanYourVoteLibrary2/JSONCandidate.cs b/Web/Models/JSONCandidate.cs → PlanYourVoteLibrary2/JSONCandidate.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class JSONCandidate
     {

diff --git a/Web/Models/JSONPollingPlace.cs → PlanYourVoteLibrary2/JSONPollingPlace.cs b/Web/Models/JSONPollingPlace.cs → PlanYourVoteLibrary2/JSONPollingPlace.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class JSONPollingPlace
     {

diff --git a/Web/Models/Map.cs → PlanYourVoteLibrary2/Map.cs b/Web/Models/Map.cs → PlanYourVoteLibrary2/Map.cs
@@ -3,7 +3,9 @@
 using Newtonsoft.Json.Converters;
 using System.Globalization;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public partial class Map
     {

diff --git a/Web/Models/MapConfiguration.cs → PlanYourVoteLibrary2/MapConfiguration.cs b/Web/Models/MapConfiguration.cs → PlanYourVoteLibrary2/MapConfiguration.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class MapConfiguration
     {

diff --git a/Web/Models/OpenGraph.cs → PlanYourVoteLibrary2/OpenGraph.cs b/Web/Models/OpenGraph.cs → PlanYourVoteLibrary2/OpenGraph.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class OpenGraph
     {

diff --git a/Web/Models/Organization.cs → PlanYourVoteLibrary2/Organization.cs b/Web/Models/Organization.cs → PlanYourVoteLibrary2/Organization.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class Organization
     {

diff --git a/PlanYourVoteLibrary2/PlanYourVoteLibrary2.csproj b/PlanYourVoteLibrary2/PlanYourVoteLibrary2.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/Web/Models/PollingPlace.cs → PlanYourVoteLibrary2/PollingPlace.cs b/Web/Models/PollingPlace.cs → PlanYourVoteLibrary2/PollingPlace.cs
@@ -3,7 +3,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class PollingPlace
     {

diff --git a/Web/Models/PollingPlaceDate.cs → PlanYourVoteLibrary2/PollingPlaceDate.cs b/Web/Models/PollingPlaceDate.cs → PlanYourVoteLibrary2/PollingPlaceDate.cs
@@ -7,7 +7,9 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class PollingPlaceDate
     {

diff --git a/Web/Models/Race.cs → PlanYourVoteLibrary2/Race.cs b/Web/Models/Race.cs → PlanYourVoteLibrary2/Race.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class Race
     {

diff --git a/Web/Models/SocialMedia.cs → PlanYourVoteLibrary2/SocialMedia.cs b/Web/Models/SocialMedia.cs → PlanYourVoteLibrary2/SocialMedia.cs
@@ -4,7 +4,9 @@
 using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class SocialMedia
     {

diff --git a/Web/Models/State.cs → PlanYourVoteLibrary2/State.cs b/Web/Models/State.cs → PlanYourVoteLibrary2/State.cs
@@ -4,7 +4,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class State
     {

diff --git a/Web/Models/Step.cs → PlanYourVoteLibrary2/Step.cs b/Web/Models/Step.cs → PlanYourVoteLibrary2/Step.cs
@@ -5,7 +5,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class Step
     {

diff --git a/Web/Models/Theme.cs → PlanYourVoteLibrary2/Theme.cs b/Web/Models/Theme.cs → PlanYourVoteLibrary2/Theme.cs
@@ -1,6 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.Models
+
+namespace PlanYourVoteLibrary2
+
 {
     public class Theme
     {

diff --git a/Web/Models/VoteEvent.cs → PlanYourVoteLibrary2/VoteEvent.cs b/Web/Models/VoteEvent.cs → PlanYourVoteLibrary2/VoteEvent.cs
@@ -3,7 +3,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Web.Models
+namespace PlanYourVoteLibrary2
+
 {
     public class VoteEvent
     {

diff --git a/Web/ApiControllers/BallotIssuesApiController.cs b/Web/ApiControllers/BallotIssuesApiController.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.Data;
 using Web.ApiDTO;
 

diff --git a/Web/ApiControllers/CandidateApiController.cs b/Web/ApiControllers/CandidateApiController.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.Data;
 
 namespace Web.Controllers

diff --git a/Web/ApiControllers/ElectionsController.cs b/Web/ApiControllers/ElectionsController.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.Data;
 
 namespace Web.ApiControllers

diff --git a/Web/ApiControllers/EmailController.cs b/Web/ApiControllers/EmailController.cs
@@ -10,7 +10,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Web.Models;
+using PlanYourVoteLibrary2;
 
 namespace Web.Controllers
 {

diff --git a/Web/ApiControllers/MapController.cs b/Web/ApiControllers/MapController.cs
@@ -15,7 +15,7 @@
 using System.Windows.Input;
 using Web.ApiDTO;
 using Web.Data;
-using Web.Models;
+using PlanYourVoteLibrary2;
 
 namespace Web.ApiControllers
 {

diff --git a/Web/ApiControllers/PollingPlacesController.cs b/Web/ApiControllers/PollingPlacesController.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.Data;
 using Web.ApiDTO;
 

diff --git a/Web/ApiControllers/RacesApiController.cs b/Web/ApiControllers/RacesApiController.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Web.ApiDTO;
 using Web.Data;
-using Web.Models;
+using PlanYourVoteLibrary2;
 
 namespace Web.Controllers
 {

diff --git a/Web/ApiControllers/SocialMediasAPIController.cs b/Web/ApiControllers/SocialMediasAPIController.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Web.Data;
-using Web.Models;
+using PlanYourVoteLibrary2;
 
 namespace Web.ApiControllers
 {

diff --git a/Web/ApiControllers/StepsApiController.cs b/Web/ApiControllers/StepsApiController.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Web.Data;
-using Web.Models;
+using PlanYourVoteLibrary2;
 
 namespace Web.ApiControllers
 {

diff --git a/Web/ApiControllers/ThemesController.cs b/Web/ApiControllers/ThemesController.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.Data;
 
 namespace Web.ApiControllers

diff --git a/Web/CmsControllers/BallotIssuesController.cs b/Web/CmsControllers/BallotIssuesController.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Web.Data;
-using Web.Models;
+using PlanYourVoteLibrary2;
 using Web.ViewModels;
 
 namespace Web