From 91cd73104211c3d9d8b7d84fea65958edd3ceb31 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:19:33 +0300
Subject: [PATCH 1/6] Update data seeder for app-template

---
 .../ProjectBuilding/Templates/App/AppTemplateBase.cs   |  4 ++++
 .../appsettings.json                                   | 10 ++++++++++
 .../OpenIddict/OpenIddictDataSeedContributor.cs        | 10 ++++++++++
 3 files changed, 24 insertions(+)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index e8522f6f193..d57771c8cdd 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -399,6 +399,7 @@ protected void ConfigureWithoutUi(ProjectBuildContext context, List<ProjectBuild
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
     }
@@ -424,6 +425,7 @@ protected void ConfigureWithBlazorUi(ProjectBuildContext context, List<ProjectBu
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
 
@@ -517,6 +519,7 @@ protected void ConfigureWithAngularUi(ProjectBuildContext context, List<ProjectB
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
 
@@ -554,6 +557,7 @@ protected void ConfigureWithMauiBlazorUi(ProjectBuildContext context, List<Proje
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
             steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+            context.Symbols.Add("HostWithIds");
             steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
         }
     }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
index 5332ea7677b..b589481948d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@@ -9,28 +9,38 @@
   //</TEMPLATE-REMOVE>
   "OpenIddict": {
     "Applications": {
+      //<TEMPLATE-REMOVE IF-NOT='ui:mvc'>
       "MyProjectName_Web": {
         "ClientId": "MyProjectName_Web",
         "ClientSecret": "1q2w3e*",
         "RootUrl": "https://localhost:44302"
       },
+      //</TEMPLATE-REMOVE>
+      //<TEMPLATE-REMOVE IF-NOT='ui:blazor'>
       "MyProjectName_Blazor": {
         "ClientId": "MyProjectName_Blazor",
         "RootUrl": "https://localhost:44307"
       },
+      //</TEMPLATE-REMOVE>
+      //<TEMPLATE-REMOVE IF-NOT='ui:angular'>
       "MyProjectName_App": {
         "ClientId": "MyProjectName_App",
         "RootUrl": "http://localhost:4200"
       },
+      //</TEMPLATE-REMOVE>
+      //<TEMPLATE-REMOVE IF-NOT='ui:blazor-server&&TIERED'>
       "MyProjectName_BlazorServerTiered": {
         "ClientId": "MyProjectName_BlazorServerTiered",
         "ClientSecret": "1q2w3e*",
         "RootUrl": "https://localhost:44309"
       },
+      //</TEMPLATE-REMOVE>
+      //<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
       "MyProjectName_Swagger": {
         "ClientId": "MyProjectName_Swagger",
         "RootUrl": "https://localhost:44305"
       }
+      //</TEMPLATE-REMOVE>
     }
   }
 }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
index ccf35ec0269..a1af7f6b6af 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
@@ -79,6 +79,7 @@ private async Task CreateApplicationsAsync()
 
         var configurationSection = _configuration.GetSection("OpenIddict:Applications");
 
+        //<TEMPLATE-REMOVE IF-NOT='ui:mvc'>
         //Web Client
         var webClientId = configurationSection["MyProjectName_Web:ClientId"];
         if (!webClientId.IsNullOrWhiteSpace())
@@ -103,7 +104,9 @@ await CreateApplicationAsync(
                 postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc"
             );
         }
+        //</TEMPLATE-REMOVE>
 
+        //<TEMPLATE-REMOVE IF-NOT='ui:angular'>
         //Console Test / Angular Client
         var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"];
         if (!consoleAndAngularClientId.IsNullOrWhiteSpace())
@@ -127,7 +130,9 @@ await CreateApplicationAsync(
                 postLogoutRedirectUri: consoleAndAngularClientRootUrl
             );
         }
+        //</TEMPLATE-REMOVE>
 
+        //<TEMPLATE-REMOVE IF-NOT='ui:blazor'>
         // Blazor Client
         var blazorClientId = configurationSection["MyProjectName_Blazor:ClientId"];
         if (!blazorClientId.IsNullOrWhiteSpace())
@@ -147,7 +152,9 @@ await CreateApplicationAsync(
                 postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback"
             );
         }
+        //</TEMPLATE-REMOVE>
 
+        //<TEMPLATE-REMOVE IF-NOT='ui:blazor-server&&TIERED'>
         // Blazor Server Tiered Client
         var blazorServerTieredClientId = configurationSection["MyProjectName_BlazorServerTiered:ClientId"];
         if (!blazorServerTieredClientId.IsNullOrWhiteSpace())
