Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic mvc UI #46

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add basic mvc UI #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe700a4
Add menus, add translations
RayMMond Oct 7, 2022
cdb73fa
Add basic mvc ui
RayMMond Oct 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,5 @@ modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/Logs/logs.txt
modules/BookingService/host/EasyAbp.BookingService.Web.Host/Logs/logs.txt
modules/BookingService/host/EasyAbp.BookingService.Web.Unified/Logs/logs.txt
modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/Logs/logs.txt
/local
appsettings.secrets.json
/local
4 changes: 2 additions & 2 deletions modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace EasyAbp.BookingService.Blazor.Host;

public class Program
public static class Program
{
public async static Task Main(string[] args)
public static async Task Main(string[] args)
{
var builder = WebAssemblyHostBuilder.CreateDefault(args);

Expand Down
4 changes: 2 additions & 2 deletions .../BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService.Blazor.Server.Host;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions ...e.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions ...Service.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions ...rvice.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions ...kingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions ...gService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions modules/BookingService/host/EasyAbp.BookingService.Blazor.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace EasyAbp.BookingService.Blazor.Host;

public class Program
public static class Program
{
public async static Task Main(string[] args)
public static async Task Main(string[] args)
{
var builder = WebAssemblyHostBuilder.CreateDefault(args);

Expand All @@ -20,4 +20,4 @@ public async static Task Main(string[] args)

await host.RunAsync();
}
}
}
6 changes: 3 additions & 3 deletions modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService.Blazor.Server.Host;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down Expand Up @@ -50,4 +50,4 @@ public async static Task<int> Main(string[] args)
Log.CloseAndFlush();
}
}
}
}
2 changes: 0 additions & 2 deletions ...es/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions modules/BookingService/host/EasyAbp.BookingService.IdentityServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down Expand Up @@ -50,4 +50,4 @@ public async static Task<int> Main(string[] args)
Log.CloseAndFlush();
}
}
}
}
2 changes: 0 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.IdentityServer/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.Web.Host/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down
2 changes: 0 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.Web.Host/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions modules/BookingService/host/EasyAbp.BookingService.Web.Unified/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace EasyAbp.BookingService;

public class Program
public static class Program
{
public async static Task<int> Main(string[] args)
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
Expand Down Expand Up @@ -53,4 +53,4 @@ public async static Task<int> Main(string[] args)
Log.CloseAndFlush();
}
}
}
}
2 changes: 0 additions & 2 deletions modules/BookingService/host/EasyAbp.BookingService.Web.Unified/appsettings.secrets.json
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions modules/BookingService/src/EasyAbp.BookingService.Web/Menus/BookingServiceMenuContributor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Threading.Tasks;
using EasyAbp.BookingService.Localization;
using Volo.Abp.UI.Navigation;

namespace EasyAbp.BookingService.Web.Menus;
Expand All @@ -16,8 +18,13 @@ public async Task ConfigureMenuAsync(MenuConfigurationContext context)
private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
{
//Add main menu items.
context.Menu.AddItem(new ApplicationMenuItem(BookingServiceMenus.Prefix, displayName: "BookingService", "~/BookingService", icon: "fa fa-globe"));
// context.Menu.AddItem(new ApplicationMenuItem(BookingServiceMenus.Prefix, displayName: "BookingService", "~/BookingService", icon: "fa fa-globe"));

var l = context.GetLocalizer<BookingServiceResource>(); //Add main menu items.

var bookingServiceMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == BookingServiceCommonMenus.Prefix,
() => new ApplicationMenuItem(BookingServiceCommonMenus.Prefix, l["Menu:BookingService"]));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the LeptonX theme, the icon is required.


