update

Dacoband · Apr 7, 2024 · dde7656 · dde7656
1 parent 81060e8
commit dde7656
Show file tree

Hide file tree

Showing 36 changed files with 164 additions and 165 deletions.
diff --git a/README.md b/README.md
@@ -36,20 +36,15 @@
       - Sign Up Page :
         ![SignUpPage](UI/SignUpPage.png)
     - ### **Admin Page :**
-      - *Manage* :
+      - *Manage : The Admin page will be for accounts with the Admin role and the Admin will manage all parameters about the Artwork, User, and Order of the User, along with a statistics table of the number of visits of the Artwork.*
         - Statistics :
-          ![StatisticsPage](Figma/AdminStatictisc.png)
-        - Transaction Logs : 
-          ![TransactionLogsPage](Figma/TransactionLogs.png)
-        - Manage Users :
-          ![ManageUsersPage](Figma/ManageUsers.png)
-      - *Moderator* :
-        - View Reports :
-          ![ViewReportsPage](Figma/ViewReports.png)
-        - Mod Supports :
-          ![ModSupportPage](Figma/ModSupport.png)
-        - Banned Listed :
-          ![BannedListPage](Figma/BannedList.png)
+          ![StatisticsPage](UI/AdminOveriew.png)
+        - List Of Users : 
+          ![ListOfUser](UI/AdminListOfUser.png)
+        - List Of Report :
+          ![ListOfReport](UI/AdminListReport.png)
+        - Manage Orders :
+          ![ViewReportsPage](UI/AdminManagerOrder.png)
     - ### **Users Page :**
       - *Home Page LightMode* :
         ![HomePage](UI/LightHomePage.png)
@@ -58,11 +53,13 @@
         - *Home Page Nav-Bar * :
         ![HomePage](UI/NavBar2.png)
         ![HomePage](UI/navBar3.png)
-      <!-- Sẽ cập nhật sau -->
+      - *Upgrade to Premium* :
+        ![UpgradeToPremiumPage](UI/AccountPackage.png)
+      - *My Profile* :
+        ![MyProfilePage](UI/ProfileUserPage.png)
   - ### Future Advancement
   - ### Limitation
 
-
 - # Specifications
    - ### Process 1 Register An Account :
       - Send form to Guest to register
@@ -76,54 +73,53 @@
       - Check whether it is a guest or a user to grant permissions to the user
       - If you are a guest, you do not have the right to buy, sell or post works on the website
       - User or Admin has the right to create products, add, remove, delete... (Only admin has the right to edit User rights.)
+    - ## Process 3 Artwork Management
+      - Artists will be responsible for the management of their Artwork
 
-## Process 3 Artwork Management
-• Artists will be responsible for the management of their Artwork
-
-• Name
+      - Name
 
-• Description
+      - Description
 
-• Tag
+      - Tag
 
-• Purchasable
+      - Purchasable
 
-• Price (If Artwork unpurchasable, artist can not set price)
+      - Price (If Artwork unpurchasable, artist can not set price)
 
-## Process 4 Get Product Details
+    - ## Process 4 Get Product Details
 
-• The website sends detailed information about the work to customers in a new website
+      - The website sends detailed information about the work to customers in a new website
 
-• Name
+      - Name
 
-• Information
+      - Information
 
-• The Review of the work
+      - The Review of the work
 
-## Process 5 Cart Management
+    - ## Process 5 Cart Management
 
-• Create a cart if the cart is empty
+      - Create a cart if the cart is empty
 
-• Add to cart (detail to cart)
+      - Add to cart (detail to cart)
 
-• Name
+      - Name
 
-• Delete 1
+      - Delete 1
 
-• Update the cart when the user makes adjustments
+      - Update the cart when the user makes adjustments
 
-• Delete the entire cart
+      - Delete the entire cart
 
-• Go to payment
+      - Go to payment
 
-## Process 6 Payment Management
+    - ## Process 6 Payment Management
 
-• The store allows customers to choose payment methods in many ways:
+      - The store allows customers to choose payment methods in many ways:
 
-• Directly text the artist: Message the artist directly to make payment
+      - Directly text the artist: Message the artist directly to make payment
 
-• Indirect: Online payment via banking app or apps like MOMO, ZaloPay, etc.
+      - Indirect: Online payment via banking app or apps like MOMO, ZaloPay, etc.
 
-• Apply discount code
+      - Apply discount code
 
