Skip to content

Commit

Permalink
929097: Updated sample version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Manikandan-Lakshmanan
Manikandan-Lakshmanan committed Dec 20, 2024
1 parent 6a613f1 commit 986af59
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 128 deletions.
104 changes: 48 additions & 56 deletions Serene1/Serene1/Serene1.Web/Modules/Membership/Account/AccountLogin.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,57 @@
@inject Serenity.ITextLocalizer Localizer
@inject IDataMigrations DataMigrations
@inject Microsoft.Extensions.Options.IOptions<Serenity.Extensions.EnvironmentSettings> EnvironmentOptions
@{
ViewData["Title"] = Texts.Forms.Membership.Login.LoginToYourAccount.ToString(Localizer);
ViewData["PageId"] = "Login";
Layout = MVC.Views.Shared._LayoutNoNavigation;
}

@addTagHelper *, Syncfusion.EJ2

<div class="text-center">
<h1 class="display-4">Welcome</h1>
<p>Learn about <a href="https://learn.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>

<!-- Buttons Section -->
<ejs-button id="element" content="Button"></ejs-button>
<ejs-button id="primarybtn1" cssClass="e-primary" content="Primary"></ejs-button>
<ejs-button id="successbtn" cssClass="e-success" content="Success"></ejs-button>
<ejs-button id="infobtn" cssClass="e-info" content="Info"></ejs-button>
<ejs-button id="warningbtn" cssClass="e-warning" content="Warning"></ejs-button>
<ejs-button id="dangerbtn" cssClass="e-danger" content="Danger"></ejs-button>
<ejs-button id="linkbtn" cssClass="e-link" content="Link"></ejs-button>
<br />
</div>

<!-- Custom Styles for Button Icons -->
<style>
a { text-decoration: none; }
</style>

@if (DataMigrations.SkippedMigrations)
{
<div class="alert alert-error alert-dismissible">
<button type="button" class="close btn-close" data-dismiss="alert" data-bs-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-warning"></i> Warning!</h4>
Serene1 skipped running migrations to avoid modifying an arbitrary database.
If you'd like to run migrations on this database, remove the safety check
in SiteInitialization.RunMigrations method.
</div>
}

@if (ViewData["Activated"] != null)
{
<div class="alert alert-info alert-dismissible">
<button type="button" class="close btn-close" data-dismiss="alert" data-bs-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-info"></i>@Localizer.Get("Dialogs.InformationTitle")</h4>
@Texts.Forms.Membership.SignUp.ActivationCompleteMessage.ToString(Localizer)
</div>
}

