Skip to content

Commit

Permalink
better piggybank and subscription pages, light refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@atomikaya
atomikaya committed Oct 27, 2024
1 parent 62e72fc commit d0ab3e3
Show file tree
Hide file tree
Showing 5 changed files with 179 additions and 120 deletions.
17 changes: 8 additions & 9 deletions build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,18 @@ def clean_dir(path):
network_link = active_link,
)

tirelire = dict(
piggybank = dict(
base_url = '..',
page_title = 'Tirelire',
page_content = read('templates/compte/index.html'),
page_content = read('templates/account/index.html'),
piggybank_link = active_link,
)


transactions = dict(
bookings = dict(
base_url = '../..',
page_title = 'Transactions',
page_content = read('templates/compte/transactions/index.html'),
transactions_link = active_link,
page_title = 'Adhésions',
page_content = read('templates/account/bookings/index.html'),
bookings_link = active_link,
)

# build
Expand All @@ -106,7 +105,7 @@ def clean_dir(path):
write('public/agenda/boeuf-lampions/index.html', render('templates/base.html', agenda_event_free))
write('public/agenda/see-you-in-the-pit-13/index.html', render('templates/base.html', agenda_event))
write('public/reseau/index.html', render('templates/base.html', network))
write('public/compte/index.html', render('templates/base.html', tirelire))
write('public/compte/transactions/index.html', render('templates/base.html', transactions))
write('public/account/index.html', render('templates/base.html', piggybank))
write('public/account/bookings/index.html', render('templates/base.html', bookings))

shutil.copytree('assets', 'public/assets')
119 changes: 119 additions & 0 deletions templates/account/bookings/index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<main class="container-lg py-5">
<ul class="nav nav-tabs mb-0">
<li class="nav-item">
<a class="nav-link" href="../">
<i class="bi bi-piggy-bank-fill"></i>
<span class="d-none d-md-inline">Tirelire</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link active" aria-current="page" href=".">
<i class="bi bi-person-badge-fill"></i>
<span class="d-none d-md-inline">Adhésions</span>
</a>
</li>
<!-- <li class="nav-item">
<a class="nav-link" href="#">
<i class="bi bi-ticket-perforated-fill"></i>
<span class="d-none d-md-inline">Réservations</span>
</a>
</li> -->
<li class="nav-item">
<a class="nav-link" href="#">
<i class="bi bi-stopwatch-fill"></i>
<span class="d-none d-md-inline">Badgeuse</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">
<i class="bi bi-gear-fill"></i>
<span class="d-none d-md-inline">Préférences</span>
</a>
</li>
</ul>
<section class="card border-top-0 rounded-top-0">
<div class="card-body">
<h1 class="card-title d-md-none">Adhésions</h1>
<p class="lead">
Ici je peux voir mes adhésions en cours, les renouveler et
souscrire une nouvelle adhésion parmi celles disponibles sur le
réseau.
</p>
</div>
</section>

<h2 class="pt-3">Mes adhésions</h2>

<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4 mt-3 mb-5">
<div class="col">
<div class="card h-100">
<div class="card-body">
<h3 class="card-title">Adhésion Tiers-Lustre</h3>
<p class="card-text">
L'adhésion donne accès au Fusible (fablab, ateliers
bois et élec) et à l'Ampoule (café-concert, scène
musicale). L'atelier bois et géré à 80% par
l'association Chantefrein, adhésion séparée à prévoir
pour se servir des machines sur leurs créneaux.
</p>
</div>
<div class="card-footer">
<p><strong>Adhésion annuelle</strong> du 03/09/24 au 03/09/25</p>

<a href="#" class="btn btn-primary d-block mb-3">
Renouveler pour un an à <strong>20</strong> tibillets
</a>
</div>
</div>
</div>
<div class="col">
<div class="card h-100 opacity-50">
<div class="card-body">
<h3 class="card-title">Pass-Noisette</h3>
<p class="card-text">
Avec le Pass-Noisette tu accède aux prix préférentiels
des Assos du Bois, et as un accès gratuit aux concerts
de l'été. Merci de nous soutenir !
</p>
</div>
<div class="card-footer">
<p><strong>Adhésion annuelle</strong> du 11/06/22 au 11/06/25</p>

<a href="#" class="btn btn-primary d-block mb-3 disabled">
Renouveler pour un an à <strong>12</strong> tibillets
</a>
</div>
</div>
</div>
</div>

<h2 class="pt-3">Souscrire une nouvelle adhésion</h2>

<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4 mt-3 mb-5">
<div class="col">
<div class="card h-100">
<div class="card-body">
<h3 class="card-title">Adhésion Chantefrein</h3>
<p class="card-text">
L'adhésion donne accès à la réservation de créneaux, aux
activités et formations sur des machines.
</p>
</div>
<div class="card-footer">
<p><strong>Adhésion mensuelle</strong> jusqu'au 18/11/24</p>

<a href="#" class="btn btn-secondary d-block mb-3">
Souscrire pour un mois à <strong>5</strong> tibillets
</a>

<p><strong>Adhésion annuelle</strong> jusqu'au 18/10/25</p>

<a href="#" class="btn btn-secondary d-block mb-3">
Souscrire pour un an à <strong>50</strong> tibillets
</a>
</div>
</div>
</div>
</div>

