Skip to content

Commit f63ac4d

Browse files
cathalbahncathalbahn
committed
Added Compiler Config - https://marketplace.visualstudio.com/items?itemName=MadsKristensen.WebCompiler Added Environment Tags Added Alert Manager Replaced Right User Area with Component Added Dashboard with Chart Removed Unused RightSideBar Removed Unused SideBarNav Html Fixes
1 parent d700a1b commit f63ac4d

File tree

122 files changed

+33288
-698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+33288
-698
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/DefaultLanguagesCreator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private static List<ApplicationLanguage> GetInitialLanguages()
1717
var tenantId = AbpProjectNameConsts.MultiTenancyEnabled ? null : (int?)MultiTenancyConsts.DefaultTenantId;
1818
return new List<ApplicationLanguage>
1919
{
20-
new ApplicationLanguage(tenantId, "en", "English", "flag-icon flag-icon-us"),
20+
new ApplicationLanguage(tenantId, "en", "English", "flag-icon flag-icon-gb"),
2121
new ApplicationLanguage(tenantId, "ar", "العربية", "flag-icon flag-icon-sa"),
2222
new ApplicationLanguage(tenantId, "de", "German", "flag-icon flag-icon-de"),
2323
new ApplicationLanguage(tenantId, "it", "Italiano", "flag-icon flag-icon-it"),

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/About/Index.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using AbpCompanyName.AbpProjectName.Web.Startup
22
@{
33
ViewBag.CurrentPageName = PageNames.About;
4+
ViewBag.Title = L("About");
45
}
56
<div class="content-header">
67
<div class="container-fluid">
@@ -9,7 +10,7 @@
910
<h1 class="m-0 text-dark">@L("About")</h1>
1011
</div>
1112
</div>
12-
</div>
13+
</div>
1314
</div>
1415
<div class="content">
1516
<div class="container-fluid">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/AbpProjectNameRazorPage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Microsoft.AspNetCore.Mvc.Razor.Internal;
2-
using Abp.AspNetCore.Mvc.Views;
1+
using Abp.AspNetCore.Mvc.Views;
32
using Abp.Runtime.Session;
3+
using Microsoft.AspNetCore.Mvc.Razor.Internal;
44

55
namespace AbpCompanyName.AbpProjectName.Web.Views
66
{

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ViewBag.Title = L("LogIn");
55
}
66
@section scripts
7-
{
7+
{
88
<environment names="Development">
99
<script src="~/view-resources/Views/Account/Login.js" asp-append-version="true"></script>
1010
</environment>
@@ -13,12 +13,12 @@
1313
<script src="~/view-resources/Views/Account/Login.min.js" asp-append-version="true"></script>
1414
</environment>
1515
}
16-
<p class="login-box-msg">@L("LogIn")</p>
16+
<h4 class="text-center">@L("LogIn")</h4>
1717
<form id="LoginForm" asp-action="Login" method="post">
1818
<input type="hidden" name="returnUrl" value="@Model.ReturnUrl" />
1919
<input type="hidden" name="returnUrlHash" />
2020
<div class="input-group mb-3">
21-
<input name="usernameOrEmailAddress" class="form-control" placeholder="@L("UserNameOrEmail")" required autofocus maxlength="@AbpUserBase.MaxEmailAddressLength">
21+
<input type="text" name="usernameOrEmailAddress" class="form-control" placeholder="@L("UserNameOrEmail")" required autofocus maxlength="@AbpUserBase.MaxEmailAddressLength">
2222
<div class="input-group-append">
2323
<div class="input-group-text">
2424
<span class="fas fa-user"></span>
@@ -43,7 +43,7 @@
4343
</div>
4444
</div>
4545
<div class="col-4">
46-
<button type="submit" id="LoginButton" class="btn btn-primary btn-block">@L("LogIn")</button>
46+
<button type="submit" id="LoginButton" class="btn btn-primary btn-block btn-flat">@L("LogIn")</button>
4747
</div>
4848
</div>
4949
</form>
@@ -59,6 +59,10 @@
5959
<p class="mb-0">
6060
@if (Model.IsSelfRegistrationAllowed)
6161
{
62-
<a asp-action="Register" class="text-center"><i class="fa fa-plus-circle"></i> @L("Register")</a>
62+
<div class="row">
63+
<div class="col-12">
64+
<a asp-action="Register" class="text-center"><i class="fa fa-plus-circle"></i> @L("Register")</a>
65+
</div>
66+
</div>
6367
}
6468
</p>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Register.cshtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ViewBag.Title = L("Register");
55
}
66
@section scripts
7-
{
7+
{
88
<environment names="Development">
99
<script src="~/view-resources/Views/Account/Register.js" asp-append-version="true"></script>
1010
</environment>
@@ -13,26 +13,26 @@
1313
<script src="~/view-resources/Views/Account/Register.min.js" asp-append-version="true"></script>
1414
</environment>
1515
}
16-
<p class="login-box-msg">@L("Register")</p>
16+
<h4 class="text-center">@L("Register")</h4>
1717
<form id="RegisterForm" asp-action="Register" method="post">
1818
@if (ViewBag.ErrorMessage != null)
1919
{
2020
<div class="alert alert-danger">
21-
<i class="fa fa-warning"></i> @ViewBag.ErrorMessage
21+
<i class="fas fa-warning"></i> @ViewBag.ErrorMessage
2222
</div>
2323
}
2424
<input type="hidden" name="IsExternalLogin" value="@Model.IsExternalLogin.ToString()" />
2525
<input type="hidden" name="ExternalLoginAuthSchema" value="@Model.ExternalLoginAuthSchema" />
2626
<div class="input-group mb-3">
27-
<input name="Name" class="form-control" placeholder="@L("Name")" value="@Model.Name" required maxlength="@AbpUserBase.MaxNameLength">
27+
<input type="text" name="Name" class="form-control" placeholder="@L("Name")" value="@Model.Name" required maxlength="@AbpUserBase.MaxNameLength">
2828
<div class="input-group-append">
2929
<div class="input-group-text">
3030
<span class="fas fa-arrow-left"></span>
3131
</div>
3232
</div>
3333
</div>
3434
<div class="input-group mb-3">
35-
<input name="Surname" class="form-control" placeholder="@L("Surname")" value="@Model.Surname" required maxlength="@AbpUserBase.MaxSurnameLength">
35+
<input type="text" name="Surname" class="form-control" placeholder="@L("Surname")" value="@Model.Surname" required maxlength="@AbpUserBase.MaxSurnameLength">
3636
<div class="input-group-append">
3737
<div class="input-group-text">
3838
<span class="fas fa-arrow-left"></span>
@@ -48,7 +48,7 @@
4848
</div>
4949
</div>
5050
<div class="input-group mb-3">
51-
<input name="UserName" class="form-control" placeholder="@L("UserName")" value="@Model.UserName" required maxlength="@AbpUserBase.MaxUserNameLength">
51+
<input type="text" name="UserName" class="form-control" placeholder="@L("UserName")" value="@Model.UserName" required maxlength="@AbpUserBase.MaxUserNameLength">
5252
<div class="input-group-append">
5353
<div class="input-group-text">
5454
<span class="fas fa-user"></span>
@@ -65,10 +65,10 @@
6565
</div>
6666
<div class="row">
6767
<div class="col-8">
68-
<a asp-action="Login" class="text-center"><i class="fa fa-arrow-circle-left"></i> @L("Back")</a>
68+
<a asp-action="Login" class="btn btn-default btn-flat"><i class="fa fa-arrow-circle-left"></i> @L("Back")</a>
6969
</div>
7070
<div class="col-4">
71-
<button type="submit" id="RegisterButton" class="btn btn-primary btn-block">@L("Register")</button>
71+
<button type="submit" id="RegisterButton" class="btn btn-primary btn-flat float-right">@L("Register")</button>
7272
</div>
7373
</div>
7474
</form>
@@ -82,4 +82,4 @@
8282
<i class="fab fa-google-plus mr-2"></i>
8383
Sign up using Google+
8484
</a>
85-
</div>*@
85+
</div>*@

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/RegisterResult.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ViewBag.Title = L("SuccessfullyRegistered");
44
}
55
<div class="card">
6-
<div class="body">
6+
<div class="card-body">
77
<h4>@L("SuccessfullyRegistered")</h4>
88
<ul>
99
<li><span class="text-muted">@L("NameSurname"):</span> @Model.NameAndSurname</li>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml

Lines changed: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,21 @@
2626

2727
<link rel="shortcut icon" href="~/img/favicon.ico">
2828
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
29-
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" />
30-
<link href="~/libs/flag-icon/css/flag-icon.min.css" rel="stylesheet" />
31-
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.min.css" rel="stylesheet" />
32-
<link href="~/libs/toastr/toastr.min.css" rel="stylesheet" />
33-
<link href="~/libs/admin-lte/dist/css/adminlte.min.css" rel="stylesheet" />
34-
<link href="~/css/main.css" rel="stylesheet" />
35-
<link href="~/css/style.css" rel="stylesheet" />
29+
30+
<environment names="Development">
31+
<link href="~/libs/font-awesome/css/all.css" rel="stylesheet" asp-append-version="true" />
32+
<link href="~/libs/flag-icon/css/flag-icon.css" rel="stylesheet" asp-append-version="true" />
33+
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
34+
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
35+
<link href="~/libs/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />
36+
<link href="~/libs/admin-lte/dist/css/adminlte.css" rel="stylesheet" asp-append-version="true" />
37+
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
38+
<link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
39+
</environment>
40+
41+
<environment names="Staging,Production">
42+
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />
43+
</environment>
3644

3745
@RenderSection("styles", required: false)
3846
</head>
@@ -61,41 +69,50 @@
6169
</div>
6270
</div>
6371
</div>
64-
<script src="~/libs/jquery/jquery.min.js"></script>
65-
<script src="~/libs/bootstrap/js/bootstrap.bundle.min.js"></script>
66-
<script src="~/libs/admin-lte/dist/js/adminlte.min.js"></script>
67-
<script src="~/libs/jquery-validate/jquery.validate.min.js"></script>
72+
<script type="text/javascript">
73+
// This is used to get the application's root path from javascript.
74+
// It's useful if you're running application in a virtual directory under IIS.
75+
var abp = abp || {};
76+
abp.appPath = '@ApplicationPath';
77+
</script>
78+
<environment names="Development">
79+
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
80+
<script src="~/libs/bootstrap/js/bootstrap.bundle.js" asp-append-version="true"></script>
81+
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
82+
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
83+
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
84+
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
85+
<script src="~/libs/block-ui/jquery.blockUI.js" asp-append-version="true"></script>
86+
<script src="~/libs/spin/spin.js" asp-append-version="true"></script>
87+
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
88+
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
89+
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
90+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
91+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
92+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
93+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
94+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
95+
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
96+
<script src="~/js/main.js" asp-append-version="true"></script>
97+
</environment>
98+
99+
<environment names="Staging,Production">
100+
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
101+
</environment>
102+
68103
@if (CultureInfo.CurrentUICulture.Name != "en")
69104
{
70-
<script src="~/libs/jquery-validate/localization/[email protected](CultureInfo.CurrentUICulture.Name.Replace("-", "_" ) + ".js" )" asp-append-version="true"></script>
105+
<script src="~/libs/jquery-validate/localization/[email protected](CultureInfo.CurrentUICulture.Name.Replace("-", "_") + ".js")" asp-append-version="true"></script>
71106
}
72-
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.min.js"></script>
73-
<script src="~/libs/toastr/toastr.min.js"></script>
74-
<script src="~/libs/block-ui/jquery.blockUI.min.js"></script>
75-
<script src="~/libs/spin/spin.min.js"></script>
76-
<script src="~/libs-ext/spin/jquery.spin.js"></script>
77-
<script src="~/libs/sweetalert/sweetalert.min.js"></script>
78-
<script src="~/libs/moment/moment-with-locales.min.js"></script>
107+
79108
<script type="text/javascript">
80109
// Localizing momentjs
81110
moment.locale('@CultureInfo.CurrentUICulture.Name');
82-
83-
// This is used to get the application's root path from javascript.
84-
// It's useful if you're running application in a virtual directory under IIS.
85-
var abp = abp || {};
86-
abp.appPath = '@ApplicationPath';
87111
</script>
88-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
89-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
90-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
91-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
92-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
93-
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
112+
94113
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
95114
<script src="~/AbpServiceProxies/GetAll?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
96115
<script src="~/AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
97-
<script src="~/js/main.js"></script>
98-
<script src="~/js/script.js"></script>
99116

100117
@WebResourceManager.RenderScripts()
101118
@RenderSection("scripts", required: false)

0 commit comments

Comments
 (0)