Skip to content

Commit c7d65e6

Browse files
Merge branch 'main' into feature/copyright
2 parents e6be8ca + bd69dc4 commit c7d65e6

File tree

7 files changed

+257
-301
lines changed

7 files changed

+257
-301
lines changed

components/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const FooterImpl: React.FC = () => {
3636

3737
return (
3838
<footer className={styles.footer}>
39-
<div className={styles.copyright}>Copyright { currentYear } {config.author}</div>
39+
<div className={styles.copyright}>Copyright {currentYear} {config.author}</div>
4040

4141
<div className={styles.settings}>
4242
{hasMounted && (

components/NotionPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import styles from './styles.module.css'
3535
const Code = dynamic(() =>
3636
import('react-notion-x/build/third-party/code').then(async (m) => {
3737
// add / remove any prism syntaxes here
38-
await Promise.all([
38+
await Promise.allSettled([
3939
import('prismjs/components/prism-markup-templating.js'),
4040
import('prismjs/components/prism-markup.js'),
4141
import('prismjs/components/prism-bash.js'),

lib/get-site-map.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getAllPagesInSpace, uuidToId } from 'notion-utils'
1+
import { getAllPagesInSpace, uuidToId, getPageProperty } from 'notion-utils'
22
import pMemoize from 'p-memoize'
33

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

50+
const block = recordMap.block[pageId]?.value
51+
if (!(getPageProperty<boolean|null>('Public', block, recordMap) ?? true)) {
52+
return map
53+
}
54+
5055
const canonicalPageId = getCanonicalPageId(pageId, recordMap, {
5156
uuid
5257
})

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"fathom-client": "^3.4.1",
3737
"got": "^12.0.3",
3838
"isomorphic-unfetch": "^3.1.0",
39-
"lqip-modern": "^1.2.0",
40-
"next": "^12.3.1",
39+
"lqip-modern": "^2.0.0",
40+
"next": "12",
4141
"notion-client": "^6.15.6",
4242
"notion-types": "^6.15.6",
4343
"notion-utils": "^6.15.6",
@@ -49,7 +49,7 @@
4949
"react-dom": "^18.2.0",
5050
"react-notion-x": "^6.15.6",
5151
"react-tweet-embed": "^2.0.0",
52-
"react-use": "^17.3.2",
52+
"react-use": "^17.4.2",
5353
"rss": "^1.2.2"
5454
},
5555
"devDependencies": {

site.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default siteConfig({
4949
pageUrlOverrides: null,
5050

5151
// whether to use the default notion navigation style or a custom one with links to
52-
// important pages
52+
// important pages. To use `navigationLinks`, set `navigationStyle` to `custom`.
5353
navigationStyle: 'default'
5454
// navigationStyle: 'custom',
5555
// navigationLinks: [

styles/notion.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,3 +386,19 @@
386386
.notion-block-260baa77f1e1428b97fb14ac99c7c385 {
387387
display: none;
388388
}
389+
390+
.notion-search .searchBar {
391+
box-shadow: var(--fg-color-0) 0px 1px 0px;
392+
}
393+
394+
.notion-search .noResults {
395+
color: var(--fg-color-3);
396+
}
397+
398+
.notion-search .noResultsDetail {
399+
color: var(--fg-color-2);
400+
}
401+
402+
.notion-equation.notion-equation-block{
403+
align-items: center;
404+
}

0 commit comments

Comments
 (0)