Skip to content

Commit

Permalink
Initial Name changes and Font change in UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@bharathwajv
bharathwajv committed May 15, 2022
1 parent 737cb10 commit 56e0a0f
Show file tree
Hide file tree
Showing 17 changed files with 3,402 additions and 2,108 deletions.
5,416 changes: 3,366 additions & 2,050 deletions src/Client.Infrastructure/ApiClient/FSHApi.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Client.Infrastructure/ApiClient/nswag.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"wrapResponseMethods": [],
"generateResponseClasses": true,
"responseClass": "SwaggerResponse",
"namespace": "FSH.BlazorWebAssembly.Client.Infrastructure.ApiClient",
"namespace": "RewardsPlus.BlazorWebAssembly.Client.Infrastructure.ApiClient",
"requiredPropertiesMustBeDefined": true,
"dateType": "System.DateTimeOffset",
"jsonConverters": null,
Expand Down
4 changes: 2 additions & 2 deletions src/Client.Infrastructure/Client.Infrastructure.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSH.BlazorWebAssembly.Client.Infrastructure</RootNamespace>
<AssemblyName>FSH.BlazorWebAssembly.Client.Infrastructure</AssemblyName>
<RootNamespace>RewardsPlus.BlazorWebAssembly.Client.Infrastructure</RootNamespace>
<AssemblyName>RewardsPlus.BlazorWebAssembly.Client.Infrastructure</AssemblyName>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Client.Infrastructure/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace RewardsPlus.BlazorWebAssembly.Client.Infrastructure;

public static class Startup
{
private const string ClientName = "FullStackHero.API";
private const string ClientName = "RewardsPlus";

public static IServiceCollection AddClientServices(this IServiceCollection services, IConfiguration config) =>
services
Expand Down
28 changes: 14 additions & 14 deletions src/Client.Infrastructure/Theme/CustomTypography.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,107 +4,107 @@ namespace RewardsPlus.BlazorWebAssembly.Client.Infrastructure.Theme;

public static class CustomTypography
{
public static Typography FSHTypography => new Typography()
public static Typography RPTypography => new Typography()
{
Default = new Default()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = ".875rem",
FontWeight = 200,
LineHeight = 1.43,
LetterSpacing = ".01071em"
},
H1 = new H1()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "6rem",
FontWeight = 300,
LineHeight = 1.167,
LetterSpacing = "-.01562em"
},
H2 = new H2()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "3.75rem",
FontWeight = 300,
LineHeight = 1.2,
LetterSpacing = "-.00833em"
},
H3 = new H3()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "3rem",
FontWeight = 400,
LineHeight = 1.167,
LetterSpacing = "0"
},
H4 = new H4()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "2.125rem",
FontWeight = 400,
LineHeight = 1.235,
LetterSpacing = ".00735em"
},
H5 = new H5()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "1.5rem",
FontWeight = 400,
LineHeight = 1.334,
LetterSpacing = "0"
},
H6 = new H6()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "1.25rem",
FontWeight = 400,
LineHeight = 1.6,
LetterSpacing = ".0075em"
},
Button = new Button()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = ".875rem",
FontWeight = 400,
LineHeight = 1.75,
LetterSpacing = ".02857em"
},
Body1 = new Body1()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "1rem",
FontWeight = 400,
LineHeight = 1.5,
LetterSpacing = ".00938em"
},
Body2 = new Body2()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = ".875rem",
FontWeight = 400,
LineHeight = 1.43,
LetterSpacing = ".01071em"
},
Caption = new Caption()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = ".75rem",
FontWeight = 200,
LineHeight = 1.66,
LetterSpacing = ".03333em"
},
Subtitle1 = new Subtitle1()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = "1rem",
FontWeight = 400,
LineHeight = 1.57,
LetterSpacing = ".00714em"
},
Subtitle2 = new Subtitle2()
{
FontFamily = new[] { "Montserrat", "Helvetica", "Arial", "sans-serif" },
FontFamily = new[] { "Jost", "Helvetica", "Arial", "sans-serif" },
FontSize = ".875rem",
FontWeight = 400,
LineHeight = 1.57,
Expand Down
2 changes: 1 addition & 1 deletion src/Client.Infrastructure/Theme/DarkTheme.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public DarkTheme()
DefaultBorderRadius = "5px",
};

