Skip to content

Commit 396d30b

Browse files
Vatsal6288Vatsal6288
authored
Merge pull request #3 from themeselection/dev
Merge dev branch into main branch
2 parents 2ecde34 + 58648b2 commit 396d30b

File tree

292 files changed

+37427
-46959
lines changed

Some content is hidden

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

292 files changed

+37427
-46959
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ bld/
100100
.vs/
101101
# Uncomment if you have tasks that create the project's static files in wwwroot
102102

103+
# Ignoring following files/folder only for master
103104

105+
wwwroot/vendor/fonts/*.css
106+
wwwroot/vendor/fonts/**/*
107+
wwwroot/vendor/**/*.js
104108

105109

106110
# Visual Studio 2017 auto generated files

‎AspnetCoreMvcFull.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
8-
98
</Project>

‎Gulpfile.js‎

Lines changed: 25 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ const buildCssTask = function (cb) {
6666
gulpIf(
6767
conf.minify,
6868
`sass --load-path=node_modules/ src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --style compressed --no-source-map`,
69-
gulpIf(
70-
conf.fastDev,
71-
`sass --load-path=node_modules/ src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/scss/pages:${conf.distPath}/vendor/css/pages src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --no-source-map`
72-
)
69+
`sass --load-path=node_modules/ src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --no-source-map`
7370
),
7471
function (err) {
7572
cb(err);
@@ -146,58 +143,35 @@ const pageJsTask = function () {
146143
.pipe(dest(conf.distPath + `/js`));
147144
};
148145

149-
// Build fonts
146+
// Iconify task
150147
// -------------------------------------------------------------------------------
148+
const buildIconifyTask = function (cb) {
149+
// Create required directories without copying files
150+
const fs = require('fs');
151+
const directories = ['./src/fonts/iconify', './src/fonts'];
152+
153+
directories.forEach(dir => {
154+
if (!fs.existsSync(dir)) {
155+
fs.mkdirSync(dir, { recursive: true });
156+
}
157+
});
151158

152-
const FONT_TASKS = [
153-
{
154-
name: 'remixicon',
155-
path: [
156-
'node_modules/remixicon/fonts/remixicon.eot',
157-
'node_modules/remixicon/fonts/remixicon.ttf',
158-
'node_modules/remixicon/fonts/remixicon.woff',
159-
'node_modules/remixicon/fonts/remixicon.woff2',
160-
'node_modules/remixicon/fonts/remixicon.svg'
161-
]
162-
}
163-
].reduce(function (tasks, font) {
164-
const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
165-
const taskFunction = function () {
166-
// return src(root(font.path))
167-
return (
168-
src(font.path)
169-
// .pipe(dest(normalize(path.join(conf.distPath, 'fonts', font.name))))
170-
.pipe(dest(path.join(conf.distPath + `/vendor/`, 'fonts', font.name)))
171-
);
172-
};
173-
174-
Object.defineProperty(taskFunction, 'name', {
175-
value: functionName
159+
const iconify = require('child_process').spawn('node', ['./src/fonts/iconify/iconify.js'], {
160+
cwd: __dirname
176161
});
177162

178-
return tasks.concat([taskFunction]);
179-
}, []);
180-
181-
// Formula module requires KaTeX - Quill Editor
182-
const KATEX_FONT_TASK = [
183-
{
184-
name: 'katex',
185-
path: 'node_modules/katex/dist/fonts/*'
186-
}
187-
].reduce(function (tasks, font) {
188-
const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
189-
const taskFunction = function () {
190-
return src(font.path).pipe(dest(path.join(conf.distPath, 'vendor/libs/quill/fonts')));
191-
};
192-
193-
Object.defineProperty(taskFunction, 'name', {
194-
value: functionName
163+
iconify.stdout.on('data', data => {
164+
console.log(data.toString());
195165
});
196166

197-
return tasks.concat([taskFunction]);
198-
}, []);
167+
iconify.stderr.on('data', data => {
168+
console.error(data.toString());
169+
});
199170

200-
const buildFontsTask = parallel(FONT_TASKS, KATEX_FONT_TASK);
171+
iconify.on('close', code => {
172+
cb();
173+
});
174+
};
201175

202176
// Clean build directory
203177
// -------------------------------------------------------------------------------
@@ -228,7 +202,7 @@ const watchTask = function () {
228202
// -------------------------------------------------------------------------------
229203
const buildJsTask = series(webpackJsTask, pageJsTask);
230204

231-
const buildTasks = [buildCssTask, buildJsTask, buildFontsTask];
205+
const buildTasks = [buildCssTask, buildJsTask, buildIconifyTask];
232206
const buildTask = conf.cleanDist
233207
? series(cleanAllTask, parallel(buildTasks))
234208
: series(cleanAllTask, cleanSourcemapsTask, parallel(buildTasks));
@@ -240,8 +214,7 @@ module.exports = {
240214
clean: cleanAllTask,
241215
'build:js': buildJsTask,
242216
'build:css': buildCssTask,
243-
'build:fonts': buildFontsTask,
244-
// 'build:ren': renameTask,
217+
'build:iconify': buildIconifyTask,
245218
build: buildTask,
246219
watch: watchTask
247220
};

‎README.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,22 @@ For free products, enjoy community support via GitHub issues. Upgrade to Premium
176176
- [ASP.Net Core Admin Templates](https://themeselection.com/item/category/asp-net-dashboard/)
177177
- [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)
178178

179-
If you want to [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/) like Materio Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
179+
If you want to [Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/) like Materio then do visit [ThemeSelection](https://themeselection.com/).
180180

181181
## Useful Links 🎁
182182

183183
- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
184-
- [Freebies](https://themeselection.com/item/category/free-admin-templates/)
185-
- [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
184+
- [Freebies](https://themeselection.com/item/category/freebies/)
185+
- [Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
186186
- [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
187+
- [FlyonUI](https://flyonui.com/)
188+
- [JetShip](https://demos.themeselection.com/jetship-laravel-starter-kit/)
187189

188190
## Social Media :earth_africa:
189191

190-
- [Twitter](https://twitter.com/Theme_Selection)
192+
- [x](https://x.com/Theme_Selection)
191193
- [Facebook](https://www.facebook.com/ThemeSelections/)
192-
- [Pinterest](https://pinterest.com/themeselect/)
194+
- [Pinterest](https://www.pinterest.com/themeselection/)
193195
- [Instagram](https://www.instagram.com/themeselection/)
194-
- [Discord](https://discord.gg/kBHkY7DekX)
196+
- [Discord](https://discord.com/invite/kBHkY7DekX)
195197
- [YouTube](https://www.youtube.com/channel/UCuryo5s0CW4aP83itLjIdZg)

‎Views/Auth/ForgotPasswordBasic.cshtml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
}
99

1010
@* ************** Content ************** *@
11-
1211
<div class="position-relative">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner py-6 mx-4">
15-
1614
<!-- Logo -->
17-
<div class="card p-7">
15+
<div class="card p-sm-7 p-2">
1816
<!-- Forgot Password -->
1917
<div class="app-brand justify-content-center mt-5">
2018
<a href="/" class="app-brand-link gap-3">
@@ -26,25 +24,25 @@
2624
<div class="card-body mt-1">
2725
<h4 class="mb-1">Forgot Password? 🔒</h4>
2826
<p class="mb-5">Enter your email and we'll send you instructions to reset your password</p>
29-
<form id="formAuthentication" class="mb-5" action="~/" method="GET">
30-
<div class="form-floating form-floating-outline mb-5">
31-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
27+
<form id="formAuthentication" class="mb-5" action="/" method="POST">
28+
<div class="form-floating form-floating-outline mb-5 form-control-validation">
29+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus />
3230
<label>Email</label>
3331
</div>
3432
<button class="btn btn-primary d-grid w-100 mb-5">Send Reset Link</button>
3533
</form>
3634
<div class="text-center">
3735
<a href="~/Auth/LoginBasic" class="d-flex align-items-center justify-content-center">
38-
<i class="ri-arrow-left-s-line scaleX-n1-rtl ri-20px me-1_5"></i>
36+
<i class="icon-base ri ri-arrow-left-s-line scaleX-n1-rtl icon-20px me-1_5"></i>
3937
Back to login
4038
</a>
4139
</div>
4240
</div>
4341
</div>
4442
<!-- /Forgot Password -->
45-
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
46-
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" height="172" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
47-
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
43+
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
44+
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" />
45+
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
4846
</div>
4947
</div>
5048
</div>

‎Views/Auth/LoginBasic.cshtml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
}
55

66
@section PageStyles {
7-
<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css">
7+
<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css" />
88
}
99

1010
@* ************** Content ************** *@
11-
1211
<div class="position-relative">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner py-6 mx-4">
15-
1614
<!-- Login -->
17-
<div class="card p-7">
15+
<div class="card p-sm-7 p-2">
1816
<!-- Logo -->
1917
<div class="app-brand justify-content-center mt-5">
2018
<a href="/" class="app-brand-link gap-3">
@@ -28,28 +26,26 @@
2826
<h4 class="mb-1">Welcome to @TempData.Peek("appName")! 👋🏻</h4>
2927
<p class="mb-5">Please sign-in to your account and start the adventure</p>
3028

31-
<form id="formAuthentication" class="mb-5" action="~/" method="GET">
32-
<div class="form-floating form-floating-outline mb-5">
33-
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus>
29+
<form id="formAuthentication" class="mb-5" action="/" method="POST">
30+
<div class="form-floating form-floating-outline mb-5 form-control-validation">
31+
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus />
3432
<label for="email">Email or Username</label>
3533
</div>
3634
<div class="mb-5">
37-
<div class="form-password-toggle">
35+
<div class="form-password-toggle form-control-validation">
3836
<div class="input-group input-group-merge">
3937
<div class="form-floating form-floating-outline">
4038
<input type="password" id="password" class="form-control" name="password" placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;" aria-describedby="password" />
4139
<label for="password">Password</label>
4240
</div>
43-
<span class="input-group-text cursor-pointer"><i class="ri-eye-off-line ri-20px"></i></span>
41+
<span class="input-group-text cursor-pointer"><i class="icon-base ri ri-eye-off-line icon-20px"></i></span>
4442
</div>
4543
</div>
4644
</div>
4745
<div class="mb-5 pb-2 d-flex justify-content-between pt-2 align-items-center">
4846
<div class="form-check mb-0">
49-
<input class="form-check-input" type="checkbox" id="remember-me">
50-
<label class="form-check-label" for="remember-me">
51-
Remember Me
52-
</label>
47+
<input class="form-check-input" type="checkbox" id="remember-me" />
48+
<label class="form-check-label" for="remember-me"> Remember Me </label>
5349
</div>
5450
<a href="/Auth/ForgotPasswordBasic" class="float-end mb-1">
5551
<span>Forgot Password?</span>
@@ -69,9 +65,9 @@
6965
</div>
7066
</div>
7167
<!-- /Login -->
72-
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
73-
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" height="172" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
74-
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
68+
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
69+
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png" />
70+
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
7571
</div>
7672
</div>
7773
</div>

‎Views/Auth/RegisterBasic.cshtml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
}
55

66
@section PageStyles {
7-
<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css">
7+
<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css" />
88
}
99

1010
@* ************** Content ************** *@
11-
1211
<div class="position-relative">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner py-6 mx-4">
15-
1614
<!-- Register Card -->
17-
<div class="card p-7">
15+
<div class="card p-sm-7 p-2">
1816
<!-- Logo -->
1917
<div class="app-brand justify-content-center mt-5">
2018
<a href="/" class="app-brand-link gap-3">
@@ -27,37 +25,35 @@
2725
<h4 class="mb-1">Adventure starts here 🚀</h4>
2826
<p class="mb-5">Make your app management easy and fun!</p>
2927

30-
<form id="formAuthentication" class="mb-5" action="~/" method="GET">
31-
<div class="form-floating form-floating-outline mb-5">
32-
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus>
28+
<form id="formAuthentication" class="mb-5" action="/" method="POST">
29+
<div class="form-floating form-floating-outline mb-5 form-control-validation">
30+
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus />
3331
<label for="username">Username</label>
3432
</div>
35-
<div class="form-floating form-floating-outline mb-5">
36-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email">
33+
<div class="form-floating form-floating-outline mb-5 form-control-validation">
34+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" />
3735
<label for="email">Email</label>
3836
</div>
39-
<div class="mb-5 form-password-toggle">
37+
<div class="mb-5 form-password-toggle form-control-validation">
4038
<div class="input-group input-group-merge">
4139
<div class="form-floating form-floating-outline">
4240
<input type="password" id="password" class="form-control" name="password" placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;" aria-describedby="password" />
4341
<label for="password">Password</label>
4442
</div>
45-
<span class="input-group-text cursor-pointer"><i class="ri-eye-off-line ri-20px"></i></span>
43+
<span class="input-group-text cursor-pointer"><i class="icon-base ri ri-eye-off-line icon-20px"></i></span>
4644
</div>
4745
</div>
4846

49-
<div class="mb-5 py-2">
47+
<div class="mb-5 py-2 form-control-validation">
5048
<div class="form-check mb-0">
51-
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms">
49+
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms" />
5250
<label class="form-check-label" for="terms-conditions">
5351
I agree to
5452
<a href="javascript:void(0);">privacy policy & terms</a>
5553
</label>
5654
</div>
5755
</div>
58-
<button class="btn btn-primary d-grid w-100 mb-5">
59-
Sign up
60-
</button>
56+
<button class="btn btn-primary d-grid w-100 mb-5">Sign up</button>
6157
</form>
6258

6359
<p class="text-center mb-5">
@@ -69,9 +65,9 @@
6965
</div>
7066
</div>
7167
<!-- Register Card -->
72-
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
73-
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" height="172" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
74-
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
68+
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
69+
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" />
70+
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
7571
</div>
7672
</div>
7773
</div>

0 commit comments

Comments
 (0)