Skip to content

Commit 4d4e15c

Browse files
Vatsal6288Vatsal6288
authored
Merge pull request #2 from themeselection/dev
Merge dev branch into main branch
2 parents dd0345b + 0bf3c19 commit 4d4e15c

File tree

229 files changed

+27343
-39280
lines changed

Some content is hidden

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

229 files changed

+27343
-39280
lines changed

‎.jsbeautifyrc‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.prettierignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.prettierrc.json‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.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 & 3 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"
@@ -80,5 +80,5 @@
8080
"git.enableSmartCommit": true,
8181
"eslint.format.enable": true,
8282
// Extension: npm
83-
"npm.packageManager": "yarn",
84-
}
83+
"npm.packageManager": "yarn"
84+
}

‎README.md‎

Lines changed: 40 additions & 38 deletions
Large diffs are not rendered by default.

‎apps/authentication/templates/auth_forgot_password_basic.html‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,45 @@
66
{% block title %}Forgot Password - Pages{% endblock %}
77

88
{% block page_css %}
9-
{{ block.super }}
10-
<link rel="stylesheet" href="{% static 'vendor/css/pages/page-auth.css' %}" />
9+
{{ block.super }}
10+
<link rel="stylesheet" href="{% static 'vendor/css/pages/page-auth.css' %}"/>
1111
{% endblock page_css %}
1212

13-
1413
{% block content %}
15-
<div class="container-xxl">
16-
<div class="authentication-wrapper authentication-basic container-p-y">
17-
<div class="authentication-inner">
18-
19-
<!-- Forgot Password -->
20-
<div class="card px-sm-6 px-0">
21-
<div class="card-body">
22-
<!-- Logo -->
23-
<div class="app-brand justify-content-center mb-6">
24-
<a href="{% url 'index' %}" class="app-brand-link gap-2">
25-
<span class="app-brand-logo demo">{% include 'partials/logo.html' with withbg="#696cff" %}</span>
26-
<span class="app-brand-text demo text-heading fw-bold">{% get_theme_variables 'template_name' %}</span>
27-
</a>
28-
</div>
29-
<!-- /Logo -->
30-
<h4 class="mb-1">Forgot Password? 🔒</h4>
31-
<p class="mb-6">Enter your email and we'll send you instructions to reset your password</p>
32-
<form id="formAuthentication" class="mb-6" action="{% url 'index' %}">
33-
{% csrf_token %}
34-
<div class="mb-6">
35-
<label for="email" class="form-label">Email</label>
36-
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
14+
<div class="container-xxl">
15+
<div class="authentication-wrapper authentication-basic container-p-y">
16+
<div class="authentication-inner">
17+
<!-- Forgot Password -->
18+
<div class="card px-sm-6 px-0">
19+
<div class="card-body">
20+
<!-- Logo -->
21+
<div class="app-brand justify-content-center mb-6">
22+
<a href="{% url 'index' %}" class="app-brand-link gap-2">
23+
<span class="app-brand-logo demo">{% include 'partials/logo.html' %}</span>
24+
<span class="app-brand-text demo text-heading fw-bold">{% get_theme_variables 'template_name' %}</span>
25+
</a>
26+
</div>
27+
<!-- /Logo -->
28+
<h4 class="mb-1">Forgot Password? 🔒</h4>
29+
<p class="mb-6">Enter your email and we'll send you instructions to reset your password</p>
30+
<form id="formAuthentication" class="mb-6" action="{% url 'index' %}">
31+
{% csrf_token %}
32+
<div class="mb-6">
33+
<label for="email" class="form-label">Email</label>
34+
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus="autofocus"/>
35+
</div>
36+
<button class="btn btn-primary d-grid w-100">Send Reset Link</button>
37+
</form>
38+
<div class="text-center">
39+
<a href="{% url 'auth-login-basic' %}" class="d-flex justify-content-center">
40+
<i class="icon-base bx bx-chevron-left me-1"></i>
41+
Back to login
42+
</a>
3743
</div>
38-
<button class="btn btn-primary d-grid w-100">Send Reset Link</button>
39-
</form>
40-
<div class="text-center">
41-
<a href="{% url 'auth-login-basic' %}" class="d-flex justify-content-center">
42-
<i class="bx bx-chevron-left me-1"></i>
43-
Back to login
44-
</a>
4544
</div>
4645
</div>
46+
<!-- /Forgot Password -->
4747
</div>
48-
<!-- /Forgot Password -->
4948
</div>
5049
</div>
51-
</div>
52-
{% endblock %}
50+
{% endblock %}

‎apps/authentication/templates/auth_login_basic.html‎

Lines changed: 57 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,72 @@
66
{% block title %}Login - Pages{% endblock %}
77

88
{% block page_css %}
9-
{{ block.super }}
10-
<link rel="stylesheet" href="{% static 'vendor/css/pages/page-auth.css' %}">
9+
{{ block.super }}
10+
<link rel="stylesheet" href="{% static 'vendor/css/pages/page-auth.css' %}">
1111
{% endblock page_css %}
1212

