Skip to content

Commit

Permalink
pre-release v2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Roophee committed Jun 11, 2021
1 parent cb93f63 commit e86ab6c
Show file tree
Hide file tree
Showing 38 changed files with 2,694 additions and 1,426 deletions.
9 changes: 9 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/.git
/.vscode
/.idea
/.cache
/.history
/dist
node_modules
.DS_Store
DS_Store?
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/styled_news_app.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "4.0.3",
"styled-components": "^5.3.0",
"web-vitals": "^1.0.1"
},
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
name="description"
content="Web site created using create-react-app"
/>
<link href="https://fonts.googleapis.com/css2?family=Ubuntu+Mono:wght@700&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Cormorant+Garamond:ital,wght@0,300;0,400;0,500;0,600;0,700;1,400&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;700;800&display=swap" rel="stylesheet">
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down
38 changes: 0 additions & 38 deletions src/App.css

This file was deleted.

54 changes: 38 additions & 16 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,45 @@
import logo from './logo.svg';
import './App.css';
// import './App.css';
import Header from './components/Header'
import Main from './components/Main'
import Footer from './components/Footer'
import QueryStateProvider from './hoc/QueryStateProvider'
import { createGlobalStyle } from 'styled-components'

const GlobalStyle = createGlobalStyle`
:root {
font-family: 'Cormorant Garamond', serif;
font-family: 'Open Sans', sans-serif;
font-weight: 300;
font-size: 18px;
}
*{
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
background: #EEEEEE;
}
.App {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
min-height: 100vh;
}
`

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<GlobalStyle/>
<Header/>
<QueryStateProvider>
<Main/>
</QueryStateProvider>
<Footer/>
</div>
);
}
Expand Down
8 changes: 0 additions & 8 deletions src/App.test.js

This file was deleted.

15 changes: 15 additions & 0 deletions src/blank_elements/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import styled from 'styled-components';

const StyledButton = styled.button`
margin: 0 5px;
padding: 5px;
`;

export default function Button(props) {
return (
<StyledButton {...props}>
{props.children}
</StyledButton>
)
}
19 changes: 19 additions & 0 deletions src/blank_elements/FlexContainer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import styled from 'styled-components';

const FlexContainer = styled.div`
display: flex;
flex-direction: ${props => props.directionColumn ? 'column' : 'row'};
justify-content: ${props => props.justifyContent || 'center'};
align-items: ${props => props.alignItems || 'center'};
align-self: ${props => props.alignSelf };
flex-wrap: ${props => props.wrap ? 'wrap' : 'nowrap'};
`

export default function Flex ( {children, ...props}) {
return (
<FlexContainer {...props}>
{children}
</FlexContainer>
)
}
18 changes: 18 additions & 0 deletions src/blank_elements/Link.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import styled from 'styled-components';

const StyledLink = styled.a`
text-decoration: none;
color: black;
&:hover{
color: ${props => props.hoverColor || 'black'};
}
`

export default function Link({children, ...props}){
return(
<StyledLink {...props}>
{children}
</StyledLink>
)
}
35 changes: 35 additions & 0 deletions src/components/Account.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from 'react';
import styled from 'styled-components';
import Flex from '../blank_elements/FlexContainer';
import HeaderNav from './HeaderNav'

const StyledUsersInitials = styled.div`
width: 40px;
height: 40px;
border: 1px solid #000;
border-radius: 50%;
background: brown;
margin-right: 20px;
visibility: ${props => props.visibility || 'hidden'};
`
const StyledButton = styled.button.attrs(props => ({
type: 'button',
}))`
padding: 5px 15px;
font-size: .7rem;
font-weight: 500;
`

// const

export default function Account() {
return (
<Flex>
{/*<StyledUsersInitials/>*/}
<HeaderNav/>
{/*<StyledButton>*/}
{/* Login*/}
{/*</StyledButton>*/}
</Flex>
)
}
Loading

0 comments on commit e86ab6c

Please sign in to comment.