Compare commits

..

No commits in common. "76de321d4155fb7b2e3104cdb5c51c119f73dc0f" and "19898e1b09f875ee2cbccb2a5d706aefe86eea4e" have entirely different histories.

6 changed files with 18 additions and 22 deletions

2
Cargo.lock generated
View file

@ -578,7 +578,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]] [[package]]
name = "fabula_votes_server" name = "fabula_votes_server"
version = "1.4.1" version = "1.4.0"
dependencies = [ dependencies = [
"argon2", "argon2",
"blake2", "blake2",

View file

@ -3,7 +3,7 @@ name = "fabula_votes_server"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["trotFunky"] authors = ["trotFunky"]
version = "1.4.1" version = "1.4.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1,9 +1,7 @@
const limit_ratio = 1.3 const limit_ratio = 1.3
const colors = ['#b6b8fc', '#b6f4fc', '#fcb6cc', '#e0fcb6', '#fcdcb6', '#b6fcc8', '#f0b6fc'] const colors = ['#b6b8fc', '#b6f4fc', '#fcb6cc', '#e0fcb6', '#fcdcb6', '#b6fcc8', '#f0b6fc']
async function main() { async function main() {
let current_url = new URL(document.URL) const vote_response = await fetch(document.URL+"/votes");
current_url.hash = '' // Strip the local part of the URL, for example if we select a Truth
const vote_response = await fetch(current_url.toString()+"/votes");
if (!vote_response.ok) { if (!vote_response.ok) {
return; return;
} }

View file

@ -21,7 +21,7 @@
{% for truth in truths %} {% for truth in truths %}
<div class="individual_truth"> <div class="individual_truth">
<a href="/{{ truth.week }}#{{ truth.number }}"><h3 id="{{ truth.number }}">Semaine {{ truth.week }} - Vérité {{ truth.number }}</h3></a> <a href="/{{ truth.week }}/#{{ truth.number }}"><h3 id="{{ truth.number }}">Semaine {{ truth.week }} - Vérité {{ truth.number }}</h3></a>
<p>{{ truth.rendered_text | safe }}</p> <p>{{ truth.rendered_text | safe }}</p>
</div> </div>
{% endfor %} {% endfor %}

View file

@ -1,5 +1,5 @@
<div class="individual_truth"> <div class="individual_truth">
<a href="/{{ truth.week }}#{{ truth.number }}"><h3 id="{{ truth.number }}">Vérité {{ truth.number }}</h3></a> <h3>Vérité {{ truth.number }}</h3>
<p>{{ truth.rendered_text | safe }}</p> <p>{{ truth.rendered_text | safe }}</p>
<div class="truth_tags"> <div class="truth_tags">
{% for tag in truth.tags %} {% for tag in truth.tags %}
@ -15,7 +15,6 @@
<form class="truth_edit_form" action="/{{ week_data.number }}/edit/{{ truth.number }}" method="POST"> <form class="truth_edit_form" action="/{{ week_data.number }}/edit/{{ truth.number }}" method="POST">
{% include "weeks/truth_editor" %} {% include "weeks/truth_editor" %}
</form> </form>
{% if tags | length > 0 and tags | length > truth.tags | length %}
<form class="truth_edit_form" action="/{{ week_data.number }}/tag/{{ truth.id }}" method="post"> <form class="truth_edit_form" action="/{{ week_data.number }}/tag/{{ truth.id }}" method="post">
<label>Thème supplémentaire: <label>Thème supplémentaire:
<select name="name"> <select name="name">
@ -28,5 +27,4 @@
</label> </label>
<button>Ajouter un thème</button> <button>Ajouter un thème</button>
</form> </form>
{% endif %}
</div> </div>

View file

@ -5,7 +5,7 @@
{%- endif -%} {%- endif -%}
<div class="individual_truth"> <div class="individual_truth">
<a href="/{{ truth.week }}#{{ truth.number }}"><h3 id="{{ truth.number }}">Vérité {{ truth.number }}</h3></a> <a href="/{{ truth.week }}/#{{ truth.number }}"><h3 id="{{ truth.number }}">Vérité {{ truth.number }}</h3></a>
<p>{{ truth.rendered_text | safe }}</p> <p>{{ truth.rendered_text | safe }}</p>
<hr> <hr>
<div class="truth_tags"> <div class="truth_tags">