diff --git a/client/src/components/NewsTeasers.vue b/client/src/components/NewsTeasers.vue index 168d0be6..62a47182 100644 --- a/client/src/components/NewsTeasers.vue +++ b/client/src/components/NewsTeasers.vue @@ -3,7 +3,7 @@
-

Quelle {{teaser.imageSource}}

+

Quelle {{teaser.imageSource}}

{{teaser.title}}

{{teaser.description}}

{{teaser.displayDate}}

diff --git a/client/src/styles/_typography.scss b/client/src/styles/_typography.scss index 0c121c71..d30f94b4 100644 --- a/client/src/styles/_typography.scss +++ b/client/src/styles/_typography.scss @@ -81,7 +81,7 @@ input, textarea, select, button { color: $color-brand-dark; } -.tiny { +.tiny-text { font-size: toRem(11px); font-family: $sans-serif-font-family; font-weight: $font-weight-regular; diff --git a/server/api/schema_public.py b/server/api/schema_public.py index 5e070259..3f344510 100644 --- a/server/api/schema_public.py +++ b/server/api/schema_public.py @@ -2,7 +2,7 @@ import graphene from django.conf import settings from graphene_django.debug import DjangoDebug -from newsteaser.schema_public import AllNewsTeasersQuery +from news.schema_public import AllNewsTeasersQuery from users.mutations_public import UserMutations from registration.mutations_public import RegistrationMutations diff --git a/server/core/settings.py b/server/core/settings.py index 66757e9a..a1e99f6a 100644 --- a/server/core/settings.py +++ b/server/core/settings.py @@ -57,7 +57,7 @@ INSTALLED_APPS = [ 'surveys', 'notes', 'registration', - 'newsteaser', + 'news', 'wagtail.contrib.forms', 'wagtail.contrib.redirects', diff --git a/server/newsteaser/__init__.py b/server/news/__init__.py similarity index 100% rename from server/newsteaser/__init__.py rename to server/news/__init__.py diff --git a/server/newsteaser/admin.py b/server/news/admin.py similarity index 81% rename from server/newsteaser/admin.py rename to server/news/admin.py index 838b177c..d52dda6f 100644 --- a/server/newsteaser/admin.py +++ b/server/news/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from newsteaser.models import NewsTeaser +from news.models import NewsTeaser @admin.register(NewsTeaser) diff --git a/server/newsteaser/apps.py b/server/news/apps.py similarity index 73% rename from server/newsteaser/apps.py rename to server/news/apps.py index 874c4b14..78e39c93 100644 --- a/server/newsteaser/apps.py +++ b/server/news/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class UserConfig(AppConfig): - name = 'newsteaser' + name = 'news' diff --git a/server/newsteaser/date_helper.py b/server/news/date_helper.py similarity index 100% rename from server/newsteaser/date_helper.py rename to server/news/date_helper.py diff --git a/server/newsteaser/factories.py b/server/news/factories.py similarity index 94% rename from server/newsteaser/factories.py rename to server/news/factories.py index 1c5cc99f..bb2701f1 100644 --- a/server/newsteaser/factories.py +++ b/server/news/factories.py @@ -6,7 +6,7 @@ from factory.fuzzy import FuzzyDateTime from pytz import UTC from core.factories import fake, fake_title -from newsteaser.models import NewsTeaser +from news.models import NewsTeaser class NewsTeaserFactory(factory.django.DjangoModelFactory): diff --git a/server/newsteaser/management/__init__.py b/server/news/management/__init__.py similarity index 100% rename from server/newsteaser/management/__init__.py rename to server/news/management/__init__.py diff --git a/server/newsteaser/management/commands/__init__.py b/server/news/management/commands/__init__.py similarity index 100% rename from server/newsteaser/management/commands/__init__.py rename to server/news/management/commands/__init__.py diff --git a/server/newsteaser/management/commands/dummy_news.py b/server/news/management/commands/dummy_news.py similarity index 71% rename from server/newsteaser/management/commands/dummy_news.py rename to server/news/management/commands/dummy_news.py index d614e26d..6fcb2f02 100644 --- a/server/newsteaser/management/commands/dummy_news.py +++ b/server/news/management/commands/dummy_news.py @@ -1,7 +1,7 @@ from django.core.management import BaseCommand -from newsteaser.factories import NewsTeaserFactory -from newsteaser.models import NewsTeaser +from news.factories import NewsTeaserFactory +from news.models import NewsTeaser class Command(BaseCommand): diff --git a/server/newsteaser/migrations/0001_initial.py b/server/news/migrations/0001_initial.py similarity index 100% rename from server/newsteaser/migrations/0001_initial.py rename to server/news/migrations/0001_initial.py diff --git a/server/newsteaser/migrations/__init__.py b/server/news/migrations/__init__.py similarity index 100% rename from server/newsteaser/migrations/__init__.py rename to server/news/migrations/__init__.py diff --git a/server/newsteaser/models.py b/server/news/models.py similarity index 100% rename from server/newsteaser/models.py rename to server/news/models.py diff --git a/server/newsteaser/schema_public.py b/server/news/schema_public.py similarity index 84% rename from server/newsteaser/schema_public.py rename to server/news/schema_public.py index afbac9ae..34f1b307 100644 --- a/server/newsteaser/schema_public.py +++ b/server/news/schema_public.py @@ -5,8 +5,8 @@ from graphene import relay from graphene_django import DjangoObjectType from graphene_django.filter import DjangoFilterConnectionField -from newsteaser.date_helper import month_to_german_string -from newsteaser.models import NewsTeaser +from news.date_helper import month_to_german_string +from news.models import NewsTeaser class NewsTeaserNode(DjangoObjectType): @@ -18,7 +18,7 @@ class NewsTeaserNode(DjangoObjectType): interfaces = (relay.Node,) def resolve_display_date(self, *args, **kwargs): - # play it safe, locale might not be installed in platform + # play it safe, locale might not be installed on platform try: locale.setlocale(locale.LC_TIME, "de_DE") return self.date.strftime("%-d. %B %Y") diff --git a/server/newsteaser/tests/__init__.py b/server/news/tests/__init__.py similarity index 100% rename from server/newsteaser/tests/__init__.py rename to server/news/tests/__init__.py diff --git a/server/newsteaser/tests/test_newsteaser.py b/server/news/tests/test_newsteaser.py similarity index 95% rename from server/newsteaser/tests/test_newsteaser.py rename to server/news/tests/test_newsteaser.py index 4cf3f98d..4d86cb47 100644 --- a/server/newsteaser/tests/test_newsteaser.py +++ b/server/news/tests/test_newsteaser.py @@ -2,7 +2,7 @@ from unittest import TestCase from graphene.test import Client from api.schema_public import schema -from newsteaser.factories import NewsTeaserFactory +from news.factories import NewsTeaserFactory class NewsTeaserTests(TestCase):