sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Show correct timezone

Browse source 
Timezone is for now converted to django's TIME_ZONE setting for all users
This commit is contained in:
Sonny Bakker 2020-10-27 22:38:49 +01:00
parent 9ad6a1a7b8
commit ffefc76acc
7 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/newsreader/js/pages/homepage/App.js
View file

@ -23,6 +23,7 @@ class App extends React.Component {
feedUrl={this.props.feedUrl} feedUrl={this.props.feedUrl}
subredditUrl={this.props.subredditUrl} subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl} timelineUrl={this.props.timelineUrl}
timezone={this.props.timezone}
/> />
{this.props.error && ( {this.props.error && (
@ -38,6 +39,7 @@ class App extends React.Component {
subredditUrl={this.props.subredditUrl} subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl} timelineUrl={this.props.timelineUrl}
categoriesUrl={this.props.categoriesUrl} categoriesUrl={this.props.categoriesUrl}
timezone={this.props.timezone}
/> />
)} )}
</> </>

4
src/newsreader/js/pages/homepage/components/PostModal.js
View file

@ -72,7 +72,9 @@ class PostModal extends React.Component {
<div className="post__header"> <div className="post__header">
<h2 className={titleClassName}>{`${post.title} `}</h2> <h2 className={titleClassName}>{`${post.title} `}</h2>
<div className="post__meta-info"> <div className="post__meta-info">
<span className="post__date">{publicationDate}</span> <span className="post__date">
{publicationDate} {this.props.timezone}
</span>
{post.author && <span className="post__author">{post.author}</span>} {post.author && <span className="post__author">{post.author}</span>}
{this.props.category && ( {this.props.category && (
<span className="badge post__category" title={this.props.category.name}> <span className="badge post__category" title={this.props.category.name}>

2
src/newsreader/js/pages/homepage/components/postlist/PostItem.js
View file

@ -41,7 +41,7 @@ class PostItem extends React.Component {
<div className="posts-info"> <div className="posts-info">
<span className="posts-info__date" title={publicationDate}> <span className="posts-info__date" title={publicationDate}>
{publicationDate} {post.author && `By ${post.author}`} {publicationDate} {this.props.timezone} {post.author && `By ${post.author}`}
</span> </span>
{this.props.selected.type == CATEGORY_TYPE && ( {this.props.selected.type == CATEGORY_TYPE && (
<span className="badge"> <span className="badge">

1
src/newsreader/js/pages/homepage/components/postlist/PostList.js
View file

@ -46,6 +46,7 @@ class PostList extends React.Component {
feedUrl={this.props.feedUrl} feedUrl={this.props.feedUrl}
subredditUrl={this.props.subredditUrl} subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl} timelineUrl={this.props.timelineUrl}
timezone={this.props.timezone}
/> />
); );
}); });

7
src/newsreader/js/pages/homepage/index.js
View file

@ -11,10 +11,8 @@ const page = document.getElementById('homepage--page');
if (page) { if (page) {
const store = configureStore(); const store = configureStore();
let feedUrl = document.getElementById('feedUrl').textContent; const settings = JSON.parse(document.getElementById('homepageSettings').textContent);
let subredditUrl = document.getElementById('subredditUrl').textContent; const { feedUrl, subredditUrl, timelineUrl, categoriesUrl } = settings;
let timelineUrl = document.getElementById('timelineUrl').textContent;
let categoriesUrl = document.getElementById('categoriesUrl').textContent;
ReactDOM.render( ReactDOM.render(
<Provider store={store}> <Provider store={store}>
@ -23,6 +21,7 @@ if (page) {
subredditUrl={subredditUrl.substring(1, subredditUrl.length - 4)} subredditUrl={subredditUrl.substring(1, subredditUrl.length - 4)}
timelineUrl={timelineUrl.substring(1, timelineUrl.length - 4)} timelineUrl={timelineUrl.substring(1, timelineUrl.length - 4)}
categoriesUrl={categoriesUrl.substring(1, categoriesUrl.length - 4)} categoriesUrl={categoriesUrl.substring(1, categoriesUrl.length - 4)}
timezone={settings.timezone}
/> />
</Provider>, </Provider>,
page page

5
src/newsreader/news/core/templates/news/core/views/homepage.html
View file

@ -6,10 +6,7 @@
{% endblock content %} {% endblock content %}
{% block scripts %} {% block scripts %}
{{ feed_url|json_script:"feedUrl" }} {{ homepageSettings|json_script:"homepageSettings" }}
{{ subreddit_url|json_script:"subredditUrl" }}
{{ twitter_timeline_url|json_script:"timelineUrl" }}
{{ categories_url|json_script:"categoriesUrl" }}
{{ block.super }} {{ block.super }}
{% endblock scripts %} {% endblock scripts %}

20
src/newsreader/news/core/views.py
View file

@ -1,3 +1,4 @@
from django.conf import settings
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from django.views.generic.edit import CreateView, UpdateView from django.views.generic.edit import CreateView, UpdateView
@ -16,14 +17,17 @@ class NewsView(TemplateView):
return { return {
**context, **context,
"feed_url": reverse_lazy("news:collection:feed-update", args=(0,)), "homepageSettings": {
"subreddit_url": reverse_lazy( "feedUrl": reverse_lazy("news:collection:feed-update", args=(0,)),
"news:collection:subreddit-update", args=(0,) "subredditUrl": reverse_lazy(
), "news:collection:subreddit-update", args=(0,)
"twitter_timeline_url": reverse_lazy( ),
"news:collection:twitter-timeline-update", args=(0,) "timelineUrl": reverse_lazy(
), "news:collection:twitter-timeline-update", args=(0,)
"categories_url": reverse_lazy("news:core:category-update", args=(0,)), ),
"categoriesUrl": reverse_lazy("news:core:category-update", args=(0,)),
"timezone": settings.TIME_ZONE,
},
} }