<div class="s-full-page justify-content-center">
<div id="LoginPanel" class="s-container-tight s-Form flex-layout">
@@font-face {
font-family: 'button-icons';
src: url(data:application/x-font-ttf;charset=utf-8;base64,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) format('truetype');
font-weight: normal;
font-style: normal;
}
</div>
</div>
button {
margin: 25px 5px 20px 20px;
}
<script type="text/javascript">
.e-btn-sb-icons {
font-family: 'button-icons';
line-height: 1;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
jQuery(function() {
var loginPanel = new Serene1.Membership.LoginPanel($('#LoginPanel')).init();
loginPanel.element.find('.forgot-password').appendTo('.field.Password');
.e-play-icon::before {
content: '\e701';
}
@if (EnvironmentOptions.Value.IsPublicDemo)
{
<text>
loginPanel.byId('Username').val('admin').attr('placeholder', 'admin')
loginPanel.byId('Password').val('serenity').attr('placeholder', 'serenity');
</text>
.e-pause-icon::before {
content: '\e705';
}
@if (ViewData["Activated"] != null)
{
<text>
$(function() {
loginPanel.byId('Username').val(@Html.Raw(Serenity.JSON.Stringify(ViewData["Activated"])));
loginPanel.byId('Password').focus();
});
</text>
.e-open-icon::before {
content: '\e70d';
}
});
</script>
.e-add-icon::before {
content: '\e70a';
}
</style>
137 changes: 65 additions & 72 deletions Serene1/Serene1/Serene1.Web/Serene1.Web.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,66 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Serene1.Web</AssemblyName>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<SerenitySrc>..\..\Serenity\src\</SerenitySrc>
<DotNetSergen>dotnet sergen</DotNetSergen>
<DotNetSergenDir>$(SerenitySrc)Serenity.Net.CodeGenerator\bin"</DotNetSergenDir>
<DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen')">$(DotNetSergenDir)sergen</DotNetSergen>
<DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen.exe')">$(DotNetSergenDir)sergen.exe</DotNetSergen>
<CommonSrc>..\..\common-features\src\</CommonSrc>
<ProSrc>..\..\pro-features\src\</ProSrc>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\**\*.sql" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
<None Update="wwwroot\**\*">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
<None Update="Modules\**\*.Template.html;Modules\**\*.ts.html">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="EPPlus" Version="4.5.3.2" />
<PackageReference Include="FastMember" Version="1.5.0" />
<PackageReference Include="FluentMigrator.Runner" Version="3.2.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.7.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Serenity.Assets" Version="5.2.2" />
<PackageReference Include="Serenity.Extensions" Version="5.2.2" />
<PackageReference Include="Serenity.Scripts" Version="5.2.4" />
<PackageReference Include="Serenity.Net.Web" Version="6.7.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serenity.Assets" Version="5.2.2" />
<PackageReference Include="Serenity.Scripts" Version="5.2.4" />
<PackageReference Include="Serenity.Net.Web" Version="6.7.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serenity.Extensions" Version="5.2.2" />
<PackageReference Include="Serenity.Demo.Northwind" Version="5.2.2" />
<PackageReference Include="Serenity.Demo.BasicSamples" Version="5.2.2" />
</ItemGroup>
<Import Project="$(SolutionDir)Serenity\build\submodule.targets" Condition="Exists('$(SolutionDir)Serenity\build\submodule.targets')" />
<Target Name="CreateInputsOutputs" BeforeTargets="BeforeBuild">
<CreateItem Include="Modules\**\*.ts;Imports\**\*.ts;tsconfig.json">
<Output TaskParameter="Include" ItemName="CompileTSCInputs" />
</CreateItem>
</Target>
<Target Name="NpmInstall" BeforeTargets="BeforeBuild" Condition="!Exists('node_modules\@types\jquery\index.d.ts')">
<Message Text="Installing NPM packages..." Importance="high"></Message>
<Exec Command="npm install" />
</Target>
<Target Name="TransformMvcClientTypes" BeforeTargets="BeforeBuild">
<Exec Command="dotnet tool restore" ContinueOnError="true" />
<Exec Command="$(DotNetSergen) restore" ContinueOnError="true" />
<Exec Command="$(DotNetSergen) mvct" ContinueOnError="true" />
</Target>
<Target Name="TransformServerTypings" AfterTargets="AfterBuild">
<Exec Command="$(DotNetSergen) servertypings" ContinueOnError="true" />
</Target>
<Target Name="CompileTSC" AfterTargets="AfterBuild" Inputs="@(CompileTSCInputs)" Outputs="wwwroot\Scripts\site\Serene1.Web.js">
<Message Text="Executing TypeScript compiler..." Importance="high"></Message>
<Exec Command="node &quot;$(TSJavaScriptFile.Replace('build\\..\tools\', 'tools\'))&quot; -p ./tsconfig.json" ContinueOnError="true" />
</Target>
</Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Serene1.Web</AssemblyName>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<SerenitySrc>..\..\Serenity\src\</SerenitySrc>
<DotNetSergen>dotnet sergen</DotNetSergen>
<DotNetSergenDir>$(SerenitySrc)Serenity.Net.CodeGenerator\bin</DotNetSergenDir>
<DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen')">$(DotNetSergenDir)sergen</DotNetSergen>
<DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen.exe')">$(DotNetSergenDir)sergen.exe</DotNetSergen>
<CommonSrc>..\..\common-features\src\</CommonSrc>
<ProSrc>..\..\pro-features\src\</ProSrc>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\**\*.sql" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
<None Update="wwwroot\**\*">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
<None Update="Modules\**\*.Template.html;Modules\**\*.ts.html">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="EPPlus" Version="6.2.3" />
<PackageReference Include="FastMember" Version="1.5.0" />
<PackageReference Include="FluentMigrator.Runner" Version="3.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0" />
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.4.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Serenity.Assets" Version="6.0.0" />
<PackageReference Include="Serenity.Extensions" Version="6.0.0" />
<PackageReference Include="Serenity.Scripts" Version="6.0.0" />
<PackageReference Include="Serenity.Net.Web" Version="6.0.0" />
<PackageReference Include="Serenity.Demo.Northwind" Version="6.0.0" />
<PackageReference Include="Serenity.Demo.BasicSamples" Version="6.0.0" />
<PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.1.35" />
</ItemGroup>
<Import Project="$(SolutionDir)Serenity\build\submodule.targets" Condition="Exists('$(SolutionDir)Serenity\build\submodule.targets')" />
<Target Name="CreateInputsOutputs" BeforeTargets="BeforeBuild">
<CreateItem Include="Modules\**\*.ts;Imports\**\*.ts;tsconfig.json">
<Output TaskParameter="Include" ItemName="CompileTSCInputs" />
</CreateItem>
</Target>
<Target Name="NpmInstall" BeforeTargets="BeforeBuild" Condition="!Exists('node_modules\@types\jquery\index.d.ts')">
<Message Text="Installing NPM packages..." Importance="high"></Message>
<Exec Command="npm install" />
</Target>
<Target Name="TransformMvcClientTypes" BeforeTargets="BeforeBuild">
<Exec Command="dotnet tool restore" ContinueOnError="true" />
<Exec Command="$(DotNetSergen) restore" ContinueOnError="true" />
<Exec Command="$(DotNetSergen) mvct" ContinueOnError="true" />
</Target>
<Target Name="TransformServerTypings" AfterTargets="AfterBuild">
<Exec Command="$(DotNetSergen) servertypings" ContinueOnError="true" />
</Target>
<Target Name="CompileTSC" AfterTargets="AfterBuild" Inputs="@(CompileTSCInputs)" Outputs="wwwroot\Scripts\site\Serene1.Web.js">
<Message Text="Executing TypeScript compiler..." Importance="high"></Message>
<Exec Command="node &quot;$(TSJavaScriptFile.Replace('build\\..\tools\', 'tools\'))&quot; -p ./tsconfig.json" ContinueOnError="true" />
</Target>
</Project>
5 changes: 5 additions & 0 deletions Serene1/Serene1/Serene1.Web/Views/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
<partial name="@MVC.Views.Shared._LayoutHead" />
@RenderSection("Head", false)
<title>@(ViewData["Title"]) - Serene1</title>
<!-- Syncfusion ASP.NET Core controls styles -->
<link rel="stylesheet" href="https://cdn.syncfusion.com/ej2/28.1.33/fluent.css" />
<!-- Syncfusion ASP.NET Core controls scripts -->
<script src="https://cdn.syncfusion.com/ej2/28.1.33/dist/ej2.min.js"></script>
</head>
<body id="s-@(ViewData["PageId"])Page" class="@(ViewData["BodyClass"]) @(sidebarPaneCollapsed)">
<div id="PageBackground" style="display: none"></div>
Expand Down Expand Up @@ -44,5 +48,6 @@ else
</section>
</main>
}
<ejs-scripts></ejs-scripts>
</body>
</html>
1 change: 1 addition & 0 deletions Serene1/Serene1/Serene1.Web/Views/_ViewImports.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
@using Serene1
@using Microsoft.AspNetCore.Html
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Syncfusion.EJ2

0 comments on commit 986af59

Please sign in to comment.