big update

[func] all pages apart from other tournaments

.worktime

@@ -2,4 +2,5 @@
 09.06.2022 - 1h
 12.06.2022 - 1h 15 mins
 15.06.2022 - 1h 30 mins
-23.06.2022 - 1h 30 mins
+23.06.2022 - 1h 30 mins
+07.07.2022 - 2h 30 mins

core/admin.py

@@ -2,16 +2,34 @@ from django.apps import apps
 from django.contrib import admin
 from django.contrib.admin.sites import AlreadyRegistered
 from django_summernote.admin import SummernoteModelAdmin
+from admin_ordering.admin import OrderableAdmin
 from .models import *
 
 # Register your models here.
 
 
+@admin.register(Post)
 class PostModelAdmin(SummernoteModelAdmin):
     summernote_fields = ['content']
 
 
-admin.site.register(Post, PostModelAdmin)
+@admin.register(Calendar)
+class CalendarModelAdmin(SummernoteModelAdmin):
+    summernote_fields = ['content']
+
+
+@admin.register(GrandPrix)
+class GrandPrixModelAdmin(SummernoteModelAdmin):
+    summernote_fields = ['content']
+
+
+@admin.register(AdministrationMember)
+class AdministrationMemberModelAdmin(OrderableAdmin, admin.ModelAdmin):
+    list_display = ['__str__', 'ordering']
+    list_editable = ['ordering']
+    ordering_field_hide_input = True
+    exclude = ['ordering']
+
 
 app_models = apps.get_app_config('core').get_models()
 for model in app_models:

core/migrations/0006_administrationannouncement_administrationmember_and_more.py

@@ -0,0 +1,132 @@
+# Generated by Django 4.0.5 on 2022-07-06 23:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_alter_administration_year'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AdministrationAnnouncement',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('year', models.IntegerField(blank=True, null=True, verbose_name='Rok')),
+                ('title', models.CharField(max_length=250, verbose_name='Tytuł')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('attachment', models.FileField(upload_to='announcements', verbose_name='Plik pdf')),
+            ],
+            options={
+                'verbose_name': 'Zarząd - Ogłoszenie',
+                'verbose_name_plural': 'Zarząd - Ogłoszenia',
+            },
+        ),
+        migrations.CreateModel(
+            name='AdministrationMember',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ordering', models.PositiveIntegerField(default=0, verbose_name='ordering')),
+                ('name', models.CharField(max_length=512, verbose_name='Imię i nazwisko')),
+                ('contact', models.CharField(max_length=512, verbose_name='Dane kontaktowe')),
+                ('function', models.CharField(max_length=512, verbose_name='Funkcja')),
+            ],
+            options={
+                'verbose_name': 'Zarząd - Członek',
+                'verbose_name_plural': 'Zarząd - Członkowie',
+                'ordering': ['ordering'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AdministrationProtocol',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('year', models.IntegerField(blank=True, null=True, verbose_name='Rok')),
+                ('title', models.CharField(max_length=250, verbose_name='Tytuł')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('attachment', models.FileField(upload_to='protocols', verbose_name='Plik pdf')),
+            ],
+            options={
+                'verbose_name': 'Zarząd - Protokół / Uchwała',
+                'verbose_name_plural': 'Zarząd - Protokoły / Uchwały',
+            },
+        ),
+        migrations.CreateModel(
+            name='AdministrationRegulation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('year', models.IntegerField(blank=True, null=True, verbose_name='Rok')),
+                ('title', models.CharField(max_length=250, verbose_name='Tytuł')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('attachment', models.FileField(upload_to='regulations', verbose_name='Plik pdf')),
+            ],
+            options={
+                'verbose_name': 'Zarząd - Regulamin',
+                'verbose_name_plural': 'Zarząd - Regulaminy',
+            },
+        ),
+        migrations.CreateModel(
+            name='AdministrationStatute',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('year', models.IntegerField(blank=True, null=True, verbose_name='Rok')),
+                ('title', models.CharField(max_length=250, verbose_name='Tytuł')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('attachment', models.FileField(upload_to='statutes', verbose_name='Plik pdf')),
+            ],
+            options={
+                'verbose_name': 'Zarząd - Statut',
+                'verbose_name_plural': 'Zarząd - Statuty',
+            },
+        ),
+        migrations.CreateModel(
+            name='Calendar',
+            fields=[
+                ('year', models.IntegerField(primary_key=True, serialize=False, verbose_name='Rok')),
+                ('content', models.TextField(verbose_name='Kalendarz')),
+            ],
+            options={
+                'verbose_name': 'Kalendarz',
+                'verbose_name_plural': 'Kalendarze',
+                'ordering': ['-year'],
+            },
+        ),
+        migrations.CreateModel(
+            name='GrandPrix',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.TextField(verbose_name='Tekst GPB')),
+            ],
+            options={
+                'verbose_name': 'Grand Prix Białegostoku',
+                'verbose_name_plural': 'Grand Prix Białegostoku',
+            },
+        ),
+        migrations.CreateModel(
+            name='ThirdLeague',
+            fields=[
+                ('year', models.IntegerField(primary_key=True, serialize=False, verbose_name='Rok')),
+                ('link', models.CharField(max_length=512, verbose_name='Link do wyników')),
+            ],
+            options={
+                'verbose_name': 'Wyniki III Ligi',
+                'verbose_name_plural': 'Wyniki III Ligi',
+                'ordering': ['-year'],
+            },
+        ),
+        migrations.DeleteModel(
+            name='Administration',
+        ),
+        migrations.RemoveField(
+            model_name='membership',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='membership',
+            name='year',
+            field=models.IntegerField(primary_key=True, serialize=False, verbose_name='Rok'),
+        ),
+    ]

