Made some updates

*Application based on the manuscript is fully functional and ready for deployment

GigisCakesAndPastries/GigisCakesAndPastries.sln

@@ -5,7 +5,9 @@ VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GigisCakesAndPastries", "GigisCakesAndPastries\GigisCakesAndPastries.csproj", "{2B1C6970-373C-417C-AD31-2B0732C94E8F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GigisCakesAndPastriesGUI", "GigisCakesAndPastriesGUI\GigisCakesAndPastriesGUI.csproj", "{9E21375F-EC76-4A34-BB97-55218626353E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GigisCakesAndPastriesGUI", "GigisCakesAndPastriesGUI\GigisCakesAndPastriesGUI.csproj", "{9E21375F-EC76-4A34-BB97-55218626353E}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "GigisCakesAndPastriesSetup", "GigisCakesAndPastriesSetup\GigisCakesAndPastriesSetup.vdproj", "{7F9FC0AB-B504-42BA-B6C6-745C57DA54F8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,8 @@ Global
 		{9E21375F-EC76-4A34-BB97-55218626353E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E21375F-EC76-4A34-BB97-55218626353E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E21375F-EC76-4A34-BB97-55218626353E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F9FC0AB-B504-42BA-B6C6-745C57DA54F8}.Debug|Any CPU.ActiveCfg = Debug
+		{7F9FC0AB-B504-42BA-B6C6-745C57DA54F8}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GigisCakesAndPastries/GigisCakesAndPastries/ClassDiagram1.cd

@@ -3,7 +3,7 @@
   <Class Name="GigisCakesAndPastries.Admin">
     <Position X="1.5" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=</HashCode>
       <FileName>Admin.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
@@ -31,36 +31,24 @@
   <Class Name="GigisCakesAndPastries.Customer" Collapsed="true">
     <Position X="4.75" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAEAAIAAABAAAAAAAIAGAAEAAAAAAAABAAAgAACQ=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAgAAEA=</HashCode>
       <FileName>Customer.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="GigisCakesAndPastries.Database" Collapsed="true">
     <Position X="9" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>MAFiDACACCMAAAAAwhBIAQMBAAFIjgAgRAAggAgQUIA=</HashCode>
       <FileName>Database.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="GigisCakesAndPastries.Ingredients" Collapsed="true">
     <Position X="10.75" Y="2.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAIAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAgAAAAAAAAIAAAAAQAAACAAAAAAQAAgAAAAAA=</HashCode>
       <FileName>Ingredients.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="GigisCakesAndPastries.Inventory" Collapsed="true">
-    <Position X="9.75" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AASABACAAACAAAAAACAAAAQIIIAABAQAABBAAAAAAAA=</HashCode>
-      <FileName>Inventory.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsCollectionAssociation>
-      <Field Name="Cake" />
-      <Field Name="Ingredient" />
-      <Field Name="Pastry" />
-    </ShowAsCollectionAssociation>
-  </Class>
   <Class Name="GigisCakesAndPastries.Pastries" Collapsed="true">
     <Position X="5.25" Y="5" Width="1.5" />
     <TypeIdentifier>
@@ -71,18 +59,14 @@
   <Class Name="GigisCakesAndPastries.Products" Collapsed="true">
     <Position X="3.5" Y="2.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>EAAAAAAAAQAAgAAAAAAAAAQEAAAAAAAAAQAAoAAAAAA=</HashCode>
+      <HashCode>EAAAAAAAAQAAgAAAAAAAAAAAAACAAAAAAQAAgAAIAAA=</HashCode>
       <FileName>Products.cs</FileName>
     </TypeIdentifier>
-    <ShowAsCollectionAssociation>
-      <Field Name="Cakes" />
-      <Field Name="Pastries" />
-    </ShowAsCollectionAssociation>
   </Class>
   <Class Name="GigisCakesAndPastries.User" Collapsed="true">
     <Position X="3.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAACAAgAAAAQAAQAwAABAAAAACAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAECAACAAgAAAAQAQQAwABBAAAAAGAAAAAAAAAAA=</HashCode>
       <FileName>User.cs</FileName>
     </TypeIdentifier>
   </Class>

GigisCakesAndPastries/GigisCakesAndPastries/UserContext.cs → GigisCakesAndPastries/GigisCakesAndPastries/Config.cs

@@ -6,8 +6,8 @@
 
 namespace GigisCakesAndPastries
 {
-    public static class UserContext
+    public class Config
     {
-        public static List<string> UsersCntxt { get; } = new List<string>();
+        public bool IsFirstTimeInstallation { get; set; }
     }
 }

GigisCakesAndPastries/GigisCakesAndPastries/Customer.cs

@@ -9,7 +9,7 @@ namespace GigisCakesAndPastries
 {
     public class Customer : User
     {
-        public int LoyaltyPoints { get; private set; }
+        public int LoyaltyPoints { get; set; }
         internal List<Products> FavouriteProducts = new List<Products>();
         public Customer(string id, string surname, string firstName, string middleName, string email, string username, string password, string phoneNumber, string address, string birthMonth, string birthDate, string birthYear, DateTime accountDateCreatead) : base(id, surname, firstName, middleName, email, username, password, phoneNumber, address, birthMonth, birthDate, birthYear, accountDateCreatead)
         {

GigisCakesAndPastries/GigisCakesAndPastries/Database.cs

@@ -124,25 +124,29 @@ public static void CreateFileToGoogleDrive()
         public static void SerializeAdmin()
         {
             string contents = JsonConvert.SerializeObject(Admins);
+            contents = encryptDecrypt(contents);
             File.WriteAllText(AdminListFileName, contents);
         }
 
         public static void DeserializeAdmin()
         {
             string contents = File.ReadAllText(Path.Combine(downloadPath, AdminListFileName));
-            Admins = JsonConvert.DeserializeObject<List<Admin>>(contents);
+            string decryptedContents = encryptDecrypt(contents);
+            Admins = JsonConvert.DeserializeObject<List<Admin>>(decryptedContents);
         }
 
         public static void SerializeCustomers()
         {
             string contents = JsonConvert.SerializeObject(Customers);
+            contents = encryptDecrypt(contents);
             File.WriteAllText(CustomerListFileName, contents);
         }
 
         public static void DeserializeCustomers()
         {
             string contents = File.ReadAllText(Path.Combine(downloadPath, CustomerListFileName));
-            Customers = JsonConvert.DeserializeObject<List<Customer>>(contents);
+            string decryptedContents = encryptDecrypt(contents);
+            Customers = JsonConvert.DeserializeObject<List<Customer>>(decryptedContents);
         }
         public static void SerializeProduct()
         {

GigisCakesAndPastries/GigisCakesAndPastries/GigisCakesAndPastries.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Drive.v2" Version="1.60.0.3058" />
-    <PackageReference Include="Google.Apis.Drive.v3" Version="1.60.0.3034" />
+    <PackageReference Include="Google.Apis.Drive.v2" Version="1.60.0.3075" />
+    <PackageReference Include="Google.Apis.Drive.v3" Version="1.60.0.3082" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

GigisCakesAndPastries/GigisCakesAndPastries/GigisCakesAndPastries.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_LastSelectedProfileId>C:\Users\ROG\Desktop\Rain Files\2Y2ndSem\Application Dev\FinalProject\GigisCakesAndPastries\GigisCakesAndPastries\GigisCakesAndPastries\Properties\PublishProfiles\ClickOnceProfile.pubxml</_LastSelectedProfileId>
+  </PropertyGroup>
+</Project>

GigisCakesAndPastries/GigisCakesAndPastries/Program.cs

@@ -11,7 +11,7 @@ public static void Main(string[] args)
 
         //DateTime dt = new DateTime(2002, 09, 09);
 
-        /*Admin rene = new Admin("00-00", "de los Reyes", "Rene Angelo", "Gonzalo", "rendzdelosreyes@gmail.com", "rendznicoy", "sadude75","09991980065", "Ormoc City", 1, 9, 2002, DateTime.Now);
+        /*Admin rene = new Admin("00-00", "de los Reyes", "Rene Angelo", "Gonzalo", "rendzdelosreyes@gmail.com", "rendznicoy", "sadude75", "09991980065", "Ormoc City", "September", "9", "2002", DateTime.Now);
 
         Database.Admins.Add(rene);
 
@@ -44,5 +44,11 @@ public static void Main(string[] args)
         /*Database.Product.Clear();
         Database.SerializeOrder();
         Database.UploadOrderList();*/
+        /*Admin admin = new Admin("", "", "", "", "", "admin123", "admin123", "", "", "", "", "", DateTime.Now);
+
+        Database.Admins.Add(admin);
+
+        Database.SerializeAdmin();
+        Database.UploadAdminList();*/
     }
 }

GigisCakesAndPastries/GigisCakesAndPastries/User.cs

@@ -17,14 +17,14 @@ public abstract class User
         public string Email { get; set; }
         public string Username { get; set; }
 
-        [JsonRequired]
-        private string Password;
         public string PhoneNumber { get; set; }
         public string Address { get; set; }
         public string BirthMonth { get; set; }
         public string BirthDate { get; set; }
         public string BirthYear { get; set; }
         public DateTime AccountDateCreatead { get; set; }
+        [JsonRequired]
+        private string Password;
 
         public User (string id, string surname, string firstName, string middleName, string email, string username, string password, string phoneNumber, string address, string birthMonth, string birthDate, string birthYear, DateTime accountDateCreatead)
         {

GigisCakesAndPastries/GigisCakesAndPastries/bin/Debug/net6.0/GigisCakesAndPastries.deps.json

@@ -8,8 +8,8 @@
     ".NETCoreApp,Version=v6.0": {
       "GigisCakesAndPastries/1.0.0": {
         "dependencies": {
-          "Google.Apis.Drive.v2": "1.60.0.3058",
-          "Google.Apis.Drive.v3": "1.60.0.3034",
+          "Google.Apis.Drive.v2": "1.60.0.3075",
+          "Google.Apis.Drive.v3": "1.60.0.3082",
           "Newtonsoft.Json": "13.0.3"
         },
         "runtime": {
@@ -54,27 +54,27 @@
           }
         }
       },
-      "Google.Apis.Drive.v2/1.60.0.3058": {
+      "Google.Apis.Drive.v2/1.60.0.3075": {
         "dependencies": {
           "Google.Apis": "1.60.0",
           "Google.Apis.Auth": "1.60.0"
         },
         "runtime": {
           "lib/netstandard2.0/Google.Apis.Drive.v2.dll": {
-            "assemblyVersion": "1.60.0.3058",
-            "fileVersion": "1.60.0.3058"
+            "assemblyVersion": "1.60.0.3075",
+            "fileVersion": "1.60.0.3075"
           }
         }
       },
-      "Google.Apis.Drive.v3/1.60.0.3034": {
+      "Google.Apis.Drive.v3/1.60.0.3082": {
         "dependencies": {
           "Google.Apis": "1.60.0",
           "Google.Apis.Auth": "1.60.0"
         },
         "runtime": {
           "lib/netstandard2.0/Google.Apis.Drive.v3.dll": {
-            "assemblyVersion": "1.60.0.3034",
-            "fileVersion": "1.60.0.3034"
+            "assemblyVersion": "1.60.0.3082",
+            "fileVersion": "1.60.0.3082"
           }
         }
       },
@@ -115,19 +115,19 @@
       "path": "google.apis.core/1.60.0",
       "hashPath": "google.apis.core.1.60.0.nupkg.sha512"
     },
-    "Google.Apis.Drive.v2/1.60.0.3058": {
+    "Google.Apis.Drive.v2/1.60.0.3075": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-pHr7Q35/r+OTRNYh56YSMAgimNV5QA7JPW33je5SxcehYH/HJi84vbFydL0mHkgxPvFf+cE0F7t67RCLiAWzAw==",
-      "path": "google.apis.drive.v2/1.60.0.3058",
-      "hashPath": "google.apis.drive.v2.1.60.0.3058.nupkg.sha512"
+      "sha512": "sha512-p5BGGMe2gbKcuqNCxL7rImkRpOXUapI2MFY/Y+jrd3mJiAFQFSvFDK6+V7AmmD3aEwTmJ7LY/1ihtlpnuIMhyg==",
+      "path": "google.apis.drive.v2/1.60.0.3075",
+      "hashPath": "google.apis.drive.v2.1.60.0.3075.nupkg.sha512"
     },
-    "Google.Apis.Drive.v3/1.60.0.3034": {
+    "Google.Apis.Drive.v3/1.60.0.3082": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-4mM3c4/IDs2Uzk0ciQZf0iIlP9XpHM3BLieEEL4rzPNYtuXDS/HntLytQU5h1856DIIA7SP/DprodLyEEgJLcA==",
-      "path": "google.apis.drive.v3/1.60.0.3034",
-      "hashPath": "google.apis.drive.v3.1.60.0.3034.nupkg.sha512"
+      "sha512": "sha512-cQOAJI0gQtOQ1gXdrmyjLWT/XjTSzfWuXNRz2fDiXC9JUjMi905w7/nO2Wkq/4Bmb8/onxgF4wZF9+Yal5R2DQ==",
+      "path": "google.apis.drive.v3/1.60.0.3082",
+      "hashPath": "google.apis.drive.v3.1.60.0.3082.nupkg.sha512"
     },
     "Newtonsoft.Json/13.0.3": {
       "type": "package",