Skip to content

Commit c743b78

Browse files
Vatsal6288Vatsal6288
authored
Merge pull request #2 from themeselection/dev
Merge dev branch into main branch
2 parents e300091 + 20abfd4 commit c743b78

File tree

223 files changed

+24619
-46784
lines changed

Some content is hidden

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

223 files changed

+24619
-46784
lines changed

‎.vscode/extensions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"esbenp.prettier-vscode",
1212
"editorconfig.editorconfig",
1313
"dbaeumer.vscode-eslint",
14+
"hookyqr.beautify",
1415
// If needed
1516
"VisualStudioExptTeam.vscodeintellicode",
1617
"formulahendry.auto-close-tag",

‎.vscode/settings.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"editor.defaultFormatter": "HookyQR.beautify"
4848
},
4949
"[javascript]": {
50-
"editor.defaultFormatter": "esbenp.prettier-vscode"
50+
"editor.defaultFormatter": "vscode.typescript-language-features"
5151
},
5252
"[markdown]": {
5353
"editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -69,16 +69,12 @@
6969
"django-html": "html"
7070
},
7171
"beautify.language": {
72-
"html": [
73-
"htm",
74-
"html",
75-
"django-html"
76-
]
72+
"html": ["htm", "html", "django-html"]
7773
},
7874
// Extension: Git
7975
"git.rebaseWhenSync": true,
8076
"git.enableSmartCommit": true,
8177
"eslint.format.enable": true,
8278
// Extension: npm
83-
"npm.packageManager": "yarn",
79+
"npm.packageManager": "yarn"
8480
}

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,22 @@ For free products, enjoy community support via GitHub issues. Upgrade to Premium
184184
- [Django Admin Templates](https://themeselection.com/item/category/django-admin-template/)
185185
- [React (NextJS) Admin Templates](https://themeselection.com/item/category/next-js-admin-template/)
186186
- [ASP.Net Core Admin Templates](https://themeselection.com/item/category/asp-net-dashboard/)
187-
- [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)
187+
- [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)
188188

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

191191
## Useful Links 🎁
192192

193193
- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
194-
- [Freebies](https://themeselection.com/item/category/free-admin-templates/)
195-
- [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
194+
- [Freebies](https://themeselection.com/item/category/freebies/)
195+
- [Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
196196
- [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
197+
- [FlyonUI](https://flyonui.com/)
198+
- [JetShip](https://demos.themeselection.com/jetship-laravel-starter-kit/)
197199

198200
## Social Media :earth_africa:
199201

200-
- [Twitter](https://twitter.com/Theme_Selection)
202+
- [X](https://x.com/Theme_Selection)
201203
- [Facebook](https://www.facebook.com/ThemeSelections/)
202204
- [Pinterest](https://pinterest.com/themeselect/)
203205
- [Instagram](https://www.instagram.com/themeselection/)

‎apps/authentication/templates/auth_forgot_password_basic.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
<div class="position-relative">
1515
<div class="authentication-wrapper authentication-basic container-p-y">
1616
<div class="authentication-inner py-6 mx-4">
17-
1817
<!-- Logo -->
19-
<div class="card p-7">
18+
<div class="card p-sm-7 p-2">
2019
<!-- Forgot Password -->
2120
<div class="app-brand justify-content-center mt-5">
2221
<a href="{% url 'index' %}" class="app-brand-link gap-3">
23-
<span class="app-brand-logo demo">{% include 'partials/logo.html' with bgcolor="#9055FD" %}</span>
22+
<span class="app-brand-logo demo">{% include 'partials/logo.html' %}</span>
2423
<span class="app-brand-text demo text-heading fw-semibold">{% get_theme_variables 'template_name' %}</span>
2524
</a>
2625
</div>
@@ -31,23 +30,23 @@ <h4 class="mb-1">Forgot Password? 🔒</h4>
3130
<form id="formAuthentication" class="mb-5" action="{% url 'index' %}">
3231
{% csrf_token %}
3332
<div class="form-floating form-floating-outline mb-5">
34-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
33+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus />
3534
<label>Email</label>
3635
</div>
3736
<button class="btn btn-primary d-grid w-100 mb-5">Send Reset Link</button>
3837
</form>
3938
<div class="text-center">
4039
<a href="{% url 'auth-login-basic' %}" class="d-flex align-items-center justify-content-center">
41-
<i class="ri-arrow-left-s-line scaleX-n1-rtl ri-20px me-1_5"></i>
40+
<i class="icon-base ri ri-arrow-left-s-line scaleX-n1-rtl icon-20px me-1_5"></i>
4241
Back to login
4342
</a>
4443
</div>
4544
</div>
4645
</div>
4746
<!-- /Forgot Password -->
48-
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
49-
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" class="authentication-image d-none d-lg-block" height="172" alt="triangle-bg">
50-
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
47+
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
48+
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" />
49+
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
5150
</div>
5251
</div>
5352
</div>

‎apps/authentication/templates/auth_login_basic.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
<div class="position-relative">
1616
<div class="authentication-wrapper authentication-basic container-p-y">
1717
<div class="authentication-inner py-6 mx-4">
18-
1918
<!-- Login -->
20-
<div class="card p-7">
19+
<div class="card p-sm-7 p-2">
2120
<!-- Logo -->
2221
<div class="app-brand justify-content-center mt-5">
2322
<a href="{% url 'index' %}" class="app-brand-link gap-3">
24-
<span class="app-brand-logo demo">{% include 'partials/logo.html' with bgcolor="#9055FD" %}</span>
23+
<span class="app-brand-logo demo">{% include 'partials/logo.html' %}</span>
2524
<span class="app-brand-text demo text-heading fw-semibold">{% get_theme_variables 'template_name' %}</span>
2625
</a>
2726
</div>
@@ -34,7 +33,7 @@ <h4 class="mb-1">Welcome to {% get_theme_variables 'template_name' %}! 👋🏻<
3433
<form id="formAuthentication" class="mb-5" action="{% url 'index' %}">
3534
{% csrf_token %}
3635
<div class="form-floating form-floating-outline mb-5">
37-
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus>
36+
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus />
3837
<label for="email">Email or Username</label>
3938
</div>
4039
<div class="mb-5">
@@ -44,16 +43,14 @@ <h4 class="mb-1">Welcome to {% get_theme_variables 'template_name' %}! 👋🏻<
4443
<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" />
4544
<label for="password">Password</label>
4645
</div>
47-
<span class="input-group-text cursor-pointer"><i class="ri-eye-off-line ri-20px"></i></span>
46+
<span class="input-group-text cursor-pointer"><i class="icon-base ri ri-eye-off-line icon-20px"></i></span>
4847
</div>
4948
</div>
5049
</div>
5150
<div class="mb-5 pb-2 d-flex justify-content-between pt-2 align-items-center">
5251
<div class="form-check mb-0">
53-
<input class="form-check-input" type="checkbox" id="remember-me">
54-
<label class="form-check-label" for="remember-me">
55-
Remember Me
56-
</label>
52+
<input class="form-check-input" type="checkbox" id="remember-me" />
53+
<label class="form-check-label" for="remember-me"> Remember Me </label>
5754
</div>
5855
<a href="{% url 'auth-forgot-password-basic' %}" class="float-end mb-1">
5956
<span>Forgot Password?</span>
@@ -73,9 +70,9 @@ <h4 class="mb-1">Welcome to {% get_theme_variables 'template_name' %}! 👋🏻<
7370
</div>
7471
</div>
7572
<!-- /Login -->
76-
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
77-
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" height="172" class="authentication-image d-none d-lg-block" alt="triangle-bg">
78-
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
73+
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
74+
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" />
75+
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
7976
</div>
8077
</div>
8178
</div>

‎apps/authentication/templates/auth_register_basic.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
<div class="position-relative">
1616
<div class="authentication-wrapper authentication-basic container-p-y">
1717
<div class="authentication-inner py-6 mx-4">
18-
1918
<!-- Register Card -->
20-
<div class="card p-7">
19+
<div class="card p-sm-7 p-2">
2120
<!-- Logo -->
2221
<div class="app-brand justify-content-center mt-5">
2322
<a href="{% url 'index' %}" class="app-brand-link gap-3">
24-
<span class="app-brand-logo demo">{% include 'partials/logo.html' with bgcolor="#9055FD" %}</span>
23+
<span class="app-brand-logo demo">{% include 'partials/logo.html' %}</span>
2524
<span class="app-brand-text demo text-heading fw-semibold">{% get_theme_variables 'template_name' %}</span>
2625
</a>
2726
</div>
@@ -31,13 +30,13 @@ <h4 class="mb-1">Adventure starts here 🚀</h4>
3130
<p class="mb-5">Make your app management easy and fun!</p>
3231

3332
<form id="formAuthentication" class="mb-5" action="{% url 'index' %}">
34-
{% csrf_token %}
33+
{% csrf_token %}
3534
<div class="form-floating form-floating-outline mb-5">
36-
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus>
35+
<input type="text" class="form-control" id="username" name="username" placeholder="Enter your username" autofocus />
3736
<label for="username">Username</label>
3837
</div>
3938
<div class="form-floating form-floating-outline mb-5">
40-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email">
39+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" />
4140
<label for="email">Email</label>
4241
</div>
4342
<div class="mb-5 form-password-toggle">
@@ -46,22 +45,20 @@ <h4 class="mb-1">Adventure starts here 🚀</h4>
4645
<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" />
4746
<label for="password">Password</label>
4847
</div>
49-
<span class="input-group-text cursor-pointer"><i class="ri-eye-off-line ri-20px"></i></span>
48+
<span class="input-group-text cursor-pointer"><i class="icon-base ri ri-eye-off-line icon-20px"></i></span>
5049
</div>
5150
</div>
5251

5352
<div class="mb-5 py-2">
5453
<div class="form-check mb-0">
55-
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms">
54+
<input class="form-check-input" type="checkbox" id="terms-conditions" name="terms" />
5655
<label class="form-check-label" for="terms-conditions">
5756
I agree to
5857
<a href="javascript:void(0);">privacy policy & terms</a>
5958
</label>
6059
</div>
6160
</div>
62-
<button class="btn btn-primary d-grid w-100 mb-5">
63-
Sign up
64-
</button>
61+
<button class="btn btn-primary d-grid w-100 mb-5">Sign up</button>
6562
</form>
6663

6764
<p class="text-center mb-5">
@@ -73,9 +70,9 @@ <h4 class="mb-1">Adventure starts here 🚀</h4>
7370
</div>
7471
</div>
7572
<!-- Register Card -->
76-
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
77-
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" height="172" class="authentication-image d-none d-lg-block" alt="triangle-bg">
78-
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
73+
<img src="{% static 'img/illustrations/tree-3.png' %}" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block" />
74+
<img src="{% static 'img/illustrations/auth-basic-mask-light.png' %}" class="authentication-image d-none d-lg-block scaleX-n1-rtl" height="172" alt="triangle-bg" />
75+
<img src="{% static 'img/illustrations/tree.png' %}" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block" />
7976
</div>
8077
</div>
8178
</div>

0 commit comments

Comments
 (0)