Skip to content

Commit 0f43633

Browse files
alirizaadiyahsialirizaadiyahsi
committed
2 parents debbb14 + 261f965 commit 0f43633

File tree

244 files changed

+949
-22746
lines changed

Some content is hidden

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

244 files changed

+949
-22746
lines changed

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj‎

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,9 @@
488488
<Content Include="Content\themes\base\tooltip.css" />
489489
<Content Include="css\materialize.css" />
490490
<Content Include="css\style.css" />
491-
<Content Include="css\style.min.css" />
491+
<Content Include="css\style.min.css">
492+
<DependentUpon>style.css</DependentUpon>
493+
</Content>
492494
<Content Include="css\themes\all-themes.css" />
493495
<Content Include="css\themes\all-themes.min.css" />
494496
<Content Include="css\themes\theme-amber.css" />
@@ -2232,47 +2234,7 @@
22322234
<Content Include="lib\spin.js\jquery.spin.js" />
22332235
<Content Include="lib\spin.js\spin.js" />
22342236
<Content Include="lib\spin.js\spin.min.js" />
2235-
<Content Include="lib\sweetalert\.gitignore" />
2236-
<Content Include="lib\sweetalert\dev\gulpfile-wrap-template.js" />
2237-
<Content Include="lib\sweetalert\dev\ie9.css" />
2238-
<Content Include="lib\sweetalert\dev\loader-animation.css" />
2239-
<Content Include="lib\sweetalert\dev\modules\default-params.js" />
2240-
<Content Include="lib\sweetalert\dev\modules\handle-click.js" />
2241-
<Content Include="lib\sweetalert\dev\modules\handle-dom.js" />
2242-
<Content Include="lib\sweetalert\dev\modules\handle-key.js" />
2243-
<Content Include="lib\sweetalert\dev\modules\handle-swal-dom.js" />
2244-
<Content Include="lib\sweetalert\dev\modules\injected-html.js" />
2245-
<Content Include="lib\sweetalert\dev\modules\set-params.js" />
2246-
<Content Include="lib\sweetalert\dev\modules\utils.js" />
2247-
<Content Include="lib\sweetalert\dev\sweetalert.es6.js" />
2248-
<Content Include="lib\sweetalert\dist\sweetalert-dev.js" />
2249-
<Content Include="lib\sweetalert\dist\sweetalert.css" />
22502237
<Content Include="lib\sweetalert\dist\sweetalert.min.js" />
2251-
<Content Include="lib\sweetalert\example\example.css" />
2252-
<Content Include="lib\sweetalert\example\images\logo_big%402x.png" />
2253-
<Content Include="lib\sweetalert\example\images\logo_big.png" />
2254-
<Content Include="lib\sweetalert\example\images\logo_small%402x.png" />
2255-
<Content Include="lib\sweetalert\example\images\logo_small.png" />
2256-
<Content Include="lib\sweetalert\example\images\thumbs-up.jpg" />
2257-
<Content Include="lib\sweetalert\example\images\vs_icon%402x.png" />
2258-
<Content Include="lib\sweetalert\example\images\vs_icon.png" />
2259-
<Content Include="lib\sweetalert\gulpfile.js" />
2260-
<Content Include="lib\sweetalert\index.html" />
2261-
<Content Include="lib\sweetalert\lib\modules\default-params.js" />
2262-
<Content Include="lib\sweetalert\lib\modules\handle-click.js" />
2263-
<Content Include="lib\sweetalert\lib\modules\handle-dom.js" />
2264-
<Content Include="lib\sweetalert\lib\modules\handle-key.js" />
2265-
<Content Include="lib\sweetalert\lib\modules\handle-swal-dom.js" />
2266-
<Content Include="lib\sweetalert\lib\modules\injected-html.js" />
2267-
<Content Include="lib\sweetalert\lib\modules\set-params.js" />
2268-
<Content Include="lib\sweetalert\lib\modules\utils.js" />
2269-
<Content Include="lib\sweetalert\lib\sweetalert.js" />
2270-
<Content Include="lib\sweetalert\sweetalert.gif" />
2271-
<Content Include="lib\sweetalert\test\index.html" />
2272-
<Content Include="lib\sweetalert\test\tests.js" />
2273-
<Content Include="lib\sweetalert\themes\facebook\facebook.css" />
2274-
<Content Include="lib\sweetalert\themes\google\google.css" />
2275-
<Content Include="lib\sweetalert\themes\twitter\twitter.css" />
22762238
<Content Include="lib\toastr\toastr.css" />
22772239
<Content Include="lib\toastr\toastr.js" />
22782240
<Content Include="lib\toastr\toastr.min.css" />
@@ -2719,20 +2681,8 @@
27192681
<Content Include="lib\spin.js\bower.json" />
27202682
<Content Include="lib\spin.js\LICENSE.md" />
27212683
<Content Include="lib\spin.js\README.md" />
2722-
<Content Include="lib\sweetalert\.bower.json" />
2723-
<Content Include="lib\sweetalert\.editorconfig" />
2724-
<Content Include="lib\sweetalert\.jshintrc" />
2725-
<Content Include="lib\sweetalert\.travis.yml" />
2726-
<Content Include="lib\sweetalert\bower.json" />
2727-
<Content Include="lib\sweetalert\dev\sweetalert.scss" />
2728-
<Content Include="lib\sweetalert\example\example.scss" />
2729-
<Content Include="lib\sweetalert\example\images\te-logo-small.svg" />
2730-
<Content Include="lib\sweetalert\LICENSE" />
27312684
<Content Include="lib\sweetalert\package.json" />
27322685
<Content Include="lib\sweetalert\README.md" />
2733-
<Content Include="lib\sweetalert\themes\facebook\facebook.scss" />
2734-
<Content Include="lib\sweetalert\themes\google\google.scss" />
2735-
<Content Include="lib\sweetalert\themes\twitter\twitter.scss" />
27362686
<Content Include="lib\toastr\.bower.json" />
27372687
<Content Include="lib\toastr\bower.json" />
27382688
<Content Include="lib\toastr\README.md" />
@@ -2754,6 +2704,7 @@
27542704
<Content Include="Abp\Framework\styles\abp.mixings.css.map" />
27552705
<Content Include="Abp\Framework\styles\abp.less" />
27562706
<Content Include="Abp\Framework\styles\abp.css.map" />
2707+
<None Include="bundleconfig.json" />
27572708
<None Include="compilerconfig.json" />
27582709
<None Include="compilerconfig.json.defaults">
27592710
<DependentUpon>compilerconfig.json</DependentUpon>
@@ -2771,6 +2722,10 @@
27712722
<Content Include="Content\bootstrap.css.map" />
27722723
<Content Include="Content\bootstrap-theme.min.css.map" />
27732724
<Content Include="Content\bootstrap-theme.css.map" />
2725+
<Content Include="lib\sweetalert\LICENSE.md" />
2726+
<Content Include="fonts\material-icons\materialicons.eot" />
2727+
<Content Include="fonts\material-icons\materialicons.ttf" />
2728+
<Content Include="fonts\material-icons\materialicons.woff" />
27742729
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
27752730
<None Include="Scripts\jquery-3.2.1.intellisense.js" />
27762731
<Content Include="Scripts\bootstrap.js" />
@@ -3026,6 +2981,32 @@
30262981
<ItemGroup>
30272982
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
30282983
</ItemGroup>
2984+
<ItemGroup>
2985+
<TypeScriptCompile Include="lib\sweetalert\typings\core.d.ts" />
2986+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\actions.d.ts" />
2987+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\class-list\index.d.ts" />
2988+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\event-listeners.d.ts" />
2989+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\buttons.d.ts" />
2990+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\content.d.ts" />
2991+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\icon.d.ts" />
2992+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\index.d.ts" />
2993+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\modal.d.ts" />
2994+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\overlay.d.ts" />
2995+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\text.d.ts" />
2996+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\buttons.d.ts" />
2997+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\content.d.ts" />
2998+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\icons.d.ts" />
2999+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\index.d.ts" />
3000+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\modal.d.ts" />
3001+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\overlay.d.ts" />
3002+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\buttons.d.ts" />
3003+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\content.d.ts" />
3004+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\deprecations.d.ts" />
3005+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\index.d.ts" />
3006+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\state.d.ts" />
3007+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\utils.d.ts" />
3008+
<TypeScriptCompile Include="lib\sweetalert\typings\sweetalert.d.ts" />
3009+
</ItemGroup>
30293010
<PropertyGroup>
30303011
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
30313012
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/BundleConfig.cs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public static void RegisterBundles(BundleCollection bundles)
1414
.Include("~/fonts/material-icons/materialicons.css", new CssRewriteUrlTransform())
1515
.Include("~/lib/bootstrap/dist/css/bootstrap.css", new CssRewriteUrlTransform())
1616
.Include("~/lib/toastr/toastr.css", new CssRewriteUrlTransform())
17-
.Include("~/lib/sweetalert/dist/sweetalert.css", new CssRewriteUrlTransform())
1817
.Include("~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css", new CssRewriteUrlTransform())
1918
.Include("~/lib/font-awesome/css/font-awesome.css", new CssRewriteUrlTransform())
2019
.Include("~/lib/Waves/dist/waves.css", new CssRewriteUrlTransform())
@@ -34,16 +33,16 @@ public static void RegisterBundles(BundleCollection bundles)
3433
"~/lib/jquery-validation/dist/jquery.validate.js",
3534
"~/lib/blockUI/jquery.blockUI.js",
3635
"~/lib/toastr/toastr.js",
37-
"~/lib/sweetalert/dist/sweetalert-dev.js",
36+
"~/lib/sweetalert/dist/sweetalert.min.js",
3837
"~/lib/spin.js/spin.js",
3938
"~/lib/spin.js/jquery.spin.js",
4039
"~/lib/Waves/dist/waves.js",
41-
"~/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
42-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
43-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
44-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
45-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
46-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
40+
"~/Abp/Framework/scripts/abp.js",
41+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
42+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
43+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
44+
"~/Abp/Framework/scripts/libs/abp.spin.js",
45+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
4746
"~/js/admin.js",
4847
"~/js/main.js"
4948
)
@@ -59,7 +58,6 @@ public static void RegisterBundles(BundleCollection bundles)
5958
.Include("~/lib/bootstrap/dist/css/bootstrap.css", new CssRewriteUrlTransform())
6059
.Include("~/lib/bootstrap-select/dist/css/bootstrap-select.css", new CssRewriteUrlTransform())
6160
.Include("~/lib/toastr/toastr.css", new CssRewriteUrlTransform())
62-
.Include("~/lib/sweetalert/dist/sweetalert.css", new CssRewriteUrlTransform())
6361
.Include("~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css", new CssRewriteUrlTransform())
6462
.Include("~/lib/font-awesome/css/font-awesome.css", new CssRewriteUrlTransform())
6563
.Include("~/lib/Waves/dist/waves.css", new CssRewriteUrlTransform())
@@ -81,19 +79,19 @@ public static void RegisterBundles(BundleCollection bundles)
8179
"~/lib/jquery-validation/dist/jquery.validate.js",
8280
"~/lib/blockUI/jquery.blockUI.js",
8381
"~/lib/toastr/toastr.js",
84-
"~/lib/sweetalert/dist/sweetalert-dev.js",
82+
"~/lib/sweetalert/dist/sweetalert.min.js",
8583
"~/lib/spin.js/spin.js",
8684
"~/lib/spin.js/jquery.spin.js",
8785
"~/lib/bootstrap-select/dist/js/bootstrap-select.js",
8886
"~/lib/jquery-slimscroll/jquery.slimscroll.js",
8987
"~/lib/Waves/dist/waves.js",
9088
"~/lib/push.js/push.js",
91-
"~/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
92-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
93-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
94-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
95-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
96-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
89+
"~/Abp/Framework/scripts/abp.js",
90+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
91+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
92+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
93+
"~/Abp/Framework/scripts/libs/abp.spin.js",
94+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
9795
"~/js/admin.js",
9896
"~/js/main.js",
9997
"~/Views/Shared/_Layout.js",

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/Startup.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
using System.Configuration;
13
using Abp.Owin;
24
using AbpCompanyName.AbpProjectName.Api.Controllers;
35
using AbpCompanyName.AbpProjectName.WebMpa;
@@ -21,7 +23,11 @@ public void Configuration(IAppBuilder app)
2123
app.UseCookieAuthentication(new CookieAuthenticationOptions
2224
{
2325
AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie,
24-
LoginPath = new PathString("/Account/Login")
26+
LoginPath = new PathString("/Account/Login"),
27+
// by setting following values, the auth cookie will expire after the configured amount of time (default 14 days) when user set the (IsPermanent == true) on the login
28+
ExpireTimeSpan = new TimeSpan(int.Parse(ConfigurationManager.AppSettings["AuthSession.ExpireTimeInDays.WhenPersistent"] ?? "14"), 0, 0, 0),
29+
SlidingExpiration = bool.Parse(ConfigurationManager.AppSettings["AuthSession.SlidingExpirationEnabled"] ?? bool.FalseString)
30+
2531
});
2632

