Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#42 - Migrate to next #43

Merged
merged 1 commit into from
Oct 14, 2020
Merged

#42 - Migrate to next #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

.next

# dependencies
/node_modules

Expand Down
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"next": "^9.5.3",
"paginate-array": "^2.1.0",
"react": "^16.10.2",
"react-content-loader": "^5.0.0",
Expand All @@ -15,8 +16,9 @@
"reactstrap": "^8.1.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"dev": "next dev",
"start": "next start",
"build": "next build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
Expand Down
13 changes: 0 additions & 13 deletions src/components/404Page.js
View file
Open in desktop

This file was deleted.

51 changes: 28 additions & 23 deletions src/components/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,48 @@ import {
NavbarToggler,
NavbarBrand,
Nav,
NavItem,
NavLink } from 'reactstrap';
import { Link } from 'react-router-dom'
} from 'reactstrap';
import { useRouter } from 'next/router'

const Links = [
{ name: 'Top', linkTo: '/' },
{ name: 'New', linkTo: '/new' },
{ name: 'Best', linkTo: '/best' },
{ name: 'Ask', linkTo: '/ask' },
{ name: 'Show', linkTo: '/show' },
{ name: 'Jobs', linkTo: '/jobs' },
]

const GenLink = ({ name, linkTo }) => {
const router = useRouter()
return (
<li className="nav-item">
<a
className="nav-link"
onClick={() => router.push(linkTo)}
style={{ cursor: 'pointer' }}>{name}</a>
</li>
)
}

const NavBar = () => {
const [isOpen, setIsOpen] = useState(false)

const toggle = () => {
const toggle = () => {
setIsOpen(!isOpen)
}

return (
<div>
<Navbar color="light" light expand="md">
<NavbarBrand tag={Link} to="/">HN React</NavbarBrand>
<NavbarBrand href='/'>HN React</NavbarBrand>
<Fragment>
<NavbarToggler onClick={toggle} />
<Collapse isOpen={isOpen} navbar>
<Nav className="ml-auto" navbar>
<NavItem>
<NavLink tag={Link} to="/">Top</NavLink>
</NavItem>
<NavItem>
<NavLink tag={Link} to="/new">New</NavLink>
</NavItem>
<NavItem>
<NavLink tag={Link} to="/best">Best</NavLink>
</NavItem>
<NavItem>
<NavLink tag={Link} to="/ask">Ask</NavLink>
</NavItem>
<NavItem>
<NavLink tag={Link} to="/show">Show</NavLink>
</NavItem>
<NavItem>
<NavLink tag={Link} to="/jobs">Jobs</NavLink>
</NavItem>
{
Links.map((each, index) => <GenLink key={index} {...each} />)
}
</Nav>
</Collapse>
</Fragment>
Expand Down
16 changes: 16 additions & 0 deletions src/pages/404.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import Link from 'next/link'

const NotFound = () => {
return (
<>
<div>404 Not Found</div>
<Link href="/">
<a>Click here</a>
</Link>{' '}
to go back to home page
</>
);
}

export default NotFound
21 changes: 21 additions & 0 deletions src/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import '../styles/index.css'
import 'bootstrap/dist/css/bootstrap.min.css';
import Head from 'next/head'
import NavBar from '../components/NavBar'

function MyApp({ Component, pageProps }) {
return (
<div className="main-container">
<Head>
<title>HN React</title>
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
</Head>
<NavBar />
<div className="container">
<Component {...pageProps} />
</div>
</div>
)
}

export default MyApp
8 changes: 8 additions & 0 deletions src/pages/ask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="askstories" key="4" />


export default Index
8 changes: 8 additions & 0 deletions src/pages/best.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="beststories" key="3" />


export default Index
8 changes: 8 additions & 0 deletions src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="topstories" key="1" />


export default Index
8 changes: 8 additions & 0 deletions src/pages/jobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="jobstories" key="6" />


export default Index
8 changes: 8 additions & 0 deletions src/pages/new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="newstories" key="2" />


export default Index
8 changes: 8 additions & 0 deletions src/pages/show.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import Stories from '../components/Stories'


const Index = () => <Stories storytype="showstories" key="5" />


export default Index
0 src/index.css → src/styles/index.css
View file
Open in desktop
File renamed without changes.
Loading