refactor: data and global

Author: doddgu

MASA.Blazor.Pro/App.razor

@@ -1,4 +1,4 @@
-@inject GlobalConfigs ScopedGlobalConfigs;
+@inject GlobalConfig ScopedGlobalConfig;
 @inject I18n I18n
 
 <CascadingAuthenticationState>
@@ -17,22 +17,22 @@
 </CascadingAuthenticationState>
 
 @code {
-    private GlobalConfigs? _globalConfig;
+    private GlobalConfig? _globalConfig;
 
     [Parameter]
-    public GlobalConfigs GlobalConfigs
+    public GlobalConfig GlobalConfig
     {
-        get => _globalConfig ?? throw new Exception("Please set parameter GlobalConfig!");
+        get => _globalConfig ?? throw new Exception("Please configure the GlobalConfig first!");
         set => _globalConfig = value;
     }
 
     protected override void OnInitialized()
     {
-        ScopedGlobalConfigs.Bind(GlobalConfigs);
+        ScopedGlobalConfig.Bind(GlobalConfig);
 
-        if (ScopedGlobalConfigs.I18nConfig?.Language is not null)
+        if (ScopedGlobalConfig.I18nConfig?.Language is not null)
         {
-            I18n.SetLang(ScopedGlobalConfigs.I18nConfig.Language);
+            I18n.SetLang(ScopedGlobalConfig.I18nConfig.Language);
         }
     }
 }

MASA.Blazor.Pro/Data/App/ECommerce/BasketService.cs

@@ -0,0 +1,17 @@
+namespace MASA.Blazor.Pro.Data.App.ECommerce;
+
+public static class BasketService
+{
+    public static BasketDto Get() => new BasketDto()
+    {
+        Items = new List<BasketItemDto>
+        {
+            new BasketItemDto(1,"Apple Watch Series 5","Apple",4,1,"Delivery by Sun, Nov 28","12% off 3 offers Available",339.99m,"1.png",true),
+            new BasketItemDto(2,"Google - Google Home - White/Slate fabric","Google",4,1,"Delivery by Wed, Dec 1","16% off 1 offers Available",129.29m,"7.png",true),
+            new BasketItemDto(3,"Apple iPhone 11 (64GB, Black)","Apple",5,1,"Delivery by Thu, Nov 25","8% off 1 offers Available",669.99m,"2.png",true),
+            new BasketItemDto(4,"Apple iMac 27-inch","Apple",4,1,"Delivery by Mon, Nov 29","3% off 4 offers Available",999.99m,"3.png",true),
+            new BasketItemDto(5,"Apple - MacBook Air® (Latest Model) - 13.3\" Display - Silver","Apple",4,1,"Delivery by Sun, Nov 28","17% off 4 offers Available",999.99m,"5.png",false)
+        }
+    };
+}
+

MASA.Blazor.Pro/Data/App/ECommerce/Dto/BasketDto.cs

@@ -0,0 +1,5 @@
+namespace MASA.Blazor.Pro.Data.App.ECommerce.Dto;
+public class BasketDto
+{
+    public List<BasketItemDto> Items { get; set; } = new List<BasketItemDto>();
+}

MASA.Blazor.Pro/Pages/Apps/ECommerce/Order/ViewModel/CustomerBasket.cs renamed to MASA.Blazor.Pro/Data/App/ECommerce/Dto/BasketItemDto.cs

@@ -1,13 +1,8 @@
-namespace MASA.Blazor.Pro.Pages;
+namespace MASA.Blazor.Pro.Data.App.ECommerce.Dto;
 