2733
app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
@@ -35,4 +41,4 @@ public void Configuration(IAppBuilder app)
3541
//});
3642
}
3743
}
38-
}
44+
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/Controllers/AccountController.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,21 @@ private async Task SignInAsync(User user, ClaimsIdentity identity = null, bool r
139139
}
140140

141141
_authenticationManager.SignOut(DefaultAuthenticationTypes.ApplicationCookie);
142-
_authenticationManager.SignIn(new AuthenticationProperties { IsPersistent = rememberMe }, identity);
142+
// Many browsers do not clean up session cookies when you close them. So the rule of thumb must be:
143+
// For having a consistent behaviour across all browsers, don't rely solely on browser behaviour for proper clean-up
144+
// of session cookies. It is safer to use non-session cookies (IsPersistent == true) in bundle with an expiration date.
145+
// See http://blog.petersondave.com/cookies/Session-Cookies-in-Chrome-Firefox-and-Sitecore/
146+
if (rememberMe) {
147+
_authenticationManager.SignIn(new AuthenticationProperties { IsPersistent = true }, identity);
148+
} else {
149+
_authenticationManager.SignIn(
150+
new AuthenticationProperties
151+
{
152+
IsPersistent = true,
153+
ExpiresUtc = DateTimeOffset.UtcNow.AddMinutes(int.Parse(System.Configuration.ConfigurationManager.AppSettings["AuthSession.ExpireTimeInMinutes.WhenNotPersistent"] ?? "30"))
154+
},
155+
identity);
156+
}
143157
}
144158

