Skip to content

Commit

Permalink
Merge branch 'main' into fix-dark-mode-search-dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
transitive-bullshit authored Dec 17, 2023
2 parents 6bf730e + 86b9ed6 commit 9740a30
Show file tree
Hide file tree
Showing 7 changed files with 245 additions and 301 deletions.
2 changes: 1 addition & 1 deletion components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const FooterImpl: React.FC = () => {

return (
<footer className={styles.footer}>
<div className={styles.copyright}>Copyright 2022 {config.author}</div>
<div className={styles.copyright}>Copyright {new Date().getFullYear()} {config.author}</div>

<div className={styles.settings}>
{hasMounted && (
Expand Down
2 changes: 1 addition & 1 deletion components/NotionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import styles from './styles.module.css'
const Code = dynamic(() =>
import('react-notion-x/build/third-party/code').then(async (m) => {
// add / remove any prism syntaxes here
await Promise.all([
await Promise.allSettled([
import('prismjs/components/prism-markup-templating.js'),
import('prismjs/components/prism-markup.js'),
import('prismjs/components/prism-bash.js'),
Expand Down
7 changes: 6 additions & 1 deletion lib/get-site-map.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAllPagesInSpace, uuidToId } from 'notion-utils'
import { getAllPagesInSpace, uuidToId, getPageProperty } from 'notion-utils'
import pMemoize from 'p-memoize'

import * as config from './config'
Expand Down Expand Up @@ -47,6 +47,11 @@ async function getAllPagesImpl(
throw new Error(`Error loading page "${pageId}"`)
}

const block = recordMap.block[pageId]?.value
if (!(getPageProperty<boolean|null>('Public', block, recordMap) ?? true)) {
return map
}

const canonicalPageId = getCanonicalPageId(pageId, recordMap, {
uuid
})
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"fathom-client": "^3.4.1",
"got": "^12.0.3",
"isomorphic-unfetch": "^3.1.0",
"lqip-modern": "^1.2.0",
"next": "^12.3.1",
"lqip-modern": "^2.0.0",
"next": "12",
"notion-client": "^6.15.6",
"notion-types": "^6.15.6",
"notion-utils": "^6.15.6",
Expand All @@ -49,7 +49,7 @@
"react-dom": "^18.2.0",
"react-notion-x": "^6.15.6",
"react-tweet-embed": "^2.0.0",
"react-use": "^17.3.2",
"react-use": "^17.4.2",
"rss": "^1.2.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion site.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default siteConfig({
pageUrlOverrides: null,

// whether to use the default notion navigation style or a custom one with links to
// important pages
// important pages. To use `navigationLinks`, set `navigationStyle` to `custom`.
navigationStyle: 'default'
// navigationStyle: 'custom',
// navigationLinks: [
Expand Down
4 changes: 4 additions & 0 deletions styles/notion.css
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,7 @@
.notion-search .noResultsDetail {
color: var(--fg-color-2);
}

.notion-equation.notion-equation-block{
align-items: center;
}
523 changes: 229 additions & 294 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 9740a30

Please sign in to comment.