This commit is contained in:
Sergey Yarkov 2020-02-29 14:41:05 +03:00
parent f07efd2dfc
commit c277275875
6 changed files with 18 additions and 17 deletions

View File

@ -5,7 +5,6 @@ import { withApollo } from "../utils/apollo";
const Nav = () => { const Nav = () => {
return ( return (
<div>
<Query query={CATEGORIES_QUERY} id={null}> <Query query={CATEGORIES_QUERY} id={null}>
{({ data: { categories } }) => { {({ data: { categories } }) => {
return ( return (
@ -39,8 +38,7 @@ const Nav = () => {
); );
}} }}
</Query> </Query>
</div>
); );
}; };
export default Nav; export default Nav

View File

@ -5,7 +5,11 @@ const Query = ({ children, query, id }) => {
variables: {id} variables: {id}
}) })
if (loading) return <p>loading...</p> if (loading) return (
<div className="uk-container">
<p>loading...</p>
</div>
)
if (error) return <p>Error: {JSON.stringify(error)}</p> if (error) return <p>Error: {JSON.stringify(error)}</p>
return children({ data }) return children({ data })
} }

View File

@ -4,5 +4,8 @@ const withCSS = require('@zeit/next-css')
module.exports = withCSS({ module.exports = withCSS({
env: { env: {
API_URL: process.env.API_URL API_URL: process.env.API_URL
},
devIndicators: {
autoPrerender: false,
} }
}) })

View File

@ -11,10 +11,11 @@ const Article = () => {
const router = useRouter(); const router = useRouter();
return ( return (
<Layout titlePage={`Article id: ${router.query.id}`}>
<Query query={ARTICLE_QUERY} id={router.query.id}> <Query query={ARTICLE_QUERY} id={router.query.id}>
{({ data: { article } }) => { {({ data: { article } }) => {
return ( return (
<Layout titlePage={article.title}>
<div> <div>
<div <div
id="banner" id="banner"
@ -35,10 +36,11 @@ const Article = () => {
</div> </div>
</div> </div>
</div> </div>
</Layout>
); );
}} }}
</Query> </Query>
</Layout>
); );
}; };

View File

@ -10,10 +10,11 @@ const Category = () => {
const router = useRouter(); const router = useRouter();
return ( return (
<>
<Layout titlePage={`Category id: ${router.query.id}`}>
<Query query={CATEGORY_ARTICLES_QUERY} id={router.query.id}> <Query query={CATEGORY_ARTICLES_QUERY} id={router.query.id}>
{({ data: { category } }) => { {({ data: { category } }) => {
return ( return (
<Layout titlePage={category.name}>
<div> <div>
<div className="uk-section"> <div className="uk-section">
<div className="uk-container uk-container-large"> <div className="uk-container uk-container-large">
@ -22,10 +23,11 @@ const Category = () => {
</div> </div>
</div> </div>
</div> </div>
</Layout>
); );
}} }}
</Query> </Query>
</Layout>
</>
); );
}; };

View File

@ -8,20 +8,12 @@ import "../assets/css/style.css";
import Router from 'next/router' import Router from 'next/router'
Router.events.on('routeChangeStart', url => NProgress.start()) Router.events.on('routeChangeStart', () => NProgress.start())
Router.events.on('routeChangeComplete', () => NProgress.done()) Router.events.on('routeChangeComplete', () => NProgress.done())
Router.events.on('routeChangeError', () => NProgress.done()) Router.events.on('routeChangeError', () => NProgress.done())
const GRAPHQL_URL = process.env.BACKEND_URL || 'http://localhost:1337/graphql' const GRAPHQL_URL = process.env.BACKEND_URL || 'http://localhost:1337/graphql'
const link = new HttpLink({
fetch,
uri: GRAPHQL_URL
})
let apolloClient = null let apolloClient = null
/** /**