[Merge] develop 과 merge #32

why
feed main 페이지를 보여주기 위해서

how
규종님이 작업하신 feed write 컨테이너 붙임
feed -> Feed 로 폴더이름 변경

client/src/__test__/components/WritingFeed.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import '@testing-library/jest-dom/extend-expect';
 import { render, cleanup } from '@testing-library/react';
-import WritingFeed from '../../composition/feed/WritingFeed';
+import WritingFeed from '../../composition/Feed/WritingFeed';
 import { ThemeProvider } from 'styled-components';
 import theme from '../../style/theme';
 

client/src/composition/feed/Comment.tsx

@@ -1,5 +1,5 @@
-import React from "react";
-import styled from "styled-components";
+import React from 'react';
+import styled from 'styled-components';
 
 interface ITest {
   size: string;

client/src/composition/feed/Feed.tsx

@@ -1,10 +1,9 @@
-import React from "react";
-import styled from "styled-components";
-import FeedHeader from "./FeedHeader";
-import FeedBody from "./FeedBody";
-import FeedFooter from "./FeedFooter";
-import Comment from "./Comment";
-import buttons from "../../image/buttons.png";
+import React from 'react';
+import styled from 'styled-components';
+import FeedHeader from './FeedHeader';
+import FeedBody from './FeedBody';
+import FeedFooter from './FeedFooter';
+import Comment from './Comment';
 
 const FeedDiv = styled.div`
   ${props => props.theme.borders.feedBorder};
@@ -20,7 +19,7 @@ const FeedContentDiv = styled.div`
 const FeedEditDiv = styled.span`
   float: right;
   cursor: pointer;
-  background-image: url(${buttons});
+  background-image: url('/images/buttons.png');
   background-repeat: no-repeat;
   background-size: 64px 134px;
   background-position: 0 -66px;

client/src/composition/feed/FeedContainer.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import FeedPresentor from './FeedPresentor';
-import WritingFeed from '../../composition/feed/WritingFeed';
+import WritingFeedContainer from './WritingFeed';
 
 const FeedContainer: React.FC = () => {
   return (
     <>
-      <WritingFeed />
+      <WritingFeedContainer />
       <FeedPresentor />
     </>
   );

client/src/composition/feed/index.tsx

@@ -1,8 +1,9 @@
-import React, { useState, useMemo, useEffect } from "react";
-import Feed from "./Feed";
-import { useQuery } from "@apollo/react-hooks";
-import gql from "graphql-tag";
-import useScrollEnd from "../../hooks/useScrollEnd";
+import React, { useState, useMemo, useEffect } from 'react';
+import Feed from './Feed';
+import { useQuery } from '@apollo/react-hooks';
+import gql from 'graphql-tag';
+import useScrollEnd from '../../hooks/useScrollEnd';
+import WritingFeedContainer from './WritingFeed';
 
 interface IFeed {
   content: string;
@@ -29,7 +30,7 @@ interface FeedVars {
 const OFFSET = 2;
 const FeedContainer = () => {
   const [feeds, setFeeds] = useState<IFeed[]>([]);
-  const [cursor, setCursor] = useState<string>("9999-12-31T09:29:26.050Z");
+  const [cursor, setCursor] = useState<string>('9999-12-31T09:29:26.050Z');
 
   const checkEnd = useScrollEnd();
   // hooks 에서 useQuery 1 부터 시작
@@ -73,6 +74,7 @@ const FeedContainer = () => {
 
   return (
     <>
+      <WritingFeedContainer />
       {feeds.map(feed => (
         <Feed content={feed.content} createdAt={feed.createdAt} />
       ))}

client/src/pages/Main/index.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import Feed from '../../composition/feed';
+import FeedContainer from '../../composition/Feed';
 
 const SignUp: React.FC = () => {
-  return <Feed />;
+  return <FeedContainer />;
 };
 
 export default SignUp;