diff --git a/package.json b/package.json index 83936d82..9e11d087 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,19 @@ "@types/node": "12.12.7", "@types/react": "16.9.11", "@types/react-dom": "16.9.4", + "@types/react-router-dom": "^5.1.2", + "@types/styled-components": "^4.4.0", + "@types/styled-theming": "^2.2.2", "apollo-boost": "^0.4.4", "graphql": "^14.5.8", "react": "^16.11.0", "react-dom": "^16.11.0", "react-router-dom": "^5.1.2", "react-scripts": "3.2.0", + "react-toastify": "^5.4.1", "snyk": "^1.244.0", + "styled-components": "^4.4.1", + "styled-theming": "^2.2.0", "typescript": "3.7.2" }, "scripts": { diff --git a/src/App.css b/src/App.css deleted file mode 100644 index afc38857..00000000 --- a/src/App.css +++ /dev/null @@ -1,22 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #09d3ac; -} diff --git a/src/App.tsx b/src/App.tsx index 226ee631..a7b969b2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,26 +1,46 @@ -import React from 'react'; -import logo from './logo.svg'; -import './App.css'; +import React from "react"; +import styled, { ThemeProvider } from "styled-components"; +import { GlobalStyles } from "./styles/GlobalStyle"; +import { Header } from "./sections/header/Header"; +import { Footer } from "./sections/footer/Footer"; +import { Navigation } from "./sections/navigation/Navigation"; +import { Content } from "./sections/content/Content"; +import { ApolloProvider } from "@apollo/react-hooks"; +import { BrowserRouter } from "react-router-dom"; +import ApolloClient from "apollo-boost"; + +const client = new ApolloClient({ + uri: "http://localhost:3001" +}); + +const Container = styled.div` + display: grid; + grid-template-areas: + "header header header" + "nav content content" + "footer footer footer"; + grid-template-columns: 200px 1fr 200px; + grid-template-rows: auto 1fr auto; + gap: 10px; + height: 100vh; +`; const App: React.FC = () => { return ( -
-
- logo -

- Edit src/App.tsx and save to reload. -

- - Learn React - -
-
+ + + + + +
+ + +