From ebff79e3deff32183a334f35a3a1a7ca960f9f2b Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Tue, 10 Oct 2023 00:20:39 +0200 Subject: [PATCH] Update some wording --- .idea/misc.xml | 3 +++ README.md | 9 +++++++++ contrib/Caddyfile.local | 15 +++++++++++++++ envs/docker-local-envs.env | 2 +- envs/local-envs.env | 2 +- envs/test-envs.env | 2 +- .../character_details/gm_notes_display.html | 2 +- .../character_details/gm_notes_update.html | 2 +- .../snippets/character_details/notes_display.html | 3 +-- .../snippets/character_details/notes_update.html | 3 +-- 10 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 contrib/Caddyfile.local diff --git a/.idea/misc.xml b/.idea/misc.xml index eff9091..9cb90e7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + \ No newline at end of file diff --git a/README.md b/README.md index 12b1f38..a922024 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,14 @@ inv test ./src/manage.py createsuperuser ``` +## With preview mode + +```shell +caddy --config contrib/Caddyfile.local +./src/manage.py runserver +cd ~/Projects/charasheet-go +make run/live +``` + # Reuse If you do reuse my work, please consider linking back to this repository 🙂 diff --git a/contrib/Caddyfile.local b/contrib/Caddyfile.local new file mode 100644 index 0000000..6b2acbe --- /dev/null +++ b/contrib/Caddyfile.local @@ -0,0 +1,15 @@ +{ + email gabriel@augendre.info + http_port 8000 +} + +http://localhost:8080 { + @preview { + header Cookie *preview=enabled;* + path /test /test/* /character/1/notes_change/ + } + route { + reverse_proxy @preview localhost:4444 + reverse_proxy localhost:8000 + } +} diff --git a/envs/docker-local-envs.env b/envs/docker-local-envs.env index 7ee9770..e19f642 100644 --- a/envs/docker-local-envs.env +++ b/envs/docker-local-envs.env @@ -2,7 +2,7 @@ # DJANGO ############################################################################### DJANGO_SETTINGS_MODULE=charasheet.settings -SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiT$r2t%N4F" +SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiTr2t%N4F" DEBUG=False ALLOWED_HOSTS=localhost,127.0.0.1 diff --git a/envs/local-envs.env b/envs/local-envs.env index 5f2cf3f..f7eb65e 100644 --- a/envs/local-envs.env +++ b/envs/local-envs.env @@ -2,7 +2,7 @@ # DJANGO ############################################################################### DJANGO_SETTINGS_MODULE=charasheet.settings -SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiT$r2t%N4F" +SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiTr2t%N4F" DEBUG=True ALLOWED_HOSTS=localhost,127.0.0.1 diff --git a/envs/test-envs.env b/envs/test-envs.env index 666a1b9..f14c71f 100644 --- a/envs/test-envs.env +++ b/envs/test-envs.env @@ -2,7 +2,7 @@ # DJANGO ############################################################################### DJANGO_SETTINGS_MODULE=charasheet.settings -SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiT$r2t%N4F" +SECRET_KEY="UkZF3iM%Fqdj6HWugPWS26q!tmquRm#8G^X#&AiXiTr2t%N4F" DEBUG=False ALLOWED_HOSTS=localhost,127.0.0.1 diff --git a/src/character/templates/character/snippets/character_details/gm_notes_display.html b/src/character/templates/character/snippets/character_details/gm_notes_display.html index d575566..540a69d 100644 --- a/src/character/templates/character/snippets/character_details/gm_notes_display.html +++ b/src/character/templates/character/snippets/character_details/gm_notes_display.html @@ -10,6 +10,6 @@ Edit -
Le joueur ne peut pas voir ces notes.
+
Seul le MJ peut voir et modifier ces notes.
{{ character.get_formatted_gm_notes|safe }} diff --git a/src/character/templates/character/snippets/character_details/gm_notes_update.html b/src/character/templates/character/snippets/character_details/gm_notes_update.html index e7d9b24..e6772ea 100644 --- a/src/character/templates/character/snippets/character_details/gm_notes_update.html +++ b/src/character/templates/character/snippets/character_details/gm_notes_update.html @@ -10,7 +10,7 @@ Save -
Ces notes ne sont pas visibles par le joueur.
+
Seul le MJ peut voir et modifier ces notes.
{% csrf_token %} diff --git a/src/character/templates/character/snippets/character_details/notes_display.html b/src/character/templates/character/snippets/character_details/notes_display.html index 2048673..57364ca 100644 --- a/src/character/templates/character/snippets/character_details/notes_display.html +++ b/src/character/templates/character/snippets/character_details/notes_display.html @@ -11,8 +11,7 @@
- Le {% if character|mastered_by:user %}joueur{% else %}MJ{% endif %} - peut également voir et modifier ces notes. + Le joueur et le MJ peuvent voir et modifier ces notes.
{{ character.get_formatted_notes|safe }} diff --git a/src/character/templates/character/snippets/character_details/notes_update.html b/src/character/templates/character/snippets/character_details/notes_update.html index 6967d81..b20104e 100644 --- a/src/character/templates/character/snippets/character_details/notes_update.html +++ b/src/character/templates/character/snippets/character_details/notes_update.html @@ -11,8 +11,7 @@
- Ces notes ne sont visibles que par le joueur et les MJ - des groupes auquel ce personnage appartient. + Le joueur et le MJ peuvent voir et modifier ces notes.
{% csrf_token %}