core/migrations/0007_rodo_rename_thirdleague_league.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.0.5 on 2022-07-06 23:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0006_administrationannouncement_administrationmember_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RODO',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('who', models.CharField(max_length=512, verbose_name='Przez kogo przetwarzane dane osobowe?')),
+                ('attachment', models.FileField(upload_to='rodo', verbose_name='Plik pdf')),
+            ],
+            options={
+                'verbose_name': 'Dokument RODO',
+                'verbose_name_plural': 'Dokumenty RODO',
+            },
+        ),
+        migrations.RenameModel(
+            old_name='ThirdLeague',
+            new_name='League',
+        ),
+    ]

core/models.py

@@ -1,4 +1,6 @@
 from django.db import models
+from admin_ordering.models import OrderableModel
+
 
 # Create your models here.
 
@@ -17,8 +19,83 @@ class Post(models.Model):
         ordering = ['-created_at']
 
 
+class AttachmentModel(models.Model):
+    year = models.IntegerField('Rok', blank=True, null=True)
+    title = models.CharField('Tytuł', max_length=250)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        abstract = True
+        ordering = ['-created_at']
+
+
+class SingletonModel(models.Model):
+    class Meta:
+        abstract = True
+
+    def save(self, *args, **kwargs):
+        self.pk = 1
+        super(SingletonModel, self).save(*args, **kwargs)
+
+    def delete(self, *args, **kwargs):
+        pass
+
+    @classmethod
+    def load(cls):
+        obj, created = cls.objects.get_or_create(pk=1)
+        return obj
+
+
+class AdministrationStatute(AttachmentModel):
+    attachment = models.FileField('Plik pdf', upload_to='statutes')
+
+    class Meta:
+        verbose_name = 'Zarząd - Statut'
+        verbose_name_plural = 'Zarząd - Statuty'
+
+
+class AdministrationAnnouncement(AttachmentModel):
+    attachment = models.FileField('Plik pdf', upload_to='announcements')
+
+    class Meta:
+        verbose_name = 'Zarząd - Ogłoszenie'
+        verbose_name_plural = 'Zarząd - Ogłoszenia'
+
+
+class AdministrationProtocol(AttachmentModel):
+    attachment = models.FileField('Plik pdf', upload_to='protocols')
+
+    class Meta:
+        verbose_name = 'Zarząd - Protokół / Uchwała'
+        verbose_name_plural = 'Zarząd - Protokoły / Uchwały'
+
+
+class AdministrationRegulation(AttachmentModel):
+    attachment = models.FileField('Plik pdf', upload_to='regulations')
+
+    class Meta:
+        verbose_name = 'Zarząd - Regulamin'
+        verbose_name_plural = 'Zarząd - Regulaminy'
+
+
+class AdministrationMember(OrderableModel):
+    name = models.CharField('Imię i nazwisko', max_length=512)
+    contact = models.CharField('Dane kontaktowe', max_length=512)
+    function = models.CharField('Funkcja', max_length=512)
+
+    def __str__(self):
+        return f'{self.function} - {self.name}'
+
+    class Meta(OrderableModel.Meta):
+        verbose_name = 'Zarząd - Członek'
+        verbose_name_plural = 'Zarząd - Członkowie'
+
+
 class Membership(models.Model):
