Skip to content

Commit 3689f1a

Browse files
app-generatorapp-generator
committed
Release v1.0.6 - Improvements
- Integrate all pages for `Django.contrib.AUTH` - Integrate all theme links
1 parent 3035af6 commit 3689f1a

File tree

7 files changed

+72
-117
lines changed

7 files changed

+72
-117
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## [1.0.6] 2022-11-11
4+
### Improvements
5+
6+
- Integrate all pages for `Django.contrib.AUTH`
7+
- Integrate all theme links
8+
39
## [1.0.5] 2022-11-18
410
### PROMO
511

‎README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@ $ pip install git+https://github.com/app-generator/django-admin-argon-dashboard.
6868
]
6969
```
7070

71+
Here are the available `links`:
72+
73+
```python
74+
75+
path('', views.index, name='index'),
76+
path('billing/', views.billing, name='billing'),
77+
path('profile/', views.profile, name='profile'),
78+
path('tables/', views.tables, name='tables' ),
79+
path('rtl/', views.rtl, name='rtl' ),
80+
path('vr/', views.vr, name='vr' ),
81+
82+
```
83+
7184
<br />
7285

7386
> **Collect static** if you are in `production environment`:

‎admin_argon/templates/includes/sidebar.html‎

Lines changed: 27 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,76 @@
1-
{% load i18n static admin_argon %}
2-
3-
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-4 " id="sidenav-main">
1+
{% load static %}
2+
3+
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-end me-4 rotate-caret" id="sidenav-main">
44
<div class="sidenav-header">
5-
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute end-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
5+
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute start-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
66
<a class="navbar-brand m-0" href="/">
77
<img src="{% static 'img/logo-ct-dark.png' %}" class="navbar-brand-img h-100" alt="main_logo">
8-
<span class="ms-1 font-weight-bold">Argon Dashboard 2</span>
8+
<span class="me-1 font-weight-bold">Argon Dashboard 2</span>
99
</a>
1010
</div>
1111
<hr class="horizontal dark mt-0">
12-
<div class="collapse navbar-collapse w-auto " id="sidenav-collapse-main">
12+
<div class="collapse navbar-collapse px-0 w-auto " id="sidenav-collapse-main">
1313
<ul class="navbar-nav">
14-
{% admin_get_menu as app_list %}
15-
{% if app_list %}
16-
{% for app in app_list %}
17-
{% if app.has_perms and not app.pinned %}
18-
<li class="nav-item">
19-
{% comment %} <span class="nav-link{% if app_label != app.label and app.url not in request.path|urlencode %} collapsed{% endif %} text-white" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}">
20-
<span class="d-flex justify-content-between align-items-center">
21-
<div class="text-center me-2 d-flex align-items-center justify-content-center">
22-
<span class="sidebar-icon {{ app.icon }}"></span>
23-
</div>
24-
<a href="{{ app.url }}">
25-
<span class="nav-link-text ms-1">{{ app.label|slice:10 }}{% if app.label|length > 10 %}..{% endif %}</span>
26-
</a>
27-
</span>
28-
</span> {% endcomment %}
29-
<a class="nav-link {% if app_label != app.label and app.url not in request.path|urlencode %} collapsed{% endif %}" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}" href="{{ app.url }}">
30-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
31-
<i class="{{ app.icon }} text-primary text-sm opacity-10"></i>
32-
</div>
33-
<span class="nav-link-text ms-1">{{ app.label|slice:10 }}{% if app.label|length > 10 %}..{% endif %}</span>
34-
</a>
35-
36-
{% if app.models %}
37-
<div class="multi-level ms-5 collapse {% if 'tables-bootstrap-' in segment or app_label == app.label or app.url in request.path|urlencode %} show {% endif %}" role="list" id="submenu-{{ app.app_label }}" aria-expanded="{% if app_label == app.label or app.url in request.path|urlencode %}true{% else %}false{% endif %}">
38-
<ul class="flex-column nav">
39-
{% for model in app.models %}
40-
{% if model.url %}
41-
<li class="nav-item{% if 'bootstrap-tables' in segment or model.url in request.path|urlencode %} active {% endif %} list-unstyled">
42-
<a class="nav-link" href="{{ model.url }}">
43-
<span class="nav-link-text ms-1">{{ model.label }}</span>
44-
</a>
45-
</li>
46-
{% else %}
47-
<li class="nav-item list-unstyled">{{ model.label }}</li>
48-
{% endif %}
49-
{% endfor %}
50-
</ul>
51-
</div>
52-
{% endif %}
53-
</li>
54-
{% endif %}
55-
{% endfor %}
56-
{% endif %}
57-
5814
<li class="nav-item">
59-
{% if request.user.is_superuser %}
60-
<a href="{% url 'admin:index' %}" class="nav-link {% if 'index' in segment %} active {% endif %}">
61-
{% else %}
62-
<a href="/" class="nav-link {% if 'index' in segment %} active {% endif %}">
63-
{% endif %}
64-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
15+
<a class="nav-link " href="{% url 'index' %}">
16+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
6517
<i class="ni ni-tv-2 text-primary text-sm opacity-10"></i>
6618
</div>
67-
<span class="nav-link-text ms-1">Dashboard</span>
19+
<span class="nav-link-text me-1">لوحة القيادة</span>
6820
</a>
6921
</li>
70-
71-
{% if request.user.is_authenticated and not request.user.is_superuser %}
7222
<li class="nav-item">
73-
<a class="nav-link " href="../pages/tables.html">
74-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
23+
<a class="nav-link " href="{% url 'tables' %}">
24+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
7525
<i class="ni ni-calendar-grid-58 text-warning text-sm opacity-10"></i>
7626
</div>
77-
<span class="nav-link-text ms-1">Tables</span>
27+
<span class="nav-link-text me-1">الجداول</span>
7828
</a>
7929
</li>
8030
<li class="nav-item">
81-
<a class="nav-link " href="../pages/billing.html">
82-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
31+
<a class="nav-link " href="{% url 'billing' %}">
32+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
8333
<i class="ni ni-credit-card text-success text-sm opacity-10"></i>
8434
</div>
85-
<span class="nav-link-text ms-1">Billing</span>
35+
<span class="nav-link-text me-1">الفواتير</span>
8636
</a>
8737
</li>
8838
<li class="nav-item">
89-
<a class="nav-link " href="../pages/virtual-reality.html">
90-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
39+
<a class="nav-link " href="{% url 'vr' %}">
40+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
9141
<i class="ni ni-app text-info text-sm opacity-10"></i>
9242
</div>
93-
<span class="nav-link-text ms-1">Virtual Reality</span>
43+
<span class="nav-link-text me-1">الواقع الافتراضي</span>
9444
</a>
9545
</li>
9646
<li class="nav-item">
97-
<a class="nav-link " href="../pages/rtl.html">
98-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
47+
<a class="nav-link active" href="{% url 'rtl' %}">
48+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
9949
<i class="ni ni-world-2 text-danger text-sm opacity-10"></i>
10050
</div>
101-
<span class="nav-link-text ms-1">RTL</span>
51+
<span class="nav-link-text me-1">RTL</span>
10252
</a>
10353
</li>
10454
<li class="nav-item mt-3">
105-
<h6 class="ps-4 ms-2 text-uppercase text-xs font-weight-bolder opacity-6">Account pages</h6>
55+
<h6 class="ps-4 me-4 pe-2 text-uppercase text-xs font-weight-bolder opacity-6">صفحات المرافق</h6>
10656
</li>
10757
<li class="nav-item">
108-
<a class="nav-link " href="../pages/profile.html">
109-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
58+
<a class="nav-link " href="{% url 'profile' %}">
59+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
11060
<i class="ni ni-single-02 text-dark text-sm opacity-10"></i>
11161
</div>
112-
<span class="nav-link-text ms-1">Profile</span>
62+
<span class="nav-link-text me-1">حساب تعريفي</span>
11363
</a>
11464
</li>
115-
<li class="nav-item">
116-
<a class="nav-link " href="../pages/sign-in.html">
117-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
118-
<i class="ni ni-single-copy-04 text-warning text-sm opacity-10"></i>
119-
</div>
120-
<span class="nav-link-text ms-1">Sign In</span>
121-
</a>
122-
</li>
123-
<li class="nav-item">
124-
<a class="nav-link " href="../pages/sign-up.html">
125-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
126-
<i class="ni ni-collection text-info text-sm opacity-10"></i>
127-
</div>
128-
<span class="nav-link-text ms-1">Sign Up</span>
129-
</a>
130-
</li>
131-
{% endif %}
13265
</ul>
13366
</div>
13467
<div class="sidenav-footer mx-3 ">
13568
<div class="card card-plain shadow-none" id="sidenavCard">
13669
<img class="w-50 mx-auto" src="{% static 'img/illustrations/icon-documentation.svg' %}" alt="sidebar_illustration">
13770
<div class="card-body text-center p-3 w-100 pt-0">
13871
<div class="docs-info">
139-
<h6 class="mb-0">Need help?</h6>
140-
<p class="text-xs font-weight-bold mb-0">Please check the links</p>
72+
<h6 class="mb-0 text-center">تحتاج مساعدة?</h6>
73+
<p class="text-xs font-weight-bold text-center mb-0">يرجى التحقق من مستنداتنا</p>
14174
</div>
14275
</div>
14376
</div>

‎admin_argon/templates/pages/virtual-reality.html‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -168,39 +168,39 @@ <h6 class="text-sm font-weight-normal mb-1">
168168
<div class="collapse navbar-collapse w-auto " id="sidenav-collapse-main">
169169
<ul class="navbar-nav">
170170
<li class="nav-item">
171-
<a class="nav-link " href="../pages/dashboard.html">
171+
<a class="nav-link " href="{% url 'index' %}">
172172
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
173173
<i class="ni ni-tv-2 text-primary text-sm opacity-10"></i>
174174
</div>
175175
<span class="nav-link-text ms-1">Dashboard</span>
176176
</a>
177177
</li>
178178
<li class="nav-item">
179-
<a class="nav-link " href="../pages/tables.html">
179+
<a class="nav-link " href="{% url 'tables' %}">
180180
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
181181
<i class="ni ni-calendar-grid-58 text-warning text-sm opacity-10"></i>
182182
</div>
183183
<span class="nav-link-text ms-1">Tables</span>
184184
</a>
185185
</li>
186186
<li class="nav-item">
187-
<a class="nav-link " href="../pages/billing.html">
187+
<a class="nav-link " href="{% url 'billing' %}">
188188
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
189189
<i class="ni ni-credit-card text-success text-sm opacity-10"></i>
190190
</div>
191191
<span class="nav-link-text ms-1">Billing</span>
192192
</a>
193193
</li>
194194
<li class="nav-item">
195-
<a class="nav-link active" href="../pages/virtual-reality.html">
195+
<a class="nav-link active" href="{% url 'vr' %}">
196196
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
197197
<i class="ni ni-app text-info text-sm opacity-10"></i>
198198
</div>
199199
<span class="nav-link-text ms-1">Virtual Reality</span>
200200
</a>
201201
</li>
202202
<li class="nav-item">
203-
<a class="nav-link " href="../pages/rtl.html">
203+
<a class="nav-link " href="{% url 'rtl' %}">
204204
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
205205
<i class="ni ni-world-2 text-danger text-sm opacity-10"></i>
206206
</div>
@@ -211,29 +211,13 @@ <h6 class="text-sm font-weight-normal mb-1">
211211
<h6 class="ps-4 ms-2 text-uppercase text-xs font-weight-bolder opacity-6">Account pages</h6>
212212
</li>
213213
<li class="nav-item">
214-
<a class="nav-link " href="../pages/profile.html">
214+
<a class="nav-link " href="{% url 'profile' %}">
215215
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
216216
<i class="ni ni-single-02 text-dark text-sm opacity-10"></i>
217217
</div>
218218
<span class="nav-link-text ms-1">Profile</span>
219219
</a>
220220
</li>
221-
<li class="nav-item">
222-
<a class="nav-link " href="../pages/sign-in.html">
223-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
224-
<i class="ni ni-single-copy-04 text-warning text-sm opacity-10"></i>
225-
</div>
226-
<span class="nav-link-text ms-1">Sign In</span>
227-
</a>
228-
</li>
229-
<li class="nav-item">
230-
<a class="nav-link " href="../pages/sign-up.html">
231-
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
232-
<i class="ni ni-collection text-info text-sm opacity-10"></i>
233-
</div>
234-
<span class="nav-link-text ms-1">Sign Up</span>
235-
</a>
236-
</li>
237221
</ul>
238222
</div>
239223
<div class="sidenav-footer mx-3 ">

‎admin_argon/urls.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55

66
urlpatterns = [
77
path('', views.index, name='index'),
8+
path('billing/', views.billing, name='billing'),
9+
path('profile/', views.profile, name='profile'),
10+
path('tables/', views.tables, name='tables' ),
11+
path('rtl/', views.rtl, name='rtl' ),
12+
path('vr/', views.vr, name='vr' ),
813

914
# Authentication
1015
path('accounts/login/', views.UserLoginView.as_view(), name='login'),

‎admin_argon/views.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@
88
def index(request):
99
return render(request, 'pages/dashboard.html')
1010

11+
def billing(request):
12+
return render(request, 'pages/billing.html')
13+
14+
def profile(request):
15+
return render(request, 'pages/profile.html')
16+
17+
def tables(request):
18+
return render(request, 'pages/tables.html')
19+
20+
def rtl(request):
21+
return render(request, 'pages/rtl.html')
22+
23+
def vr(request):
24+
return render(request, 'pages/virtual-reality.html')
1125

1226
def register(request):
1327
if request.method == 'POST':

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setup(
1010
name='django-admin-argon-dashboard',
11-
version='1.0.5',
11+
version='1.0.6',
1212
zip_safe=False,
1313
packages=find_packages(),
1414
include_package_data=True,

0 commit comments

Comments
 (0)