Skip to content

Commit

Permalink
Merge branch 'main' into feature/reaper_it1
Browse files Browse the repository at this point in the history
  • Loading branch information
@fedihamdi
fedihamdi committed Nov 17, 2023
2 parents 0f2d0fe + b9a579e commit bb6c10c
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 161 deletions.
48 changes: 5 additions & 43 deletions src/reaper/admin_material/templates/includes/fixed-plugin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<div class="card shadow-lg">
<div class="card-header pb-0 pt-3">
<div class="float-start">
<h5 class="mt-3 mb-0">Material UI Configurator</h5>
<p>See our dashboard options.</p>
<h5 class="mt-3 mb-0">Paramètres</p>
</div>
<div class="float-end mt-4">
<button class="btn btn-link text-dark p-0 fixed-plugin-close-button">
Expand All @@ -17,48 +16,9 @@ <h5 class="mt-3 mb-0">Material UI Configurator</h5>
</div>
<hr class="horizontal dark my-1" />
<div class="card-body pt-sm-3 pt-0">
<!-- Sidebar Backgrounds -->
<div>
<h6 class="mb-0">Sidebar Colors</h6>
</div>
<a href="javascript:void(0)" class="switch-trigger background-color">
<div class="badge-colors my-2 text-start">
<span
class="badge filter bg-gradient-primary active"
data-color="primary"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-dark"
data-color="dark"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-info"
data-color="info"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-success"
data-color="success"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-warning"
data-color="warning"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-danger"
data-color="danger"
onclick="sidebarColor(this)"
></span>
</div>
</a>
<!-- Sidenav Type -->
<div class="mt-3">
<h6 class="mb-0">Sidenav Type</h6>
<p class="text-sm">Choose between 2 different sidenav types.</p>
<h6 class="mb-0">Couleur de la Barre latérale</h6>
</div>
<div class="d-flex">
<button
Expand Down Expand Up @@ -88,7 +48,7 @@ <h6 class="mb-0">Sidenav Type</h6>
</p>
<!-- Navbar Fixed -->
<div class="mt-3 d-flex">
<h6 class="mb-0">Navbar Fixed</h6>
<h6 class="mb-0">Barre de menus Fixe</h6>
<div class="form-check form-switch ps-0 ms-auto my-auto">
<input
class="form-check-input mt-1 ms-auto"
Expand All @@ -109,11 +69,13 @@ <h6 class="mb-0">Light / Dark</h6>
onclick="darkMode(this)"
/>
</div>

</div>
<hr class="horizontal dark my-sm-4" />
<a class="btn bg-gradient-info w-100" target="_blank" href="">Download</a>
<a class="btn btn-outline-dark w-100" target="_blank" href=""
>MD5 Team 5</a>
</div>

</div>
</div>
13 changes: 2 additions & 11 deletions src/reaper/admin_material/templates/includes/footer-fullscreen.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,13 @@
href="https://bit.ly/3fKQZaL"
class="text-white font-weight-bold"
target="_blank"
>MD5 Team 5</a
>MD5 Group 5</a
>
Coded by Team 5
</div>
</div>
<div class="col-12 col-md-6">
<ul
class="nav nav-footer justify-content-center justify-content-lg-end"
>
<li class="nav-item">
<a href="" class="nav-link text-white" target="_blank">Download</a>
</li>