</main>
61 changes: 44 additions & 17 deletions templates/compte/index.html → templates/account/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./transactions/">
<i class="bi bi-cash-coin"></i>
<span class="d-none d-md-inline">Transactions</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">
<a class="nav-link" href="./bookings/">
<i class="bi bi-person-badge-fill"></i>
<span class="d-none d-md-inline">Adhésions</span>
</a>
</li>
<li class="nav-item">
<!-- <li class="nav-item">
<a class="nav-link" href="#">
<i class="bi bi-ticket-perforated-fill"></i>
<span class="d-none d-md-inline">Réservations</span>
</a>
</li>
</li> -->
<li class="nav-item">
<a class="nav-link" href="#">
<i class="bi bi-stopwatch-fill"></i>
Expand All @@ -42,8 +36,8 @@
<h1 class="card-title d-md-none">Tirelire</h1>
<p class="lead">
Ici je retrouve mon solde TiBillet et mes heures déclarées.
Certaines monnaies ou monnaie-heures peuvent ne pas être
utilisables ici.
Certaines monnaies ou monnaie-heures peuvent n'être utilisables
qu'ailleurs.
</p>
</div>
<div class="row g-0">
Expand All @@ -52,13 +46,13 @@ <h3>Monnaies</h3>
<p class="lead flex-fill">
<strong>40,25</strong> tibillets utilisables avec
<em>Le Tiers Lustre</em> <br />
<span class="opacity-50"><strong>80,25</strong> en tout</span>
<span class="opacity-50"><strong>80,25</strong> tibillets en tout</span>
</p>

<a href="#" class="btn btn-primary mb-3">
Recharger ma tirelire
</a>
<a href="#detail-monnaies" class="btn btn-secondary d-md-none mb-3">
<a href="#detail-monnaies" class="btn btn-secondary d-md-none">
Détail des monnaies
</a>
</div>
Expand All @@ -67,12 +61,12 @@ <h3>Pointages</h3>
<p class="lead flex-fill">
<strong>03:30</strong> heures échangeables avec
<em>Le Tiers Lustre</em> <br />
<span class="opacity-50"><strong>07:00</strong> en tout</span>
<span class="opacity-50"><strong>07:00</strong> heures en tout</span>
</p>
<a href="#" class="btn btn-primary mb-3">
Déclarer des heures
</a>
<a href="#detail-heures" class="btn btn-secondary d-md-none mb-3">
<a href="#detail-heures" class="btn btn-secondary d-md-none">
Détail des heures
</a>
</div>
Expand All @@ -84,7 +78,7 @@ <h3>Pointages</h3>
<h2 class="pt-3 d-md-none" id="detail-monnaies">Détail des monnaies</h2>
<table class="table">
<thead>
<th>Montant</th>
<th>Solde</th>
<th>Réseau concerné</th>
<th>Dernière transaction</th>
</thead>
Expand Down Expand Up @@ -144,7 +138,7 @@ <h2 class="pt-3 d-md-none" id="detail-monnaies">Détail des monnaies</h2>
<h2 class="pt-3 d-md-none" id="detail-heures">Détail des heures</h2>
<table class="table">
<thead>
<th>Compte</th>
<th>Solde</th>
<th>Réseau concerné</th>
<th>Dernière transaction</th>
</thead>
Expand All @@ -171,5 +165,38 @@ <h2 class="pt-3 d-md-none" id="detail-heures">Détail des heures</h2>
</table>
</div>
</div>

<p class="py-3 text-center">
<a href="#" class="btn btn-outline-primary d-block d-sm-inline">
Historique des transactions
</a>
</p>

<h2 class="pt-3 d-none">Historique des transactions</h2>
<div class="table-responsive d-none">
<table class="table">
<thead>
<th>Montant</th>
<th>Action</th>
<th>Chemin</th>
<th>Date</th>
</thead>
<tbody>
<tr>
<td>
<strong>30</strong>
Étincelles
</td>
<td>Recharge</td>
<td>
Carte bancaire
<i class="bi bi-arrow-right"></i>
Tirelire
</td>
<td>12/03/24</td>
</tr>
</tbody>
</table>
</div>

</main>
25 changes: 8 additions & 17 deletions templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,29 +78,23 @@
<ul class="dropdown-menu dropdown-menu-lg-end">
<li class="dropdown-header"><code>jdulac@exemple.fr</code></li>
<li>
<a class="dropdown-item $piggybank_link" href="$base_url/compte/">
<a class="dropdown-item $piggybank_link" href="$base_url/account/">
<i class="bi bi-piggy-bank-fill"></i>
Tirelire
</a>
</li>
<li>
<a class="dropdown-item $transactions_link" href="$base_url/compte/transactions/">
<i class="bi bi-cash-coin"></i>
Transactions
</a>
</li>
<li>
<a class="dropdown-item" href="#">
<a class="dropdown-item $bookings_link" href="$base_url/account/bookings/">
<i class="bi bi-person-badge-fill"></i>
Adhésions
</a>
</li>
<li>
<!-- <li>
<a class="dropdown-item" href=".">
<i class="bi bi-ticket-perforated-fill"></i>
Réservations
</a>
</li>
</li> -->
<li>
<a class="dropdown-item" href="#">
<i class="bi bi-stopwatch-fill"></i>
Expand Down Expand Up @@ -166,17 +160,14 @@ <h4>Le Tiers-Lustre</h4>
<hr>
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link" href="#">Tirelire</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Transactions</a>
<a class="nav-link $piggybank_link" href="$base_url/account/">Tirelire</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Adhésions</a>
<a class="nav-link $bookings_link" href="$base_url/account/bookings/">Adhésions</a>
</li>
<li class="nav-item">
<!-- <li class="nav-item">
<a class="nav-link" href=".">Réservations</a>
</li>
</li> -->
<li class="nav-item">
<a class="nav-link" href="#">Badgeuse</a>
</li>
Expand Down
Loading

0 comments on commit d0ab3e3

Please sign in to comment.