-• Check whether the payment is successful or not sent by the web side that accepts the payment (if successful, go back to the payment details page and show a successful payment popup to the customer/ if it fails, go back to the cart page and show payment failed)
+      - Check whether the payment is successful or not sent by the web side that accepts the payment (if successful, go back to the payment details page and show a successful payment popup to the customer/ if it fails, go back to the cart page and show payment failed)
diff --git a/UI/AccountPackage.png b/UI/AccountPackage.png
diff --git a/UI/AdminListOfUser.png b/UI/AdminListOfUser.png
diff --git a/UI/AdminListReport.png b/UI/AdminListReport.png
diff --git a/UI/AdminManagerOrder.png b/UI/AdminManagerOrder.png
diff --git a/UI/AdminOveriew.png b/UI/AdminOveriew.png
diff --git a/UI/ArtworkDetailPaid.png b/UI/ArtworkDetailPaid.png
diff --git a/UI/ArtworkDetailUnpaid.png b/UI/ArtworkDetailUnpaid.png
diff --git a/UI/DarkHomePage.png b/UI/DarkHomePage.png
diff --git a/UI/InfoPackageCheckout.png b/UI/InfoPackageCheckout.png
diff --git a/UI/LightHomePage.png b/UI/LightHomePage.png
diff --git a/UI/MyDashboardCreator.png b/UI/MyDashboardCreator.png
diff --git a/UI/MyShop.png b/UI/MyShop.png
diff --git a/UI/NavBar2.png b/UI/NavBar2.png
diff --git a/UI/ProfileUserPage.png b/UI/ProfileUserPage.png
diff --git a/UI/ShareArtwork.png b/UI/ShareArtwork.png
diff --git a/UI/ShopPage.png b/UI/ShopPage.png
diff --git a/UI/TransactionHistory.png b/UI/TransactionHistory.png
diff --git a/UI/YourCommission.png b/UI/YourCommission.png
diff --git a/UI/YourRequest.png b/UI/YourRequest.png
diff --git a/backend/backend/bin/Debug/net8.0/backend.dll b/backend/backend/bin/Debug/net8.0/backend.dll
diff --git a/backend/backend/bin/Debug/net8.0/backend.pdb b/backend/backend/bin/Debug/net8.0/backend.pdb
diff --git a/backend/backend/obj/Debug/net8.0/backend.AssemblyInfo.cs b/backend/backend/obj/Debug/net8.0/backend.AssemblyInfo.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -14,11 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("backend")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fa5491d5c5943cc7215f25dc38d00f75c85eeab4")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+038832d18c17cab27039566ff7c5112686b5176b")]
->>>>>>> 0ea161f8edef38cec809ad8d09bf82d61172ec54
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+81060e825d6ed74b00e151db9e01d8160c0e44fb")]
 [assembly: System.Reflection.AssemblyProductAttribute("backend")]
 [assembly: System.Reflection.AssemblyTitleAttribute("backend")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/backend/backend/obj/Debug/net8.0/backend.AssemblyInfoInputs.cache b/backend/backend/obj/Debug/net8.0/backend.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d40937c8750d77f7bee2479dcde8654ae8eeae8063cdd5ca8cc0d6e17f811333
-=======
-2d4fea4777a36363bb7c8e67af2598ab2b0bf9097f4d42c95fd7da9436b1f726
->>>>>>> 0ea161f8edef38cec809ad8d09bf82d61172ec54
+9daa868aca9b20db7dc5ca2c2ccdc237a1578786c3a34489432c4f4f7a357e91
diff --git a/backend/backend/obj/Debug/net8.0/backend.GeneratedMSBuildEditorConfig.editorconfig b/backend/backend/obj/Debug/net8.0/backend.GeneratedMSBuildEditorConfig.editorconfig
@@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = backend
 build_property.RootNamespace = backend
-build_property.ProjectDir = /Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/
+build_property.ProjectDir = D:\FPT_Learning\SWP391\SWP391-Artix\backend\backend\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.RazorLangVersion = 8.0
 build_property.SupportLocalizedComponentNames = 
 build_property.GenerateRazorMetadataSourceChecksumAttributes = 
-build_property.MSBuildProjectDirectory = /Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend
+build_property.MSBuildProjectDirectory = D:\FPT_Learning\SWP391\SWP391-Artix\backend\backend
 build_property._RazorSourceGeneratorDebug = 
diff --git a/backend/backend/obj/Debug/net8.0/backend.assets.cache b/backend/backend/obj/Debug/net8.0/backend.assets.cache
diff --git a/backend/backend/obj/Debug/net8.0/backend.csproj.CoreCompileInputs.cache b/backend/backend/obj/Debug/net8.0/backend.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-25221db736853f47a87e9a1420a9d1c38c60b13a0ea094d229ff704495baf18e
+5b74669c9911d8c8d687dbc9776825823556bb836a3278a066529aaf22c95f53
diff --git a/backend/backend/obj/Debug/net8.0/backend.dll b/backend/backend/obj/Debug/net8.0/backend.dll
diff --git a/backend/backend/obj/Debug/net8.0/backend.pdb b/backend/backend/obj/Debug/net8.0/backend.pdb
diff --git a/backend/backend/obj/Debug/net8.0/ref/backend.dll b/backend/backend/obj/Debug/net8.0/ref/backend.dll
diff --git a/backend/backend/obj/Debug/net8.0/refint/backend.dll b/backend/backend/obj/Debug/net8.0/refint/backend.dll
diff --git a/backend/backend/obj/backend.csproj.nuget.dgspec.json b/backend/backend/obj/backend.csproj.nuget.dgspec.json
@@ -1,26 +1,27 @@
 {
   "format": 1,
   "restore": {
-    "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj": {}
+    "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj": {}
   },
   "projects": {
-    "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj": {
+    "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj",
+        "projectUniqueName": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj",
         "projectName": "backend",
-        "projectPath": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj",
-        "packagesPath": "/Users/hendrix/.nuget/packages/",
-        "outputPath": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/obj/",
+        "projectPath": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj",
+        "packagesPath": "C:\\Users\\bolic\\.nuget\\packages\\",
+        "outputPath": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
-          "/Users/hendrix/.nuget/NuGet/NuGet.Config"
+          "C:\\Users\\bolic\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
           "net8.0"
         ],
         "sources": {
-          "/usr/local/share/dotnet/library-packs": {},
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -33,6 +34,11 @@
           "warnAsError": [
             "NU1605"
           ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
         }
       },
       "frameworks": {
@@ -123,7 +129,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.201/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/backend/backend/obj/backend.csproj.nuget.g.props b/backend/backend/obj/backend.csproj.nuget.g.props
@@ -4,23 +4,23 @@
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/hendrix/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/hendrix/.nuget/packages/</NuGetPackageFolders>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\bolic\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.4.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.9.1</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="/Users/hendrix/.nuget/packages/" />
+    <SourceRoot Include="C:\Users\bolic\.nuget\packages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server/6.0.5/build/Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server/6.0.5/build/Microsoft.Extensions.ApiDescription.Server.props')" />
-    <Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore/6.5.0/build/Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore/6.5.0/build/Swashbuckle.AspNetCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore/8.0.3/buildTransitive/net8.0/Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore/8.0.3/buildTransitive/net8.0/Microsoft.EntityFrameworkCore.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design/8.0.3/build/net8.0/Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design/8.0.3/build/net8.0/Microsoft.EntityFrameworkCore.Design.props')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props')" />
+    <Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\8.0.3\buildTransitive\net8.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\8.0.3\buildTransitive\net8.0\Microsoft.EntityFrameworkCore.props')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design\8.0.3\build\net8.0\Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design\8.0.3\build\net8.0\Microsoft.EntityFrameworkCore.Design.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">/Users/hendrix/.nuget/packages/microsoft.extensions.apidescription.server/6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">/Users/hendrix/.nuget/packages/microsoft.codeanalysis.analyzers/3.3.3</PkgMicrosoft_CodeAnalysis_Analyzers>
-    <PkgMicrosoft_EntityFrameworkCore_Tools Condition=" '$(PkgMicrosoft_EntityFrameworkCore_Tools)' == '' ">/Users/hendrix/.nuget/packages/microsoft.entityframeworkcore.tools/8.0.3</PkgMicrosoft_EntityFrameworkCore_Tools>
+    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\bolic\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
+    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\bolic\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.3</PkgMicrosoft_CodeAnalysis_Analyzers>
+    <PkgMicrosoft_EntityFrameworkCore_Tools Condition=" '$(PkgMicrosoft_EntityFrameworkCore_Tools)' == '' ">C:\Users\bolic\.nuget\packages\microsoft.entityframeworkcore.tools\8.0.3</PkgMicrosoft_EntityFrameworkCore_Tools>
   </PropertyGroup>
 </Project>
diff --git a/backend/backend/obj/project.assets.json b/backend/backend/obj/project.assets.json
@@ -3897,25 +3897,26 @@
     ]
   },
   "packageFolders": {
-    "/Users/hendrix/.nuget/packages/": {}
+    "C:\\Users\\bolic\\.nuget\\packages\\": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj",
+      "projectUniqueName": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj",
       "projectName": "backend",
-      "projectPath": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/backend.csproj",
-      "packagesPath": "/Users/hendrix/.nuget/packages/",
-      "outputPath": "/Volumes/Ze_Data/Document/ReactProjects/SWP391-Artix/backend/backend/obj/",
+      "projectPath": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\backend.csproj",
+      "packagesPath": "C:\\Users\\bolic\\.nuget\\packages\\",
+      "outputPath": "D:\\FPT_Learning\\SWP391\\SWP391-Artix\\backend\\backend\\obj\\",
       "projectStyle": "PackageReference",
       "configFilePaths": [
-        "/Users/hendrix/.nuget/NuGet/NuGet.Config"
+        "C:\\Users\\bolic\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "net8.0"
       ],
       "sources": {
-        "/usr/local/share/dotnet/library-packs": {},
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -3928,6 +3929,11 @@
         "warnAsError": [
           "NU1605"
         ]
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
       }
     },
     "frameworks": {
@@ -4018,7 +4024,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.201/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
       }
     }
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		25221db736853f47a87e9a1420a9d1c38c60b13a0ea094d229ff704495baf18e
		5b74669c9911d8c8d687dbc9776825823556bb836a3278a066529aaf22c95f53