Skip to content

Merging: design-update branch to main branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 2, 2024
Merged

Merging: design-update branch to main branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
140b91d
chore: added docs filr
jd-solanki Jan 5, 2024
103b4d0
chore: added hire-us file
jd-solanki Jan 5, 2024
bca3a3e
Added Vue CheatSheet in Useful Links Section
yagnikvamja Mar 15, 2024
98e6576
refactor: updated links
jd-solanki Jun 5, 2024
7fbe5c7
refactor(assets): updated assets for all pages
Vatsal6288 Aug 27, 2024
37f17a8
Merge branch 'main' of https://github.com/themeselection/template-fre…
Vatsal6288 Aug 27, 2024
e3955e9
refactor(pages): updated accountsettings cshtml file as per new design
Vatsal6288 Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions AspnetCoreMvcFull.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34322.80
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspnetCoreMvcFull", "AspnetCoreMvcFull.csproj", "{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspnetCoreMvcFull", "AspnetCoreMvcFull.csproj", "{B3F387EE-69F2-410B-BF7C-D48AD6403234}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Release|Any CPU.Build.0 = Release|Any CPU
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E129492E-9D1C-4963-8F37-96CE8E204C18}
SolutionGuid = {D80F505E-3FBC-4ADC-BE79-BD5DED605BAA}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Controllers/IconsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ namespace AspnetCoreMvcFull.Controllers;

public class IconsController : Controller
{
public IActionResult MdiIcons() => View();
public IActionResult RiIcons() => View();
}
26 changes: 18 additions & 8 deletions Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,22 @@ const buildCssTask = function (cb) {
// If conf.minify == true, generate compressed style without sourcemap
gulpIf(
conf.minify,
`sass 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`,
`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 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/scss/pages:${conf.distPath}/vendor/css/pages src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --no-source-map`
)
),
function (err) {
cb(err);
}
),
sass({
outputStyle: conf.minify ? 'compressed' : 'expanded'
}).on('error', sass.logError)
sass
.sync({
includePaths: ['node_modules'], // Add this line to include node_modules
outputStyle: conf.minify ? 'compressed' : 'expanded'
})
.on('error', sass.logError)
)
)
.pipe(gulpIf(conf.sourcemaps, sourcemaps.write()))
Expand All @@ -88,7 +91,8 @@ const buildCssTask = function (cb) {
path.dirname = path.dirname.replace('scss', 'css');
})
)
.pipe(dest(conf.distPath));
.pipe(dest(conf.distPath))
.pipe(browserSync.stream());
};