return Task.CompletedTask;
}
}
}
93 changes: 92 additions & 1 deletion ...c/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp/BookingService/Localization/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,97 @@
"EasyAbp.BookingService:CannotUpdatePeriodInUse": "Can not update Period which is in use. PeriodId: {id}",
"EasyAbp.BookingService:CannotDeletePeriodSchemeInUse": "Can not delete PeriodScheme which is in use. PeriodScheme: {name}, Id: {id}. ",
"EasyAbp.BookingService:FailToObtainAssetOccupancyLock": "Fail to obtain asset occupancy lock",
"EasyAbp.BookingService:InvalidOccupyingVolume": "Negative occupying volume: {volume}"
"EasyAbp.BookingService:InvalidOccupyingVolume": "Negative occupying volume: {volume}",
"Menu:BookingService": "BookingService",
"Menu:AssetCategory": "AssetCategory",
"Permission:PeriodScheme": "PeriodScheme",
"Permission:AssetSchedule": "AssetSchedule",
"Permission:Asset": "Asset",
"Permission:AssetPeriodScheme": "AssetPeriodScheme",
"Menu:AssetOccupancy": "AssetOccupancy",
"Menu:AssetPeriodScheme": "AssetPeriodScheme",
"Menu:Asset": "Asset",
"Menu:AssetSchedule": "AssetSchedule",
"Menu:PeriodScheme": "PeriodScheme",
"Menu:Period": "Period",
"Permission:AssetCategory": "AssetCategory",
"Permission:AssetOccupancy": "AssetOccupancy",
"AssetCategory": "AssetCategory",
"AssetCategoryAssetDefinitionName": "AssetDefinitionName",
"AssetCategoryPeriodSchemeId": "PeriodSchemeId",
"AssetCategoryDefaultPeriodUsable": "DefaultPeriodUsable",
"AssetCategoryTimeInAdvance": "TimeInAdvance",
"AssetCategoryDisabled": "Disabled",
"AssetCategoryCode": "Code",
"AssetCategoryLevel": "Level",
"AssetCategoryParentId": "ParentId",
"AssetCategoryDisplayName": "DisplayName",
"CreateAssetCategory": "CreateAssetCategory",
"EditAssetCategory": "EditAssetCategory",
"AssetCategoryDeletionConfirmationMessage": "Are you sure to delete the assetCategory {0}?",
"SuccessfullyDeleted": "Successfully deleted",
"AssetOccupancy": "AssetOccupancy",
"AssetOccupancyAssetId": "AssetId",
"AssetOccupancyAssetDefinitionName": "AssetDefinitionName",
"AssetOccupancyVolume": "Volume",
"AssetOccupancyDate": "Date",
"AssetOccupancyStartingTime": "StartingTime",
"AssetOccupancyDuration": "Duration",
"AssetOccupancyOccupierUserId": "OccupierUserId",
"AssetOccupancyOccupierName": "OccupierName",
"CreateAssetOccupancy": "CreateAssetOccupancy",
"AssetOccupancyDeletionConfirmationMessage": "Are you sure to delete the assetOccupancy {0}?",
"AssetPeriodScheme": "AssetPeriodScheme",
"AssetPeriodSchemePeriodSchemeId": "PeriodSchemeId",
"AssetPeriodSchemeAssetId": "AssetId",
"AssetPeriodSchemeDate": "Date",
"CreateAssetPeriodScheme": "CreateAssetPeriodScheme",
"EditAssetPeriodScheme": "EditAssetPeriodScheme",
"AssetPeriodSchemeDeletionConfirmationMessage": "Are you sure to delete the assetPeriodScheme {0}?",
"Asset": "Asset",
"AssetName": "AssetName",
"AssetAssetDefinitionName": "AssetDefinitionName",
"AssetAssetCategoryId": "AssetCategoryId",
"AssetPeriodSchemeId": "PeriodSchemeId",
"AssetDefaultPeriodUsable": "DefaultPeriodUsable",
"AssetVolume": "Volume",
"AssetPriority": "Priority",
"AssetTimeInAdvance": "TimeInAdvance",
"AssetDisabled": "Disabled",
"CreateAsset": "CreateAsset",
"EditAsset": "EditAsset",
"AssetDeletionConfirmationMessage": "Are you sure to delete the asset {0}?",
"AssetSchedule": "AssetSchedule",
"AssetScheduleDate": "Date",
"AssetScheduleAssetId": "AssetId",
"AssetSchedulePeriodSchemeId": "PeriodSchemeId",
"AssetSchedulePeriodId": "PeriodId",
"AssetSchedulePeriodUsable": "PeriodUsable",
"AssetScheduleTimeInAdvance": "TimeInAdvance",
"CreateAssetSchedule": "CreateAssetSchedule",
"EditAssetSchedule": "EditAssetSchedule",
"AssetScheduleDeletionConfirmationMessage": "Are you sure to delete the assetSchedule {0}?",
"PeriodScheme": "PeriodScheme",
"PeriodSchemeName": "PeriodSchemeName",
"PeriodSchemeIsDefault": "IsDefault",
"PeriodSchemePeriods": "Periods",
"CreatePeriodScheme": "CreatePeriodScheme",
"EditPeriodScheme": "EditPeriodScheme",
"PeriodSchemeDeletionConfirmationMessage": "Are you sure to delete the periodScheme {0}?",
"TimeInAdvanceMaxDaysInAdvance": "TimeInAdvanceMaxDaysInAdvance",
"TimeInAdvanceMaxTimespanInAdvance": "TimeInAdvanceMaxTimespanInAdvance",
"TimeInAdvanceMinDaysInAdvance": "TimeInAdvanceMinDaysInAdvance",
"TimeInAdvanceMinTimespanInAdvance": "TimeInAdvanceMinTimespanInAdvance",
"Enum:PeriodUsable:0": "Accept",
"Enum:PeriodUsable:1": "Reject",
"PeriodStartingTime": "PeriodStartingTime",
"PeriodDuration": "PeriodDuration",
"CreatePeriod": "CreatePeriod",
"EditPeriod": "EditPeriod",
"Period": "Period",
"PeriodDeletionConfirmationMessage": "Are you sure to delete the period {0}?",
"PeriodSchemeSetAsDefaultConfirmationMessage": "Are you sure to set this period scheme as default {0}?",
"SuccessfullyEdited": "Successfully edited",
"SetAsDefault": "Set as default"
}
}
Loading