Skip to content

Commit 27f2734

Browse files
committed
Fix og image gen and updates
1 parent d74ee4c commit 27f2734

File tree

12 files changed

+875
-1306
lines changed

12 files changed

+875
-1306
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ jobs:
66
Build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010

11-
- uses: actions/setup-node@v2
11+
- uses: actions/setup-node@v3
1212
with:
13-
node-version: 14
13+
node-version: 16
1414
cache: yarn
1515

1616
- run: yarn install --frozen-lockfile

.gitpod.yml

+131-131
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
11
image:
2-
file: .gitpod.Dockerfile
2+
file: .gitpod.Dockerfile
33
tasks:
4-
- name: tailscaled
5-
command: |
6-
if [ -n "${TS_STATE_TAILSCALE_EXAMPLE}" ]; then
7-
# restore the tailscale state from gitpod user's env vars
8-
sudo mkdir -p /var/lib/tailscale
9-
echo "${TS_STATE_TAILSCALE_EXAMPLE}" | sudo tee /var/lib/tailscale/tailscaled.state > /dev/null
10-
fi
11-
sudo tailscaled
12-
- name: Tailscale
13-
command: |
14-
sudo -E tailscale up --hostname "gitpod@nooobcoder-${GITPOD_WORKSPACE_ID}" \
15-
--authkey "${TAILSCALE_AUTHKEY}"
16-
- name: ImportGPG
17-
command: >
18-
[[ ! -z $GNUPG_KEY ]] &&
19-
gpg --verbose --batch --import <(echo $GNUPG_KEY|base64 -d) &&
20-
echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf &&
21-
git config commit.gpgsign true
4+
- name: tailscaled
5+
command: |
6+
if [ -n "${TS_STATE_TAILSCALE_EXAMPLE}" ]; then
7+
# restore the tailscale state from gitpod user's env vars
8+
sudo mkdir -p /var/lib/tailscale
9+
echo "${TS_STATE_TAILSCALE_EXAMPLE}" | sudo tee /var/lib/tailscale/tailscaled.state > /dev/null
10+
fi
11+
sudo tailscaled
12+
- name: Tailscale
13+
command: |
14+
sudo -E tailscale up --hostname "gitpod@nooobcoder-${GITPOD_WORKSPACE_ID}" \
15+
--authkey "${TAILSCALE_AUTHKEY}"
16+
- name: ImportGPG
17+
command: >
18+
[[ ! -z $GNUPG_KEY ]] &&
19+
gpg --verbose --batch --import <(echo $GNUPG_KEY|base64 -d) &&
20+
echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf &&
21+
git config commit.gpgsign true
2222
vscode:
23-
extensions:
24-
- mutantdino.resourcemonitor
25-
- cweijan.vscode-mysql-client2
26-
- Gruntfuggly.todo-tree
27-
- jsDelivr.jsdelivr
28-
- manuth.eslint-language-service
29-
- markwylde.vscode-filesize
30-
- mongodb.mongodb-vscode
31-
- monokai.theme-monokai-pro-vscode
32-
- ngryman.codesandbox-theme
33-
- njzy.stats-bar
34-
- pflannery.vscode-versionlens
35-
- rangav.vscode-thunder-client
36-
- redwan-hossain.auto-rename-tag-clone
37-
- tombonnike.vscode-status-bar-format-toggle
38-
- vlanguage.vscode-vlang
39-
- vscjava.vscode-spring-initializr
40-
- zaaack.markdown-editor
41-
- aaron-bond.better-comments
42-
- ahmadawais.shades-of-purple
43-
- apollographql.vscode-apollo
44-
- avraammavridis.vsc-react-documentation
45-
- bengreenier.vscode-node-readme
46-
- benjaminbenais.codesandbox-dark
47-
- bierner.color-info
48-
- bradlc.vscode-tailwindcss
49-
- bungcip.better-toml
50-
- chris-noring.node-snippets
51-
- christian-kohler.npm-intellisense
52-
- christian-kohler.path-intellisense
53-
- chrmarti.regex
54-
- CodeSandbox-io.codesandbox-projects
55-
- CodeSandbox-io.codesandbox-projects-theme
56-
- cssho.vscode-svgviewer
57-
- DaltonMenezes.aura-theme
58-
- Dart-Code.dart-code
59-
- Dart-Code.flutter
60-
- dbaeumer.vscode-eslint
61-
- docsmsft.docs-markdown
62-
- docsmsft.docs-preview
63-
- DominicVonk.parameter-hints
64-
- dsznajder.es7-react-js-snippets
65-
- eamodio.gitlens
66-
- ecmel.vscode-html-css
67-
- EditorConfig.EditorConfig
68-
- eg2.vscode-npm-script
69-
- esbenp.prettier-vscode
70-
- evan-buss.font-switcher
71-
- formulahendry.auto-rename-tag
72-
- geeebe.duplicate
73-
- GitHub.codespaces
74-
- GitHub.copilot-labs
75-
- GitHub.copilot-nightly
76-
- GitHub.github-vscode-theme
77-
- GitHub.vscode-pull-request-github
78-
- gitpod.gitpod-desktop
79-
- golang.go
80-
- GraphQL.vscode-graphql
81-
- hashicorp.terraform
82-
- hollowtree.vue-snippets
83-
- jcbuisson.vue
84-
- jeff-hykin.better-cpp-syntax
85-
- k--kato.intellij-idea-keybindings
86-
- me-dutour-mathieu.vscode-github-actions
87-
- mechatroner.rainbow-csv
88-
- mikestead.dotenv
89-
- ms-python.python
90-
- ms-python.vscode-pylance
91-
- ms-toolsai.jupyter
92-
- ms-toolsai.jupyter-keymap
93-
- ms-vscode-remote.remote-containers
94-
- ms-vscode-remote.remote-ssh
95-
- ms-vscode-remote.remote-ssh-edit
96-
- ms-vscode-remote.remote-wsl
97-
- ms-vscode-remote.vscode-remote-extensionpack
98-
- ms-vscode.cmake-tools
99-
- ms-vscode.cpptools
100-
- ms-vscode.cpptools-extension-pack
101-
- ms-vscode.cpptools-themes
102-
- ms-vscode.js-debug-nightly
103-
- ms-vscode.vscode-typescript-next
104-
- ms-vscode.vscode-typescript-tslint-plugin
105-
- ms-vsliveshare.vsliveshare
106-
- ms-vsliveshare.vsliveshare-audio
107-
- ms-vsliveshare.vsliveshare-pack
108-
- naumovs.color-highlight
109-
- oderwat.indent-rainbow
110-
- PKief.material-icon-theme
111-
- pranaygp.vscode-css-peek
112-
- Prisma.prisma
113-
- Prisma.prisma-insider
114-
- redhat.java
115-
- redhat.vscode-xml
116-
- redhat.vscode-yaml
117-
- ritwickdey.LiveServer
118-
- sdras.night-owl
119-
- silvenon.mdx
120-
- steoates.autoimport
121-
- tgreen7.vs-code-node-require
122-
- tomoki1207.selectline-statusbar
123-
- twxs.cmake
124-
- usernamehw.errorlens
125-
- VisualStudioExptTeam.vscodeintellicode
126-
- vscjava.vscode-java-debug
127-
- vscjava.vscode-java-dependency
128-
- vscjava.vscode-java-pack
129-
- vscjava.vscode-java-test
130-
- vscjava.vscode-maven
131-
- vscode-icons-team.vscode-icons
132-
- wix.vscode-import-cost
133-
- xabikos.JavaScriptSnippets
134-
- Zignd.html-css-class-completion
23+
extensions:
24+
- mutantdino.resourcemonitor
25+
- cweijan.vscode-mysql-client2
26+
- Gruntfuggly.todo-tree
27+
- jsDelivr.jsdelivr
28+
- manuth.eslint-language-service
29+
- markwylde.vscode-filesize
30+
- mongodb.mongodb-vscode
31+
- monokai.theme-monokai-pro-vscode
32+
- ngryman.codesandbox-theme
33+
- njzy.stats-bar
34+
- pflannery.vscode-versionlens
35+
- rangav.vscode-thunder-client
36+
- redwan-hossain.auto-rename-tag-clone
37+
- tombonnike.vscode-status-bar-format-toggle
38+
- vlanguage.vscode-vlang
39+
- vscjava.vscode-spring-initializr
40+
- zaaack.markdown-editor
41+
- aaron-bond.better-comments
42+
- ahmadawais.shades-of-purple
43+
- apollographql.vscode-apollo
44+
- avraammavridis.vsc-react-documentation
45+
- bengreenier.vscode-node-readme
46+
- benjaminbenais.codesandbox-dark
47+
- bierner.color-info
48+
- bradlc.vscode-tailwindcss
49+
- bungcip.better-toml
50+
- chris-noring.node-snippets
51+
- christian-kohler.npm-intellisense
52+
- christian-kohler.path-intellisense
53+
- chrmarti.regex
54+
- CodeSandbox-io.codesandbox-projects
55+
- CodeSandbox-io.codesandbox-projects-theme
56+
- cssho.vscode-svgviewer
57+
- DaltonMenezes.aura-theme
58+
- Dart-Code.dart-code
59+
- Dart-Code.flutter
60+
- dbaeumer.vscode-eslint
61+
- docsmsft.docs-markdown
62+
- docsmsft.docs-preview
63+
- DominicVonk.parameter-hints
64+
- dsznajder.es7-react-js-snippets
65+
- eamodio.gitlens
66+
- ecmel.vscode-html-css
67+
- EditorConfig.EditorConfig
68+
- eg2.vscode-npm-script
69+
- esbenp.prettier-vscode
70+
- evan-buss.font-switcher
71+
- formulahendry.auto-rename-tag
72+
- geeebe.duplicate
73+
- GitHub.codespaces
74+
- GitHub.copilot-labs
75+
- GitHub.copilot-nightly
76+
- GitHub.github-vscode-theme
77+
- GitHub.vscode-pull-request-github
78+
- gitpod.gitpod-desktop
79+
- golang.go
80+
- GraphQL.vscode-graphql
81+
- hashicorp.terraform
82+
- hollowtree.vue-snippets
83+
- jcbuisson.vue
84+
- jeff-hykin.better-cpp-syntax
85+
- k--kato.intellij-idea-keybindings
86+
- me-dutour-mathieu.vscode-github-actions
87+
- mechatroner.rainbow-csv
88+
- mikestead.dotenv
89+
- ms-python.python
90+
- ms-python.vscode-pylance
91+
- ms-toolsai.jupyter
92+
- ms-toolsai.jupyter-keymap
93+
- ms-vscode-remote.remote-containers
94+
- ms-vscode-remote.remote-ssh
95+
- ms-vscode-remote.remote-ssh-edit
96+
- ms-vscode-remote.remote-wsl
97+
- ms-vscode-remote.vscode-remote-extensionpack
98+
- ms-vscode.cmake-tools
99+
- ms-vscode.cpptools
100+
- ms-vscode.cpptools-extension-pack
101+
- ms-vscode.cpptools-themes
102+
- ms-vscode.js-debug-nightly
103+
- ms-vscode.vscode-typescript-next
104+
- ms-vscode.vscode-typescript-tslint-plugin
105+
- ms-vsliveshare.vsliveshare
106+
- ms-vsliveshare.vsliveshare-audio
107+
- ms-vsliveshare.vsliveshare-pack
108+
- naumovs.color-highlight
109+
- oderwat.indent-rainbow
110+
- PKief.material-icon-theme
111+
- pranaygp.vscode-css-peek
112+
- Prisma.prisma
113+
- Prisma.prisma-insider
114+
- redhat.java
115+
- redhat.vscode-xml
116+
- redhat.vscode-yaml
117+
- ritwickdey.LiveServer
118+
- sdras.night-owl
119+
- silvenon.mdx
120+
- steoates.autoimport
121+
- tgreen7.vs-code-node-require
122+
- tomoki1207.selectline-statusbar
123+
- twxs.cmake
124+
- usernamehw.errorlens
125+
- VisualStudioExptTeam.vscodeintellicode
126+
- vscjava.vscode-java-debug
127+
- vscjava.vscode-java-dependency
128+
- vscjava.vscode-java-pack
129+
- vscjava.vscode-java-test
130+
- vscjava.vscode-maven
131+
- vscode-icons-team.vscode-icons
132+
- wix.vscode-import-cost
133+
- xabikos.JavaScriptSnippets
134+
- Zignd.html-css-class-completion

