diff --git a/BookStoreMVC.sln b/BookStoreMVC.sln index 064a8d7..b6474c2 100644 --- a/BookStoreMVC.sln +++ b/BookStoreMVC.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30711.63 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "eShopSolution.WebApp", "eShopSolution.WebApp\eShopSolution.WebApp.csproj", "{B3DD9B83-FF04-47FB-A39D-9FD98EE4E685}" EndProject diff --git a/EmailService/EmailService.cs b/EmailService/EmailService.cs index 5faa896..9d9036f 100644 --- a/EmailService/EmailService.cs +++ b/EmailService/EmailService.cs @@ -33,7 +33,8 @@ public void Send(string from, string to, string subject, string text) // send email using var smtp = new SmtpClient(); smtp.Connect("smtp.gmail.com", 587, SecureSocketOptions.StartTls); - smtp.Authenticate("hytranluan@gmail.com", ""); + smtp.Authenticate("nguyenthanhtoanx2@gmail.com", "kvkh jioj hies lrjn"); + try { diff --git a/EmailService/EmailService.csproj b/EmailService/EmailService.csproj index 49f77eb..f32a9a3 100644 --- a/EmailService/EmailService.csproj +++ b/EmailService/EmailService.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 53b66b0..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 luanhytran - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 1fc101d..fbd3860 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ - Admin App - template : https://startbootstrap.com/template/sb-admin - Tich hop api +- ..... +- Sử dụng kĩ thuât Left-join trong csdl để gán sản phẩm vào danh mục 26: Cookie Authentication va Login Logout ## Cấu hình và Run * Git clone @@ -38,4 +40,5 @@ * Thay đổi kết nối cơ sở dữ liệu trong appsinstall.Development.json trong dự án eShopSolution.WebApp * Chọn 3 project BackEndApi-AdminApp-WebApp thành self-host * Chọn multiple run project: Chuột phải vào Solution và choose Properties and set Multiple Project, choose Start for 3 Projects: BackendApi, WebApp and AdminApp -* Build Prj và F5 \ No newline at end of file +* Build Prj và F5 +* Done \ No newline at end of file diff --git a/eShopSolution.AdminApp/Views/Home/Index.cshtml b/eShopSolution.AdminApp/Views/Home/Index.cshtml index f1649ef..807b69f 100644 --- a/eShopSolution.AdminApp/Views/Home/Index.cshtml +++ b/eShopSolution.AdminApp/Views/Home/Index.cshtml @@ -77,7 +77,7 @@ DataTable Example -
+ @*
@@ -560,6 +560,6 @@
-
+
*@ diff --git a/eShopSolution.AdminApp/Views/Login/Index.cshtml b/eShopSolution.AdminApp/Views/Login/Index.cshtml index cb830dc..d01bc29 100644 --- a/eShopSolution.AdminApp/Views/Login/Index.cshtml +++ b/eShopSolution.AdminApp/Views/Login/Index.cshtml @@ -56,7 +56,7 @@
-
Bản quyền thuộc © Electro Store 2021
+
Bản quyền thuộc © Electro Store 2023
diff --git a/eShopSolution.AdminApp/Views/Product/Details.cshtml b/eShopSolution.AdminApp/Views/Product/Details.cshtml index adf96e9..330cdb8 100644 --- a/eShopSolution.AdminApp/Views/Product/Details.cshtml +++ b/eShopSolution.AdminApp/Views/Product/Details.cshtml @@ -53,7 +53,7 @@ - Chi tiết sản phẩm + Thông tin sản phầm @{ diff --git a/eShopSolution.AdminApp/Views/Shared/Components/Navigation/Default.cshtml b/eShopSolution.AdminApp/Views/Shared/Components/Navigation/Default.cshtml index aa711a6..624b3f7 100644 --- a/eShopSolution.AdminApp/Views/Shared/Components/Navigation/Default.cshtml +++ b/eShopSolution.AdminApp/Views/Shared/Components/Navigation/Default.cshtml @@ -1,6 +1,6 @@ @model NavigationViewModel