Format date, style source

This commit is contained in:
Christian Cueni 2020-05-27 11:51:43 +02:00
parent 8ce5401311
commit 12c5bf8d90
5 changed files with 28 additions and 13 deletions

View File

@ -2,10 +2,10 @@
<div class="news__teasers teasers"> <div class="news__teasers teasers">
<div v-for="teaser in newsTeasers" :key="teaser.id" class="teasers__teaser teaser"> <div v-for="teaser in newsTeasers" :key="teaser.id" class="teasers__teaser teaser">
<img :src="teaser.imageUrl" class="teaser__image" /> <img :src="teaser.imageUrl" class="teaser__image" />
<p class="teaser__image-source">{{teaser.imageSource}}</p> <p class="teaser__image-source"><a class="hep-link" :href="teaser.imageSource">Quelle</a></p>
<h3 class="teaser__title">{{teaser.title}}</h3> <h4 class="teaser__title">{{teaser.title}}</h4>
<p class="teaser__description">{{teaser.description}}</p> <p class="teaser__description">{{teaser.description}}</p>
<p class="teaser__date">{{teaser.date}}</p> <p class="teaser__date">{{teaser.displayDate}}</p>
</div> </div>
</div> </div>
</template> </template>
@ -67,16 +67,22 @@
.teaser { .teaser {
margin-bottom: $large-spacing;
&__image { &__image {
display: block; display: block;
max-width: 100%; max-width: 100%;
// max-height: 100%;
// width: auto;
height: auto; height: auto;
@include desktop { @include desktop {
max-width: $news_width; max-width: $news_width;
} }
} }
&__date {
font-family: $sans-serif-font-family;
font-weight: $font-weight-regular;
color: $color-silver-dark;
}
} }
</style> </style>

View File

@ -7,7 +7,7 @@ query NewsTeasers {
title title
imageUrl imageUrl
newsArticleUrl newsArticleUrl
date displayDate
imageSource imageSource
} }
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="news"> <div class="news">
<h2 class="news__heading">News</h2> <h1 class="news__heading">News</h1>
<NewsTeasers /> <NewsTeasers />
</div> </div>
</template> </template>
@ -16,14 +16,17 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_variables.scss"; @import "@/styles/_variables.scss";
@import "@/styles/_functions.scss";
@import "@/styles/_mixins.scss"; @import "@/styles/_mixins.scss";
$news_width: 550px;
$image_height: 254px;
.news { .news {
padding: 0 $large-spacing; padding: 0 $large-spacing;
max-width: 800px;
margin: 0 auto;
@include desktop {
max-width: unset;
margin: 0;
}
} }
</style> </style>

View File

@ -1,3 +1,4 @@
import graphene
from graphene import relay from graphene import relay
from graphene_django import DjangoObjectType from graphene_django import DjangoObjectType
from graphene_django.filter import DjangoFilterConnectionField from graphene_django.filter import DjangoFilterConnectionField
@ -6,15 +7,20 @@ from newsteaser.models import NewsTeaser
class NewsTeaserNode(DjangoObjectType): class NewsTeaserNode(DjangoObjectType):
display_date = graphene.String()
class Meta: class Meta:
model = NewsTeaser model = NewsTeaser
filter_fields = [] filter_fields = ['date',]
interfaces = (relay.Node,) interfaces = (relay.Node,)
def resolve_display_date(self, *args, **kwargs):
return self.date.strftime("%d. %B %Y")
class AllNewsTeasersQuery(object): class AllNewsTeasersQuery(object):
news_teasers = DjangoFilterConnectionField(NewsTeaserNode) news_teasers = DjangoFilterConnectionField(NewsTeaserNode)
def resolve_news_teasers(self, info, **kwargs): def resolve_news_teasers(self, info, **kwargs):
return NewsTeaser.objects.all().order_by('order_id') return NewsTeaser.objects.all().order_by('order_id')

View File

@ -23,7 +23,7 @@ class NewsTeaserTests(TestCase):
title title
imageUrl imageUrl
newsArticleUrl newsArticleUrl
date displayDate
imageSource imageSource
} }
} }