gnouseu/gnousdoteu-v3
4
0
Fork 0
Code Issues 3 Pull requests Activity

fix(all): close #1, close #3, close #13, close #14

Browse source
This commit is contained in:
Romain J 2020-06-19 02:35:59 +02:00
parent 10b0e0c37a
commit 6165657ad9
14 changed files with 193 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/gnous_eu/static/stylesheets/css/index.css
View file

@ -29,6 +29,8 @@ html[data-theme="dark"] .uk-card {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap; }
html[data-theme="dark"] .uk-card-secondary {
background: #23272A; }
html[data-theme="dark"] .uk-border-circle {
box-shadow: -5px -5px 12px 0 rgba(41, 41, 41, 0.6), 5px 5px 12px 0 rgba(0, 0, 0, 0.3); }
html[data-theme="dark"] .uk-h1, html[data-theme="dark"] h1 {
@ -386,4 +388,12 @@ html[data-theme="light"] .subtitle-text {
font-size: 1.2em;
opacity: 0.7; }
.uk-label-success {
background-color: rgb(22, 101, 72);
}
.uk-label-warning {
background-color: rgb(145, 66, 4);
}
/*# sourceMappingURL=index.css.map */

2
apps/gnous_eu/static/stylesheets/css/index.min.css vendored
View file

File diff suppressed because one or more lines are too long

8
apps/gnous_eu/static/stylesheets/css/uikit_fix.css
View file

@ -35,4 +35,12 @@
.uk-border-circle {
box-shadow: -5px -5px 12px 0 rgba(255, 255, 255, 0.5), 5px 5px 12px 0 rgba(0, 0, 0, 0.1); }
.uk-label-success {
background-color: rgb(22, 101, 72);
}
.uk-label-warning {
background-color: rgb(145, 66, 4);
}
/*# sourceMappingURL=uikit_fix.css.map */

11
apps/gnous_eu/static/stylesheets/sass/uikit_fix.scss
View file

@ -49,6 +49,9 @@
white-space: nowrap;
}
}
.uk-card-secondary {
background: #23272A;
}
.uk-border-circle {
box-shadow: map_get(map_get($themes, $theme), 'shadow');
@ -151,4 +154,12 @@ html[data-theme="dark"] {
html[data-theme="light"] {
@include render_theme('light')
}
.uk-label-success {
background-color: rgb(22, 101, 72);
}
.uk-label-warning {
background-color: rgb(145, 66, 4);
}

55
apps/gnous_eu/templates/about.html
View file

@ -3,15 +3,13 @@
{% load i18n %}
{% block content %}
<div class="uk-flex uk-flex-middle top-wrap-height">
<div class="uk-flex uk-flex-middle">
<div class="uk-container uk-flex-auto uk-position-relative uk-margin-medium-top">
<div class="uk-grid" data-uk-grid="masonry: true">
<div class="uk-width-1">
<h1 class="uk-margin-remove-bottom uk-text-bold">{% trans 'À propos' %}</h1>
</div>
<div class="uk-width-1">
<h1 class="uk-margin-remove-bottom uk-text-bold">{% trans 'À propos' %}</h1>
</div>
<div class="uk-width-1 uk-margin">
<!-- attention, indentation pourrie en dessous, raison : flemme de scroll horizontalement -->
<div class="uk-width-1 uk-margin">
{% blocktrans %}
<p>GnousEU est une communauté de passionnés du libre ayant débuté en février 2017 sur la plateforme Discord.
Depuis elle s'est diversifiée sur plusieurs plateformes hébergées par elle-même en favorisant les instances décentralisées.
@ -26,7 +24,48 @@ mais aussi par <code><a href="https://git.gnous.eu/Romain">Romain J.</a></code>,
<code><a href="https://huteau-leo.fr/">Léo H</a></code>. Avant son départ, <code><a href="https://git.gnous.eu/orakle">Orakle</a></code> s'occupait du design.</p>
<p>GnousEU est hébergé sur l'infrastructure <a href='https://enpls.org/'>EnPLS.org</a> disposant de serveurs en France, Pays-Bas, Allemagne et Guadeloupe.</p>
{% endblocktrans %}
</div>
</div>
<hr class="uk-margin-large">
<div class="uk-width-1">
<h2 class="uk-margin-remove-bottom uk-text-bold uk-text-center">{% trans 'Partenaires' %}</h2>
</div>
<div class="uk-width-1 uk-margin">
{% if partners|length >= 1 %}
<div class="uk-grid uk-grid-margin-medium uk-child-width-1-3@m" data-uk-grid="masonry: true">
{% for partner in partners %}
<div class="uk-margin">
<div class="uk-card uk-card-secondary">
<div class="uk-card-media-top">
<img class="uk-align-center" src="{{ partner.photo.url }}" loading="lazy" alt="{{ partner.name }}">
</div>
<div class="uk-card-body">
<h3 class="uk-card-title">
{{ partner.name }}
<code>{{ partner.domain }}</code>
</h3>
<p>{% get_current_language as LANGUAGE_CODE %}{% if LANGUAGE_CODE == 'en' and partner.description_en != None %}{{ partner.description_en }}{% else %}{{ partner.description }}{% endif %}</p>
<a href="https://{{ partner.domain }}" class="uk-text-large">{% trans "Voir" %}</a>
</div>
</div>
</div>
{% endfor %}
</div>
{% else %}
<div class="uk-width-2-3@m uk-align-center">
<div class="uk-card">
<div class="uk-card-header">
<div class="uk-grid-small uk-flex-middle uk-grid">
<div class="uk-width-2-3">
<h3 class="uk-card-title uk-text-bold uk-text-danger">{% trans "Nous n'avons aucun partenaire..." %}</h3>
</div>
</div>
</div>
</div>
</div>
{% endif %}
</div>
</div>
</div>

27
apps/gnous_eu/templates/index.html
View file

@ -5,20 +5,21 @@
{% block content %}
<div class="uk-flex uk-flex-middle top-wrap-height">
<div class="uk-container uk-flex-auto uk-position-relative uk-margin-medium-top">
<div class="uk-grid" data-uk-grid="masonry: true">
<div class="uk-width-1-2@s">
<h1 class="uk-margin-remove-bottom uk-text-bold">GnousEU</h1>
<p class="uk-margin-remove-bottom subtitle-text uk-text-bold">{% trans "Communauté francophone de passionnés du libre depuis 2017." %}</p>
<div class="uk-child-width-expand@s uk-grid">
<div class="uk-grid-item-match uk-first-column">
<div>
<h1 class="uk-margin-remove-bottom uk-text-bold">GnousEU</h1>
<p class="uk-margin-remove-bottom subtitle-text uk-text-bold">{% trans "Communauté francophone de passionnés du libre depuis 2017." %}</p>
</div>
<div>
<a class="uk-button uk-margin-small-right" href="{% url 'gnous_eu:services' %}">{% trans "Nos services" %}</a>
<a class="uk-button uk-margin-small-left" href="{% url 'gnous_eu:about' %}">{% trans "À propos" %}</a>
</div>
</div>
<div class="uk-width-expand">
<img
src="{% static 'images/illustrations/services.svg' %}"
alt="Image">
</div>
<div class="uk-width-1-2@s">
<a class="uk-button uk-margin-small-left" href="{% url 'gnous_eu:services' %}">{% trans "Nos services" %}</a>
<a class="uk-button uk-margin-small-right" href="{% url 'gnous_eu:about' %}">{% trans "À propos" %}</a>
<div>
<div class="uk-width-expand">
<img src="{% static 'images/illustrations/services.svg' %}" loading="lazy" alt="Image">
</div>
</div>
</div>
</div>

2
apps/gnous_eu/templates/layouts/foot.html
View file

@ -42,7 +42,7 @@ Don't judge me
banner_cookie_div = document.getElementById("banner_cookie_div");
if (banner_cookie === undefined || banner_cookie.split('cookie-banner=')[1] !== 'hidden') {
banner_cookie_div.querySelector("a.uk-close").addEventListener('click', event => {
banner_cookie_div.addEventListener('click', event => {
document.cookie = 'cookie-banner=hidden';
banner_cookie_div.style.display = "none"
});

8
apps/gnous_eu/templates/services.html
View file

@ -24,9 +24,9 @@
</div>
{% if services|length >= 1 %}
<ul class="uk-grid uk-grid-margin-medium uk-child-width-1-3@m" data-uk-grid="masonry: true">
<div class="uk-grid uk-grid-margin-medium uk-child-width-1-3@m">
{% for service in services %}
<li>
<div class="uk-margin">
<div class="uk-card uk-card-secondary">
<div class="uk-card-media-top">
<img src="{{ service.photo.url }}" loading="lazy" alt="{{ service.name }}">
@ -57,9 +57,9 @@
{% endif %}
</div>
</div>
</li>
</div>
{% endfor %}
</ul>
</div>
<ul class="uk-pagination uk-margin-medium-top">
<li class="uk-width-1-3">

6
apps/gnous_eu/urls.py
View file

@ -1,13 +1,13 @@
from django.urls import path, include
from django.urls import path
from django.views.generic import TemplateView
from .views import ServicesView
from .views import ServicesView, PartnersView
app_name = "gnous_eu"
urlpatterns = [
path("", TemplateView.as_view(template_name="index.html"), name="index"),
path("about", TemplateView.as_view(template_name="about.html"), name="about"),
path("about", PartnersView.index, name="about"),
path("tips", TemplateView.as_view(template_name="tips.html"), name="tips"),
path("services", ServicesView.index, name="services"),
]

16
apps/gnous_eu/views.py
View file

@ -1,9 +1,9 @@
from django.http import HttpResponse, HttpRequest
from django.shortcuts import render
from django.core.paginator import Paginator
from django.db.models import Q
from django.http import HttpResponse, HttpRequest
from django.shortcuts import render
from apps.gnous_eu.models import Service
from apps.gnous_eu.models import Service, Partner
TEMPLATE_PATH = "./"
@ -35,3 +35,13 @@ class ServicesView:
TEMPLATE_PATH + "services.html",
{"services": paginator.get_page(page), "search": search},
)
class PartnersView:
@staticmethod
def index(request: HttpRequest, *args, **kwargs) -> HttpResponse:
return render(
request,
TEMPLATE_PATH + "about.html",
{"partners": Partner.objects.all().filter(hidden=False)},
)

2
gnousEU/settings.py
View file

@ -25,7 +25,7 @@ SECRET_KEY = local_settings.SECRET_KEY
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = ["127.0.0.1", "localhost", "django", "gnous.eu"]
ALLOWED_HOSTS = ["127.0.0.1", "localhost", "192.168.1.21", "django", "gnous.eu"]
CSRF_TRUSTED_ORIGINS = ['gnous.eu']
# Application definition

70
locale/en/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 21:44+0000\n"
"POT-Creation-Date: 2020-06-19 00:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,14 +38,14 @@ msgstr "Federated"
msgid "Centralisé"
msgstr "Centralized"
#: apps/gnous_eu/templates/about.html:11 apps/gnous_eu/templates/index.html:22
#: apps/gnous_eu/templates/about.html:9 apps/gnous_eu/templates/index.html:16
#: apps/gnous_eu/templates/layouts/head.html:14
#: apps/gnous_eu/templates/layouts/header.html:33
#: apps/gnous_eu/templates/layouts/sidebar.html:27
#: apps/gnous_eu/templates/layouts/sidebar.html:32
msgid "À propos"
msgstr "About"
#: apps/gnous_eu/templates/about.html:17
#: apps/gnous_eu/templates/about.html:13
msgid ""
"\n"
"<p>GnousEU est une communauté de passionnés du libre ayant débuté en février "
@ -93,26 +93,30 @@ msgstr ""
"<code><a href=\"https://git.gnous.eu/orakle\">Orakle</a></code> was in "
"charge of design.</p>\n"
"<p>GnousEU is hosted on the infrastructure <a href='https://enpls."
"org/'>EnPLS.org</a> infrastructure with servers in France, Netherlands, Germany and "
"Guadeloupe.</p>\n"
"org/'>EnPLS.org</a> infrastructure with servers in France, Netherlands, "
"Germany and Guadeloupe.</p>\n"
#: apps/gnous_eu/templates/about.html:32
msgid "Partenaires"
msgstr "Partners"
#: apps/gnous_eu/templates/about.html:50
msgid "Voir"
msgstr "View"
#: apps/gnous_eu/templates/about.html:62
msgid "Nous n'avons aucun partenaire..."
msgstr "We don't have any partners..."
#: apps/gnous_eu/templates/index.html:12
msgid "Communauté francophone de passionnés du libre depuis 2017."
msgstr "French community of free software enthusiasts since 2017."
#: apps/gnous_eu/templates/index.html:21
#: apps/gnous_eu/templates/index.html:15
#: apps/gnous_eu/templates/services.html:10
msgid "Nos services"
msgstr "Our services"
#: apps/gnous_eu/templates/layouts/foot.html:42
msgid ""
"Bla bla bla... bannière alakon pour dire qu&amp;on utilise des cookies (pour "
"la langue et cette bannière)"
msgstr ""
"GnousEU uses cookies in order to save the language of the site you are using "
"and the closing of this banner."
#: apps/gnous_eu/templates/layouts/footer.html:7
msgid "Designé par"
msgstr "Designed by"
@ -125,15 +129,23 @@ msgstr "Created by"
msgid "Fait avec"
msgstr "Built with"
#: apps/gnous_eu/templates/layouts/footer.html:44
msgid ""
"Bla bla bla... bannière alakon pour dire qu&amp;on utilise des cookies (pour "
"la langue et cette bannière)"
msgstr ""
"GnousEU uses cookies in order to save the language of the site you are using "
"and the closing of this banner."
#: apps/gnous_eu/templates/layouts/head.html:12
#: apps/gnous_eu/templates/layouts/header.html:17
#: apps/gnous_eu/templates/layouts/sidebar.html:13
#: apps/gnous_eu/templates/layouts/sidebar.html:18
msgid "Accueil"
msgstr "Home"
#: apps/gnous_eu/templates/layouts/head.html:13
#: apps/gnous_eu/templates/layouts/header.html:23
#: apps/gnous_eu/templates/layouts/sidebar.html:20
#: apps/gnous_eu/templates/layouts/sidebar.html:25
msgid "Services"
msgstr "Services"
@ -142,7 +154,7 @@ msgid "Dons"
msgstr "Tips"
#: apps/gnous_eu/templates/layouts/header.html:39
#: apps/gnous_eu/templates/layouts/sidebar.html:32
#: apps/gnous_eu/templates/layouts/sidebar.html:37
msgid "Donner"
msgstr "Tips"
@ -159,27 +171,27 @@ msgstr ""
msgid "Rechercher..."
msgstr "Search..."
#: apps/gnous_eu/templates/services.html:43
#: apps/gnous_eu/templates/services.html:40
msgid "Rejoindre !"
msgstr "Join !"
#: apps/gnous_eu/templates/services.html:75
#: apps/gnous_eu/templates/services.html:72
msgid "Précédent"
msgstr "Previous"
#: apps/gnous_eu/templates/services.html:90
#: apps/gnous_eu/templates/services.html:87
msgid "Suivant"
msgstr "Next"
#: apps/gnous_eu/templates/services.html:101
#: apps/gnous_eu/templates/services.html:98
msgid "Aucun service trouvé pour la recheche: "
msgstr "No services found for the search: "
#: apps/gnous_eu/templates/tips.html:12
#: apps/gnous_eu/templates/tips.html:11
msgid "Donnez à GnousEU"
msgstr "Give to GnousEU"
#: apps/gnous_eu/templates/tips.html:14
#: apps/gnous_eu/templates/tips.html:13
msgid ""
"Participez au développement de la communauté de GnousEU via un don monétaire "
"via le site Tipeee."
@ -187,11 +199,11 @@ msgstr ""
"Participate in the development of the GnousEU community by making a monetary "
"donation via the Tipeee website."
#: apps/gnous_eu/templates/tips.html:25
#: apps/gnous_eu/templates/tips.html:23
msgid "Vous souhaitez nous donner du materiel ?"
msgstr "Would you like to give us some material?"
#: apps/gnous_eu/templates/tips.html:27
#: apps/gnous_eu/templates/tips.html:25
msgid ""
"Vous disposez de materiel réseau ou serveur usagé et vous ne savez pas quoi "
"en faire ?"
@ -199,15 +211,15 @@ msgstr ""
"You have used network or server hardware and you don't know what to do with "
"it?"
#: apps/gnous_eu/templates/tips.html:29 apps/gnous_eu/templates/tips.html:41
#: apps/gnous_eu/templates/tips.html:27 apps/gnous_eu/templates/tips.html:38
msgid "Contactez nous par mail à "
msgstr "Contact us by mail at "
#: apps/gnous_eu/templates/tips.html:37
#: apps/gnous_eu/templates/tips.html:34
msgid "Vous êtes fournisseur de services ?"
msgstr "Are you a service provider?"
#: apps/gnous_eu/templates/tips.html:39
#: apps/gnous_eu/templates/tips.html:36
msgid ""
"Discutons plus en détails de votre proposition ! Nous sommes ouvert à tout "
"partenariat."

66
locale/fr/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 21:44+0000\n"
"POT-Creation-Date: 2020-06-19 00:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,14 +38,14 @@ msgstr ""
msgid "Centralisé"
msgstr ""
#: apps/gnous_eu/templates/about.html:11 apps/gnous_eu/templates/index.html:22
#: apps/gnous_eu/templates/about.html:9 apps/gnous_eu/templates/index.html:16
#: apps/gnous_eu/templates/layouts/head.html:14
#: apps/gnous_eu/templates/layouts/header.html:33
#: apps/gnous_eu/templates/layouts/sidebar.html:27
#: apps/gnous_eu/templates/layouts/sidebar.html:32
msgid "À propos"
msgstr ""
#: apps/gnous_eu/templates/about.html:17
#: apps/gnous_eu/templates/about.html:13
msgid ""
"\n"
"<p>GnousEU est une communauté de passionnés du libre ayant débuté en février "
@ -74,23 +74,27 @@ msgid ""
"Guadeloupe.</p>\n"
msgstr ""
#: apps/gnous_eu/templates/about.html:32
msgid "Partenaires"
msgstr ""
#: apps/gnous_eu/templates/about.html:50
msgid "Voir"
msgstr ""
#: apps/gnous_eu/templates/about.html:62
msgid "Nous n'avons aucun partenaire..."
msgstr ""
#: apps/gnous_eu/templates/index.html:12
msgid "Communauté francophone de passionnés du libre depuis 2017."
msgstr ""
#: apps/gnous_eu/templates/index.html:21
#: apps/gnous_eu/templates/index.html:15
#: apps/gnous_eu/templates/services.html:10
msgid "Nos services"
msgstr ""
#: apps/gnous_eu/templates/layouts/foot.html:42
msgid ""
"Bla bla bla... bannière alakon pour dire qu&amp;on utilise des cookies (pour "
"la langue et cette bannière)"
msgstr ""
"GnousEU utilise des cookies afin de sauvegarder la langue du site que vous "
"utilisez ainsi que pour la fermeture de cette bannière."
#: apps/gnous_eu/templates/layouts/footer.html:7
msgid "Designé par"
msgstr ""
@ -103,15 +107,23 @@ msgstr ""
msgid "Fait avec"
msgstr ""
#: apps/gnous_eu/templates/layouts/footer.html:44
msgid ""
"Bla bla bla... bannière alakon pour dire qu&amp;on utilise des cookies (pour "
"la langue et cette bannière)"
msgstr ""
"GnousEU utilise des cookies afin de sauvegarder la langue du site que vous "
"utilisez ainsi que pour la fermeture de cette bannière."
#: apps/gnous_eu/templates/layouts/head.html:12
#: apps/gnous_eu/templates/layouts/header.html:17
#: apps/gnous_eu/templates/layouts/sidebar.html:13
#: apps/gnous_eu/templates/layouts/sidebar.html:18
msgid "Accueil"
msgstr ""
#: apps/gnous_eu/templates/layouts/head.html:13
#: apps/gnous_eu/templates/layouts/header.html:23
#: apps/gnous_eu/templates/layouts/sidebar.html:20
#: apps/gnous_eu/templates/layouts/sidebar.html:25
msgid "Services"
msgstr ""
@ -120,7 +132,7 @@ msgid "Dons"
msgstr ""
#: apps/gnous_eu/templates/layouts/header.html:39
#: apps/gnous_eu/templates/layouts/sidebar.html:32
#: apps/gnous_eu/templates/layouts/sidebar.html:37
msgid "Donner"
msgstr ""
@ -135,51 +147,51 @@ msgstr ""
msgid "Rechercher..."
msgstr ""
#: apps/gnous_eu/templates/services.html:43
#: apps/gnous_eu/templates/services.html:40
msgid "Rejoindre !"
msgstr ""
#: apps/gnous_eu/templates/services.html:75
#: apps/gnous_eu/templates/services.html:72
msgid "Précédent"
msgstr ""
#: apps/gnous_eu/templates/services.html:90
#: apps/gnous_eu/templates/services.html:87
msgid "Suivant"
msgstr ""
#: apps/gnous_eu/templates/services.html:101
#: apps/gnous_eu/templates/services.html:98
msgid "Aucun service trouvé pour la recheche: "
msgstr ""
#: apps/gnous_eu/templates/tips.html:12
#: apps/gnous_eu/templates/tips.html:11
msgid "Donnez à GnousEU"
msgstr ""
#: apps/gnous_eu/templates/tips.html:14
#: apps/gnous_eu/templates/tips.html:13
msgid ""
"Participez au développement de la communauté de GnousEU via un don monétaire "
"via le site Tipeee."
msgstr ""
#: apps/gnous_eu/templates/tips.html:25
#: apps/gnous_eu/templates/tips.html:23
msgid "Vous souhaitez nous donner du materiel ?"
msgstr ""
#: apps/gnous_eu/templates/tips.html:27
#: apps/gnous_eu/templates/tips.html:25
msgid ""
"Vous disposez de materiel réseau ou serveur usagé et vous ne savez pas quoi "
"en faire ?"
msgstr ""
#: apps/gnous_eu/templates/tips.html:29 apps/gnous_eu/templates/tips.html:41
#: apps/gnous_eu/templates/tips.html:27 apps/gnous_eu/templates/tips.html:38
msgid "Contactez nous par mail à "
msgstr ""
#: apps/gnous_eu/templates/tips.html:37
#: apps/gnous_eu/templates/tips.html:34
msgid "Vous êtes fournisseur de services ?"
msgstr ""
#: apps/gnous_eu/templates/tips.html:39
#: apps/gnous_eu/templates/tips.html:36
msgid ""
"Discutons plus en détails de votre proposition ! Nous sommes ouvert à tout "
"partenariat."

BIN
media/partner/milkywan_100.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB