From 98c517421c283edac77495c670160181588f0af4 Mon Sep 17 00:00:00 2001 From: Guillaume Bertholon Date: Sun, 27 Dec 2020 12:48:08 +0100 Subject: [PATCH] Rename 'mainsite' to 'website' --- accounts/views.py | 2 +- gestiojeux/settings_base.py | 4 ++-- gestiojeux/urls.py | 2 +- mainsite/__init__.py | 1 - website/__init__.py | 1 + {mainsite => website}/admin.py | 0 {mainsite => website}/apps.py | 4 ++-- {mainsite => website}/markdown.py | 0 {mainsite => website}/migrations/0001_initial.py | 2 +- {mainsite => website}/migrations/__init__.py | 0 {mainsite => website}/models.py | 4 ++-- {mainsite => website}/scss/Makefile | 0 {mainsite => website}/scss/forms.scss | 0 {mainsite => website}/scss/header.scss | 0 {mainsite => website}/scss/mixins.scss | 0 {mainsite => website}/scss/params.scss | 0 {mainsite => website}/scss/style.scss | 0 .../static/css/font-awesome.min.css | 0 {mainsite => website}/static/css/fonts.css | 0 {mainsite => website}/static/css/style.css | 0 {mainsite => website}/static/fonts/FontAwesome.otf | Bin .../static/fonts/fontawesome-webfont.eot | Bin .../static/fonts/fontawesome-webfont.svg | 0 .../static/fonts/fontawesome-webfont.ttf | Bin .../static/fonts/fontawesome-webfont.woff | Bin .../static/fonts/fontawesome-webfont.woff2 | Bin .../static/fonts/kalam-v10-latin-regular.eot | Bin .../static/fonts/kalam-v10-latin-regular.svg | 0 .../static/fonts/kalam-v10-latin-regular.ttf | Bin .../static/fonts/kalam-v10-latin-regular.woff | Bin .../static/fonts/kalam-v10-latin-regular.woff2 | Bin .../static/fonts/open-sans-v17-latin-regular.eot | Bin .../static/fonts/open-sans-v17-latin-regular.svg | 0 .../static/fonts/open-sans-v17-latin-regular.ttf | Bin .../static/fonts/open-sans-v17-latin-regular.woff | Bin .../static/fonts/open-sans-v17-latin-regular.woff2 | Bin .../static/fonts/philosopher-v12-latin-italic.woff2 | Bin .../static/fonts/philosopher-v12-latin-regular.eot | Bin .../static/fonts/philosopher-v12-latin-regular.svg | 0 .../static/fonts/philosopher-v12-latin-regular.ttf | Bin .../static/fonts/philosopher-v12-latin-regular.woff | Bin .../fonts/philosopher-v12-latin-regular.woff2 | Bin {mainsite => website}/static/img/cof.svg | 0 {mainsite => website}/static/img/favicon.png | Bin {mainsite => website}/static/img/logo.svg | 0 {mainsite => website}/static/img/select_arrow.svg | 0 {mainsite => website}/static/js/gestiojeux.js | 0 {mainsite => website}/static/js/jquery-3.4.1.min.js | 0 {mainsite => website}/templates/400.html | 2 +- {mainsite => website}/templates/403.html | 2 +- {mainsite => website}/templates/404.html | 2 +- {mainsite => website}/templates/500.html | 2 +- {mainsite => website}/templates/base.html | 0 .../templates/partials/footer.html | 0 {mainsite => website}/templates/partials/head.html | 0 .../templates/partials/header.html | 2 +- .../templates/partials/messages.html | 0 {mainsite => website}/templates/small_page.html | 0 .../templates/website}/markdown_page.html | 0 {mainsite => website}/tests.py | 0 {mainsite => website}/urls.py | 2 +- {mainsite => website}/views.py | 2 +- 62 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 mainsite/__init__.py create mode 100644 website/__init__.py rename {mainsite => website}/admin.py (100%) rename {mainsite => website}/apps.py (56%) rename {mainsite => website}/markdown.py (100%) rename {mainsite => website}/migrations/0001_initial.py (95%) rename {mainsite => website}/migrations/__init__.py (100%) rename {mainsite => website}/models.py (87%) rename {mainsite => website}/scss/Makefile (100%) rename {mainsite => website}/scss/forms.scss (100%) rename {mainsite => website}/scss/header.scss (100%) rename {mainsite => website}/scss/mixins.scss (100%) rename {mainsite => website}/scss/params.scss (100%) rename {mainsite => website}/scss/style.scss (100%) rename {mainsite => website}/static/css/font-awesome.min.css (100%) rename {mainsite => website}/static/css/fonts.css (100%) rename {mainsite => website}/static/css/style.css (100%) rename {mainsite => website}/static/fonts/FontAwesome.otf (100%) rename {mainsite => website}/static/fonts/fontawesome-webfont.eot (100%) rename {mainsite => website}/static/fonts/fontawesome-webfont.svg (100%) rename {mainsite => website}/static/fonts/fontawesome-webfont.ttf (100%) rename {mainsite => website}/static/fonts/fontawesome-webfont.woff (100%) rename {mainsite => website}/static/fonts/fontawesome-webfont.woff2 (100%) rename {mainsite => website}/static/fonts/kalam-v10-latin-regular.eot (100%) rename {mainsite => website}/static/fonts/kalam-v10-latin-regular.svg (100%) rename {mainsite => website}/static/fonts/kalam-v10-latin-regular.ttf (100%) rename {mainsite => website}/static/fonts/kalam-v10-latin-regular.woff (100%) rename {mainsite => website}/static/fonts/kalam-v10-latin-regular.woff2 (100%) rename {mainsite => website}/static/fonts/open-sans-v17-latin-regular.eot (100%) rename {mainsite => website}/static/fonts/open-sans-v17-latin-regular.svg (100%) rename {mainsite => website}/static/fonts/open-sans-v17-latin-regular.ttf (100%) rename {mainsite => website}/static/fonts/open-sans-v17-latin-regular.woff (100%) rename {mainsite => website}/static/fonts/open-sans-v17-latin-regular.woff2 (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-italic.woff2 (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-regular.eot (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-regular.svg (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-regular.ttf (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-regular.woff (100%) rename {mainsite => website}/static/fonts/philosopher-v12-latin-regular.woff2 (100%) rename {mainsite => website}/static/img/cof.svg (100%) rename {mainsite => website}/static/img/favicon.png (100%) rename {mainsite => website}/static/img/logo.svg (100%) rename {mainsite => website}/static/img/select_arrow.svg (100%) rename {mainsite => website}/static/js/gestiojeux.js (100%) rename {mainsite => website}/static/js/jquery-3.4.1.min.js (100%) rename {mainsite => website}/templates/400.html (65%) rename {mainsite => website}/templates/403.html (82%) rename {mainsite => website}/templates/404.html (65%) rename {mainsite => website}/templates/500.html (72%) rename {mainsite => website}/templates/base.html (100%) rename {mainsite => website}/templates/partials/footer.html (100%) rename {mainsite => website}/templates/partials/head.html (100%) rename {mainsite => website}/templates/partials/header.html (93%) rename {mainsite => website}/templates/partials/messages.html (100%) rename {mainsite => website}/templates/small_page.html (100%) rename {mainsite/templates/mainsite => website/templates/website}/markdown_page.html (100%) rename {mainsite => website}/tests.py (100%) rename {mainsite => website}/urls.py (91%) rename {mainsite => website}/views.py (89%) diff --git a/accounts/views.py b/accounts/views.py index 8c2311f..7520d4c 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -57,7 +57,7 @@ class LogoutView(RedirectView): auth_logout(self.request) if "next" in self.request.GET: return self.request.GET["next"] - return reverse("mainsite:home") + return reverse("website:home") if "next" in self.request.GET: return "{}?next={}".format( diff --git a/gestiojeux/settings_base.py b/gestiojeux/settings_base.py index cc851cd..e2bf2e4 100644 --- a/gestiojeux/settings_base.py +++ b/gestiojeux/settings_base.py @@ -27,7 +27,7 @@ INSTALLED_APPS = [ "django.contrib.staticfiles", "markdownx", "haystack", - "mainsite", + "website", "inventory", "django_cas_ng", "accounts", @@ -90,7 +90,7 @@ MARKDOWNX_MARKDOWN_EXTENSIONS = [ "markdown.extensions.extra", "markdown.extensions.sane_lists", "iconfonts", - "mainsite.markdown", + "website.markdown", "inventory.markdown", ] diff --git a/gestiojeux/urls.py b/gestiojeux/urls.py index d7a9d0e..b4f23ad 100644 --- a/gestiojeux/urls.py +++ b/gestiojeux/urls.py @@ -23,7 +23,7 @@ urlpatterns = [ path("markdownx/", include("markdownx.urls")), path("inventory/", include("inventory.urls")), path("account/", include("accounts.urls")), - path("", include("mainsite.urls")), + path("", include("website.urls")), ] if settings.DEBUG: diff --git a/mainsite/__init__.py b/mainsite/__init__.py deleted file mode 100644 index 237f5b3..0000000 --- a/mainsite/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = "mainsite.apps.MainsiteConfig" diff --git a/website/__init__.py b/website/__init__.py new file mode 100644 index 0000000..6b8ea05 --- /dev/null +++ b/website/__init__.py @@ -0,0 +1 @@ +default_app_config = "website.apps.WebsiteConfig" diff --git a/mainsite/admin.py b/website/admin.py similarity index 100% rename from mainsite/admin.py rename to website/admin.py diff --git a/mainsite/apps.py b/website/apps.py similarity index 56% rename from mainsite/apps.py rename to website/apps.py index 254ea20..4309912 100644 --- a/mainsite/apps.py +++ b/website/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class MainsiteConfig(AppConfig): - name = "mainsite" +class WebsiteConfig(AppConfig): + name = "website" verbose_name = "Site internet" diff --git a/mainsite/markdown.py b/website/markdown.py similarity index 100% rename from mainsite/markdown.py rename to website/markdown.py diff --git a/mainsite/migrations/0001_initial.py b/website/migrations/0001_initial.py similarity index 95% rename from mainsite/migrations/0001_initial.py rename to website/migrations/0001_initial.py index 7e14e6a..43e117c 100644 --- a/mainsite/migrations/0001_initial.py +++ b/website/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-12-13 14:19 +# Generated by Django 3.1.2 on 2020-12-27 11:34 from django.db import migrations, models import markdownx.models diff --git a/mainsite/migrations/__init__.py b/website/migrations/__init__.py similarity index 100% rename from mainsite/migrations/__init__.py rename to website/migrations/__init__.py diff --git a/mainsite/models.py b/website/models.py similarity index 87% rename from mainsite/models.py rename to website/models.py index 764f82d..198dc3e 100644 --- a/mainsite/models.py +++ b/website/models.py @@ -22,6 +22,6 @@ class MarkdownPage(models.Model): def get_absolute_url(self): if self.slug: - return reverse("mainsite:md_page", args=[self.slug]) + return reverse("website:md_page", args=[self.slug]) else: - return reverse("mainsite:home") + return reverse("website:home") diff --git a/mainsite/scss/Makefile b/website/scss/Makefile similarity index 100% rename from mainsite/scss/Makefile rename to website/scss/Makefile diff --git a/mainsite/scss/forms.scss b/website/scss/forms.scss similarity index 100% rename from mainsite/scss/forms.scss rename to website/scss/forms.scss diff --git a/mainsite/scss/header.scss b/website/scss/header.scss similarity index 100% rename from mainsite/scss/header.scss rename to website/scss/header.scss diff --git a/mainsite/scss/mixins.scss b/website/scss/mixins.scss similarity index 100% rename from mainsite/scss/mixins.scss rename to website/scss/mixins.scss diff --git a/mainsite/scss/params.scss b/website/scss/params.scss similarity index 100% rename from mainsite/scss/params.scss rename to website/scss/params.scss diff --git a/mainsite/scss/style.scss b/website/scss/style.scss similarity index 100% rename from mainsite/scss/style.scss rename to website/scss/style.scss diff --git a/mainsite/static/css/font-awesome.min.css b/website/static/css/font-awesome.min.css similarity index 100% rename from mainsite/static/css/font-awesome.min.css rename to website/static/css/font-awesome.min.css diff --git a/mainsite/static/css/fonts.css b/website/static/css/fonts.css similarity index 100% rename from mainsite/static/css/fonts.css rename to website/static/css/fonts.css diff --git a/mainsite/static/css/style.css b/website/static/css/style.css similarity index 100% rename from mainsite/static/css/style.css rename to website/static/css/style.css diff --git a/mainsite/static/fonts/FontAwesome.otf b/website/static/fonts/FontAwesome.otf similarity index 100% rename from mainsite/static/fonts/FontAwesome.otf rename to website/static/fonts/FontAwesome.otf diff --git a/mainsite/static/fonts/fontawesome-webfont.eot b/website/static/fonts/fontawesome-webfont.eot similarity index 100% rename from mainsite/static/fonts/fontawesome-webfont.eot rename to website/static/fonts/fontawesome-webfont.eot diff --git a/mainsite/static/fonts/fontawesome-webfont.svg b/website/static/fonts/fontawesome-webfont.svg similarity index 100% rename from mainsite/static/fonts/fontawesome-webfont.svg rename to website/static/fonts/fontawesome-webfont.svg diff --git a/mainsite/static/fonts/fontawesome-webfont.ttf b/website/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from mainsite/static/fonts/fontawesome-webfont.ttf rename to website/static/fonts/fontawesome-webfont.ttf diff --git a/mainsite/static/fonts/fontawesome-webfont.woff b/website/static/fonts/fontawesome-webfont.woff similarity index 100% rename from mainsite/static/fonts/fontawesome-webfont.woff rename to website/static/fonts/fontawesome-webfont.woff diff --git a/mainsite/static/fonts/fontawesome-webfont.woff2 b/website/static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from mainsite/static/fonts/fontawesome-webfont.woff2 rename to website/static/fonts/fontawesome-webfont.woff2 diff --git a/mainsite/static/fonts/kalam-v10-latin-regular.eot b/website/static/fonts/kalam-v10-latin-regular.eot similarity index 100% rename from mainsite/static/fonts/kalam-v10-latin-regular.eot rename to website/static/fonts/kalam-v10-latin-regular.eot diff --git a/mainsite/static/fonts/kalam-v10-latin-regular.svg b/website/static/fonts/kalam-v10-latin-regular.svg similarity index 100% rename from mainsite/static/fonts/kalam-v10-latin-regular.svg rename to website/static/fonts/kalam-v10-latin-regular.svg diff --git a/mainsite/static/fonts/kalam-v10-latin-regular.ttf b/website/static/fonts/kalam-v10-latin-regular.ttf similarity index 100% rename from mainsite/static/fonts/kalam-v10-latin-regular.ttf rename to website/static/fonts/kalam-v10-latin-regular.ttf diff --git a/mainsite/static/fonts/kalam-v10-latin-regular.woff b/website/static/fonts/kalam-v10-latin-regular.woff similarity index 100% rename from mainsite/static/fonts/kalam-v10-latin-regular.woff rename to website/static/fonts/kalam-v10-latin-regular.woff diff --git a/mainsite/static/fonts/kalam-v10-latin-regular.woff2 b/website/static/fonts/kalam-v10-latin-regular.woff2 similarity index 100% rename from mainsite/static/fonts/kalam-v10-latin-regular.woff2 rename to website/static/fonts/kalam-v10-latin-regular.woff2 diff --git a/mainsite/static/fonts/open-sans-v17-latin-regular.eot b/website/static/fonts/open-sans-v17-latin-regular.eot similarity index 100% rename from mainsite/static/fonts/open-sans-v17-latin-regular.eot rename to website/static/fonts/open-sans-v17-latin-regular.eot diff --git a/mainsite/static/fonts/open-sans-v17-latin-regular.svg b/website/static/fonts/open-sans-v17-latin-regular.svg similarity index 100% rename from mainsite/static/fonts/open-sans-v17-latin-regular.svg rename to website/static/fonts/open-sans-v17-latin-regular.svg diff --git a/mainsite/static/fonts/open-sans-v17-latin-regular.ttf b/website/static/fonts/open-sans-v17-latin-regular.ttf similarity index 100% rename from mainsite/static/fonts/open-sans-v17-latin-regular.ttf rename to website/static/fonts/open-sans-v17-latin-regular.ttf diff --git a/mainsite/static/fonts/open-sans-v17-latin-regular.woff b/website/static/fonts/open-sans-v17-latin-regular.woff similarity index 100% rename from mainsite/static/fonts/open-sans-v17-latin-regular.woff rename to website/static/fonts/open-sans-v17-latin-regular.woff diff --git a/mainsite/static/fonts/open-sans-v17-latin-regular.woff2 b/website/static/fonts/open-sans-v17-latin-regular.woff2 similarity index 100% rename from mainsite/static/fonts/open-sans-v17-latin-regular.woff2 rename to website/static/fonts/open-sans-v17-latin-regular.woff2 diff --git a/mainsite/static/fonts/philosopher-v12-latin-italic.woff2 b/website/static/fonts/philosopher-v12-latin-italic.woff2 similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-italic.woff2 rename to website/static/fonts/philosopher-v12-latin-italic.woff2 diff --git a/mainsite/static/fonts/philosopher-v12-latin-regular.eot b/website/static/fonts/philosopher-v12-latin-regular.eot similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-regular.eot rename to website/static/fonts/philosopher-v12-latin-regular.eot diff --git a/mainsite/static/fonts/philosopher-v12-latin-regular.svg b/website/static/fonts/philosopher-v12-latin-regular.svg similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-regular.svg rename to website/static/fonts/philosopher-v12-latin-regular.svg diff --git a/mainsite/static/fonts/philosopher-v12-latin-regular.ttf b/website/static/fonts/philosopher-v12-latin-regular.ttf similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-regular.ttf rename to website/static/fonts/philosopher-v12-latin-regular.ttf diff --git a/mainsite/static/fonts/philosopher-v12-latin-regular.woff b/website/static/fonts/philosopher-v12-latin-regular.woff similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-regular.woff rename to website/static/fonts/philosopher-v12-latin-regular.woff diff --git a/mainsite/static/fonts/philosopher-v12-latin-regular.woff2 b/website/static/fonts/philosopher-v12-latin-regular.woff2 similarity index 100% rename from mainsite/static/fonts/philosopher-v12-latin-regular.woff2 rename to website/static/fonts/philosopher-v12-latin-regular.woff2 diff --git a/mainsite/static/img/cof.svg b/website/static/img/cof.svg similarity index 100% rename from mainsite/static/img/cof.svg rename to website/static/img/cof.svg diff --git a/mainsite/static/img/favicon.png b/website/static/img/favicon.png similarity index 100% rename from mainsite/static/img/favicon.png rename to website/static/img/favicon.png diff --git a/mainsite/static/img/logo.svg b/website/static/img/logo.svg similarity index 100% rename from mainsite/static/img/logo.svg rename to website/static/img/logo.svg diff --git a/mainsite/static/img/select_arrow.svg b/website/static/img/select_arrow.svg similarity index 100% rename from mainsite/static/img/select_arrow.svg rename to website/static/img/select_arrow.svg diff --git a/mainsite/static/js/gestiojeux.js b/website/static/js/gestiojeux.js similarity index 100% rename from mainsite/static/js/gestiojeux.js rename to website/static/js/gestiojeux.js diff --git a/mainsite/static/js/jquery-3.4.1.min.js b/website/static/js/jquery-3.4.1.min.js similarity index 100% rename from mainsite/static/js/jquery-3.4.1.min.js rename to website/static/js/jquery-3.4.1.min.js diff --git a/mainsite/templates/400.html b/website/templates/400.html similarity index 65% rename from mainsite/templates/400.html rename to website/templates/400.html index c5d1716..5d5d25a 100644 --- a/mainsite/templates/400.html +++ b/website/templates/400.html @@ -3,5 +3,5 @@ {% block "content" %}

Requête invalide

Votre requête au serveur est invalide et n'a donc pas pu être traitée.

-

Vous pouvez retourner sur la page d'accueil.

+

Vous pouvez retourner sur la page d'accueil.

{% endblock %} diff --git a/mainsite/templates/403.html b/website/templates/403.html similarity index 82% rename from mainsite/templates/403.html rename to website/templates/403.html index 0c2e3fa..b6c5fe5 100644 --- a/mainsite/templates/403.html +++ b/website/templates/403.html @@ -7,5 +7,5 @@

Cet accès vous est probablement refusé car vous n'êtes actuellement pas connecté·e. Vous pouvez vous rendre à la page de connexion.

{% endif %} -

Vous pouvez retourner sur la page d'accueil.

+

Vous pouvez retourner sur la page d'accueil.

{% endblock %} diff --git a/mainsite/templates/404.html b/website/templates/404.html similarity index 65% rename from mainsite/templates/404.html rename to website/templates/404.html index a76efad..96ae467 100644 --- a/mainsite/templates/404.html +++ b/website/templates/404.html @@ -3,5 +3,5 @@ {% block "content" %}

Page introuvable

La page que vous avez demandée n'existe plus ou n'a jamais existé.

-

Vous pouvez retourner sur la page d'accueil.

+

Vous pouvez retourner sur la page d'accueil.

{% endblock %} diff --git a/mainsite/templates/500.html b/website/templates/500.html similarity index 72% rename from mainsite/templates/500.html rename to website/templates/500.html index fa2d0b4..22093af 100644 --- a/mainsite/templates/500.html +++ b/website/templates/500.html @@ -4,5 +4,5 @@

Incident technique

Un incident technique est survenu pendant l'affichage de cette page.

Nous allons essayer de résoudre le problème au plus vite.

-

Vous pouvez retourner sur la page d'accueil.

+

Vous pouvez retourner sur la page d'accueil.

{% endblock %} diff --git a/mainsite/templates/base.html b/website/templates/base.html similarity index 100% rename from mainsite/templates/base.html rename to website/templates/base.html diff --git a/mainsite/templates/partials/footer.html b/website/templates/partials/footer.html similarity index 100% rename from mainsite/templates/partials/footer.html rename to website/templates/partials/footer.html diff --git a/mainsite/templates/partials/head.html b/website/templates/partials/head.html similarity index 100% rename from mainsite/templates/partials/head.html rename to website/templates/partials/head.html diff --git a/mainsite/templates/partials/header.html b/website/templates/partials/header.html similarity index 93% rename from mainsite/templates/partials/header.html rename to website/templates/partials/header.html index 318dcf0..1d190c2 100644 --- a/mainsite/templates/partials/header.html +++ b/website/templates/partials/header.html @@ -8,7 +8,7 @@