Typography = CustomTypography.FSHTypography;
Typography = CustomTypography.RPTypography;
Shadows = new Shadow();
ZIndex = new ZIndex() { Drawer = 1300 };
}
Expand Down
2 changes: 1 addition & 1 deletion src/Client.Infrastructure/Theme/LightTheme.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public LightTheme()
DefaultBorderRadius = "5px"
};

Typography = CustomTypography.FSHTypography;
Typography = CustomTypography.RPTypography;
Shadows = new Shadow();
ZIndex = new ZIndex() { Drawer = 1300 };
}
Expand Down
4 changes: 2 additions & 2 deletions src/Client/Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSH.BlazorWebAssembly.Client</RootNamespace>
<AssemblyName>FSH.BlazorWebAssembly.Client</AssemblyName>
<RootNamespace>RewardsPlus.BlazorWebAssembly.Client</RootNamespace>
<AssemblyName>RewardsPlus.BlazorWebAssembly.Client</AssemblyName>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
</PropertyGroup>
Expand Down
11 changes: 0 additions & 11 deletions src/Client/Pages/Authentication/SelfRegister.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,6 @@
@bind-Value="_createUserRequest.Email" For="@(() => _createUserRequest.Email)"
InputType="InputType.Email" Adornment="Adornment.End" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField T="string" Label="First Name" Variant="Variant.Outlined"
@bind-Value="_createUserRequest.FirstName" For="@(() => _createUserRequest.FirstName)"
InputType="InputType.Text" Adornment="Adornment.End" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField T="string" Label="Last Name" Variant="Variant.Outlined"
@bind-Value="_createUserRequest.LastName" For="@(() => _createUserRequest.LastName)"
InputType="InputType.Text" Adornment="Adornment.End" />
</MudItem>


<MudItem xs="12" md="6">
<MudTextField Label="@L["Password"]" Variant="Variant.Outlined" @bind-Value="_createUserRequest.Password"
Expand Down
10 changes: 3 additions & 7 deletions src/Client/Pages/Identity/Account/Profile.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<MudAvatar Square="true" Color="Color.Primary" Style="width:100%;height:300px;">@_firstLetterOfName</MudAvatar>
}
</div>
<MudText Typo="Typo.h6" Align="Align.Center">@_profileModel.FirstName @_profileModel.LastName</MudText>
<MudText Typo="Typo.h6" Align="Align.Center">@_profileModel.UserName</MudText>
<MudText Align="Align.Center">@_profileModel.Email</MudText>
</MudCardContent>
<MudCardActions Class="d-flex justify-center">
Expand Down Expand Up @@ -55,12 +55,8 @@
<DataAnnotationsValidator />
<CustomValidation @ref="_customValidation" />
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@_profileModel.FirstName" For="@(() => _profileModel.FirstName)"
Label="@L["First Name"]" Variant="Variant.Outlined" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@_profileModel.LastName" For="@(() => _profileModel.LastName)"
Label="@L["Last Name"]" Variant="Variant.Outlined" />
<MudTextField @bind-Value="@_profileModel.UserName" For="@(() => _profileModel.UserName)"
Label="@L["User Name"]" Variant="Variant.Outlined" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@_profileModel.PhoneNumber"
Expand Down
7 changes: 3 additions & 4 deletions src/Client/Pages/Identity/Account/Profile.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ protected override async Task OnInitializedAsync()
{
_userId = user.GetUserId();
_profileModel.Email = user.GetEmail() ?? string.Empty;
_profileModel.FirstName = user.GetFirstName() ?? string.Empty;
_profileModel.LastName = user.GetSurname() ?? string.Empty;
_profileModel.UserName = user.GetFirstName() ?? string.Empty;
_profileModel.PhoneNumber = user.GetPhoneNumber();
_imageUrl = string.IsNullOrEmpty(user?.GetImageUrl()) ? string.Empty : (Config[ConfigNames.ApiBaseUrl] + user?.GetImageUrl());
if (_userId is not null) _profileModel.Id = _userId;
}

