ssr everything
This commit is contained in:
parent
4ba0bcd416
commit
ca1a95094c
|
@ -1,9 +1,7 @@
|
|||
import { PrismaClient } from '@prisma/client'
|
||||
|
||||
const prisma = global.prisma || new PrismaClient({
|
||||
global.prisma ||= new PrismaClient({
|
||||
log: ['warn', 'error']
|
||||
})
|
||||
|
||||
global.prisma = prisma
|
||||
|
||||
export default prisma
|
||||
export default global.prisma
|
||||
|
|
|
@ -6,11 +6,10 @@ import resolvers from './resolvers'
|
|||
import typeDefs from './typeDefs'
|
||||
import models from './models'
|
||||
|
||||
export default async function serverSideClient (req) {
|
||||
export default async function getSSRApolloClient (req) {
|
||||
const session = req && await getSession({ req })
|
||||
return new ApolloClient({
|
||||
ssrMode: true,
|
||||
// Instead of "createHttpLink" use SchemaLink here
|
||||
link: new SchemaLink({
|
||||
schema: mergeSchemas({
|
||||
schemas: typeDefs,
|
|
@ -1,22 +1,25 @@
|
|||
import { useQuery } from '@apollo/client'
|
||||
import Button from 'react-bootstrap/Button'
|
||||
import { MORE_FLAT_COMMENTS } from '../fragments/comments'
|
||||
import { useState } from 'react'
|
||||
import Comment, { CommentSkeleton } from './comment'
|
||||
import styles from './notifications.module.css'
|
||||
import { useRouter } from 'next/router'
|
||||
import MoreFooter from './more-footer'
|
||||
|
||||
export default function CommentsFlat ({ variables, ...props }) {
|
||||
export default function CommentsFlat ({ variables, comments, cursor, ...props }) {
|
||||
const router = useRouter()
|
||||
const { error, data, fetchMore } = useQuery(MORE_FLAT_COMMENTS, {
|
||||
const { data, fetchMore } = useQuery(MORE_FLAT_COMMENTS, {
|
||||
variables,
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (error) return <div>Failed to load!</div>
|
||||
if (!data) {
|
||||
|
||||
if (!data && !comments) {
|
||||
return <CommentsFlatSkeleton />
|
||||
}
|
||||
const { moreFlatComments: { comments, cursor } } = data
|
||||
|
||||
if (data) {
|
||||
({ moreFlatComments: { comments, cursor } } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{comments.map(item => (
|
||||
|
@ -33,7 +36,7 @@ export default function CommentsFlat ({ variables, ...props }) {
|
|||
<Comment item={item} {...props} />
|
||||
</div>
|
||||
))}
|
||||
<MoreFooter cursor={cursor} fetchMore={fetchMore} />
|
||||
<MoreFooter cursor={cursor} fetchMore={fetchMore} Skeleton={CommentsFlatSkeleton} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
@ -48,37 +51,3 @@ function CommentsFlatSkeleton () {
|
|||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function MoreFooter ({ cursor, fetchMore }) {
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
if (loading) {
|
||||
return <div><CommentsFlatSkeleton /></div>
|
||||
}
|
||||
|
||||
let Footer
|
||||
if (cursor) {
|
||||
Footer = () => (
|
||||
<Button
|
||||
variant='primary'
|
||||
size='md'
|
||||
onClick={async () => {
|
||||
setLoading(true)
|
||||
await fetchMore({
|
||||
variables: {
|
||||
cursor
|
||||
}
|
||||
})
|
||||
setLoading(false)
|
||||
}}
|
||||
>more
|
||||
</Button>
|
||||
)
|
||||
} else {
|
||||
Footer = () => (
|
||||
<div className='text-muted' style={{ fontFamily: 'lightning', fontSize: '2rem', opacity: '0.6' }}>GENISIS</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className='d-flex justify-content-center mt-4 mb-2'><Footer /></div>
|
||||
}
|
||||
|
|
|
@ -47,32 +47,6 @@ function ItemText ({ item }) {
|
|||
}
|
||||
|
||||
export default function ItemFull ({ item, bio, ...props }) {
|
||||
const query = gql`
|
||||
${ITEM_FIELDS}
|
||||
${COMMENTS}
|
||||
{
|
||||
item(id: ${item.id}) {
|
||||
...ItemFields
|
||||
text
|
||||
comments {
|
||||
...CommentsRecursive
|
||||
}
|
||||
}
|
||||
}`
|
||||
|
||||
const router = useRouter()
|
||||
const { error, data } = useQuery(query, {
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (error) {
|
||||
return <div>Failed to load!</div>
|
||||
}
|
||||
|
||||
// XXX replace item with cache version
|
||||
if (data) {
|
||||
({ item } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{item.parentId
|
||||
|
|
|
@ -1,23 +1,25 @@
|
|||
import { useQuery } from '@apollo/client'
|
||||
import Button from 'react-bootstrap/Button'
|
||||
import Item, { ItemSkeleton } from './item'
|
||||
import styles from './items.module.css'
|
||||
import { MORE_ITEMS } from '../fragments/items'
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/router'
|
||||
import MoreFooter from './more-footer'
|
||||
|
||||
export default function Items ({ variables, rank }) {
|
||||
export default function Items ({ variables, rank, items, cursor }) {
|
||||
const router = useRouter()
|
||||
const { error, data, fetchMore } = useQuery(MORE_ITEMS, {
|
||||
const { data, fetchMore } = useQuery(MORE_ITEMS, {
|
||||
variables,
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (error) return <div>Failed to load!</div>
|
||||
if (!data) {
|
||||
|
||||
if (!data && !items) {
|
||||
return <ItemsSkeleton rank={rank} />
|
||||
}
|
||||
|
||||
const { moreItems: { items, cursor } } = data
|
||||
if (data) {
|
||||
({ moreItems: { items, cursor } } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className={styles.grid}>
|
||||
|
@ -25,7 +27,10 @@ export default function Items ({ variables, rank }) {
|
|||
<Item item={item} rank={rank && i + 1} key={item.id} />
|
||||
))}
|
||||
</div>
|
||||
<MoreFooter cursor={cursor} fetchMore={fetchMore} offset={items.length} rank={rank} />
|
||||
<MoreFooter
|
||||
cursor={cursor} fetchMore={fetchMore}
|
||||
Skeleton={() => <ItemsSkeleton rank={rank} startRank={items.length} />}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
@ -41,37 +46,3 @@ function ItemsSkeleton ({ rank, startRank = 0 }) {
|
|||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function MoreFooter ({ cursor, fetchMore, rank, offset }) {
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
if (loading) {
|
||||
return <ItemsSkeleton rank={rank} startRank={offset} />
|
||||
}
|
||||
|
||||
let Footer
|
||||
if (cursor) {
|
||||
Footer = () => (
|
||||
<Button
|
||||
variant='primary'
|
||||
size='md'
|
||||
onClick={async () => {
|
||||
setLoading(true)
|
||||
await fetchMore({
|
||||
variables: {
|
||||
cursor
|
||||
}
|
||||
})
|
||||
setLoading(false)
|
||||
}}
|
||||
>more
|
||||
</Button>
|
||||
)
|
||||
} else {
|
||||
Footer = () => (
|
||||
<div className='text-muted' style={{ fontFamily: 'lightning', fontSize: '2rem', opacity: '0.6' }}>GENISIS</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className='d-flex justify-content-center mt-4 mb-2'><Footer /></div>
|
||||
}
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
import { HeaderPreview } from './header'
|
||||
import Head from 'next/head'
|
||||
import Container from 'react-bootstrap/Container'
|
||||
|
||||
export default function LayoutPreview ({ children }) {
|
||||
return (
|
||||
<>
|
||||
<Head>
|
||||
<meta name='viewport' content='initial-scale=1.0, width=device-width' />
|
||||
</Head>
|
||||
<HeaderPreview />
|
||||
|
||||
<Container className='mt-1 px-sm-0'>
|
||||
{children}
|
||||
</Container>
|
||||
</>
|
||||
)
|
||||
}
|
|
@ -0,0 +1,36 @@
|
|||
import { Button } from 'react-bootstrap'
|
||||
import { useState } from 'react'
|
||||
|
||||
export default function MoreFooter ({ cursor, fetchMore, Skeleton }) {
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
if (loading) {
|
||||
return <div><Skeleton /></div>
|
||||
}
|
||||
|
||||
let Footer
|
||||
if (cursor) {
|
||||
Footer = () => (
|
||||
<Button
|
||||
variant='primary'
|
||||
size='md'
|
||||
onClick={async () => {
|
||||
setLoading(true)
|
||||
await fetchMore({
|
||||
variables: {
|
||||
cursor
|
||||
}
|
||||
})
|
||||
setLoading(false)
|
||||
}}
|
||||
>more
|
||||
</Button>
|
||||
)
|
||||
} else {
|
||||
Footer = () => (
|
||||
<div className='text-muted' style={{ fontFamily: 'lightning', fontSize: '2rem', opacity: '0.6' }}>GENISIS</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className='d-flex justify-content-center mt-4 mb-2'><Footer /></div>
|
||||
}
|
|
@ -1,11 +1,10 @@
|
|||
import { useQuery } from '@apollo/client'
|
||||
import Button from 'react-bootstrap/Button'
|
||||
import { useState } from 'react'
|
||||
import Comment, { CommentSkeleton } from './comment'
|
||||
import Item from './item'
|
||||
import { NOTIFICATIONS } from '../fragments/notifications'
|
||||
import styles from './notifications.module.css'
|
||||
import { useRouter } from 'next/router'
|
||||
import MoreFooter from './more-footer'
|
||||
|
||||
function Notification ({ n }) {
|
||||
const router = useRouter()
|
||||
|
@ -44,18 +43,16 @@ function Notification ({ n }) {
|
|||
)
|
||||
}
|
||||
|
||||
export default function Notifications ({ variables }) {
|
||||
export default function Notifications ({ notifications, cursor, lastChecked, variables }) {
|
||||
const router = useRouter()
|
||||
const { error, data, fetchMore } = useQuery(NOTIFICATIONS, {
|
||||
const { data, fetchMore } = useQuery(NOTIFICATIONS, {
|
||||
variables,
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (error) return <div>Failed to load!</div>
|
||||
if (!data) {
|
||||
return <CommentsFlatSkeleton />
|
||||
}
|
||||
|
||||
const { notifications: { notifications, cursor, lastChecked } } = data
|
||||
if (data) {
|
||||
({ notifications: { notifications, cursor } } = data)
|
||||
}
|
||||
|
||||
const [fresh, old] =
|
||||
notifications.reduce((result, n) => {
|
||||
|
@ -75,7 +72,7 @@ export default function Notifications ({ variables }) {
|
|||
{old.map((n, i) => (
|
||||
<Notification n={n} key={i} />
|
||||
))}
|
||||
<MoreFooter cursor={cursor} fetchMore={fetchMore} />
|
||||
<MoreFooter cursor={cursor} fetchMore={fetchMore} Skeleton={CommentsFlatSkeleton} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
@ -90,37 +87,3 @@ function CommentsFlatSkeleton () {
|
|||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function MoreFooter ({ cursor, fetchMore }) {
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
if (loading) {
|
||||
return <div><CommentsFlatSkeleton /></div>
|
||||
}
|
||||
|
||||
let Footer
|
||||
if (cursor) {
|
||||
Footer = () => (
|
||||
<Button
|
||||
variant='primary'
|
||||
size='md'
|
||||
onClick={async () => {
|
||||
setLoading(true)
|
||||
await fetchMore({
|
||||
variables: {
|
||||
cursor
|
||||
}
|
||||
})
|
||||
setLoading(false)
|
||||
}}
|
||||
>more
|
||||
</Button>
|
||||
)
|
||||
} else {
|
||||
Footer = () => (
|
||||
<div className='text-muted' style={{ fontFamily: 'lightning', fontSize: '2rem', opacity: '0.6' }}>GENISIS</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className='d-flex justify-content-center mt-4 mb-2'><Footer /></div>
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ export default function UserHeader ({ user }) {
|
|||
name: 'name',
|
||||
test: async name => {
|
||||
if (!name || !name.length) return false
|
||||
const { data } = await client.query({ query: NAME_QUERY, variables: { name } })
|
||||
const { data } = await client.query({ query: NAME_QUERY, variables: { name }, fetchPolicy: 'network-only' })
|
||||
return data.nameAvailable
|
||||
},
|
||||
message: 'taken'
|
||||
|
@ -69,7 +69,10 @@ export default function UserHeader ({ user }) {
|
|||
if (error) {
|
||||
throw new Error({ message: error.toString() })
|
||||
}
|
||||
router.replace(`/${name}`)
|
||||
router.replace({
|
||||
pathname: router.pathname,
|
||||
query: { ...router.query, username: name }
|
||||
})
|
||||
|
||||
client.writeFragment({
|
||||
id: `User:${user.id}`,
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import { gql } from '@apollo/client'
|
||||
import { COMMENTS } from './comments'
|
||||
|
||||
export const ITEM_FIELDS = gql`
|
||||
fragment ItemFields on Item {
|
||||
|
@ -36,20 +37,26 @@ export const MORE_ITEMS = gql`
|
|||
}
|
||||
} `
|
||||
|
||||
export const ITEMS_FEED = gql`
|
||||
export const ITEM_FULL = id => gql`
|
||||
${ITEM_FIELDS}
|
||||
|
||||
${COMMENTS}
|
||||
{
|
||||
items {
|
||||
item(id: ${id}) {
|
||||
...ItemFields
|
||||
text
|
||||
comments {
|
||||
...CommentsRecursive
|
||||
}
|
||||
}
|
||||
}`
|
||||
|
||||
export const ITEMS_RECENT = gql`
|
||||
export const ITEM_WITH_COMMENTS = gql`
|
||||
${ITEM_FIELDS}
|
||||
|
||||
{
|
||||
items: recent {
|
||||
${COMMENTS}
|
||||
fragment ItemWithComments on Item {
|
||||
...ItemFields
|
||||
}
|
||||
}`
|
||||
text
|
||||
comments {
|
||||
...CommentsRecursive
|
||||
}
|
||||
}`
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { gql } from '@apollo/client'
|
||||
import { ITEM_FIELDS } from './items'
|
||||
import { ITEM_FIELDS, ITEM_WITH_COMMENTS } from './items'
|
||||
|
||||
export const USER_FIELDS = gql`
|
||||
${ITEM_FIELDS}
|
||||
|
@ -16,3 +16,15 @@ export const USER_FIELDS = gql`
|
|||
text
|
||||
}
|
||||
}`
|
||||
|
||||
export const USER_FULL = name => gql`
|
||||
${USER_FIELDS}
|
||||
${ITEM_WITH_COMMENTS}
|
||||
{
|
||||
user(name: "${name}") {
|
||||
...UserFields
|
||||
bio {
|
||||
...ItemWithComments
|
||||
}
|
||||
}
|
||||
}`
|
||||
|
|
105
lib/apollo.js
105
lib/apollo.js
|
@ -13,67 +13,74 @@ function isFirstPage (cursor, existing) {
|
|||
return decursor.offset === LIMIT
|
||||
} else {
|
||||
// we don't have anything cached, or our existing items are less than
|
||||
// or equal to a full page TODO test for off by one
|
||||
// or equal to a full page
|
||||
return !existing || !existing.items || existing.items.length < LIMIT
|
||||
}
|
||||
}
|
||||
|
||||
export default new ApolloClient({
|
||||
uri: '/api/graphql',
|
||||
link: additiveLink,
|
||||
cache: new InMemoryCache({
|
||||
typePolicies: {
|
||||
Query: {
|
||||
fields: {
|
||||
moreItems: {
|
||||
keyArgs: ['sort', 'userId'],
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
}
|
||||
export default function getApolloClient () {
|
||||
global.apolloClient ||= new ApolloClient({
|
||||
link: additiveLink,
|
||||
cache: new InMemoryCache({
|
||||
typePolicies: {
|
||||
Query: {
|
||||
fields: {
|
||||
moreItems: {
|
||||
keyArgs: ['sort', 'userId'],
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
}
|
||||
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
items: [...(existing?.items || []), ...incoming.items]
|
||||
}
|
||||
}
|
||||
},
|
||||
moreFlatComments: {
|
||||
keyArgs: ['userId'],
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
items: [...(existing?.items || []), ...incoming.items]
|
||||
}
|
||||
}
|
||||
},
|
||||
moreFlatComments: {
|
||||
keyArgs: ['userId'],
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
}
|
||||
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
comments: [...(existing?.comments || []), ...incoming.comments]
|
||||
}
|
||||
}
|
||||
},
|
||||
notifications: {
|
||||
keyArgs: false,
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
comments: [...(existing?.comments || []), ...incoming.comments]
|
||||
}
|
||||
}
|
||||
},
|
||||
notifications: {
|
||||
keyArgs: false,
|
||||
merge (existing, incoming) {
|
||||
if (isFirstPage(incoming.cursor, existing)) {
|
||||
return incoming
|
||||
}
|
||||
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
notifications: [...(existing?.notifications || []), ...incoming.notifications],
|
||||
lastChecked: incoming.lastChecked
|
||||
return {
|
||||
cursor: incoming.cursor,
|
||||
notifications: [...(existing?.notifications || []), ...incoming.notifications],
|
||||
lastChecked: incoming.lastChecked
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}),
|
||||
defaultOptions: {
|
||||
// cache-and-network allows us to refresh pages on navigation
|
||||
watchQuery: {
|
||||
fetchPolicy: 'cache-and-network',
|
||||
nextFetchPolicy: 'cache-first'
|
||||
},
|
||||
query: {
|
||||
fetchPolicy: 'cache-and-network',
|
||||
nextFetchPolicy: 'cache-first'
|
||||
}
|
||||
}
|
||||
}),
|
||||
defaultOptions: {
|
||||
// cache-and-network allows us to refresh pages on navigation
|
||||
watchQuery: {
|
||||
fetchPolicy: 'cache-and-network',
|
||||
nextFetchPolicy: 'cache-first'
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
return global.apolloClient
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
|
@ -9,7 +9,7 @@
|
|||
"start": "NODE_OPTIONS='--trace-warnings' next start -p $PORT"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.3.13",
|
||||
"@apollo/client": "^3.4.15",
|
||||
"@prisma/client": "^2.23.0",
|
||||
"apollo-server-micro": "^2.21.2",
|
||||
"async-retry": "^1.3.1",
|
||||
|
@ -20,20 +20,20 @@
|
|||
"domino": "^2.1.6",
|
||||
"formik": "^2.2.6",
|
||||
"graphql": "^15.5.0",
|
||||
"ln-service": "^51.7.0",
|
||||
"ln-service": "^52.8.0",
|
||||
"mdast-util-find-and-replace": "^1.1.1",
|
||||
"next": "^10.2.3",
|
||||
"next": "^11.1.2",
|
||||
"next-auth": "^3.13.3",
|
||||
"next-plausible": "^2.0.0",
|
||||
"next-plausible": "^2.1.3",
|
||||
"next-seo": "^4.24.0",
|
||||
"page-metadata-parser": "^1.1.4",
|
||||
"pageres": "^6.2.3",
|
||||
"prisma": "^2.25.0",
|
||||
"qrcode.react": "^1.0.1",
|
||||
"react": "17.0.1",
|
||||
"react": "^17.0.1",
|
||||
"react-bootstrap": "^1.5.2",
|
||||
"react-countdown": "^2.3.2",
|
||||
"react-dom": "17.0.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-markdown": "^6.0.2",
|
||||
"react-syntax-highlighter": "^15.4.3",
|
||||
"react-textarea-autosize": "^8.3.3",
|
||||
|
|
|
@ -1,45 +1,64 @@
|
|||
import Layout from '../../components/layout'
|
||||
import { gql } from '@apollo/client'
|
||||
import ApolloClient from '../../api/client'
|
||||
import { useQuery } from '@apollo/client'
|
||||
import UserHeader from '../../components/user-header'
|
||||
import CommentsFlat from '../../components/comments-flat'
|
||||
import Seo from '../../components/seo'
|
||||
import { USER_FULL } from '../../fragments/users'
|
||||
import { useRouter } from 'next/router'
|
||||
import { MORE_FLAT_COMMENTS } from '../../fragments/comments'
|
||||
import { getServerSideProps as headerProps } from './index'
|
||||
import getSSRApolloClient from '../../api/ssrApollo'
|
||||
|
||||
export async function getServerSideProps ({ req, params }) {
|
||||
const { error, data: { user } } = await (await ApolloClient(req)).query({
|
||||
query:
|
||||
gql`{
|
||||
user(name: "${params.username}") {
|
||||
id
|
||||
createdAt
|
||||
name
|
||||
nitems
|
||||
ncomments
|
||||
stacked
|
||||
sats
|
||||
}
|
||||
}`
|
||||
export async function getServerSideProps ({ req, params: { username } }) {
|
||||
const { notFound, props } = await headerProps({ req, params: { username } })
|
||||
|
||||
if (notFound) {
|
||||
return {
|
||||
notFound
|
||||
}
|
||||
}
|
||||
|
||||
const { user } = props
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { data } = await client.query({
|
||||
query: MORE_FLAT_COMMENTS,
|
||||
variables: { userId: user.id }
|
||||
})
|
||||
|
||||
if (!user || error) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
let comments, cursor
|
||||
if (data) {
|
||||
({ moreFlatComments: { comments, cursor } } = data)
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
user
|
||||
...props,
|
||||
comments,
|
||||
cursor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function UserComments ({ user }) {
|
||||
export default function UserComments ({ user, comments, cursor }) {
|
||||
const router = useRouter()
|
||||
|
||||
const { data } = useQuery(
|
||||
USER_FULL(user.name), {
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
|
||||
if (data) {
|
||||
({ user } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<Layout noSeo>
|
||||
<Seo user={user} />
|
||||
<UserHeader user={user} />
|
||||
<CommentsFlat variables={{ userId: user.id }} includeParent noReply />
|
||||
<CommentsFlat
|
||||
comments={comments} cursor={cursor}
|
||||
variables={{ userId: user.id }} includeParent noReply
|
||||
/>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,34 +1,28 @@
|
|||
import Layout from '../components/layout'
|
||||
import Layout from '../../components/layout'
|
||||
import { gql, useMutation, useQuery } from '@apollo/client'
|
||||
import ApolloClient from '../api/client'
|
||||
import UserHeader from '../components/user-header'
|
||||
import Seo from '../components/seo'
|
||||
import UserHeader from '../../components/user-header'
|
||||
import Seo from '../../components/seo'
|
||||
import { Button } from 'react-bootstrap'
|
||||
import styles from '../styles/user.module.css'
|
||||
import styles from '../../styles/user.module.css'
|
||||
import { useState } from 'react'
|
||||
import ItemFull from '../components/item-full'
|
||||
import ItemFull from '../../components/item-full'
|
||||
import * as Yup from 'yup'
|
||||
import { Form, MarkdownInput, SubmitButton } from '../components/form'
|
||||
import ActionTooltip from '../components/action-tooltip'
|
||||
import { Form, MarkdownInput, SubmitButton } from '../../components/form'
|
||||
import ActionTooltip from '../../components/action-tooltip'
|
||||
import TextareaAutosize from 'react-textarea-autosize'
|
||||
import { useMe } from '../components/me'
|
||||
import { USER_FIELDS } from '../fragments/users'
|
||||
import { useMe } from '../../components/me'
|
||||
import { USER_FULL } from '../../fragments/users'
|
||||
import { useRouter } from 'next/router'
|
||||
import { ITEM_FIELDS } from '../fragments/items'
|
||||
import { ITEM_FIELDS } from '../../fragments/items'
|
||||
import getSSRApolloClient from '../../api/ssrApollo'
|
||||
|
||||
export async function getServerSideProps ({ req, params }) {
|
||||
const { error, data: { user } } = await (await ApolloClient(req)).query({
|
||||
query:
|
||||
gql`
|
||||
${USER_FIELDS}
|
||||
{
|
||||
user(name: "${params.username}") {
|
||||
...UserFields
|
||||
}
|
||||
}`
|
||||
export async function getServerSideProps ({ req, params: { username } }) {
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { error, data } = await client.query({
|
||||
query: USER_FULL(username)
|
||||
})
|
||||
|
||||
if (!user || error) {
|
||||
if (error || !data?.user) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
|
@ -36,7 +30,7 @@ export async function getServerSideProps ({ req, params }) {
|
|||
|
||||
return {
|
||||
props: {
|
||||
user
|
||||
user: data.user
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -103,24 +97,12 @@ export default function User ({ user }) {
|
|||
const [create, setCreate] = useState(false)
|
||||
const [edit, setEdit] = useState(false)
|
||||
const me = useMe()
|
||||
|
||||
const query = gql`
|
||||
${USER_FIELDS}
|
||||
{
|
||||
user(name: "${user.name}") {
|
||||
...UserFields
|
||||
}
|
||||
}`
|
||||
|
||||
const router = useRouter()
|
||||
const { error, data } = useQuery(query, {
|
||||
|
||||
const { data } = useQuery(USER_FULL(user.name), {
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (error) {
|
||||
return <div>Failed to load!</div>
|
||||
}
|
||||
|
||||
// XXX replace item with cache version
|
||||
if (data) {
|
||||
({ user } = data)
|
||||
}
|
|
@ -1,45 +1,64 @@
|
|||
import Layout from '../../components/layout'
|
||||
import { gql } from '@apollo/client'
|
||||
import ApolloClient from '../../api/client'
|
||||
import { useQuery } from '@apollo/client'
|
||||
import UserHeader from '../../components/user-header'
|
||||
import Seo from '../../components/seo'
|
||||
import Items from '../../components/items'
|
||||
import { useRouter } from 'next/router'
|
||||
import { USER_FULL } from '../../fragments/users'
|
||||
import { getServerSideProps as headerProps } from './index'
|
||||
import getSSRApolloClient from '../../api/ssrApollo'
|
||||
import { MORE_ITEMS } from '../../fragments/items'
|
||||
|
||||
export async function getServerSideProps ({ req, params }) {
|
||||
const { error, data: { user } } = await (await ApolloClient(req)).query({
|
||||
query:
|
||||
gql`{
|
||||
user(name: "${params.username}") {
|
||||
id
|
||||
createdAt
|
||||
name
|
||||
nitems
|
||||
ncomments
|
||||
stacked
|
||||
sats
|
||||
}
|
||||
}`
|
||||
export async function getServerSideProps ({ req, params: { username } }) {
|
||||
const { notFound, props } = await headerProps({ req, params: { username } })
|
||||
|
||||
if (notFound) {
|
||||
return {
|
||||
notFound
|
||||
}
|
||||
}
|
||||
|
||||
const { user } = props
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { data } = await client.query({
|
||||
query: MORE_ITEMS,
|
||||
variables: { sort: 'user', userId: user.id }
|
||||
})
|
||||
|
||||
if (!user || error) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
let items, cursor
|
||||
if (data) {
|
||||
({ moreItems: { items, cursor } } = data)
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
user
|
||||
...props,
|
||||
items,
|
||||
cursor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function UserPosts ({ user }) {
|
||||
export default function UserPosts ({ user, items, cursor }) {
|
||||
const router = useRouter()
|
||||
|
||||
const { data } = useQuery(
|
||||
USER_FULL(user.name), {
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
|
||||
if (data) {
|
||||
({ user } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<Layout noSeo>
|
||||
<Seo user={user} />
|
||||
<UserHeader user={user} />
|
||||
<Items variables={{ sort: 'user', userId: user.id }} />
|
||||
<Items
|
||||
items={items} cursor={cursor}
|
||||
variables={{ sort: 'user', userId: user.id }}
|
||||
/>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -5,13 +5,14 @@ import { FundErrorModal, FundErrorProvider } from '../components/fund-error'
|
|||
import { MeProvider } from '../components/me'
|
||||
import PlausibleProvider from 'next-plausible'
|
||||
import { LightningProvider } from '../components/lightning'
|
||||
import apolloClient from '../lib/apollo'
|
||||
import { useRouter } from 'next/router'
|
||||
import { useEffect } from 'react'
|
||||
import { ItemActModal, ItemActProvider } from '../components/item-act'
|
||||
import getApolloClient from '../lib/apollo'
|
||||
|
||||
function MyApp ({ Component, pageProps }) {
|
||||
function MyApp ({ Component, pageProps: { session, ...props } }) {
|
||||
const router = useRouter()
|
||||
|
||||
useEffect(() => {
|
||||
router.beforePopState(({ url, as, options }) => {
|
||||
// we need to tell the next page to use a cache-first fetch policy ...
|
||||
|
@ -25,15 +26,15 @@ function MyApp ({ Component, pageProps }) {
|
|||
|
||||
return (
|
||||
<PlausibleProvider domain='stacker.news' trackOutboundLinks>
|
||||
<Provider session={pageProps.session}>
|
||||
<ApolloProvider client={apolloClient}>
|
||||
<Provider session={session}>
|
||||
<ApolloProvider client={getApolloClient()}>
|
||||
<MeProvider>
|
||||
<LightningProvider>
|
||||
<FundErrorProvider>
|
||||
<FundErrorModal />
|
||||
<ItemActProvider>
|
||||
<ItemActModal />
|
||||
<Component {...pageProps} />
|
||||
<Component {...props} />
|
||||
</ItemActProvider>
|
||||
</FundErrorProvider>
|
||||
</LightningProvider>
|
||||
|
|
|
@ -6,7 +6,7 @@ export default async function handler (req, res) {
|
|||
res.setHeader('Content-Type', 'image/png')
|
||||
try {
|
||||
const streams = await new Pageres({ crop: true })
|
||||
.src(url, ['600x300'])
|
||||
.src(url, ['600x314'])
|
||||
.run()
|
||||
res.status(200).end(streams[0])
|
||||
} catch(e) {
|
||||
|
|
|
@ -5,7 +5,7 @@ import lnd from '../../api/lnd'
|
|||
import typeDefs from '../../api/typeDefs'
|
||||
import { getSession } from 'next-auth/client'
|
||||
|
||||
const apolloServer = new ApolloServer({
|
||||
global.apolloServer ||= new ApolloServer({
|
||||
typeDefs,
|
||||
resolvers,
|
||||
tracing: true,
|
||||
|
@ -25,4 +25,4 @@ export const config = {
|
|||
}
|
||||
}
|
||||
|
||||
export default apolloServer.createHandler({ path: '/api/graphql' })
|
||||
export default global.apolloServer.createHandler({ path: '/api/graphql' })
|
||||
|
|
|
@ -1,12 +1,37 @@
|
|||
import Layout from '../components/layout'
|
||||
import Items from '../components/items'
|
||||
import { useRouter } from 'next/router'
|
||||
import getSSRApolloClient from '../api/ssrApollo'
|
||||
import { MORE_ITEMS } from '../fragments/items'
|
||||
|
||||
export default function Index () {
|
||||
export async function getServerSideProps ({ req }) {
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { data } = await client.query({
|
||||
query: MORE_ITEMS,
|
||||
variables: { sort: 'hot' }
|
||||
})
|
||||
|
||||
let items, cursor
|
||||
if (data) {
|
||||
({ moreItems: { items, cursor } } = data)
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
items,
|
||||
cursor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function Index ({ items, cursor }) {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Layout>
|
||||
<Items variables={{ sort: 'hot' }} rank key={router.query.key} />
|
||||
<Items
|
||||
items={items} cursor={cursor}
|
||||
variables={{ sort: 'hot' }} rank key={router.query.key}
|
||||
/>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
import Layout from '../../components/layout'
|
||||
import { ITEM_FIELDS } from '../../fragments/items'
|
||||
import { gql } from '@apollo/client'
|
||||
import Seo from '../../components/seo'
|
||||
import ApolloClient from '../../api/client'
|
||||
import ItemFull from '../../components/item-full'
|
||||
|
||||
// ssr the item without comments so that we can populate metatags
|
||||
export async function getServerSideProps ({ req, params: { id } }) {
|
||||
if (isNaN(id)) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
}
|
||||
|
||||
const { error, data: { item } } = await (await ApolloClient(req)).query({
|
||||
query:
|
||||
gql`
|
||||
${ITEM_FIELDS}
|
||||
{
|
||||
item(id: ${id}) {
|
||||
...ItemFields
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
|
||||
if (!item || error) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
item
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function AnItem ({ item }) {
|
||||
return (
|
||||
<Layout noSeo>
|
||||
<Seo item={item} />
|
||||
<ItemFull item={item} />
|
||||
</Layout>
|
||||
)
|
||||
}
|
|
@ -18,7 +18,7 @@ export async function getServerSideProps ({ req, params: { id } }) {
|
|||
}`
|
||||
})
|
||||
|
||||
if (!item || error) {
|
||||
if (error || !item) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
import Layout from '../../../components/layout'
|
||||
import { ITEM_FULL } from '../../../fragments/items'
|
||||
import Seo from '../../../components/seo'
|
||||
import ItemFull from '../../../components/item-full'
|
||||
import getSSRApolloClient from '../../../api/ssrApollo'
|
||||
import { useQuery } from '@apollo/client'
|
||||
import { useRouter } from 'next/router'
|
||||
|
||||
export async function getServerSideProps ({ req, params: { id } }) {
|
||||
if (isNaN(id)) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
}
|
||||
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { error, data } = await client.query({
|
||||
query: ITEM_FULL(id)
|
||||
})
|
||||
|
||||
if (error || !data?.item) {
|
||||
return {
|
||||
notFound: true
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
item: data.item
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function AnItem ({ item }) {
|
||||
const router = useRouter()
|
||||
const { data } = useQuery(ITEM_FULL(item.id), {
|
||||
fetchPolicy: router.query.cache ? 'cache-first' : undefined
|
||||
})
|
||||
if (data) {
|
||||
({ item } = data)
|
||||
}
|
||||
|
||||
return (
|
||||
<Layout noSeo>
|
||||
<Seo item={item} />
|
||||
<ItemFull item={item} />
|
||||
</Layout>
|
||||
)
|
||||
}
|
|
@ -1,12 +1,37 @@
|
|||
import { useRouter } from 'next/router'
|
||||
import getSSRApolloClient from '../api/ssrApollo'
|
||||
import Layout from '../components/layout'
|
||||
import Notifications from '../components/notifications'
|
||||
import { NOTIFICATIONS } from '../fragments/notifications'
|
||||
|
||||
export default function NotificationPage () {
|
||||
export async function getServerSideProps ({ req }) {
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { data } = await client.query({
|
||||
query: NOTIFICATIONS
|
||||
})
|
||||
|
||||
let notifications, cursor, lastChecked
|
||||
if (data) {
|
||||
({ notifications: { notifications, cursor, lastChecked } } = data)
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
notifications,
|
||||
cursor,
|
||||
lastChecked
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function NotificationPage ({ notifications, cursor, lastChecked }) {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Layout>
|
||||
<Notifications key={router.query.key} />
|
||||
<Notifications
|
||||
notifications={notifications} cursor={cursor}
|
||||
lastChecked={lastChecked} key={router.query.key}
|
||||
/>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -6,6 +6,13 @@ import { useMe } from '../components/me'
|
|||
import { DiscussionForm } from '../components/discussion-form'
|
||||
import { LinkForm } from '../components/link-form'
|
||||
|
||||
export async function getServerSideProps () {
|
||||
return {
|
||||
props: {}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export function PostForm () {
|
||||
const router = useRouter()
|
||||
const me = useMe()
|
||||
|
|
|
@ -1,12 +1,37 @@
|
|||
import Layout from '../components/layout'
|
||||
import Items from '../components/items'
|
||||
import { useRouter } from 'next/router'
|
||||
import getSSRApolloClient from '../api/ssrApollo'
|
||||
import { MORE_ITEMS } from '../fragments/items'
|
||||
|
||||
export default function Index () {
|
||||
export async function getServerSideProps ({ req }) {
|
||||
const client = await getSSRApolloClient(req)
|
||||
const { data } = await client.query({
|
||||
query: MORE_ITEMS,
|
||||
variables: { sort: 'recent' }
|
||||
})
|
||||
|
||||
let items, cursor
|
||||
if (data) {
|
||||
({ moreItems: { items, cursor } } = data)
|
||||
}
|
||||
|
||||
return {
|
||||
props: {
|
||||
items,
|
||||
cursor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default function Index ({ items, cursor }) {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Layout>
|
||||
<Items variables={{ sort: 'recent' }} rank key={router.query.key} />
|
||||
<Items
|
||||
items={items} cursor={cursor}
|
||||
variables={{ sort: 'recent' }} rank key={router.query.key}
|
||||
/>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -12,6 +12,12 @@ import { useMe } from '../components/me'
|
|||
import { useEffect } from 'react'
|
||||
import { requestProvider } from 'webln'
|
||||
|
||||
export async function getServerSideProps () {
|
||||
return {
|
||||
props: {}
|
||||
}
|
||||
}
|
||||
|
||||
export default function Wallet () {
|
||||
return (
|
||||
<LayoutCenter>
|
||||
|
|
Loading…
Reference in New Issue