@@ -170,7 +177,9 @@ await CreateApplicationAsync(
                 postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc"
             );
         }
+        //</TEMPLATE-REMOVE>
 
+        //<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
         // Swagger Client
         var swaggerClientId = configurationSection["MyProjectName_Swagger:ClientId"];
         if (!swaggerClientId.IsNullOrWhiteSpace())
@@ -189,6 +198,7 @@ await CreateApplicationAsync(
                 clientUri: swaggerRootUrl
             );
         }
+        //</TEMPLATE-REMOVE>
     }
 
     private async Task CreateApplicationAsync(

From 9b80da6669da77eab71e2934fcf4906f078814a8 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:04:37 +0300
Subject: [PATCH 2/6] app: Improve auth-server homepage design.

---
 .../MyProjectNameAuthServerModule.cs          |  4 +-
 .../Pages/Index.cshtml                        | 86 +++++++++----------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
index 104fe9fed61..2a5a34c7e56 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
@@ -35,6 +35,7 @@
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.UI;
 using Volo.Abp.VirtualFileSystem;
+using Volo.Abp.Account.Localization;
 
 namespace MyCompanyName.MyProjectName;
 
@@ -90,7 +91,8 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             options.Resources
                 .Get<MyProjectNameResource>()
                 .AddBaseTypes(
-                    typeof(AbpUiResource)
+                    typeof(AbpUiResource),
+                    typeof(AccountResource)
                 );
         });
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
index 55b17f34532..bb61b5c264d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
@@ -16,6 +16,14 @@
     Layout = Theme.GetEmptyLayout();
 }
 
+@section styles {
+    <style>
+        body {
+            background-color: white;
+        }
+    </style>
+}
+
 <div class="d-flex align-items-center" style="min-height: 100vh;">
     <div class="container">
         <abp-row>
@@ -30,37 +38,30 @@
                         <h1>@BrandingProvider.AppName</h1>
                     }
                 </div>
+
                 <abp-card>
                     <abp-card-body>
                         <div class="container">
                             <abp-row>
-                                <abp-column size="_9">
-
-                                    <div class="d-flex align-items-center">
-                                        <div class="me-3 p-2">
-                                            <i class="fa fa-user d-block" style="font-size: 10em; color: #12b900"></i>
-                                        </div>
-                                        <div class="p2">
-                                            @if (CurrentUser.IsAuthenticated)
-                                            {
-                                                <span class="fs-16">
-                                                    @L["Welcome"] <span class="fw-7">@CurrentUser.UserName</span>
-                                                </span>
-                                                <span class="fs-14 d-block text-dark-800 opacity-75 mb-1">@CurrentUser.Email</span>
-                                                <div class="d-grid gap-2">
-                                                    <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account">@L["MyAccount"]</a>
-                                                    <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account">@L["Logout"]</a>
-                                                </div>
-                                            }
-                                            else
-                                            {
-                                                <a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a>
-                                            }
-                                        </div>
-
+                                <abp-column size="_6">
+                                    <div class="mr-auto p-2 float-start">
+                                            <div class="">
+                                                @if (CurrentUser.IsAuthenticated)
+                                                {
+                                                    <div class="">
+                                                        <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a>
+                                                        <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account">@L["Logout"]</a>
+                                                    </div>
+                                                }
+                                                else
+                                                {
+                                                    <a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a>
+                                                }
+                                            </div>
                                     </div>
                                 </abp-column>
-                                <abp-column size="_3">
+
+                                <abp-column size="_6">
                                     <div class="ml-auto p-2 float-end">
                                         <abp-dropdown>
                                             <abp-dropdown-button text="@Model.CurrentLanguage" />
@@ -78,16 +79,17 @@
                                     </div>
                                 </abp-column>
                             </abp-row>