if (_profileModel.FirstName?.Length > 0)
if (_profileModel.UserName?.Length > 0)
{
_firstLetterOfName = _profileModel.FirstName.ToUpper().FirstOrDefault();
_firstLetterOfName = _profileModel.UserName.ToUpper().FirstOrDefault();
}
}

Expand Down
6 changes: 0 additions & 6 deletions src/Client/Pages/Identity/Users/Users.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
<MudItem xs="12" md="6">
<MudTextField For="@(() => context.UserName)" @bind-Value="context.UserName" Label="@L["User Name"]" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField For="@(() => context.FirstName)" @bind-Value="context.FirstName" Label="@L["First Name"]" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField For="@(() => context.LastName)" @bind-Value="context.LastName" Label="@L["Last Name"]" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField For="@(() => context.Email)" InputType="InputType.Email" @bind-Value="context.Email"
Label="@L["Email"]" />
Expand Down
4 changes: 2 additions & 2 deletions src/Client/Pages/Index.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</div>
</MudItem>
<MudItem xs="12" sm="12" md="12">
<MudText Align="Align.Center" Typo="Typo.h5" Class="smaller">@L["fullstackhero's"]</MudText>
<MudText Align="Align.Center" Typo="Typo.h4">@L["Blazor WebAssembly Boilerplate"]</MudText>
<MudText Align="Align.Center" Typo="Typo.h5" Class="smaller">@L["RewardsPlus"]</MudText>
<MudText Align="Align.Center" Typo="Typo.h4">@L["RewardsPlus WebAssembly Client"]</MudText>

</MudItem>
<MudItem xs="12" sm="12" md="12">
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Shared/MainLayout.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
OnClick="@((e) => DrawerToggle())" />
</MudTooltip>
<MudButton Variant="Variant.Text" DisableElevation="true" Link="/">
@L["fullstackhero"]</MudButton>
@L["RewardsPlus"]</MudButton>
<MudSpacer />
<MudHidden Breakpoint="Breakpoint.MdAndUp" Invert="true">
<MudButton DisableElevation Variant="Variant.Filled" Color="Color.Secondary"
Expand Down
4 changes: 2 additions & 2 deletions src/Client/wwwroot/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Blazor WebAssembly Boilerplate</title>
<base href="/" />
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Jost:300,400,500,700&display=swap" rel="stylesheet" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
<!-- This file is only needed (and apparently also only generated) if there are any Page or Component specific styles used. -->
<!--<link href="FSH.BlazorWebAssembly.Client.styles.css" rel="stylesheet" />-->
<!--<link href="RewardsPlus.BlazorWebAssembly.Client.styles.css" rel="stylesheet" />-->
<link href="css/fsh.css" rel="stylesheet" />
<link href="manifest.json" rel="manifest" />
<link rel="apple-touch-icon" sizes="512x512" href="full-stack-hero-logo.png" />
Expand Down
4 changes: 2 additions & 2 deletions src/Host/Host.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSH.BlazorWebAssembly.Host</RootNamespace>
<AssemblyName>FSH.BlazorWebAssembly.Host</AssemblyName>
<RootNamespace>RewardsPlus.BlazorWebAssembly.Host</RootNamespace>
<AssemblyName>RewardsPlus.BlazorWebAssembly.Host</AssemblyName>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Host/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
},
"profiles": {
"FSH.BlazorWebAssembly.Server": {
"RewardsPlus.BlazorWebAssembly.Server": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
Expand Down

0 comments on commit 56e0a0f

Please sign in to comment.