145159
private Exception CreateExceptionForFailedLoginAttempt(AbpLoginResultType result, string usernameOrEmailAddress, string tenancyName)
@@ -547,4 +561,4 @@ public PartialViewResult _AccountLanguages()
547561

548562
#endregion
549563
}
550-
}
564+
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/bundleconfig.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"outputFileName": "css/style.min.css",
4+
"inputFiles": [
5+
"css/style.css"
6+
]
7+
}
8+
]

‎src/AbpCompanyName.AbpProjectName.WebMpa/css/style.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8026,3 +8026,6 @@ html.ie11 .dropdown-menu ul.menu li a {
80268026
html.ie11 .bs-searchbox .form-control {
80278027
width: 90%; }
80288028

8029+
.swal-footer {
8030+
text-align: center;
8031+
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/css/style.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AbpCompanyName.AbpProjectName.WebMpa/fonts/material-icons/materialicons.css‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,28 @@
33
font-family: 'Material Icons';
44
font-style: normal;
55
font-weight: 400;
6-
src: local('Material Icons'), local('MaterialIcons-Regular'), url(materialicons.woff2) format('woff2');
6+
src: url(materialicons.eot); /* For IE6-8 */
7+
src: local('Material Icons'), local('MaterialIcons-Regular'), url(materialicons.woff2) format('woff2'), url(materialicons.woff) format('woff'), url(materialicons.ttf) format('truetype');
78
}
89

910
.material-icons {
1011
font-family: 'Material Icons';
1112
font-weight: normal;
1213
font-style: normal;
13-
font-size: 24px;
14+
font-size: 24px; /* Preferred icon size */
15+
display: inline-block;
1416
line-height: 1;
15-
letter-spacing: normal;
1617
text-transform: none;
17-
display: inline-block;
18-
white-space: nowrap;
18+
letter-spacing: normal;
1919
word-wrap: normal;
20+
white-space: nowrap;
2021
direction: ltr;
21-
-webkit-font-feature-settings: 'liga';
22+
/* Support for all WebKit browsers. */
2223
-webkit-font-smoothing: antialiased;
24+
/* Support for Safari and Chrome. */
25+
text-rendering: optimizeLegibility;
26+
/* Support for Firefox. */
27+
-moz-osx-font-smoothing: grayscale;
28+
/* Support for IE. */
29+
font-feature-settings: 'liga';
2330
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/fonts/material-icons/materialicons.eot‎

140 KB
Binary file not shown.

‎src/AbpCompanyName.AbpProjectName.WebMpa/fonts/material-icons/materialicons.ttf‎

125 KB
Binary file not shown.

0 commit comments

Comments
 (0)