From 0c8318be764a68115012834cbec2506592305733 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 19 Aug 2018 17:07:41 +0300 Subject: [PATCH] Add second pass rendering for async initial data --- src/components/Post/Post.scss | 6 -- src/components/Post/Post.tsx | 20 ------ src/components/Post/index.ts | 2 - src/models/{Post.ts => Event.ts} | 8 +-- src/pages/CommonPage/CommonPage.tsx | 2 +- src/pages/FrontPage/FrontPage.tsx | 98 +++++++++++++++++++++-------- src/routes.tsx | 2 +- src/server/App.tsx | 4 +- src/server/StaticContext.ts | 4 ++ src/server/index.ts | 35 ++++++++++- 10 files changed, 118 insertions(+), 63 deletions(-) delete mode 100644 src/components/Post/Post.scss delete mode 100644 src/components/Post/Post.tsx delete mode 100644 src/components/Post/index.ts rename src/models/{Post.ts => Event.ts} (57%) create mode 100644 src/server/StaticContext.ts diff --git a/src/components/Post/Post.scss b/src/components/Post/Post.scss deleted file mode 100644 index 1d4aa61..0000000 --- a/src/components/Post/Post.scss +++ /dev/null @@ -1,6 +0,0 @@ -.post { - &:hover { - text-decoration: underline; - cursor: pointer; - } -} diff --git a/src/components/Post/Post.tsx b/src/components/Post/Post.tsx deleted file mode 100644 index 2c84048..0000000 --- a/src/components/Post/Post.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import * as React from "react"; -import "./Post.scss"; -import { Post as PostInterface } from "../../models/Post"; - -export interface PostProps { - post: PostInterface; -} - -class Post extends React.Component { - render() { - const { title, author, id } = this.props.post; - return ( -
- #{ id }: { title } from { author } -
- ); - } -} - -export default Post; diff --git a/src/components/Post/index.ts b/src/components/Post/index.ts deleted file mode 100644 index 32f83ed..0000000 --- a/src/components/Post/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import Post from "./Post"; -export default Post; diff --git a/src/models/Post.ts b/src/models/Event.ts similarity index 57% rename from src/models/Post.ts rename to src/models/Event.ts index c88c17e..2143739 100644 --- a/src/models/Post.ts +++ b/src/models/Event.ts @@ -1,14 +1,14 @@ import axios from "axios"; -const url = `${process.env.API_URL}/posts`; +const url = `${process.env.API_URL}/events`; -export interface Post { +export interface Event { id: number; title: string; - author: string; + description: string; } -export async function getPosts(): Promise { +export async function getEvents(): Promise { try { const resp = await axios.get(url); return resp.data; diff --git a/src/pages/CommonPage/CommonPage.tsx b/src/pages/CommonPage/CommonPage.tsx index 8f1eb42..f9c6f4a 100644 --- a/src/pages/CommonPage/CommonPage.tsx +++ b/src/pages/CommonPage/CommonPage.tsx @@ -13,7 +13,7 @@ class CommonPage extends React.Component { return (
- +