-                            <hr class="m-4" />
-                            <abp-row>
-                                @if (Model.Applications != null)
-                                {
-                                    foreach (var application in Model.Applications)
-                                    {
-                                        <abp-column size-md="@Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid.ColumnSize._4" class="mb-2">
-                                            <abp-card>
-                                                <abp-card-body>
 
+                            @if (Model.Applications != null)
+                            {
+                                <hr class="m-2" />
+
+                                <abp-row class="mt-3">
+                                    
+                                        <ul class="list-group">
+                                            @foreach (var application in Model.Applications)
+                                            {
+                                                <li class="list-group-item">
                                                     @if (!application.LogoUri.IsNullOrEmpty())
                                                     {
                                                         <div class="mx-auto">
@@ -96,16 +98,12 @@
                                                     }
 
                                                     <h4>@application.DisplayName</h4>
-                                                    <span class="text-muted">@application.ClientUri</span>
-                                                    <div class="mt-1">
-                                                        <a abp-button="@Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button.AbpButtonType.Outline_Secondary" href="@application.ClientUri">@L["Visit"]</a>
-                                                    </div>
-                                                </abp-card-body>
-                                            </abp-card>
-                                        </abp-column>
-                                    }
-                                }
-                            </abp-row>
+                                                    <a href="@application.ClientUri" class="text-muted">@application.ClientUri</a>
+                                                </li>
+                                            }
+                                        </ul>
+                                </abp-row>
+                            }
                         </div>
                     </abp-card-body>
                 </abp-card>

From 496ef1814ea76fe200562a9e3883d09d1382d5cf Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:16:27 +0300
Subject: [PATCH 3/6] Update Index.cshtml

---
 .../Pages/Index.cshtml                        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
index bb61b5c264d..bd2643b53ab 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
@@ -85,11 +85,11 @@
                                 <hr class="m-2" />
 
                                 <abp-row class="mt-3">
-                                    
-                                        <ul class="list-group">
-                                            @foreach (var application in Model.Applications)
-                                            {
-                                                <li class="list-group-item">
+                                    @foreach (var application in Model.Applications)
+                                    {
+                                        <abp-column size-md="@Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid.ColumnSize._4" class="mb-2">
+                                            <abp-card>
+                                                <abp-card-body>
                                                     @if (!application.LogoUri.IsNullOrEmpty())
                                                     {
                                                         <div class="mx-auto">
@@ -98,10 +98,11 @@
                                                     }
 
                                                     <h4>@application.DisplayName</h4>
-                                                    <a href="@application.ClientUri" class="text-muted">@application.ClientUri</a>
-                                                </li>
-                                            }
-                                        </ul>
+                                                    <a href="@application.ClientUri" class="text-muted stretched-link">@application.ClientUri</a>
+                                                </abp-card-body>
+                                            </abp-card>
+                                        </abp-column>
+                                    }
                                 </abp-row>
                             }
                         </div>

From 031a421c765433eb6ddfa469efb8ab13b1e73e02 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Mon, 18 Sep 2023 15:11:13 +0300
Subject: [PATCH 4/6] Update AppTemplateBase.cs

---
 .../Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index d57771c8cdd..0060184b6c4 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -174,6 +174,7 @@ protected void DeleteUnrelatedProjects(ProjectBuildContext context, List<Project
         {
             steps.Add(new MauiChangeApplicationIdGuidStep());
             steps.Add(new MauiChangePortStep());
+            context.Symbols.Add("mobile:maui");
         }
         else
         {
@@ -192,10 +193,12 @@ protected void DeleteUnrelatedProjects(ProjectBuildContext context, List<Project
                 context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server"))
             {
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Public"));
+                context.Symbols.Add("ui:mvc-public-host");
             }
             else
             {
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Public.Host"));
+                context.Symbols.Add("ui:mvc-public");
             }
         }
     }

From 77116000b0734932b21173725dafb01ff28432b9 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 19 Sep 2023 09:24:20 +0800
Subject: [PATCH 5/6] Add `returnUrl` to logout page.

---
 .../MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
index bd2643b53ab..fb4d0ba9ced 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml
@@ -50,7 +50,7 @@
                                                 {
                                                     <div class="">
                                                         <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a>
-                                                        <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account">@L["Logout"]</a>
+                                                        <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account" asp-route-returnUrl="/" >@L["Logout"]</a>
                                                     </div>
                                                 }
                                                 else

From ddf13abbb3e1ad80be7e93e68da88f3d672f90c1 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:25:22 +0300
Subject: [PATCH 6/6] Update appsettings.json

---
 .../src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
index b589481948d..1797992d04b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@@ -35,12 +35,10 @@
         "RootUrl": "https://localhost:44309"
       },
       //</TEMPLATE-REMOVE>
-      //<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
       "MyProjectName_Swagger": {
         "ClientId": "MyProjectName_Swagger",
         "RootUrl": "https://localhost:44305"
       }
-      //</TEMPLATE-REMOVE>
     }
   }
 }