lib/config.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { parsePageId } from 'notion-utils'
9-
import posthog from 'posthog-js'
9+
import type posthog from 'posthog-js'
1010
import { getEnv, getSiteConfig } from './get-config-value'
1111
import { NavigationLink } from './site-config'
1212
import {
@@ -124,11 +124,15 @@ export const isServer = typeof window === 'undefined'
124124

125125
export const port = getEnv('PORT', '3000')
126126
export const host = isDev ? `http://localhost:${port}` : `https://${domain}`
127+
export const apiHost = isDev
128+
? host
129+
: `https://${process.env.VERCEL_URL || domain}`
127130

128131
export const apiBaseUrl = `/api`
129132

130133
export const api = {
131134
searchNotion: `${apiBaseUrl}/search-notion`,
135+
getNotionPageInfo: `${apiBaseUrl}/notion-page-info`,
132136
getSocialImage: `${apiBaseUrl}/social-image`
133137
}
134138

@@ -145,8 +149,8 @@ export const site: Site = {
145149
export const fathomId = isDev ? null : process.env.NEXT_PUBLIC_FATHOM_ID
146150
export const fathomConfig = fathomId
147151
? {
148-
excludedDomains: ['localhost', 'localhost:3000']
149-
}
152+
excludedDomains: ['localhost', 'localhost:3000']
153+
}
150154
: undefined
151155

152156
export const posthogId = process.env.NEXT_PUBLIC_POSTHOG_ID

lib/fonts.ts

-1
This file was deleted.

lib/types.ts

+10
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,13 @@ export interface PageUrlOverridesInverseMap {
6060
// (this overrides the built-in URL path generation for these pages)
6161
[pageId: string]: string
6262
}
63+
64+
export interface NotionPageInfo {
65+
pageId: string
66+
title: string
67+
image: string
68+
imageObjectPosition: string
69+
author: string
70+
authorImage: string
71+
detail: string
72+
}

0 commit comments

Comments
 (0)