-public class CustomerBasket
+public class BasketItemDto
 {
-    public List<BasketItem> Items { get; set; } = new List<BasketItem>();
-}
-
-public class BasketItem
-{
-    public BasketItem(int id, string name, string company, float score, int qty, string delivery,
+    public BasketItemDto(int id, string name, string company, float score, int qty, string delivery,
         string offers, decimal price, string pictureFileName, bool freeShipping)
     {
         Id = id;
@@ -52,5 +47,3 @@ public string GetPictureUrl()
         return $"./img/apps-eCommerce/{PictureFileName}";
     }
 }
-
-

MASA.Blazor.Pro/Data/App/ECommerce/Dto/GoodsDto.cs

@@ -0,0 +1,47 @@
+namespace MASA.Blazor.Pro.Data.App.ECommerce.Dto;
+
+public class GoodsDto
+{
+    public Guid Id { get; init; }
+
+    public string Name { get; init; }
+
+    public string Description { get; init; }
+
+    public double Price { get; init; }
+
+    public string PictureFile { get; init; }
+
+    public string Category { get; set; }
+
+    public int Rating { get; set; }
+
+    public string Brand { get; set; }
+
+    public bool Favorite { get; set; }
+
+    public GoodsDto(string name, double price, string pictureFile, string category, int rating, string brand, string description)
+    {
+        Id = Guid.NewGuid();
+        Name = name;
+        Description = description;
+        Price = price;
+        PictureFile = pictureFile;
+        Category = category;
+        Rating = rating;
+        Brand = brand;
+    }
+
+    public GoodsDto(Guid id,string name, double price, string pictureFile, string category, int rating, string brand, string description)
+    {
+        Id = id;
+        Name = name;
+        Description = description;
+        Price = price;
+        PictureFile = pictureFile;
+        Category = category;
+        Rating = rating;
+        Brand = brand;
+    }
+}
+

MASA.Blazor.Pro/Data/App/ECommerce/Dto/RelatedGoodsDto.cs

@@ -0,0 +1,24 @@
+namespace MASA.Blazor.Pro.Data.App.ECommerce.Dto;
+
+public class RelatedGoodsDto
+{
+    public string ImgUrl { get; set; } = default!;
+
+    public string Name { get; set; } = default!;
+
+    public string Brand { get; set; } = default!;
+
+    public int Rating { get; set; }
+
+    public decimal Price { get; set; }
+
+    public RelatedGoodsDto(string name, string brand, string imgUrl, decimal price, int rating)
+    {
+        Name = name;
+        Brand = brand;
+        ImgUrl = imgUrl;
+        Price = price;
+        Rating = rating;
+    }
+}
+

MASA.Blazor.Pro/Data/AppsECommerce/ShopData.cs renamed to MASA.Blazor.Pro/Data/App/ECommerce/ShopService.cs

@@ -1,41 +1,8 @@
-namespace MASA.Blazor.Pro.Data;
+namespace MASA.Blazor.Pro.Data.App.ECommerce;
 
-public class ShopDataItem
+public class ShopService
 {
-    public ShopDataItem(string name, double price, string pictureFile, string category, int rating, string brand, string description, Guid? guid = null)
-    {
-        Id = guid ?? Guid.NewGuid();
-        Name = name;
-        Description = description;
-        Price = price;
-        PictureFile = pictureFile;
-        Category = category;
-        Rating = rating;
-        Brand = brand;
-    }
-
-    public Guid Id { get; init; }
-
-    public string Name { get; init; }
-
-    public string Description { get; init; }
-
-    public double Price { get; init; }
-
-    public string PictureFile { get; init; }
-
-    public string Category { get; set; }
-
-    public int Rating { get; set; }
-
-    public string Brand { get; set; }
-
-    public bool Favorite { get; set; }
-}
-
-public static class ShopDataService
-{
-    public static List<ShopDataItem> ShopDataItems = new List<ShopDataItem>
+    public static List<GoodsDto> GetGoodsList() => new List<GoodsDto>
     {
         new("GA506B 温热管线饮水机",239.99,"https://img-cdn.lonsid.co/image/1593360117.jpg","饮水机",5,"LONSID","独特内胆 省电节能 智能触控 时尚科技 人性化操作 界面易懂 电子童锁实用安全 水电自动分离 停水贴心保护。不锈钢内胆：永不生锈，加热快，健康安全、彩灯显示：彩色灯条显示，让喝水成为一种享受。自动停水：连续出水超过1分钟会自动停止出水，防止中途离开出现意外。"),
         new("朗诗德G3速热管线机",339.99,"https://img-cdn.lonsid.co/image/1597939297.jpg","饮水机",5,"LONSID","六重智能防护 高原模式 精准控温 硅胶密封设计 休眠模式。适配全通量纯水机：适配全通量纯水机没有频繁起跳的环境噪音，有桶、无桶纯水机都适用。即热即饮：采用速热技术，一次沸腾，避免千滚水。六档精准定制水温：进出水双NTC+可控硅调节精准控温，可满足六种水温需求：25℃常温、55℃泡奶、55℃暖胃温开水、75℃花茶、85℃红茶、95℃咖啡、自动休眠：60s内无任何操作，自动进入休眠模式，节能省电，夜晚不打扰、大小杯设置：小杯 150ml、大杯500ml，走开也能放心接。"),
@@ -70,7 +37,7 @@ public static class ShopDataService
         new("J2中央净水机",339.99,"https://img-cdn.lonsid.co/image/1555406557.jpg","中央处理设备",5,"LONSID","高性能高效去除水中余氯、核心部件安全保障、智慧流量延滞型再生模式、比同类产品省33%再生剂和65%的水、智能自动循环运行。"),
         new("R3中央软水机",339.99,"https://img-cdn.lonsid.co/image/1594224411.jpg","中央处理设备",5,"LONSID","大流量匹配大用水量、食品级高容量离子交换树脂、省盐省水、大集成智能控制系统、旁通阀设计。"),
 
-        new("Apple Watch Series 5",339.99,"/img/apps-eCommerce/1.png","Cell Phones",5,"Apple","On Retina display that never sleeps, so it’s easy to see the time and other important information, without raising or tapping the display. New location features, from a built-in compass to current elevation, help users better navigate their day, while international emergency calling1 allows customers to call emergency services directly from Apple Watch in over 150 countries, even without iPhone nearby. Apple Watch Series 5 is available in a wider range of materials, including aluminium, stainless steel, ceramic and an all-new titanium.",Guid.Parse("2d1e3550-5135-50c8-836f-f988bfef91c8")),
+        new(Guid.Parse("2d1e3550-5135-50c8-836f-f988bfef91c8"),"Apple Watch Series 5",339.99,"/img/apps-eCommerce/1.png","Cell Phones",5,"Apple","On Retina display that never sleeps, so it’s easy to see the time and other important information, without raising or tapping the display. New location features, from a built-in compass to current elevation, help users better navigate their day, while international emergency calling1 allows customers to call emergency services directly from Apple Watch in over 150 countries, even without iPhone nearby. Apple Watch Series 5 is available in a wider range of materials, including aluminium, stainless steel, ceramic and an all-new titanium."),
         new("Apple iPhone 11 (65GB, Black)",669.99,"/img/apps-eCommerce/2.png","Cell Phones",5,"Apple","The Apple iPhone 11 is a great smartphone, which was loaded with a lot of quality features. It comes with a waterproof and dustproof body which is the key attraction of the device. The excellent set of cameras offer excellent images as well as capable of recording crisp videos. However, expandable storage and a fingerprint scanner would have made it a perfect option to go for around this price range."),
         new("Apple iMac 27-inch",999.99,"/img/apps-eCommerce/3.png","Computers & Tablets",5,"Apple","The all-in-one for all. If you can dream it, you can do it on iMac. It’s beautifully & incredibly intuitive and packed with tools that let you take any idea to the next level. And the new 27-inch model elevates the experience in way, with faster processors and graphics, expanded memory and storage, enhanced audio and video capabilities, and an even more stunning Retina 5K display. It’s the desktop that does it all — better and faster than ever."),
         new("OneOdio A71 Wired Headphones",59.99,"/img/apps-eCommerce/5.png","Audio",3,"OneOdio","Omnidirectional detachable boom mic upgrades the headphones into a professional headset for gaming, business, podcasting and taking calls on the go. Better pick up your voice. Control most electric devices through voice activation, or schedule a ride with Uber and order a pizza. OneOdio A71 Wired Headphones voice-controlled device turns any home into a smart device on a smartphone or tablet."),
@@ -98,5 +65,14 @@ public static class ShopDataService
         new("Rectangular Polarized, Bluetooth Audio Sunglasses",259,"/img/apps-eCommerce/26.png","Health, Fitness & Beauty",5,"Bose","Redesigned for luxury — Thoughtfully refined and strikingly elegant, the latest Bose sunglasses blend enhanced features and designs for an elevated way to listen."),
         new("VicTsing Wireless Mouse",10.99,"/img/apps-eCommerce/27.png","Computers & Tablets",3,"VicTsing","After thousands of samples of palm data, we designed this ergonomic mouse. The laptop mouse has a streamlined arc and thumb rest to help reduce the stress caused by prolonged use of the laptop mouse."),
     };
+
+    public static List<RelatedGoodsDto> GetRelatedGoodsList() => new List<RelatedGoodsDto>
+    {
+        new("GA406B 温热管线饮水机","Lonsid","https://img-cdn.lonsid.co/image/1593360117.jpg",9999,5),
+        new("G1管线饮水机","Lonsid","https://img-cdn.lonsid.co/image/1593360094.jpg",9999,5),
+        new("GA406K 速热管线饮水机","Lonsid","https://img-cdn.lonsid.co/image/1555404598.jpg",9999,5),
+        new("GT3桌面即热饮水机","Lonsid","https://img-cdn.lonsid.co/image/1560130226.jpg",9999,5),
+        new("GR320RB冷热型饮水机","Lonsid","https://img-cdn.lonsid.co/image/1603728000ddBMgnpYFmMWTlAl3bAX179.jpg",9999,5)
+    };
 }
 

MASA.Blazor.Pro/Data/App/Invoice/Dto/BillDto.cs

@@ -0,0 +1,43 @@
+namespace MASA.Blazor.Pro.Data.App.Invoice.Dto;
+
+public class BillDto
+{
+    public string? Type { get; set; }
+
+    public int Cost { get; set; }
+
+    public int Qty { get; set; }
+
+    public decimal Price { get; set; }
+
+    public string? Remark { get; set; }
+
+    public bool ShowMenu { get; set; }
+
+    public string? Discount { get; set; }
+
+    public int Tax1 { get; set; }
+
+    public int Tax2 { get; set; }
+
+    public BillDto() { }
+
+    public BillDto(string? type, int cost, int qty, decimal price, string? remark)
+    {
+        Type = type;
+        Cost = cost;
+        Qty = qty;
+        Price = price;
+        Remark = remark;
+    }
+
+    public void Set(BillDto bill)
+    {
+        Type = bill.Type;
+        Cost = bill.Cost;
+        Qty = bill.Qty;
+        Price = bill.Price;
+        Remark = bill.Remark;
+    }
+}
+

MASA.Blazor.Pro/Data/Invoice/Model/InvoiceRecord.cs renamed to MASA.Blazor.Pro/Data/App/Invoice/Dto/InvoiceRecordDto.cs

@@ -1,21 +1,17 @@
-namespace MASA.Blazor.Pro.Data;
+namespace MASA.Blazor.Pro.Data.App.Invoice.Dto;
 
-public class InvoiceRecord
+public class InvoiceRecordDto
 {
-    public InvoiceRecord(UserData client)
-    {
-        Client = client;
-    }
-
     public int Id { get; set; }
 
-    public UserData Client { get; set; }
+    public UserDto Client { get; set; }
 
     public int Total { get; set; }
 
     public DateOnly Date { get; set; } = DateOnly.FromDateTime(DateTime.Now);
 
     private DateOnly? _dueDate;
+
     public DateOnly DueDate 
     {
         get => (_dueDate ?? (_dueDate = Date.AddMonths(1).AddDays(2))).Value;
@@ -25,5 +21,10 @@ public DateOnly DueDate
     public int Balance { get; set; }
 
     public int State { get; set; }
+
+    public InvoiceRecordDto(UserDto client)
+    {
+        Client = client;
+    }
 }
 

MASA.Blazor.Pro/Data/Invoice/Model/StateItem.cs renamed to MASA.Blazor.Pro/Data/App/Invoice/Dto/InvoiceStateDto.cs

@@ -1,11 +1,12 @@
-namespace MASA.Blazor.Pro.Data;
+namespace MASA.Blazor.Pro.Data.App.Invoice.Dto;
 
-public class StateItem
+public class InvoiceStateDto
 {
     public string Label { get; set; }
+
     public int Value { get; set; }
 
-    public StateItem(string label, int value)
+    public InvoiceStateDto(string label, int value)
     {
         Label = label;
         Value = value;