From f7c3bc26b698be4009f16c52b57069b213bcb1b3 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sat, 22 Feb 2020 17:50:32 +0200
Subject: [PATCH] Fix Event and Feed type

---
 src/models/Event.ts                         | 3 ---
 src/models/Feed.ts                          | 9 ++++++---
 src/pages/AdminEventPage/AdminEventPage.tsx | 2 +-
 src/pages/AdminFeedPage/AdminFeedPage.tsx   | 4 ++--
 src/pages/FrontPage/FrontPage.tsx           | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/models/Event.ts b/src/models/Event.ts
index 1d3f276..638ef80 100644
--- a/src/models/Event.ts
+++ b/src/models/Event.ts
@@ -6,13 +6,10 @@ const url = `${process.env.API_URL}/events/`;
 
 export interface Event {
   id: number;
-  title: string;
   title_fi: string;
   title_en: string;
-  description: string;
   description_fi: string;
   description_en: string;
-  content: string;
   content_fi: string;
   content_en: string;
   start_time: string;
diff --git a/src/models/Feed.ts b/src/models/Feed.ts
index 6d7dac8..1d51829 100644
--- a/src/models/Feed.ts
+++ b/src/models/Feed.ts
@@ -5,9 +5,12 @@ const url = `${process.env.API_URL}/feed/`;
 
 export interface Post {
   id: number;
-  title: string;
-  description: string;
-  content: string;
+  title_fi: string;
+  title_en: string;
+  description_fi: string;
+  description_en: string;
+  content_fi: string;
+  content_en: string;
   publish_time: string;
   autohide: string;
   tag_id: number[];
diff --git a/src/pages/AdminEventPage/AdminEventPage.tsx b/src/pages/AdminEventPage/AdminEventPage.tsx
index 60ee59a..fb7a23f 100644
--- a/src/pages/AdminEventPage/AdminEventPage.tsx
+++ b/src/pages/AdminEventPage/AdminEventPage.tsx
@@ -91,7 +91,7 @@ class AdminEventPage extends React.Component<AdminEventPageProps, AdminEventPage
         <tbody>
           {events.map(event => (
             <tr key={event.id}>
-              <td><Anchor to={`/admin/events/${event.id}`}>{event.title}</Anchor></td>
+              <td><Anchor to={`/admin/events/${event.id}`}>{event.title_fi}</Anchor></td>
               <td>{formatRelative(new Date(event.start_time), new Date())}</td>
               <td>{formatRelative(new Date(event.end_time), new Date())}</td>
             </tr>
diff --git a/src/pages/AdminFeedPage/AdminFeedPage.tsx b/src/pages/AdminFeedPage/AdminFeedPage.tsx
index 23fea7f..a0b6d09 100644
--- a/src/pages/AdminFeedPage/AdminFeedPage.tsx
+++ b/src/pages/AdminFeedPage/AdminFeedPage.tsx
@@ -91,8 +91,8 @@ class AdminFeedPage extends React.Component<AdminFeedPageProps, AdminFeedPageSta
         <tbody>
           {feed.map(post => (
             <tr key={post.id}>
-              <td><Anchor to={`/admin/feed/${post.id}`}>{post.title}</Anchor></td>
-              <td>{post.description}</td>
+              <td><Anchor to={`/admin/feed/${post.id}`}>{post.title_fi}</Anchor></td>
+              <td>{post.description_fi}</td>
               <td>{formatRelative(new Date(post.publish_time), new Date())}</td>
             </tr>
           ))}
diff --git a/src/pages/FrontPage/FrontPage.tsx b/src/pages/FrontPage/FrontPage.tsx
index 4179919..3e58329 100644
--- a/src/pages/FrontPage/FrontPage.tsx
+++ b/src/pages/FrontPage/FrontPage.tsx
@@ -138,9 +138,9 @@ class FrontPage extends React.Component<FrontPageProps, FrontPageState> {
           {events.map(event => (
             <Card
               key={event.id}
-              title={event.title}
+              title={event.title_fi}
               start_time={event.start_time}
-              text={event.description}
+              text={event.description_fi}
               link={`/events/${event.id}`}
               image={event.tags[0].icon}
               button={
@@ -172,9 +172,9 @@ class FrontPage extends React.Component<FrontPageProps, FrontPageState> {
           {feed.map(inst => (
             <Card
               key={inst.id}
-              title={inst.title}
+              title={inst.title_fi}
               start_time={inst.publish_time}
-              text={inst.description}
+              text={inst.description_fi}
               link={`/feed/${inst.id}`}
               button={
                 <Button type={ButtonType.Filled} onClick={() => { }}>