Merge pull request #5 from themeselection/dev

Merge dev branch into main branch

Author: Vatsal6288

.gitignore

@@ -100,6 +100,14 @@ bld/
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 
+# Ignoring following files/folder only for master
+
+wwwroot/vendor/fonts/*.css
+wwwroot/vendor/fonts/**/*
+wwwroot/vendor/**/*.js
+
+src/fonts/iconify-icons.css
+
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 

AspnetCoreMvcFull.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
 </Project>

Gulpfile.js

@@ -66,10 +66,7 @@ const buildCssTask = function (cb) {
           gulpIf(
             conf.minify,
             `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`,
-            gulpIf(
-              conf.fastDev,
-              `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`
-            )
+            `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`
           ),
           function (err) {
             cb(err);
@@ -146,52 +143,35 @@ const pageJsTask = function () {
     .pipe(dest(conf.distPath + `/js`));
 };
 
-// Build fonts
+// Iconify task
 // -------------------------------------------------------------------------------
+const buildIconifyTask = function (cb) {
+  // Create required directories without copying files
+  const fs = require('fs');
+  const directories = ['./src/fonts/iconify', './src/fonts'];
+
+  directories.forEach(dir => {
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+  });
 
-const FONT_TASKS = [
-  {
-    name: 'boxicons',
-    path: 'node_modules/boxicons/fonts/*'
-  }
-].reduce(function (tasks, font) {
-  const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
-  const taskFunction = function () {
-    // return src(root(font.path))
-    return (
-      src(font.path)
-        // .pipe(dest(normalize(path.join(conf.distPath, 'fonts', font.name))))
-        .pipe(dest(path.join(conf.distPath + `/vendor/`, 'fonts', font.name)))
-    );
-  };
-
-  Object.defineProperty(taskFunction, 'name', {
-    value: functionName
+  const iconify = require('child_process').spawn('node', ['./src/fonts/iconify/iconify.js'], {
+    cwd: __dirname
   });
 
-  return tasks.concat([taskFunction]);
-}, []);
-
-// Formula module requires KaTeX - Quill Editor
-const KATEX_FONT_TASK = [
-  {
-    name: 'katex',
-    path: 'node_modules/katex/dist/fonts/*'
-  }
-].reduce(function (tasks, font) {
-  const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
-  const taskFunction = function () {
-    return src(font.path).pipe(dest(path.join(conf.distPath, 'vendor/libs/quill/fonts')));
-  };
-
-  Object.defineProperty(taskFunction, 'name', {
-    value: functionName
+  iconify.stdout.on('data', data => {
+    console.log(data.toString());
   });
 
-  return tasks.concat([taskFunction]);
-}, []);
+  iconify.stderr.on('data', data => {
+    console.error(data.toString());
+  });
 
-const buildFontsTask = parallel(FONT_TASKS, KATEX_FONT_TASK);
+  iconify.on('close', code => {
+    cb();
+  });
+};
 
 // Clean build directory
 // -------------------------------------------------------------------------------
@@ -222,7 +202,7 @@ const watchTask = function () {
 // -------------------------------------------------------------------------------
 const buildJsTask = series(webpackJsTask, pageJsTask);
 
-const buildTasks = [buildCssTask, buildJsTask, buildFontsTask];
+const buildTasks = [buildCssTask, buildJsTask, buildIconifyTask];
 const buildTask = conf.cleanDist
   ? series(cleanAllTask, parallel(buildTasks))
   : series(cleanAllTask, cleanSourcemapsTask, parallel(buildTasks));
@@ -234,7 +214,7 @@ module.exports = {
   clean: cleanAllTask,
   'build:js': buildJsTask,
   'build:css': buildCssTask,
-  'build:fonts': buildFontsTask,
+  'build:iconify': buildIconifyTask,
   build: buildTask,
   watch: watchTask
 };

README.md

@@ -174,20 +174,20 @@ For free products, enjoy community support via GitHub issues. Upgrade to Premium
 - [ASP.Net Core Admin Templates](https://themeselection.com/item/category/asp-net-dashboard/)
 - [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)
 
-If you want to [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/) like Sneat Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
+If you want to [Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/) like Sneat Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
 
 ## Useful Links 🎁
 
-* [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
-* [Freebies](https://themeselection.com/item/category/free-admin-templates/)
-* [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
-* [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
+- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
+- [Freebies](https://themeselection.com/item/category/free-admin-templates/)
+- [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
+- [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
 
 ## Social Media :earth_africa:
 
-- [Twitter](https://twitter.com/Theme_Selection)
+- [x](https://x.com/Theme_Selection)
 - [Facebook](https://www.facebook.com/ThemeSelections/)
-- [Pinterest](https://pinterest.com/themeselect/)
+- [Pinterest](https://www.pinterest.com/themeselection/)
 - [Instagram](https://www.instagram.com/themeselection/)
-- [Discord](https://discord.gg/kBHkY7DekX)
+- [Discord](https://discord.com/invite/kBHkY7DekX)
 - [YouTube](https://www.youtube.com/channel/UCuryo5s0CW4aP83itLjIdZg)

Views/Auth/ForgotPasswordBasic.cshtml

@@ -8,11 +8,9 @@
 }
 
 @* ************** Content ************** *@
-
 <div class="container-xxl">
   <div class="authentication-wrapper authentication-basic container-p-y">
     <div class="authentication-inner">
-
       <!-- Forgot Password -->
       <div class="card px-sm-6 px-0">
         <div class="card-body">
@@ -26,16 +24,16 @@
           <!-- /Logo -->
           <h4 class="mb-1">Forgot Password? 🔒</h4>
           <p class="mb-6">Enter your email and we'll send you instructions to reset your password</p>
-          <form id="formAuthentication" class="mb-6" action="~/" method="POST">
+          <form id="formAuthentication" class="mb-6" action="/" method="POST">
             <div class="mb-6">
               <label for="email" class="form-label">Email</label>
-              <input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
+              <input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus />
             </div>
             <button class="btn btn-primary d-grid w-100">Send Reset Link</button>
           </form>
           <div class="text-center">
             <a href="~/Auth/LoginBasic" class="d-flex justify-content-center">
-              <i class="bx bx-chevron-left me-1"></i>
+              <i class="icon-base bx bx-chevron-left me-1"></i>
               Back to login
             </a>
           </div>

Views/Auth/LoginBasic.cshtml

@@ -4,11 +4,10 @@
 }
 
 @section PageStyles {
-<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css">
+<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css" />
 }
 
 @* ************** Content ************** *@
-
 <div class="container-xxl">
   <div class="authentication-wrapper authentication-basic container-p-y">
     <div class="authentication-inner">
@@ -26,25 +25,23 @@
           <h4 class="mb-1">Welcome to @TempData.Peek("appName")! 👋</h4>
           <p class="mb-6">Please sign-in to your account and start the adventure</p>
 
-          <form id="formAuthentication" class="mb-6" action="~/" method="POST">
+          <form id="formAuthentication" class="mb-6" action="/" method="POST">
             <div class="mb-6">
               <label for="email" class="form-label">Email or Username</label>
-              <input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus>
+              <input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus />
             </div>
             <div class="mb-6 form-password-toggle">
               <label class="form-label" for="password">Password</label>
               <div class="input-group input-group-merge">
                 <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" />
-                <span class="input-group-text cursor-pointer"><i class="bx bx-hide"></i></span>
+                <span class="input-group-text cursor-pointer"><i class="icon-base bx bx-hide"></i></span>
               </div>
             </div>
             <div class="mb-8">
-              <div class="d-flex justify-content-between mt-8">
-                <div class="form-check mb-0 ms-2">
-                  <input class="form-check-input" type="checkbox" id="remember-me">
-                  <label class="form-check-label" for="remember-me">
-                    Remember Me
-                  </label>
+              <div class="d-flex justify-content-between">
+                <div class="form-check mb-0">
+                  <input class="form-check-input" type="checkbox" id="remember-me" />
+                  <label class="form-check-label" for="remember-me"> Remember Me </label>
                 </div>
                 <a href="/Auth/ForgotPasswordBasic">
                   <span>Forgot Password?</span>

Views/Auth/RegisterBasic.cshtml

@@ -4,15 +4,13 @@
 }
 
 @section PageStyles {
-<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css">
+<link rel="stylesheet" href="~/vendor/css/pages/page-auth.css" />
 }
 
 @* ************** Content ************** *@
-
 <div class="container-xxl">
   <div class="authentication-wrapper authentication-basic container-p-y">
     <div class="authentication-inner">
-
       <!-- Register Card -->
       <div class="card px-sm-6 px-0">
         <div class="card-body">
@@ -27,35 +25,32 @@
           <h4 class="mb-1">Adventure starts here 🚀</h4>
           <p class="mb-6">Make your app management easy and fun!</p>
 
-          <form id="formAuthentication" class="mb-6" action="~/" method="POST">
+          <form id="formAuthentication" class="mb-6" action="/" method="POST">
             <div class="mb-6">
               <label for="username" class="form-label">Username</label>
-              <input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus>
+              <input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus />
             </div>
             <div class="mb-6">
               <label for="email" class="form-label">Email</label>
-              <input type="text" class="form-control" id="email" name="email" placeholder="Enter your email">
+              <input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" />
             </div>
-            <div class="mb-6 form-password-toggle">
+            <div class="form-password-toggle">
               <label class="form-label" for="password">Password</label>
               <div class="input-group input-group-merge">
                 <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" />
-                <span class="input-group-text cursor-pointer"><i class="bx bx-hide"></i></span>
+                <span class="input-group-text cursor-pointer"><i class="icon-base bx bx-hide"></i></span>
               </div>
             </div>
-
-            <div class="my-8">
-              <div class="form-check mb-0 ms-2">
-                <input class="form-check-input" type="checkbox" id="terms-conditions" name="terms">
+            <div class="my-7">
+              <div class="form-check mb-0">
+                <input class="form-check-input" type="checkbox" id="terms-conditions" name="terms" />
                 <label class="form-check-label" for="terms-conditions">
                   I agree to
                   <a href="javascript:void(0);">privacy policy & terms</a>
                 </label>
               </div>
             </div>
-            <button class="btn btn-primary d-grid w-100">
-              Sign up
-            </button>
+            <button class="btn btn-primary d-grid w-100">Sign up</button>
           </form>
 
           <p class="text-center">