diff --git a/README.md b/README.md index 2f40045..354420c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ # gawa -Gawa is my personal website. I've personally written it using the django framework. + +Gawa is my personal website. I've personally written it using the Django framework. + +## Credentials + +These are the Credentials for logging into the admin panel: +| Username | Password | +|----------|----------| +| root | root | ## License + Bootstrap: MIT Licensed Django: BSD 3-Clause "New" or "Revised" License -###### Gawa: MIT Licensed, see LICENSE +__Gawa: MIT Licensed, see LICENSE__ diff --git a/gawa/media/img/links/favicons/Mastodon.png b/gawa/media/img/links/favicons/Mastodon.png new file mode 100644 index 0000000..d29f9ae Binary files /dev/null and b/gawa/media/img/links/favicons/Mastodon.png differ diff --git a/gawa/media/img/links/favicons/favicon-15454.png b/gawa/media/img/links/favicons/favicon-15454.png new file mode 100644 index 0000000..8cb4334 Binary files /dev/null and b/gawa/media/img/links/favicons/favicon-15454.png differ diff --git a/gawa/media/img/links/favicons/favicon-49084.png b/gawa/media/img/links/favicons/favicon-49084.png new file mode 100644 index 0000000..6d0105c Binary files /dev/null and b/gawa/media/img/links/favicons/favicon-49084.png differ diff --git a/gawa/media/img/links/favicons/favicon-58035.png b/gawa/media/img/links/favicons/favicon-58035.png new file mode 100644 index 0000000..83b9a86 Binary files /dev/null and b/gawa/media/img/links/favicons/favicon-58035.png differ diff --git a/gawa/media/img/links/favicons/favicon-58703.png b/gawa/media/img/links/favicons/favicon-58703.png new file mode 100644 index 0000000..9307437 Binary files /dev/null and b/gawa/media/img/links/favicons/favicon-58703.png differ diff --git a/gawa/start/admin.py b/gawa/start/admin.py index 0417c90..a050b64 100644 --- a/gawa/start/admin.py +++ b/gawa/start/admin.py @@ -41,6 +41,6 @@ class LinkAdmin(admin.ModelAdmin): """ Admin Interface for Links """ - list_display = ["title_en", "title_de", "url", "suburl", "favicon", "status"] + list_display = ["title_en", "title_de", "url", "suburl", "favicon", "status", "personal"] ordering = ['status', 'title_de', 'title_en'] actions = [regenerate] diff --git a/gawa/start/migrations/0010_link_personal.py b/gawa/start/migrations/0010_link_personal.py new file mode 100644 index 0000000..273bbbf --- /dev/null +++ b/gawa/start/migrations/0010_link_personal.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.19 on 2023-07-15 12:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('start', '0009_alter_link_favicon'), + ] + + operations = [ + migrations.AddField( + model_name='link', + name='personal', + field=models.BooleanField(default=False), + ), + ] diff --git a/gawa/start/migrations/0011_auto_20230715_1441.py b/gawa/start/migrations/0011_auto_20230715_1441.py new file mode 100644 index 0000000..b0d8291 --- /dev/null +++ b/gawa/start/migrations/0011_auto_20230715_1441.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.19 on 2023-07-15 12:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('start', '0010_link_personal'), + ] + + operations = [ + migrations.AlterField( + model_name='searchable', + name='desc_de', + field=models.TextField(default='Beschreibung DE', max_length=250), + ), + migrations.AlterField( + model_name='searchable', + name='desc_en', + field=models.TextField(default='Description EN', max_length=250), + ), + ] diff --git a/gawa/start/models.py b/gawa/start/models.py index a377519..0c06496 100644 --- a/gawa/start/models.py +++ b/gawa/start/models.py @@ -37,8 +37,8 @@ class Searchable(models.Model): title_en = models.CharField(max_length=50, default="title EN") subtitle_de = models.CharField(max_length=50, blank=True) subtitle_en = models.CharField(max_length=50, blank=True) - desc_de = models.CharField(max_length=250, unique=False, default="Beschreibung DE") - desc_en = models.CharField(max_length=250, unique=False, default="Description EN") + desc_de = models.TextField(max_length=250, unique=False, default="Beschreibung DE") + desc_en = models.TextField(max_length=250, unique=False, default="Description EN") # may be empty/blank for some entries date = models.DateField(blank=True, null=True) keywords = models.ManyToManyField(Keyword) @@ -99,6 +99,7 @@ class Link(Searchable): favicon_dir: str = "img/links/favicons" favicon = models.ImageField(blank=True, upload_to=favicon_dir, null=True) status = models.BooleanField(default=False) + personal = models.BooleanField(default=False) def __str__(self): return f"{{<{self.__class__.__name__}>\"{self.title_en}\"}}" diff --git a/gawa/start/templates/start/links.html b/gawa/start/templates/start/links.html index 0137411..27da635 100644 --- a/gawa/start/templates/start/links.html +++ b/gawa/start/templates/start/links.html @@ -5,11 +5,55 @@ {% block title %}{% translate "cscherr.de" %} - {% translate "Links" %}{% endblock title %} {% block main %}
-

{% trans "Links" %}

+

{% trans "Personal" %}

+
+ {% for link in personal_links %} +
+ +
+ + {% if LANGUAGE_CODE == "de" %} +
{{ link.title_de }}{{ link.subtitle }}
+
+

{{ link.desc_de }}

+ {% elif LANGUAGE_CODE == "en" %} +
{{ link.title_en }}{{ link.subtitle }}
+
+

{{ link.desc_en }}

+ {% else %} +
{{ link.title_en }}{{ link.subtitle }}
+
+

{{ link.desc_en }}

+ {% endif %} +
+
+
    + {% for keyword in link.keywords.all %} + {% if LANGUAGE_CODE == "de" %} +
  • {{ keyword.text_de }}
    • + {% elif LANGUAGE_CODE == "en" %} +
  • {{ keyword.text_en }}
    • + {% else %} +
  • {{ keyword.text_en }}
    • + {% endif %} + {% endfor %} +
  • + + {% translate "visit" %} +
    • +
+
+ +
+ {% endfor %} +
+
+
+

{% trans "Others" %}

{% for link in links %}
- +
{% if LANGUAGE_CODE == "de" %} diff --git a/gawa/start/templatetags/helper_tags.py b/gawa/start/templatetags/helper_tags.py index 639e044..d5ca8ef 100644 --- a/gawa/start/templatetags/helper_tags.py +++ b/gawa/start/templatetags/helper_tags.py @@ -21,7 +21,6 @@ def change_lang(context, lang="de", *args, **kwargs): """ path = context['request'].get_raw_uri() - logger.debug(f"requestdir: {dir(context['request'])}") url = path try: cur_lang: str = get_language() diff --git a/gawa/start/views.py b/gawa/start/views.py index d0cb392..8aacbd8 100644 --- a/gawa/start/views.py +++ b/gawa/start/views.py @@ -104,7 +104,17 @@ class Links(ListView): def get_queryset(self) -> QuerySet: object_list = Link.objects.filter( - status=True, public=True + status=True, public=True, personal=False ) - object_list = object_list.filter(public=True) return object_list + + def get_queryset_personal_links(self) -> QuerySet: + object_list = Link.objects.filter( + status=True, public=True, personal=True + ) + return object_list + + def get_context_data(self, *, object_list=None, **kwargs): + context = super().get_context_data(object_list=object_list, **kwargs) + context['personal_links'] = self.get_queryset_personal_links() + return context