<li class="nav-item">
<a href="" class="nav-link text-white" target="_blank">Support</a>
</li>
class="nav nav-footer justify-content-center justify-content-lg-end">
</ul>
</div>
</div>
Expand Down
14 changes: 3 additions & 11 deletions src/reaper/admin_material/templates/includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,15 @@
<div class="col-lg-6 mb-lg-0 mb-4">
<div class="copyright text-center text-sm text-muted text-lg-start">
&copy; <a href="" class="font-weight-bold" target="_blank">MD5</a>
Coded by Team 5
Coded by Group 5
</div>
</div>
<div class="col-lg-6">
<ul
class="nav nav-footer justify-content-center justify-content-lg-end"
>
<li class="nav-item">
<a href="" class="nav-link text-muted" target="_blank">Download</a>
</li>
class="nav nav-footer justify-content-center justify-content-lg-end">
<li class="nav-item">
<a href="" class="nav-link text-muted" target="_blank"
>MD5 Team 5</a
>
</li>
<li class="nav-item">
<a href="" class="nav-link text-muted" target="_blank">Support</a>
>MD5 Group 5</a>
</li>
</ul>
</div>
Expand Down
5 changes: 0 additions & 5 deletions src/reaper/admin_material/templates/includes/navigation-fullscreen.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
</li>
</ul>
<ul class="navbar-nav d-lg-block d-none">
<li class="nav-item">
<a target="_blank"
href=""
class="btn btn-sm mb-0 me-1 bg-gradient-dark">Download</a>
</li>
</ul>
</div>
</div>
Expand Down
41 changes: 5 additions & 36 deletions src/reaper/admin_material/templates/includes/navigation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,14 @@
<a class="dropdown-item border-radius-md" href="javascript:;">
<div class="d-flex py-1">
<div class="my-auto">
<img src="{% static 'img/team-2.jpg' %}" class="avatar avatar-sm me-3 ">
<img src="{% static 'img/favicon.png' %}" class="avatar avatar-sm me-3 ">
</div>
<div class="d-flex flex-column justify-content-center">
<h6 class="text-sm font-weight-normal mb-1">
<span class="font-weight-bold">New message</span>from Team 5
</h6>
<span class="font-weight-bold">Alerte Pollution: </span>Taux de Monoxide de carbon élevé... </h6>
<p class="text-xs text-secondary mb-0">
<i class="fa fa-clock me-1"></i>
13 minutes ago
9 minutes ago
</p>
</div>
</div>
Expand All @@ -92,11 +91,11 @@ <h6 class="text-sm font-weight-normal mb-1">
<a class="dropdown-item border-radius-md" href="javascript:;">
<div class="d-flex py-1">
<div class="my-auto">
<img src="{% static 'img/small-logos/logo-spotify.svg' %}" class="avatar avatar-sm bg-gradient-dark me-3 ">
<img src="{% static 'img/favicon.png' %}" class="avatar avatar-sm bg-gradient-dark me-3 ">
</div>
<div class="d-flex flex-column justify-content-center">
<h6 class="text-sm font-weight-normal mb-1">
<span class="font-weight-bold">New album</span> by Travis Scott
<span class="font-weight-bold">Alerte Pollens: </span>Montreuil en zone à risques élevés
</h6>
<p class="text-xs text-secondary mb-0">
<i class="fa fa-clock me-1"></i>
Expand All @@ -106,36 +105,6 @@ <h6 class="text-sm font-weight-normal mb-1">
</div>
</a>
</li>
<li>
<a class="dropdown-item border-radius-md" href="javascript:;">
<div class="d-flex py-1">
<div class="avatar avatar-sm bg-gradient-secondary me-3 my-auto">
<svg width="12px" height="12px" viewBox="0 0 43 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>credit-card</title>
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-2169.000000, -745.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g transform="translate(1716.000000, 291.000000)">
<g transform="translate(453.000000, 454.000000)">
<path class="color-background" d="M43,10.7482083 L43,3.58333333 C43,1.60354167 41.3964583,0 39.4166667,0 L3.58333333,0 C1.60354167,0 0,1.60354167 0,3.58333333 L0,10.7482083 L43,10.7482083 Z" opacity="0.593633743"></path>
<path class="color-background" d="M0,16.125 L0,32.25 C0,34.2297917 1.60354167,35.8333333 3.58333333,35.8333333 L39.4166667,35.8333333 C41.3964583,35.8333333 43,34.2297917 43,32.25 L43,16.125 L0,16.125 Z M19.7083333,26.875 L7.16666667,26.875 L7.16666667,23.2916667 L19.7083333,23.2916667 L19.7083333,26.875 Z M35.8333333,26.875 L28.6666667,26.875 L28.6666667,23.2916667 L35.8333333,23.2916667 L35.8333333,26.875 Z"></path>
</g>
</g>
</g>
</g>
</svg>
</div>
<div class="d-flex flex-column justify-content-center">
<h6 class="text-sm font-weight-normal mb-1">
Payment successfully completed
</h6>
<p class="text-xs text-secondary mb-0">
<i class="fa fa-clock me-1"></i>
2 days
</p>
</div>
</div>
</a>
</li>
</ul>
</li>
</ul>
Expand Down
7 changes: 0 additions & 7 deletions src/reaper/admin_material/templates/includes/sidebar-rtl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,4 @@
</li>
</ul>
</div>
<div class="sidenav-footer position-absolute w-100 bottom-0">
<div class="mx-3">
<a class="btn bg-gradient-primary mt-4 w-100" href="" type="button"
>Download</a
>
</div>
</div>
</aside>
1 change: 1 addition & 0 deletions src/reaper/templates/pages/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ <h6 class="mb-0">Ozone and Nitrogen Dioxide</h6>
</div>
</div>


