diff --git a/src/newsreader/js/pages/homepage/App.js b/src/newsreader/js/pages/homepage/App.js
index 77b6222..b66d256 100644
--- a/src/newsreader/js/pages/homepage/App.js
+++ b/src/newsreader/js/pages/homepage/App.js
@@ -23,6 +23,7 @@ class App extends React.Component {
feedUrl={this.props.feedUrl}
subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl}
+ timezone={this.props.timezone}
/>
{this.props.error && (
@@ -38,6 +39,7 @@ class App extends React.Component {
subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl}
categoriesUrl={this.props.categoriesUrl}
+ timezone={this.props.timezone}
/>
)}
>
diff --git a/src/newsreader/js/pages/homepage/components/PostModal.js b/src/newsreader/js/pages/homepage/components/PostModal.js
index 5196102..153f2a8 100644
--- a/src/newsreader/js/pages/homepage/components/PostModal.js
+++ b/src/newsreader/js/pages/homepage/components/PostModal.js
@@ -72,7 +72,9 @@ class PostModal extends React.Component {
{`${post.title} `}
-
{publicationDate}
+
+ {publicationDate} {this.props.timezone}
+
{post.author &&
{post.author}}
{this.props.category && (
diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
index f69a463..90a08f2 100644
--- a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
+++ b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
@@ -41,7 +41,7 @@ class PostItem extends React.Component {
- {publicationDate} {post.author && `By ${post.author}`}
+ {publicationDate} {this.props.timezone} {post.author && `By ${post.author}`}
{this.props.selected.type == CATEGORY_TYPE && (
diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostList.js b/src/newsreader/js/pages/homepage/components/postlist/PostList.js
index cff2437..7a5422e 100644
--- a/src/newsreader/js/pages/homepage/components/postlist/PostList.js
+++ b/src/newsreader/js/pages/homepage/components/postlist/PostList.js
@@ -46,6 +46,7 @@ class PostList extends React.Component {
feedUrl={this.props.feedUrl}
subredditUrl={this.props.subredditUrl}
timelineUrl={this.props.timelineUrl}
+ timezone={this.props.timezone}
/>
);
});
diff --git a/src/newsreader/js/pages/homepage/index.js b/src/newsreader/js/pages/homepage/index.js
index 394a06c..5279482 100644
--- a/src/newsreader/js/pages/homepage/index.js
+++ b/src/newsreader/js/pages/homepage/index.js
@@ -11,10 +11,8 @@ const page = document.getElementById('homepage--page');
if (page) {
const store = configureStore();
- let feedUrl = document.getElementById('feedUrl').textContent;
- let subredditUrl = document.getElementById('subredditUrl').textContent;
- let timelineUrl = document.getElementById('timelineUrl').textContent;
- let categoriesUrl = document.getElementById('categoriesUrl').textContent;
+ const settings = JSON.parse(document.getElementById('homepageSettings').textContent);
+ const { feedUrl, subredditUrl, timelineUrl, categoriesUrl } = settings;
ReactDOM.render(
@@ -23,6 +21,7 @@ if (page) {
subredditUrl={subredditUrl.substring(1, subredditUrl.length - 4)}
timelineUrl={timelineUrl.substring(1, timelineUrl.length - 4)}
categoriesUrl={categoriesUrl.substring(1, categoriesUrl.length - 4)}
+ timezone={settings.timezone}
/>
,
page
diff --git a/src/newsreader/news/core/templates/news/core/views/homepage.html b/src/newsreader/news/core/templates/news/core/views/homepage.html
index 502ef63..a135314 100644
--- a/src/newsreader/news/core/templates/news/core/views/homepage.html
+++ b/src/newsreader/news/core/templates/news/core/views/homepage.html
@@ -6,10 +6,7 @@
{% endblock content %}
{% block scripts %}
- {{ feed_url|json_script:"feedUrl" }}
- {{ subreddit_url|json_script:"subredditUrl" }}
- {{ twitter_timeline_url|json_script:"timelineUrl" }}
- {{ categories_url|json_script:"categoriesUrl" }}
+ {{ homepageSettings|json_script:"homepageSettings" }}
{{ block.super }}
{% endblock scripts %}
diff --git a/src/newsreader/news/core/views.py b/src/newsreader/news/core/views.py
index 981e7b2..18ec95c 100644
--- a/src/newsreader/news/core/views.py
+++ b/src/newsreader/news/core/views.py
@@ -1,3 +1,4 @@
+from django.conf import settings
from django.urls import reverse_lazy
from django.views.generic.base import TemplateView
from django.views.generic.edit import CreateView, UpdateView
@@ -16,14 +17,17 @@ class NewsView(TemplateView):
return {
**context,
- "feed_url": reverse_lazy("news:collection:feed-update", args=(0,)),
- "subreddit_url": reverse_lazy(
- "news:collection:subreddit-update", args=(0,)
- ),
- "twitter_timeline_url": reverse_lazy(
- "news:collection:twitter-timeline-update", args=(0,)
- ),
- "categories_url": reverse_lazy("news:core:category-update", args=(0,)),
+ "homepageSettings": {
+ "feedUrl": reverse_lazy("news:collection:feed-update", args=(0,)),
+ "subredditUrl": reverse_lazy(
+ "news:collection:subreddit-update", args=(0,)
+ ),
+ "timelineUrl": reverse_lazy(
+ "news:collection:twitter-timeline-update", args=(0,)
+ ),
+ "categoriesUrl": reverse_lazy("news:core:category-update", args=(0,)),
+ "timezone": settings.TIME_ZONE,
+ },
}