bouzoure/pop-camarades
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge recent UI & Postgres work into main branch #4

Merged
bouzoure merged 19 commits from postgres into main 2025-07-24 12:13:01 +02:00
Conversation 0 Commits 19 Files changed 51 +356 -355
12 changed files with 356 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f87ca9698d - Show all commits

10
frontend/index.css
View file

@ -57,3 +57,13 @@ a {
.fs-7 {
font-size: .75rem !important;
}
.mw-600 {
max-width: 600px;
}
.mw-900 {
max-width: 900px;
}
.mw-1200 {
max-width: 1200px;
}

20
views/account_manage.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -12,6 +12,7 @@
<hr />
</div>
<form id="account" method="post" style="max-width: 1200px;">
{% if Errors %}
<div class="alert alert-danger">
<ul class="m-0">
@ -22,10 +23,9 @@
</div>
{% endif %}
<form id="account" method="post">
<div class="row mb-3">
<label for="name" class="col-md-2 form-label"> Nom complet </label>
<div class="col-md-10">
<label for="name" class="col-md-2 col-xl-3 form-label"> Nom complet </label>
<div class="col-md-10 col-xl-9">
<input
id="name"
class="form-control"
@ -40,8 +40,8 @@
</div>
<div class="row mb-3">
<label for="email" class="col-md-2 form-label"> Email </label>
<div class="col-md-10">
<label for="email" class="col-md-2 col-xl-3 form-label"> Email </label>
<div class="col-md-10 col-xl-9">
<input
id="email"
class="form-control"
@ -55,8 +55,8 @@
</div>
<div class="row mb-3">
<label for="password" class="col-md-2 form-label"> Mot de passe </label>
<div class="col-md-10">
<label for="password" class="col-md-2 col-xl-3 form-label"> Mot de passe </label>
<div class="col-md-10 col-xl-9">
<input
id="password"
class="form-control"
@ -69,10 +69,10 @@
</div>
<div class="row mb-3">
<label for="password" class="col-md-2 form-label">
<label for="password" class="col-md-2 col-xl-3 form-label">
Confirmer le mot de passe
</label>
<div class="col-md-10">
<div class="col-md-10 col-xl-9">
<input
id="password-verify"
class="form-control"

2
views/account_totp.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">

14
views/admin.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -12,8 +12,8 @@
<hr />
</div>
<div class="row">
<div class="col-md-6">
<div class="row" style="max-width: 600px;">
<div class="col-12">
<a class="dashboard-tile" href="/admin/sections">
<div class="alert alert-primary">
<i class="bi-building me-2"></i>
@ -21,7 +21,7 @@
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/admin/lists">
<div class="alert alert-primary">
<i class="bi-list-check me-2"></i>
@ -29,7 +29,7 @@
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/admin/fields">
<div class="alert alert-primary">
<i class="bi-database-add me-2"></i>
@ -37,7 +37,7 @@
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/admin/users">
<div class="alert alert-primary">
<i class="bi-person-square me-2"></i>
@ -45,7 +45,7 @@
</div>
</a>
</div>
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/admin/roles">
<div class="alert alert-primary">
<i class="bi-briefcase me-2"></i>

2
views/error_page.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container text-center py-5">
<div class="container-fluid my-4 px-4 text-center py-5">
<div class="h1 mb-3">Erreur {{ Code }}</div>
<code>{{ Message }}</code>
</div>

10
views/index.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -11,9 +11,9 @@
<hr />
</div>
<div class="row">
<div class="row" style="max-width: 600px;">
{% if Globals.AllowMembersPage %}
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/members">
<div class="alert alert-primary">
<i class="bi-people me-2"></i>
@ -24,7 +24,7 @@
{% endif %}
{% if Globals.AllowContactsPage %}
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/contacts">
<div class="alert alert-primary">
<i class="bi-telephone me-2"></i>
@ -35,7 +35,7 @@
{% endif %}
{% if Globals.UserIsAdmin %}
<div class="col-md-6">
<div class="col-12">
<a class="dashboard-tile" href="/admin">
<div class="alert alert-primary">
<i class="bi-gear me-2"></i>

133
views/list.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container my-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -14,9 +14,10 @@
<hr />
</div>
<div class="mw-1200">
<div class="row mb-3">
<div class="col-md-2">Nom</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Nom</div>
<div class="col-md-10 col-xl-9">
<input
type="text"
class="form-control"
@ -28,8 +29,8 @@
</div>
<div class="row mb-3">
<div class="col-md-2">Liste à choix multiples</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Liste à choix multiples</div>
<div class="col-md-10 col-xl-9">
{% if List.Multi %}
<div class="input-group">
<span class="input-group-text">
@ -48,6 +49,37 @@
</div>
</div>
<div class="p-3 my-4 bg-body-tertiary border">
<div class="mb-3">
<span class="h5">Liste</span>
</div>
{% if ListItems %}
<ul class="p-0" style="list-style: none;">
{% for Item in ListItems %}
<li>
<a href="/admin/lists/{{ List.ID }}/items/{{ Item.ID }}">
{{ Item.Value }}
</a>
{% if Item.Default %}
<span class="badge text-bg-success">Par défaut</span>
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<div>Pas encore d'éléments dans cette liste</div>
{% endif %}
<a
class="btn btn-outline-primary"
href="/admin/lists/{{ List.ID }}/items/add"
>
<i class="bi-plus-lg"></i>
Ajouter
</a>
</div>
<div class="my-4 row">
<div class="col-6">
<a
@ -71,67 +103,9 @@
</div>
</div>
<div class="my-3 row">
<div class="col-sm-9 h4">Contenu de la liste</div>
<div class="col-sm-3 text-end">
<a
class="btn btn-outline-primary"
href="/admin/lists/{{ List.ID }}/items/add"
>
<i class="bi-plus-lg"></i>
Ajouter
</a>
</div>
</div>
{% if ListItems %}
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th class="w-50">Valeur</th>
<th class="w-25">Par défaut</th>
<th class="w-25"></th>
</tr>
</thead>
<tbody>
{% for Item in ListItems %}
<tr>
<td>
<a href="/admin/lists/{{ List.ID }}/items/{{ Item.ID }}">
{{ Item.Value }}
</a>
</td>
<td>
{% if Item.Default %}
<i class="bi-check-lg text-success me-1"></i>
Oui
{% else %}
<i class="bi-x-lg text-danger me-1"></i>
Non
{% endif %}
</td>
<td class="text-end">
<button
type="button"
class="btn btn-outline-danger btn-sm"
data-bs-toggle="modal"
data-bs-target="#modal-delete-value-{{ Item.ID }}"
>
<i class="bi-trash3 me-1"></i>
Supprimer
</button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div>Pas encore d'éléments dans cette liste.</div>
{% endif %}
</div>
<div id="modal-delete" class="modal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
@ -162,37 +136,4 @@
</div>
</div>
</div>
{% for Item in ListItems %}
<div id="modal-delete-value-{{ Item.ID }}" class="modal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-body">
<p>Êtes-vous sûr de vouloir supprimer cette valeur ?</p>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
>
<i class="bi-x-lg me-1"></i>
Annuler
</button>
<form
action="/admin/lists/{{ List.ID }}/items/{{ Item.ID }}/delete"
method="post"
class="d-inline p-0"
>
<button class="btn btn-outline-danger" type="submit">
<i class="bi-trash3 me-1"></i>
Supprimer
</button>
</form>
</div>
</div>
</div>
</div>
{% endfor %}
{% endblock %}

54
views/listitem_form.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -22,6 +22,7 @@
<hr />
</div>
<form id="listitem" method="post" class="mw-900">
{% if Errors %}
<div class="alert alert-danger">
<ul class="m-0">
@ -32,7 +33,6 @@
</div>
{% endif %}
<form id="listitem" method="post">
<div class="row mb-3">
<label for="value" class="form-label col-md-2"> Valeur </label>
<div class="col-md-10">
@ -67,12 +67,60 @@
</div>
</div>
<div class="my-4">
<div class="my-4 row">
<div class="col-6">
<button class="btn btn-outline-primary" type="submit">
<i class="me-1 bi-floppy"></i>
Enregistrer
</button>
</div>
<div class="col-6 text-end">
{% if ListItem.ID %}
<button
type="button"
class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal-delete"
>
<i class="bi-trash3 me-1"></i>
Supprimer
</button>
{% endif %}
</div>
</div>
</form>
</div>
{% if ListItem.ID %}
<div id="modal-delete" class="modal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-body">
<p>Êtes-vous sûr de vouloir supprimer cette valeur ?</p>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
>
<i class="bi-x-lg me-1"></i>
Annuler
</button>
<form
action="/admin/lists/{{ List.ID }}/items/{{ ListItem.ID }}/delete"
method="post"
class="d-inline p-0"
>
<button class="btn btn-outline-danger" type="submit">
<i class="bi-trash3 me-1"></i>
Supprimer
</button>
</form>
</div>
</div>
</div>
</div>
{% endif %}
{% endblock %}

2
views/lists.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container my-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">

24
views/section.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -16,9 +16,10 @@
<hr />
</div>
<div class="mw-1200">
<div class="row mb-3">
<div class="col-md-2">Nom</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Nom</div>
<div class="col-md-10 col-xl-9">
<input
type="text"
class="form-control"
@ -30,8 +31,8 @@
</div>
<div class="row mb-3">
<div class="col-md-2">Nom technique</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Nom technique</div>
<div class="col-md-10 col-xl-9">
<input
type="text"
class="form-control"
@ -43,8 +44,8 @@
</div>
<div class="row mb-3">
<div class="col-md-2">Section parente</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Section parente</div>
<div class="col-md-10 col-xl-9">
{% if Section.ParentSectionID %}
<input
type="text"
@ -65,8 +66,8 @@
</div>
<div class="row mb-3">
<div class="col-md-2">Peut contenir des membres</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Peut contenir des membres</div>
<div class="col-md-10 col-xl-9">
{% if Section.ContainsMembers %}
<div class="input-group">
<span class="input-group-text">
@ -86,8 +87,8 @@
</div>
<div class="row mb-3">
<div class="col-md-2">Peut contenir des contacts</div>
<div class="col-md-10">
<div class="col-md-2 col-xl-3">Peut contenir des contacts</div>
<div class="col-md-10 col-xl-9">
{% if Section.ContainsContacts %}
<div class="input-group">
<span class="input-group-text">
@ -160,4 +161,5 @@
</div>
</div>
</div>
</div>
{% endblock %}

20
views/section_form.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container mt-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">
@ -24,6 +24,7 @@
<hr />
</div>
<form id="section" method="post" class="mw-1200">
{% if Errors %}
<div class="alert alert-danger">
<ul class="m-0">
@ -34,10 +35,9 @@
</div>
{% endif %}
<form id="section" method="post">
<div class="row mb-3">
<label for="name" class="form-label col-md-2"> Nom </label>
<div class="col-md-10">
<label for="name" class="form-label col-md-2 col-xl-3"> Nom </label>
<div class="col-md-10 col-xl-9">
<input
id="name"
class="form-control"
@ -52,10 +52,10 @@
</div>
<div class="row mb-3">
<label for="short_name" class="form-label col-md-2">
<label for="short_name" class="form-label col-md-2 col-xl-3">
Nom technique
</label>
<div class="col-md-10">
<div class="col-md-10 col-xl-9">
<input
id="short_name"
class="form-control"
@ -69,10 +69,10 @@
</div>
<div class="row mb-3">
<label for="parent_section" class="form-label col-md-2">
<label for="parent_section" class="form-label col-md-2 col-xl-3">
Section parente
</label>
<div class="col-md-10">
<div class="col-md-10 col-xl-9">
<select
id="parent_section"
class="form-select"
@ -98,7 +98,7 @@
</div>
<div class="row mb-3">
<div class="col-md-10 offset-md-2">
<div class="col-md-10 col-xl-9 offset-md-2 offset-xl-3">
<input
type="checkbox"
class="form-check-input me-2"
@ -116,7 +116,7 @@
</div>
<div class="row mb-3">
<div class="col-md-10 offset-md-2">
<div class="col-md-10 col-xl-9 offset-md-2 offset-xl-3">
<input
type="checkbox"
class="form-check-input me-2"

2
views/sections.html
View file

@ -1,7 +1,7 @@
{% extends "layouts/main.html" %}
{% block main %}
<div class="container my-4">
<div class="container-fluid my-4 px-4">
<div class="mb-4">
<nav>
<ol class="breadcrumb">