Skip to content

Commit bee06f6

Browse files
committed
Merge branch 'rel-9.0' of https://github.com/abpframework/abp into rel-9.0
2 parents 05d262c + 854e080 commit bee06f6

File tree

4 files changed

+41
-13
lines changed

4 files changed

+41
-13
lines changed

docs/en/docs-nav.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,10 @@
11791179
"text": "The Basic Theme",
11801180
"path": "framework/ui/mvc-razor-pages/basic-theme.md"
11811181
},
1182+
{
1183+
"text": "LeptonX Lite",
1184+
"path": "ui-themes/lepton-x-lite/mvc.md"
1185+
},
11821186
{
11831187
"text": "LeptonX",
11841188
"path": "ui-themes/lepton-x/mvc.md"
@@ -2315,6 +2319,10 @@
23152319
"text": "The Basic Theme",
23162320
"path": "ui-themes/basic-theme"
23172321
},
2322+
{
2323+
"text": "LeptonX Lite",
2324+
"path": "ui-themes/lepton-x-lite"
2325+
},
23182326
{
23192327
"text": "LeptonX Theme",
23202328
"path": "ui-themes/lepton-x"

docs/en/tutorials/book-store/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
````json
33
//[doc-params]
44
{
5-
"UI": ["MVC","Blazor","BlazorServer","NG"],
5+
"UI": ["MVC","Blazor","BlazorServer","NG", "MAUIBlazor"],
66
"DB": ["EF","Mongo"]
77
}
88
````

docs/en/tutorials/todo/layered/index.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
````json
44
//[doc-params]
55
{
6-
"UI": ["MVC", "Blazor", "BlazorServer", "BlazorWebApp" ,"NG"],
6+
"UI": ["MVC", "Blazor", "BlazorServer", "BlazorWebApp" ,"NG", "MAUIBlazor"],
77
"DB": ["EF", "Mongo"]
88
}
99
````
@@ -74,7 +74,7 @@ dotnet tool install -g Volo.Abp.Studio.Cli
7474
Create an empty folder, open a command-line terminal and execute the following command in the terminal:
7575

7676
````bash
77-
abp new TodoApp{{if UI=="Blazor"}} -u blazor{{else if UI=="BlazorServer"}} -u blazor-server{{else if UI=="BlazorWebApp"}} -u blazor-webapp{{else if UI=="NG"}} -u angular{{end}}{{if DB=="Mongo"}} -d mongodb{{end}}
77+
abp new TodoApp{{if UI=="Blazor"}} -u blazor{{else if UI=="BlazorServer"}} -u blazor-server{{else if UI=="BlazorWebApp"}} -u blazor-webapp{{else if UI=="NG"}} -u angular{{else if UI=="MAUIBlazor"}} -u maui-blazor{{end}}{{if DB=="Mongo"}} -d mongodb{{end}}
7878
````
7979

8080
{{if UI=="NG"}}
@@ -113,7 +113,7 @@ abp install-libs
113113
114114
> We suggest you install [Yarn v1.22+ (not v2)](https://classic.yarnpkg.com/en/docs/install) to prevent possible package inconsistencies, if you haven't installed it yet.
115115

116-
{{if UI=="Blazor" || UI=="BlazorWebApp"}}
116+
{{if UI=="Blazor" || UI=="BlazorWebApp" || UI=="MAUIBlazor"}}
117117

118118
#### Bundling and Minification
119119

@@ -136,12 +136,16 @@ abp bundle
136136

137137
It is good to run the application before starting the development. Ensure the {{if UI=="BlazorServer"}}`TodoApp.Blazor`{{else}}`TodoApp.Web`{{end}} project is the startup project, then run the application (Ctrl+F5 in Visual Studio) to see the initial UI:
138138

139-
{{else if UI=="Blazor"}}
139+
{{else if UI=="Blazor" || UI=="MAUIBlazor"}}
140140

141141
It is good to run the application before starting the development. The solution has two main applications;
142142

143143
* `TodoApp.HttpApi.Host` hosts the server-side HTTP API.
144+
{{if UI=="Blazor"}}
144145
* `TodoApp.Blazor` is the client-side Blazor WebAssembly application.
146+
{{else if UI=="MAUIBlazor"}}
147+
* `TodoApp.MauiBlazor` is the MAUI Blazor application.
148+
{{end}}
145149

146150
Ensure the `TodoApp.HttpApi.Host` project is the startup project, then run the application (Ctrl+F5 in Visual Studio) to see the server-side HTTP API on the [Swagger UI](https://swagger.io/tools/swagger-ui/):
147151

@@ -253,7 +257,7 @@ You can apply changes to the database using the following command, in the same c
253257
dotnet ef database update
254258
````
255259
256-
> If you are using Visual Studio, you may want to use the `Add-Migration Added_TodoItem` and `Update-Database` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`TodoApp.Web`{{else if UI=="BlazorServer" || UI=="Blazor" || UI=="BlazorWebApp"}}`TodoApp.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`TodoApp.HttpApi.Host`{{end}} is the startup project and `TodoApp.EntityFrameworkCore` is the *Default Project* in PMC.
260+
> If you are using Visual Studio, you may want to use the `Add-Migration Added_TodoItem` and `Update-Database` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`TodoApp.Web`{{else if UI=="BlazorServer" || UI=="Blazor" || UI=="BlazorWebApp"}}`TodoApp.Blazor`{{else if UI=="Blazor" || UI=="NG" || UI=="MAUIBlazor"}}`TodoApp.HttpApi.Host`{{end}} is the startup project and `TodoApp.EntityFrameworkCore` is the *Default Project* in PMC.
257261
258262
{{else if DB=="Mongo"}}
259263
@@ -582,11 +586,11 @@ If you open the [Swagger UI](https://swagger.io/tools/swagger-ui/) by entering t
582586

583587
![todo-api](../images/todo-api.png)
584588

585-
{{else if UI=="Blazor" || UI=="BlazorServer" || UI=="BlazorWebApp"}}
589+
{{else if UI=="Blazor" || UI=="BlazorServer" || UI=="BlazorWebApp" || UI=="MAUIBlazor"}}
586590

587591
### Index.razor.cs
588592

589-
Open the `Index.razor.cs` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} *TodoApp.Blazor.Client* {{else}}*TodoApp.Blazor*{{end}} project and replace the content with the following code block:
593+
Open the `Index.razor.cs` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} *TodoApp.Blazor.Client* {{else if UI=="BlazorServer"}} *TodoApp.Blazor* {{else if UI=="MAUIBlazor"}} *TodoApp.MauiBlazor* {{end}} project and replace the content with the following code block:
590594

591595
```csharp
592596
using Microsoft.AspNetCore.Components;
@@ -627,15 +631,15 @@ namespace TodoApp.Blazor.Pages
627631

628632
This class uses `ITodoAppService` to perform operations for the todo items. It manipulates the `TodoItems` list after create and delete operations. This way, we don't need to refresh the whole todo list from the server.
629633
630-
{{if UI=="Blazor"}}
634+
{{if UI=="Blazor" || UI=="MAUIBlazor"}}
631635
632636
See the *Dynamic C# Proxies & Auto API Controllers* section below to learn how we could inject and use the application service interface from the Blazor application which is running on the browser! But now, let's continue and complete the application.
633637

634638
{{end # Blazor}}
635639

636640
### Index.razor
637641

638-
Open the `Index.razor` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} *TodoApp.Blazor.Client* {{else}} *TodoApp.Blazor* {{end}} project and replace the content with the following code block:
642+
Open the `Index.razor` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}} *TodoApp.Blazor.Client* {{else if UI=="BlazorServer"}} *TodoApp.Blazor* {{else if UI=="MAUIBlazor"}} *TodoApp.MauiBlazor* {{end}} project and replace the content with the following code block:
639643

640644
```xml
641645
@page "/"
@@ -677,7 +681,7 @@ Open the `Index.razor` file in the `Pages` folder of the {{if UI=="Blazor" || UI
677681

678682
### Index.razor.css
679683

680-
As the final touch, open the `Index.razor.css` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}}*TodoApp.Blazor.Client*{{else}}*TodoApp.Blazor*{{end}} project and replace it with the following content:
684+
As the final touch, open the `Index.razor.css` file in the `Pages` folder of the {{if UI=="Blazor" || UI=="BlazorWebApp"}}*TodoApp.Blazor.Client*{{else if UI=="BlazorServer"}} *TodoApp.Blazor* {{else if UI=="MAUIBlazor"}} *TodoApp.MauiBlazor* {{end}} project and replace it with the following content:
681685

682686
```css
683687
#TodoList{
@@ -710,7 +714,7 @@ This is a simple styling for the todo page. We believe that you can do much bett
710714

711715
Now, you can run the application again to see the result.
712716

713-
{{if UI=="Blazor"}}
717+
{{if UI=="Blazor" || UI=="MAUIBlazor"}}
714718

715719
### Dynamic C# Proxies & Auto API Controllers
716720

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
Read this document [here](../../framework/ui/mvc-razor-pages/basic-theme.md).
1+
# Basic Theme
2+
3+
The Basic Theme is a minimalist theme that doesn't add any styling on top of the plain [Bootstrap](https://getbootstrap.com/) styles. You can take the Basic Theme as the base theme and build your own theme or styling on top of it. Here, a screenshot from the theme:
4+
5+
![basic-theme-application-layout](../../images/basic-theme-application-layout.png)
6+
7+
8+
See the [Theming document](../../framework/ui/mvc-razor-pages/theming.md) to learn about themes.
9+
10+
## User Interfaces
11+
12+
The Basic Theme has implementation for the following UI types:
13+
14+
- [MVC UI](../../framework/ui/mvc-razor-pages/basic-theme.md)
15+
- [Blazor UI](../../framework/ui/blazor/basic-theme.md)
16+
- [Angular UI](../../framework/ui/angular/basic-theme.md)
17+

0 commit comments

Comments
 (0)