Skip to content

Commit e4a1c14

Browse files
app-generatorapp-generator
authored
Merge pull request #1 from app-generator/imran
Complete dashboard
2 parents 0efb2bd + c1c4595 commit e4a1c14

32 files changed

+398
-738
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"liveServer.settings.port": 5501
3+
}

‎apps/templates/accounts/login.html‎

Lines changed: 18 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -13,50 +13,33 @@
1313
<div class="col-xl-4 col-lg-5 col-md-6 d-flex flex-column mx-auto">
1414
<div class="card card-plain mt-8">
1515
<div class="card-header pb-0 text-left bg-transparent">
16-
<h3 class="font-weight-bolder text-info text-gradient">
17-
Sign IN
18-
</h3>
19-
<p class="mb-0">
20-
{% if msg %}
21-
<span class="text-danger">{{ msg | safe }}</span>
22-
{% else %}
23-
Add your credentials
24-
{% endif %}
25-
</p>
16+
<h3 class="font-weight-bolder text-info text-gradient">Welcome back</h3>
17+
<p class="mb-0">Enter your email and password to sign in</p>
2618
</div>
2719
<div class="card-body">
28-
<form role="form" method="post" action="#">
29-
{% if form.non_field_errors %}
30-
{% for error in form.non_field_errors %}
31-
<span class="text-danger">{{ error }}</span>
32-
{% endfor %}
33-
{% endif %}
34-
{% csrf_token %}
35-
{% for field in form %}
36-
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
37-
<div class="mb-3">
38-
{{field}}
39-
</div>
40-
{% endfor %}
41-
<p class="">
42-
<a href="{% url 'password_reset' %}" class="text-primary">Forgot password</a>
43-
</p>
44-
20+
<form role="form">
21+
<label>Email</label>
22+
<div class="mb-3">
23+
<input type="email" class="form-control" placeholder="Email" aria-label="Email" aria-describedby="email-addon">
24+
</div>
25+
<label>Password</label>
26+
<div class="mb-3">
27+
<input type="email" class="form-control" placeholder="Password" aria-label="Password" aria-describedby="password-addon">
28+
</div>
29+
<div class="form-check form-switch">
30+
<input class="form-check-input" type="checkbox" id="rememberMe" checked="">
31+
<label class="form-check-label" for="rememberMe">Remember me</label>
32+
</div>
4533
<div class="text-center">
46-
<button type="submit" class="btn bg-gradient-info w-100 mt-1 mb-0">Sign in</button>
47-
<p class="mt-4">
48-
Don't have an account?
49-
<a href="{% url 'register' %}" class="text-primary">Register</a>
50-
</p>
34+
<button type="button" class="btn bg-gradient-info w-100 mt-4 mb-0">Sign in</button>
5135
</div>
52-
5336
</form>
5437
</div>
5538
</div>
5639
</div>
5740
<div class="col-md-6">
5841
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
59-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
42+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
6043
</div>
6144
</div>
6245
</div>
@@ -69,33 +52,3 @@ <h3 class="font-weight-bolder text-info text-gradient">
6952

7053
{% endblock content %}
7154

72-
{% block extrascript %}
73-
<script type="application/javascript">
74-
{% if form.username.errors %}
75-
notification.danger("{{ form.username.errors }}", 'top', 'right');
76-
{% endif %}
77-
{% if form.password.errors %}
78-
notification.danger("{{ form.password.errors }}", 'top', 'right');
79-
{% endif %}
80-
81-
{% if user.is_authenticated %}
82-
var msg = "You are authenticated as {{ username }}, but are not authorized to " +
83-
"access this page.Would you like to login to a different account ?"
84-
notification.warning(msg, 'top', 'right');
85-
{% endif %}
86-
87-
{% if form.errors and not form.non_field_errors %}
88-
{% if form.errors.items|length == 1 %}
89-
notification.warning("{% trans "Please correct the error below." %}", 'top', 'right');
90-
{% else %}
91-
notification.warning("{% trans "Please correct the errors below." %}", 'top', 'right');
92-
{% endif %}
93-
{% endif %}
94-
95-
{% if form.non_field_errors %}
96-
{% for error in form.non_field_errors %}
97-
notification.warning("{{ error|clean_text }}", 'top', 'right');
98-
{% endfor %}
99-
{% endif %}
100-
</script>
101-
{% endblock %}

‎apps/templates/accounts/password_change.html‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -17,34 +17,28 @@ <h3 class="font-weight-bolder text-info text-gradient">
1717
Change Password
1818
</h3>
1919
<p class="mb-0">
20-
{% if msg %}
21-
<span class="text-danger">{{ msg | safe }}</span>
22-
{% else %}
23-
Add your credentials
24-
{% endif %}
20+
<span class="text-danger"></span>
21+
Add your credentials
2522
</p>
2623
</div>
2724
<div class="card-body">
28-
<form role="form" method="post" action="#">
29-
{% csrf_token %}
30-
{% for field in form %}
31-
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
32-
<div class="mb-3">
33-
{{field}}
34-
</div>
35-
<span class="text-danger">{{ field.errors }}</span>
36-
{% endfor %}
37-
38-
<div class="text-center">
39-
<button type="submit" class="btn bg-gradient-info w-100 mt-4 mb-0">Change</button>
40-
</div>
25+
<form role="form">
26+
<label>Email</label>
27+
<div class="mb-3">
28+
<input type="email" class="form-control" placeholder="Email" aria-label="Email" aria-describedby="email-addon">
29+
</div>
30+
<div class="text-center">
31+
<a href="{{url_for('accounts_password_change_done')}}">
32+
<button type="button" class="btn bg-gradient-info w-100 mt-4 mb-0">Request Password Change</button>
33+
</a>
34+
</div>
4135
</form>
4236
</div>
4337
</div>
4438
</div>
4539
<div class="col-md-6">
4640
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
47-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
41+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
4842
</div>
4943
</div>
5044
</div>

‎apps/templates/accounts/password_change_done.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -24,7 +24,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
2424
</div>
2525
<div class="col-md-6">
2626
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
27-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
27+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
2828
</div>
2929
</div>
3030
</div>

‎apps/templates/accounts/password_reset.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -50,7 +50,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
5050
</div>
5151
<div class="col-md-6">
5252
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
53-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
53+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
5454
</div>
5555
</div>
5656
</div>

‎apps/templates/accounts/password_reset_complete.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -25,7 +25,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
2525
</div>
2626
<div class="col-md-6">
2727
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
28-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
28+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
2929
</div>
3030
</div>
3131
</div>

‎apps/templates/accounts/password_reset_confirm.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -44,7 +44,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
4444
</div>
4545
<div class="col-md-6">
4646
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
47-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
47+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
4848
</div>
4949
</div>
5050
</div>

‎apps/templates/accounts/password_reset_done.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'layouts/base-fullscreen.html' %}
2-
{% load i18n static admin_soft %}
2+
33

44
{% block content %}
55

@@ -24,7 +24,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
2424
</div>
2525
<div class="col-md-6">
2626
<div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
27-
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{% static 'img/curved-images/curved6.jpg' %}')"></div>
27+
<div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url('{{ url_for('static', filename = 'assets/img/curved-images/curved6.jpg' )}}')"></div>
2828
</div>
2929
</div>
3030
</div>

0 commit comments

Comments
 (0)