Skip to content

Commit 634206b

Browse files
Vatsal6288Vatsal6288
committed
refactor(assets): updated assets as per new design
1 parent 8e00bea commit 634206b

File tree

228 files changed

+22506
-35382
lines changed

Some content is hidden

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

228 files changed

+22506
-35382
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ 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
104+
105+
wwwroot/vendor/fonts/*.css
106+
wwwroot/vendor/fonts/**/*
107+
wwwroot/vendor/**/*.js
108+
109+
src/fonts/iconify-icons.css
110+
103111
# Visual Studio 2017 auto generated files
104112
Generated\ Files/
105113

‎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 & 45 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,52 +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: 'boxicons',
155-
path: 'node_modules/boxicons/fonts/*'
156-
}
157-
].reduce(function (tasks, font) {
158-
const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
159-
const taskFunction = function () {
160-
// return src(root(font.path))
161-
return (
162-
src(font.path)
163-
// .pipe(dest(normalize(path.join(conf.distPath, 'fonts', font.name))))
164-
.pipe(dest(path.join(conf.distPath + `/vendor/`, 'fonts', font.name)))
165-
);
166-
};
167-
168-
Object.defineProperty(taskFunction, 'name', {
169-
value: functionName
159+
const iconify = require('child_process').spawn('node', ['./src/fonts/iconify/iconify.js'], {
160+
cwd: __dirname
170161
});
171162

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

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

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

196176
// Clean build directory
197177
// -------------------------------------------------------------------------------
@@ -222,7 +202,7 @@ const watchTask = function () {
222202
// -------------------------------------------------------------------------------
223203
const buildJsTask = series(webpackJsTask, pageJsTask);
224204

225-
const buildTasks = [buildCssTask, buildJsTask, buildFontsTask];
205+
const buildTasks = [buildCssTask, buildJsTask, buildIconifyTask];
226206
const buildTask = conf.cleanDist
227207
? series(cleanAllTask, parallel(buildTasks))
228208
: series(cleanAllTask, cleanSourcemapsTask, parallel(buildTasks));
@@ -234,7 +214,7 @@ module.exports = {
234214
clean: cleanAllTask,
235215
'build:js': buildJsTask,
236216
'build:css': buildCssTask,
237-
'build:fonts': buildFontsTask,
217+
'build:iconify': buildIconifyTask,
238218
build: buildTask,
239219
watch: watchTask
240220
};

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,15 @@ If you want to [Free Admin Templates](https://themeselection.com/item/category/f
179179
## Useful Links 🎁
180180

181181
- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
182-
- [Freebies](https://themeselection.com/item/category/freebies/)
183-
- [Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
182+
- [Freebies](https://themeselection.com/item/category/free-admin-templates/)
183+
- [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
184184
- [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
185-
- [FlyonUI](https://flyonui.com/)
186-
- [JetShip](https://demos.themeselection.com/jetship-laravel-starter-kit/)
187185

188186
## Social Media :earth_africa:
189187

190-
- [X](https://x.com/Theme_Selection)
188+
- [x](https://x.com/Theme_Selection)
191189
- [Facebook](https://www.facebook.com/ThemeSelections/)
192190
- [Pinterest](https://www.pinterest.com/themeselection/)
193191
- [Instagram](https://www.instagram.com/themeselection/)
194-
- [Discord](https://discord.gg/kBHkY7DekX)
192+
- [Discord](https://discord.com/invite/kBHkY7DekX)
195193
- [YouTube](https://www.youtube.com/channel/UCuryo5s0CW4aP83itLjIdZg)

‎Views/Auth/ForgotPasswordBasic.cshtml‎

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

1010
@* ************** Content ************** *@
11-
1211
<div class="container-xxl">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner">
15-
1614
<!-- Forgot Password -->
1715
<div class="card px-sm-6 px-0">
1816
<div class="card-body">
@@ -26,16 +24,16 @@
2624
<!-- /Logo -->
2725
<h4 class="mb-1">Forgot Password? 🔒</h4>
2826
<p class="mb-6">Enter your email and we'll send you instructions to reset your password</p>
29-
<form id="formAuthentication" class="mb-6" action="~/" method="POST">
27+
<form id="formAuthentication" class="mb-6" action="/" method="POST">
3028
<div class="mb-6">
3129
<label for="email" class="form-label">Email</label>
32-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
30+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus />
3331
</div>
3432
<button class="btn btn-primary d-grid w-100">Send Reset Link</button>
3533
</form>
3634
<div class="text-center">
3735
<a href="~/Auth/LoginBasic" class="d-flex justify-content-center">
38-
<i class="bx bx-chevron-left me-1"></i>
36+
<i class="icon-base bx bx-chevron-left me-1"></i>
3937
Back to login
4038
</a>
4139
</div>

‎Views/Auth/LoginBasic.cshtml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
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="container-xxl">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner">
@@ -26,25 +25,23 @@
2625
<h4 class="mb-1">Welcome to @TempData.Peek("appName")! 👋</h4>
2726
<p class="mb-6">Please sign-in to your account and start the adventure</p>
2827

29-
<form id="formAuthentication" class="mb-6" action="~/" method="POST">
28+
<form id="formAuthentication" class="mb-6" action="/" method="POST">
3029
<div class="mb-6">
3130
<label for="email" class="form-label">Email or Username</label>
32-
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus>
31+
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus />
3332
</div>
3433
<div class="mb-6 form-password-toggle">
3534
<label class="form-label" for="password">Password</label>
3635
<div class="input-group input-group-merge">
3736
<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" />
38-
<span class="input-group-text cursor-pointer"><i class="bx bx-hide"></i></span>
37+
<span class="input-group-text cursor-pointer"><i class="icon-base bx bx-hide"></i></span>
3938
</div>
4039
</div>
4140
<div class="mb-8">
42-
<div class="d-flex justify-content-between mt-8">
43-
<div class="form-check mb-0 ms-2">
44-
<input class="form-check-input" type="checkbox" id="remember-me">
45-
<label class="form-check-label" for="remember-me">
46-
Remember Me
47-
</label>
41+
<div class="d-flex justify-content-between">
42+
<div class="form-check mb-0">
43+
<input class="form-check-input" type="checkbox" id="remember-me" />
44+
<label class="form-check-label" for="remember-me"> Remember Me </label>
4845
</div>
4946
<a href="/Auth/ForgotPasswordBasic">
5047
<span>Forgot Password?</span>

‎Views/Auth/RegisterBasic.cshtml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
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="container-xxl">
1312
<div class="authentication-wrapper authentication-basic container-p-y">
1413
<div class="authentication-inner">
15-
1614
<!-- Register Card -->
1715
<div class="card px-sm-6 px-0">
1816
<div class="card-body">
@@ -27,35 +25,32 @@
2725
<h4 class="mb-1">Adventure starts here 🚀</h4>
2826
<p class="mb-6">Make your app management easy and fun!</p>
2927

30-
<form id="formAuthentication" class="mb-6" action="~/" method="POST">
28+
<form id="formAuthentication" class="mb-6" action="/" method="POST">
3129
<div class="mb-6">
3230
<label for="username" class="form-label">Username</label>
33-
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus>
31+
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus />
3432
</div>
3533
<div class="mb-6">
3634
<label for="email" class="form-label">Email</label>
37-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email">
35+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" />
3836
</div>
39-
<div class="mb-6 form-password-toggle">
37+
<div class="form-password-toggle">
4038
<label class="form-label" for="password">Password</label>
4139
<div class="input-group input-group-merge">
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" />
43-
<span class="input-group-text cursor-pointer"><i class="bx bx-hide"></i></span>
41+
<span class="input-group-text cursor-pointer"><i class="icon-base bx bx-hide"></i></span>
4442
</div>
4543
</div>
46-
47-
<div class="my-8">
48-
<div class="form-check mb-0 ms-2">
49-
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms">
44+
<div class="my-7">
45+
<div class="form-check mb-0">
46+
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms" />
5047
<label class="form-check-label" for="terms-conditions">
5148
I agree to
5249
<a href="javascript:void(0);">privacy policy & terms</a>
5350
</label>
5451
</div>
5552
</div>
56-
<button class="btn btn-primary d-grid w-100">
57-
Sign up
58-
</button>
53+
<button class="btn btn-primary d-grid w-100">Sign up</button>
5954
</form>
6055

6156
<p class="text-center">

0 commit comments

Comments
 (0)