-    year = models.IntegerField('Rok')
+    year = models.IntegerField('Rok', primary_key=True)
     attachment = models.FileField('Plik pdf', upload_to='skladki')
 
     def __str__(self):
@@ -30,18 +107,51 @@ class Membership(models.Model):
         ordering = ['-year']
 
 
-class Administration(models.Model):
+class League(models.Model):
-    type = models.IntegerField(choices=[(
+    year = models.IntegerField('Rok', primary_key=True)
-        1, 'Statut'), (2, 'Ogłoszenie'), (3, 'Protokół / Uchwała'), (4, 'Regulamin')])
+    link = models.CharField('Link do wyników', max_length=512)
-    title = models.CharField('Tytuł', max_length=250)
-    attachment = models.FileField('Plik pdf', upload_to='skladki')
-    year = models.IntegerField('Rok', blank=True, null=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        return self.title
+        return f'III Liga {self.year}'
 
     class Meta:
-        verbose_name = 'Plik zarządu'
+        verbose_name = 'Wyniki III Ligi'
-        verbose_name_plural = 'Pliki zarządu'
+        verbose_name_plural = 'Wyniki III Ligi'
-        ordering = ['type', '-created_at']
+        ordering = ['-year']
+
+
+class Calendar(models.Model):
+    year = models.IntegerField('Rok', primary_key=True)
+    content = models.TextField('Kalendarz')
+
+    def __str__(self):
+        return f'Kalendarz {self.year}'
+
+    class Meta:
+        verbose_name = 'Kalendarz'
+        verbose_name_plural = 'Kalendarze'
+        ordering = ['-year']
+
+
+class GrandPrix(SingletonModel):
+    content = models.TextField('Tekst GPB')
+
+    def __str__(self):
+        return 'Grand Prix Białegostoku'
+
+    class Meta:
+        verbose_name = 'Grand Prix Białegostoku'
+        verbose_name_plural = 'Grand Prix Białegostoku'
+
+
+class RODO(models.Model):
+    who = models.CharField(
+        'Przez kogo przetwarzane dane osobowe?', max_length=512)
+    attachment = models.FileField('Plik pdf', upload_to='rodo')
+
+    def __str__(self):
+        return f'RODO - {self.who}'
+
+    class Meta:
+        verbose_name = 'Dokument RODO'
+        verbose_name_plural = 'Dokumenty RODO'

core/static/css/dist/styles.css

@@ -1134,6 +1134,11 @@ select {
   margin-right: auto;
 }
 
+.my-0 {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
 .mb-0 {
   margin-bottom: 0px;
 }
@@ -1262,6 +1267,10 @@ select {
   gap: 0.75rem;
 }
 
+.rounded-md {
+  border-radius: 0.375rem;
+}
+
 .border {
   border-width: 1px;
 }
@@ -1289,6 +1298,26 @@ select {
   border-color: rgb(168 162 158 / var(--tw-border-opacity));
 }
 
+.border-slate-200 {
+  --tw-border-opacity: 1;
+  border-color: rgb(226 232 240 / var(--tw-border-opacity));
+}
+
+.border-slate-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(241 245 249 / var(--tw-border-opacity));
+}
+
+.border-stone-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(245 245 244 / var(--tw-border-opacity));
+}
+
+.border-stone-200 {
+  --tw-border-opacity: 1;
+  border-color: rgb(231 229 228 / var(--tw-border-opacity));
+}
+
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -1299,11 +1328,51 @@ select {
   background-color: rgb(249 250 251 / var(--tw-bg-opacity));
 }
 