// Build JS
Expand Down Expand Up @@ -147,8 +151,14 @@ const pageJsTask = function () {

const FONT_TASKS = [
{
name: 'materialdesignicons',
path: 'node_modules/@mdi/font/fonts/*'
name: 'remixicon',
path: [
'node_modules/remixicon/fonts/remixicon.eot',
'node_modules/remixicon/fonts/remixicon.ttf',
'node_modules/remixicon/fonts/remixicon.woff',
'node_modules/remixicon/fonts/remixicon.woff2',
'node_modules/remixicon/fonts/remixicon.svg'
]
}
].reduce(function (tasks, font) {
const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;
Expand Down
30 changes: 15 additions & 15 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/" target="_blank">
<img src="https://user-images.githubusercontent.com/749684/150333149-805037bc-8874-4a1f-876a-61a9683f8ef5.png" alt="materio-logo" width="30px" height="auto">
<img src="https://cdn.themeselection.com/ts-assets/materio/logo/logo.png" alt="materio-logo" width="40px" height="auto">
</a>
</p>

Expand All @@ -14,13 +14,13 @@

![GitHub](https://img.shields.io/github/license/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub issues](https://img.shields.io/github/issues/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub closed issues](https://img.shields.io/github/issues-closed/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![Twitter Follow](https://img.shields.io/twitter/follow/Theme_Selection?style=social)

<kbd>[![Materio - Free Bootstrap 5 .Net Core MVC Admin Template Demo Screenshot](https://cdn.jsdelivr.net/gh/themeselection/ts-assets/materio/materio-bootstrap-aspnet-core-mvc-admin-template-free/banner/banner.png)](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/)</kbd>
<kbd>[![Materio - Free Bootstrap 5 .Net Core MVC Admin Template Demo Screenshot](https://cdn.themeselection.com/ts-assets/materio/materio-bootstrap-aspnet-core-mvc-admin-template-free/banner/banner.png)](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/)</kbd>

## Introduction 🚀

If you’re a developer looking for the most Powerful & comprehensive [**Free Bootstrap 5 ASPNET Core MVC Admin Template**](https://themeselection.com/item/materio-bootstrap-html-aspnet-core-mvc-admin-template-free/) built for developers, rich with features, and highly customizable look no further than Materio. We’ve followed the highest industry standards to bring you the very best admin template that is not only fast and easy to use but highly scalable. Offering ultimate convenience and flexibility, you’ll be able to build whatever application you want with very little hassle.
If you’re a developer looking for the most Powerful & comprehensive [**Free Bootstrap 5 ASPNET Core MVC Admin Template**](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/) built for developers, rich with features, and highly customizable look no further than Materio. We’ve followed the highest industry standards to bring you the very best admin template that is not only fast and easy to use but highly scalable. Offering ultimate convenience and flexibility, you’ll be able to build whatever application you want with very little hassle.

Build premium quality applications with ease. Use our innovative [Aspnet Core MVC Bootstrap admin template](https://themeselection.com/item/category/bootstrap-admin-templates/) to create eye-catching, high-quality WebApps. Your apps will be completely responsive, ensuring they’ll look stunning and function flawlessly on desktops, tablets, and mobile devices.
Build premium quality applications with ease. Use our innovative [Aspnet Core MVC Bootstrap admin template](https://themeselection.com/item/category/asp-net-dashboard/) to create eye-catching, high-quality WebApps. Your apps will be completely responsive, ensuring they’ll look stunning and function flawlessly on desktops, tablets, and mobile devices.

[View Demo](https://demos.themeselection.com/materio-aspnet-core-mvc-admin-template-free/html/)

Expand Down Expand Up @@ -51,7 +51,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
- Extended UI
- Perfect Scrollbar
- Text Divider
- Material Design Icons (MDI)
- Remix Icons (RI)
- Form Elements
- Basic Inputs
- Input Groups
Expand All @@ -72,7 +72,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
| Fixed Layout(Menu) | Fixed & Static Layout(Menu) |
| 1 Simple Dashboard | 5 Niche Dashboards |
| - | Multiple Ready Applications like Calendar, Invoice, Users List, Users View, Roles and Permission,Transactions(CRUD) etc. |
| Simple From Elements | Advance form elements, validation & form wizard |
| Simple Form Elements | Advance form elements, validation & form wizard |
| Basic Cards | Basic, Advance, Statistics, Analytics, Gamification and Actions Cards |
| Basic User Interface(Components) | Advance and Custom User Interfaces(Components) |
| Two Extended Components | Twelve Ready to use Extended Components |
Expand All @@ -85,7 +85,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
| 1 Chart Library | 2 Chart Libraries |
| - | Multiple Navbar & Menu Options |
| - | Starter-kit |
| - | Internationalization support, Docker support |
| - | Internationalization support |
| - | RTL Support |
| Regular Support | Priority Support |
| Detailed Documentation | Detailed Documentation |
Expand Down Expand Up @@ -124,7 +124,7 @@ Contribution are always welcome and recommended! Here is how:

## Changelog 📆

Please refer to the [CHANGELOG](CHANGELOG.md) file. We will add detailed release notes to each new release.
Please refer to the [CHANGELOG](CHANGELOG.md) file. We will add a detailed release notes to each new release.

## Support 🧑🏻‍💻

Expand Down Expand Up @@ -168,21 +168,21 @@ For free products, enjoy community support via GitHub issues. Upgrade to Premium

**[ThemeSelection](https://themeselection.com/)** provides Selected high quality, modern design, professional and easy-to-use **Fully Coded Dashboard Templates & UI Kits** to create your applications faster!

- [Bootstrap Admin Templates](https://themeselection.com/products/category/bootstrap-admin-templates/)
- [VueJS Admin Templates](https://themeselection.com/products/category/vuejs-admin-templates/)
- [Laravel Admin Templates](https://themeselection.com/products/category/laravel-admin-templates/)
- [Bootstrap Admin Templates](https://themeselection.com/item/category/bootstrap-admin-templates/)
- [VueJS Admin Templates](https://themeselection.com/item/category/vuejs-admin-templates/)
- [Laravel Admin Templates](https://themeselection.com/item/category/laravel-admin-templates/)
- [Django Admin Templates](https://themeselection.com/item/category/django-admin-template/)
- [React (NextJS) Admin Templates](https://themeselection.com/item/category/next-js-admin-template/)
- [ASP.Net Core Admin Templates](https://themeselection.com/item/category/asp-net-dashboard/)
- [Free UI Kits](https://themeselection.com/products/category/free-ui-kits/)
- [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)

If you want to [Download Free Admin Templates](https://themeselection.com/products/category/download-free-admin-templates/) like Materio Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
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/).

## Useful Links 🎁

- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
- [Freebies](https://themeselection.com/products/category/download-free-admin-templates/)
- [Download Free Admin Templates](https://themeselection.com/products/category/download-free-admin-templates/)
- [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:
Expand Down
22 changes: 11 additions & 11 deletions Views/Auth/ForgotPasswordBasic.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,39 @@

<div class="position-relative">
<div class="authentication-wrapper authentication-basic container-p-y">
<div class="authentication-inner py-4">
<div class="authentication-inner py-6 mx-4">

<!-- Logo -->
<div class="card p-2">
<div class="card p-7">
<!-- Forgot Password -->
<div class="app-brand justify-content-center mt-5">
<a href="/" class="app-brand-link gap-2">
<a href="/" class="app-brand-link gap-3">
<span class="app-brand-logo demo">@await Html.PartialAsync("../_Partials/_Macros")</span>
<span class="app-brand-text demo text-heading fw-semibold">@TempData.Peek("appName")</span>
</a>
</div>
<!-- /Logo -->
<div class="card-body mt-2">
<h4 class="mb-2">Forgot Password? 🔒</h4>
<p class="mb-4">Enter your email and we'll send you instructions to reset your password</p>
<form id="formAuthentication" class="mb-3" action="~/Auth/ResetPasswordBasic" method="GET">
<div class="form-floating form-floating-outline mb-3">
<div class="card-body mt-1">
<h4 class="mb-1">Forgot Password? 🔒</h4>
<p class="mb-5">Enter your email and we'll send you instructions to reset your password</p>
<form id="formAuthentication" class="mb-5" action="~/" method="GET">
<div class="form-floating form-floating-outline mb-5">
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
<label>Email</label>
</div>
<button class="btn btn-primary d-grid w-100">Send Reset Link</button>
<button class="btn btn-primary d-grid w-100 mb-5">Send Reset Link</button>
</form>
<div class="text-center">
<a href="~/Auth/LoginBasic" class="d-flex align-items-center justify-content-center">
<i class="mdi mdi-chevron-left scaleX-n1-rtl mdi-24px"></i>
<i class="ri-arrow-left-s-line scaleX-n1-rtl ri-20px me-1_5"></i>
Back to login
</a>
</div>
</div>
</div>
<!-- /Forgot Password -->
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
<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">
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
</div>
</div>
Expand Down
Loading