1313
{% block content %}
14-
<div class="container-xxl">
15-
<div class="authentication-wrapper authentication-basic container-p-y">
16-
<div class="authentication-inner">
17-
<!-- Login -->
18-
<div class="card px-sm-6 px-0">
19-
<div class="card-body">
20-
<!-- Logo -->
21-
<div class="app-brand justify-content-center">
22-
<a href="{% url 'index' %}" class="app-brand-link gap-2">
23-
<span class="app-brand-logo demo">{% include 'partials/logo.html' with withbg="#696cff" %}</span>
24-
<span class="app-brand-text demo text-heading fw-bold">{% get_theme_variables 'template_name' %}</span>
25-
</a>
26-
</div>
27-
<!-- /Logo -->
28-
<h4 class="mb-1">Welcome to {% get_theme_variables 'template_name' %}! 👋</h4>
29-
<p class="mb-6">Please sign-in to your account and start the adventure</p>
30-
31-
<form id="formAuthentication" class="mb-6" action="{% url 'index' %}">
32-
{% csrf_token %}
33-
<div class="mb-6">
34-
<label for="email" class="form-label">Email or Username</label>
35-
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus>
14+
<div class="container-xxl">
15+
<div class="authentication-wrapper authentication-basic container-p-y">
16+
<div class="authentication-inner">
17+
<!-- Register -->
18+
<div class="card px-sm-6 px-0">
19+
<div class="card-body">
20+
<!-- Logo -->
21+
<div class="app-brand justify-content-center">
22+
<a href="{% url 'index' %}" class="app-brand-link gap-2">
23+
<span class="app-brand-logo demo">{% include 'partials/logo.html' %}</span>
24+
<span class="app-brand-text demo text-heading fw-bold">{% get_theme_variables 'template_name' %}</span>
25+
</a>
3626
</div>
37-
<div class="mb-6 form-password-toggle">
38-
<label class="form-label" for="password">Password</label>
39-
<div class="input-group input-group-merge">
40-
<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" />
41-
<span class="input-group-text cursor-pointer"><i class="bx bx-hide"></i></span>
27+
<!-- /Logo -->
28+
<h4 class="mb-1">Welcome to
29+
{% get_theme_variables 'template_name' %}! 👋</h4>
30+
<p class="mb-6">Please sign-in to your account and start the adventure</p>
31+
32+
<form id="formAuthentication" class="mb-6" action="{% url 'index' %}">
33+
{% csrf_token %}
34+
<div class="mb-6">
35+
<label for="email" class="form-label">Email or Username</label>
36+
<input type="text" class="form-control" id="email" name="email-username" placeholder="Enter your email or username" autofocus="autofocus"/>
4237
</div>
43-
</div>
44-
<div class="mb-8">
45-
<div class="d-flex justify-content-between mt-8">
46-
<div class="form-check mb-0 ms-2">
47-
<input class="form-check-input" type="checkbox" id="remember-me">
48-
<label class="form-check-label" for="remember-me">
49-
Remember Me
50-
</label>
38+
<div class="mb-6 form-password-toggle">
39+
<label class="form-label" for="password">Password</label>
40+
<div class="input-group input-group-merge">
41+
<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"/>
42+
<span class="input-group-text cursor-pointer">
43+
<i class="icon-base bx bx-hide"></i>
44+
</span>
5145
</div>
52-
<a href="{% url 'auth-forgot-password-basic' %}">
53-
<span>Forgot Password?</span>
54-
</a>
5546
</div>
56-
</div>
57-
<div class="mb-6">
58-
<button class="btn btn-primary d-grid w-100" type="submit">Login</button>
59-
</div>
60-
</form>
47+
<div class="mb-8">
48+
<div class="d-flex justify-content-between">
49+
<div class="form-check mb-0">
50+
<input class="form-check-input" type="checkbox" id="remember-me"/>
51+
<label class="form-check-label" for="remember-me">
52+
Remember Me
53+
</label>
54+
</div>
55+
<a href="{% url 'auth-forgot-password-basic' %}">
56+
<span>Forgot Password?</span>
57+
</a>
58+
</div>
59+
</div>
60+
<div class="mb-6">
61+
<button class="btn btn-primary d-grid w-100" type="submit">Login</button>
62+
</div>
63+
</form>
6164

62-
<p class="text-center">
63-
<span>New on our platform?</span>
64-
<a href="{% url 'auth-register-basic' %}">
65-
<span>Create an account</span>
66-
</a>
67-
</p>
65+
<p class="text-center">
66+
<span>New on our platform?</span>
67+
<a href="{% url 'auth-register-basic' %}">
68+
<span>Create an account</span>
69+
</a>
70+
</p>
71+
</div>
6872
</div>
73+
<!-- /Register -->
6974
</div>
70-
<!-- /Login -->
7175
</div>
7276
</div>
73-
</div>
74-
{% endblock %}
77+
{% endblock %}

0 commit comments

Comments
 (0)