+.bg-slate-600 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(71 85 105 / var(--tw-bg-opacity));
+}
+
+.bg-slate-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(241 245 249 / var(--tw-bg-opacity));
+}
+
+.bg-slate-50 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(248 250 252 / var(--tw-bg-opacity));
+}
+
+.bg-stone-50 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(250 250 249 / var(--tw-bg-opacity));
+}
+
 .py-4 {
   padding-top: 1rem;
   padding-bottom: 1rem;
 }
 
+.py-8 {
+  padding-top: 2rem;
+  padding-bottom: 2rem;
+}
+
+.px-2 {
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+}
+
+.py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
+
+.px-4 {
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+
 .pb-1 {
   padding-bottom: 0.25rem;
 }
@@ -1328,9 +1397,9 @@ select {
   font-family: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
 }
 
-.text-3xl {
+.text-4xl {
-  font-size: 1.875rem;
+  font-size: 2.25rem;
-  line-height: 2.25rem;
+  line-height: 2.5rem;
 }
 
 .text-xl {
@@ -1338,6 +1407,11 @@ select {
   line-height: 1.75rem;
 }
 
+.text-3xl {
+  font-size: 1.875rem;
+  line-height: 2.25rem;
+}
+
 .text-\[13px\] {
   font-size: 13px;
 }
@@ -1363,6 +1437,10 @@ select {
   font-weight: 300;
 }
 
+.font-medium {
+  font-weight: 500;
+}
+
 .italic {
   font-style: italic;
 }
@@ -1400,6 +1478,18 @@ select {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
+.shadow-sm {
+  --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+  --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.shadow-md {
+  --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
 .blur {
   --tw-blur: blur(8px);
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
@@ -1422,10 +1512,44 @@ select {
   display: block;
 }
 
+.hover\:border-slate-300:hover {
+  --tw-border-opacity: 1;
+  border-color: rgb(203 213 225 / var(--tw-border-opacity));
+}
+
+.hover\:border-slate-200:hover {
+  --tw-border-opacity: 1;
+  border-color: rgb(226 232 240 / var(--tw-border-opacity));
+}
+
+.hover\:border-stone-200:hover {
+  --tw-border-opacity: 1;
+  border-color: rgb(231 229 228 / var(--tw-border-opacity));
+}
+
+.hover\:bg-slate-200:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(226 232 240 / var(--tw-bg-opacity));
+}
+
+.hover\:bg-slate-100:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(241 245 249 / var(--tw-bg-opacity));
+}
+
+.hover\:bg-stone-100:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(245 245 244 / var(--tw-bg-opacity));
+}
+
 .prose-h1\:mb-0 :is(:where(h1):not(:where([class~="not-prose"] *))) {
   margin-bottom: 0px;
 }
 
+.prose-h1\:text-center :is(:where(h1):not(:where([class~="not-prose"] *))) {
+  text-align: center;
+}
+
 .prose-h1\:font-light :is(:where(h1):not(:where([class~="not-prose"] *))) {
   font-weight: 300;
 }
@@ -1435,6 +1559,10 @@ select {
   margin-bottom: 0px;
 }
 
+.prose-h2\:font-light :is(:where(h2):not(:where([class~="not-prose"] *))) {
+  font-weight: 300;
+}
+
 .prose-h3\:text-xs :is(:where(h3):not(:where([class~="not-prose"] *))) {
   font-size: 0.75rem;
   line-height: 1rem;

core/templates/administration.html

@@ -1,6 +1,35 @@
 {% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
 {% load static tailwind_tags %} {% block content %}
 <div class="flex flex-col items-center gap-4">
+  <h1 class="text-4xl">Zarząd PodlZBS</h1>
+
+  {% for member in czlonkowie %}
+  <div
+    class="grid lg:grid-cols-2 gap-4 text-center items-center place-items-center prose-h1:font-light prose-h3:text-xs prose-h2:text-md prose-h2:my-0 prose-h1:mb-0"
+  >
+    <div class="prose">
+      <h1>{{ member.function }}</h1>
+      <h2>{{ member.name }}</h2>
+      <h3>{{ member.contact }}</h3>
+    </div>
+  </div>
+  {% empty %}
+  <span class="py-4 text-xl">Brak członków</span>
+  {% endfor %}
+
+  <div class="prose prose-h2:font-light">
+    <a href="{{ statut.attachment.url }}" target="_blank">
+      <h2 class="my-0 text-center">{{ statut.title }}</h2>
+    </a>
+  </div>
+
+  <div class="flex flex-col items-center text-xl font-semibold">
+    <span>Adres Podlaskiego ZBS - 15-057 Białystok</span>
+    <span>ul. B. Chrobrego 5B m.33</span>
+    <span>Konto: PKO SA O/B-tok 43 1240 5211 1111 0000 4919 1721</span>
+    <span>NIP: 542 258 14 53 REGON 050816091</span>
+  </div>
+
   <h1 class="text-3xl">Ogłoszenia</h1>
   {% for file in ogloszenia %}
   <article>
@@ -15,6 +44,7 @@
   {% empty %}
   <span class="py-4 text-xl">Brak ogłoszeń</span>
   {% endfor %}
+
   <h1 class="text-3xl">Protokoły / Ustawy</h1>
   {% for file in protokoly %}
   <article>
@@ -29,6 +59,7 @@
   {% empty %}
   <span class="py-4 text-xl">Brak protokołów / ustaw</span>
   {% endfor %}
+
   <h1 class="text-3xl">Regulaminy</h1>
   {% for file in regulaminy %}
   <article>
@@ -43,60 +74,5 @@
   {% empty %}
   <span class="py-4 text-xl">Brak regulaminów</span>
   {% endfor %}
-  <h1 class="text-3xl">Zarząd PodlZBS</h1>
-  <div
-    class="grid lg:grid-cols-2 gap-4 text-center items-center place-items-center prose-h1:font-light prose-h3:text-xs prose-h2:text-md prose-h2:my-0 prose-h1:mb-0"
-  >
-    <div class="prose">
-      <h1>Prezes</h1>
-      <h2>Andrzej Błachno</h2>
-      <h3>tel. kom. +48 508 190 471 podlaski.wzbs@gmail.com</h3>
-    </div>
-    <div class="prose">
-      <h1>V-c Prezes Zarządu</h1>
-      <h2>Mirosław Liszewski</h2>
-      <h3>tel.608 479 096 biuro@roansj.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu</h1>
-      <h2>Adam Szempliński</h2>
-      <h3>tel. +48 798 270 525 e-mail: as51as@icloud.com</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s. Finansowych</h1>
-      <h2>Anna Tompolska</h2>
-      <h3>tel. kom. 668 099 992 atompolska@emag.bialystok.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s Cezara, odznaczeń</h1>
-      <h2>Andrzej Raczkowski</h2>
-      <h3>tel. dom. 85 744 35 03 tel. kom. 886 732 044 arara@wp.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s. szkolenia młodzieży</h1>
-      <h2>Krzysztof Krajewski</h2>
-      <h3>tel kom. +48 502-543-699 joe1961@wp.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s koordynacji sportu młodzieżowego</h1>
-      <h2>Dariusz Hutnik</h2>
-      <h3>Tel. 723 443 001 Mail: d.hutnik@wp.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s. Drużynowych Mistrzostw Polski (liga)</h1>
-      <h2>Artur Kozłowski</h2>
-      <h3>tel. kom. 606 478 314 a.kozlowski@pb.edu.pl</h3>
-    </div>
-    <div class="prose">
-      <h1>Członek Zarządu d/s. techniki informatycznej (IT)</h1>
-      <h2>Adam Rogowski</h2>
-      <h3>tel. kom. 512 442 959 rogowiak333@gmail.com</h3>
-    </div>
-  </div>
-  <div class="prose prose-h1:font-light">
-    <a href="{{ statut.attachment.url }}" target="_blank">
-      <h1 class="mb-0">{{ statut.title }}</h1>
-    </a>
-  </div>
 </div>
 {% endblock %}

core/templates/base.html

@@ -47,8 +47,8 @@
             <li class="nav-item {% if 'zarzad' in request.path %}active{% endif %}"><a href="{% url 'administration' %}">Zarząd</a></li>
             <li class="nav-item {% if 'rodo' in request.path %}active{% endif %}"><a href="{% url 'rodo' %}">RODO</a></li>
             <li class="nav-item {% if 'liga' in request.path %}active{% endif %}"><a href="{% url 'league' %}">III&nbsp;Liga</a></li>
-            <li class="nav-item {% if 'kalendarz' in request.path %}active{% endif %}"><a href="{% url 'calendar' %}">Kalendarz&nbsp;2022</a></li>
+            <li class="nav-item {% if 'kalendarz' in request.path %}active{% endif %}"><a href="{% url 'calendar' %}">Kalendarz</a></li>
-            <li class="nav-item {% if 'grandprix' in request.path %}active{% endif %}"><a href="{% url 'gpx' %}">GPB&nbsp;2020</a></li>
+            <li class="nav-item {% if 'grandprix' in request.path %}active{% endif %}"><a href="{% url 'gpx' %}">GPB</a></li>
             <li class="nav-item {% if 'inneturnieje' in request.path %}active{% endif %}"><a href="{% url 'others' %}">Inne&nbsp;turnieje</a></li>
             <li class="nav-item {% if 'skladki' in request.path %}active{% endif %}"><a href="{% url 'membership' %}">Składki&nbsp;członkowskie</a></li>
           </ul>

core/templates/calendar.html

@@ -0,0 +1,14 @@
+{% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
+{% load static tailwind_tags %} {% block content %}
+<div class="flex flex-col items-center gap-4">
+  {% for calendar in calendars %}
+  <article
+    class="prose w-full py-4 prose-h1:text-center {% if forloop.first %} pt-0 {% endif %} {% if not forloop.last %} border-b border-stone-200 {% endif %}"
+  >
+    <h1>Kalendarz {{ calendar.year }}</h1>
+    <div>{{ calendar.content | safe }}</div>
+  </article>
+  {% empty %}
+  <span class="py-4 text-xl">Brak dokumentów</span>
+  {% endfor %} {% endblock %}
+</div>

core/templates/grandprix.html

@@ -0,0 +1,7 @@
+{% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
+{% load static tailwind_tags %} {% block content %}
+<article class="prose prose-h1:text-center mx-auto">
+  <h1>Grand Prix Białegostoku</h1>
+  <div>{{ gp.content | safe }}</div>
+</article>
+{% endblock %}

core/templates/home.html

@@ -1,14 +1,16 @@
 {% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
 {% load static tailwind_tags %} {% block content %}
-<div class="flex flex-col lg:flex-row justify-around gap-4 prose-h1:font-light">
+<div class="flex flex-col lg:flex-row justify-around gap-4">
   {% if highlight %}
   <article class="prose w-full basis-3/5">
     <h1>{{ highlight.title }}</h1>
     {{ highlight.content | safe }}
   </article>
   {% endif %}
-  <div class="flex flex-col basis-2/5">
+  <div class="flex flex-col basis-2/5 not-prose">
-    <h1 class="text-3xl pb-6 mb-4 border-b border-stone-500 border-dashed">
+    <h1
+      class="text-3xl pb-6 mb-4 border-b border-stone-500 border-dashed font-medium"
+    >
       Aktualności PodlZBS
     </h1>
     {% for post in posts %}

core/templates/league.html

@@ -0,0 +1,16 @@
+{% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
+{% load static tailwind_tags %} {% block content %}
+<div class="flex flex-col items-center gap-4">
+  {% for league in leagues %}
+  <a
+    href="{{ league.link }}"
+    target="_blank"
+    rel="noreferrer noopener"
+    class="px-4 py-3 rounded-md shadow-md border border-stone-200 bg-stone-50 hover:border-stone-200 hover:bg-stone-100 font-semibold"
+  >
+    Wyniki III ligi DMP {{ league.year }}-{{ league.year | add:"1" }}
+  </a>
+  {% empty %}
+  <span class="py-4 text-xl">Brak wyników</span>
+  {% endfor %} {% endblock %}
+</div>

core/templates/membership.html

@@ -1,12 +1,10 @@
 {% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
 {% load static tailwind_tags %} {% block content %}
-<div class="flex flex-col items-center gap-4 prose-h1:font-light">
+<div class="flex flex-col items-center gap-4">
   {% for membership in memberships %}
-  <article
+  <article class="prose py-4">
-    class="prose w-full py-4 {% if forloop.first %} pt-0 {% endif %} {% if not forloop.last %} border-b border-stone-400 {% endif %}"
-  >
     <a href="{{ membership.attachment.url }}" target="_blank">
-      <h2 class="mb-0">{{ membership }}</h2>
+      <h2 class="my-0">{{ membership }}</h2>
     </a>
   </article>
   {% empty %}

core/templates/rodo.html

@@ -0,0 +1,15 @@
+{% extends 'base.html' %} {% block title %}Strona główna | pdlzbs{% endblock %}
+{% load static tailwind_tags %} {% block content %}
+<div class="flex flex-col items-center gap-4">
+  {% for rodo in rodos %}
+  <article class="prose py-4">
+    <h2 class="my-0 text-center">
+      Informacje o przetwarzaniu danych osobowych zawodników przez
+      <a href="{{ rodo.attachment.url }}" target="_blank">{{ rodo.who }}</a>
+    </h2>
+  </article>
+  {% empty %}
+  <span class="py-4 text-xl">Brak dokumentów</span>
+  {% endfor %}
+</div>
+{% endblock %}

core/urls.py

@@ -4,10 +4,10 @@ from .views import *
 urlpatterns = [
     path('', HomeView.as_view(), name='home'),
     path('zarzad', AdministrationView.as_view(), name='administration'),
-    path('rodo', HomeView.as_view(), name='rodo'),
+    path('rodo', RODOView.as_view(), name='rodo'),
-    path('liga', HomeView.as_view(), name='league'),
+    path('liga', LeagueView.as_view(), name='league'),
-    path('kalendarz', HomeView.as_view(), name='calendar'),
+    path('kalendarz', CalendarView.as_view(), name='calendar'),
-    path('grandprix', HomeView.as_view(), name='gpx'),
+    path('grandprix', GrandPrixView.as_view(), name='gpx'),
     path('inneturnieje', HomeView.as_view(), name='others'),
     path('skladki', MembershipView.as_view(), name='membership'),
 ]

core/views.py

@@ -20,6 +20,64 @@ class HomeView(TemplateView):
         return context
 
 
+class AdministrationView(TemplateView):
+    template_name = 'administration.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context = {
+            **context,
+            'czlonkowie': AdministrationMember.objects.all(),
+            'statut': AdministrationStatute.objects.first(),
+            'ogloszenia': AdministrationAnnouncement.objects.all(),
+            'protokoly': AdministrationProtocol.objects.all(),
+            'regulaminy': AdministrationRegulation.objects.all(),
+        }
+
+        return context
+
+
+class RODOView(TemplateView):
+    template_name = 'rodo.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['rodos'] = RODO.objects.all()
+
+        return context
+
+
+class LeagueView(TemplateView):
+    template_name = 'league.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['leagues'] = League.objects.all()
+
+        return context
+
+
+class CalendarView(TemplateView):
+    template_name = 'calendar.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['calendars'] = Calendar.objects.all()
+
+        return context
+
+
+class GrandPrixView(TemplateView):
+    template_name = 'grandprix.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['gp'] = GrandPrix.objects.first()
+
+        return context
+
+
 class MembershipView(TemplateView):
     template_name = 'membership.html'
 
@@ -28,21 +86,3 @@ class MembershipView(TemplateView):
         context['memberships'] = Membership.objects.all()
 
         return context
-
-
-class AdministrationView(TemplateView):
-    template_name = 'administration.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        files = Administration.objects
-        context = {
-            **context,
-            'statut': files.filter(type=1).first(),
-            'ogloszenia': files.filter(type=2),
-            'protokoly': files.filter(type=3),
-            'regulaminy': files.filter(type=4)
-        }
-
-        return context

pdlzbs/settings.py

@@ -45,7 +45,9 @@ INSTALLED_APPS = [
     'core',
     'tailwind',
     'django_summernote',
-    'django_browser_reload'
+    'admin_ordering',
+    'django_browser_reload',
+    'django_cleanup'
 ]
 
 TAILWIND_APP_NAME = 'core'

pdlzbs/urls.py

@@ -22,6 +22,7 @@ urlpatterns = [
     path('', include('core.urls')),
     path('admin/', admin.site.urls),
     path('summernote/', include('django_summernote.urls')),
+    path('editor/', include('django_summernote.urls')),
     path('__reload__/', include('django_browser_reload.urls')),
 ]
 

requirements.txt

@@ -2,4 +2,6 @@ Django
 django-browser-reload
 django-tailwind
 django-summernote
-django-htmlmin
+django-admin-ordering
+django-htmlmin
+django-cleanup