<div class="row mb-4">
<div class="col-lg-8 col-md-6 mb-md-0 mb-4">
<div class="card">
Expand Down
50 changes: 3 additions & 47 deletions src/reaper/templates/templates/includes/fixed-plugin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<div class="card shadow-lg">
<div class="card-header pb-0 pt-3">
<div class="float-start">
<h5 class="mt-3 mb-0">Material UI Configurator</h5>
<p>See our dashboard options.</p>
<h5 class="mt-3 mb-0">Parametres</h5>
<p></p>
</div>
<div class="float-end mt-4">
<button class="btn btn-link text-dark p-0 fixed-plugin-close-button">
Expand All @@ -17,48 +17,9 @@ <h5 class="mt-3 mb-0">Material UI Configurator</h5>
</div>
<hr class="horizontal dark my-1" />
<div class="card-body pt-sm-3 pt-0">
<!-- Sidebar Backgrounds -->
<div>
<h6 class="mb-0">Sidebar Colors</h6>
</div>
<a href="javascript:void(0)" class="switch-trigger background-color">
<div class="badge-colors my-2 text-start">
<span
class="badge filter bg-gradient-primary active"
data-color="primary"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-dark"
data-color="dark"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-info"
data-color="info"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-success"
data-color="success"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-warning"
data-color="warning"
onclick="sidebarColor(this)"
></span>
<span
class="badge filter bg-gradient-danger"
data-color="danger"
onclick="sidebarColor(this)"
></span>
</div>
</a>
<!-- Sidenav Type -->
<div class="mt-3">
<h6 class="mb-0">Sidenav Type</h6>
<p class="text-sm">Choose between 2 different sidenav types.</p>
<h6 class="mb-0">Couleur de la Barre latérale</h6>
</div>
<div class="d-flex">
<button
Expand Down Expand Up @@ -109,10 +70,5 @@ <h6 class="mb-0">Light / Dark</h6>
onclick="darkMode(this)"
/>
</div>
</div>
<hr class="horizontal dark my-sm-4" />
<a class="btn bg-gradient-info w-100" target="_blank" href=""></a>
<a class="btn btn-outline-dark w-100" target="_blank" href=""></a>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/reaper/templates/templates/includes/sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ <h6 class="ps-4 ms-2 text-uppercase text-xs text-white font-weight-bolder opacit
<div class="sidenav-footer position-absolute w-100 bottom-0 ">
<div class="mx-3">
<a class="btn bg-gradient-primary mt-4 w-100" target="_blank"
href="" type="button">MD5 Team 5</a>
href="" type="button">MD5 Groupe 5</a>
</div>
</div>
</aside>

0 comments on commit bb6c10c

Please sign in to comment.