From 32b845af2b853ca478bcf275f7bad413f8621784 Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Fri, 15 Jan 2021 12:51:25 -0500 Subject: [PATCH] feat: minor fixes --- components/ErrorPage.tsx | 3 --- components/NotionPage.tsx | 23 +++++++---------------- components/Page404.tsx | 3 --- lib/config.ts | 3 --- pages/_document.tsx | 9 ++++++++- public/favicon-96x96.png | Bin 0 -> 5320 bytes public/favicon.png | Bin 0 -> 1582 bytes public/manifest.json | 5 +++++ 8 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 public/favicon-96x96.png create mode 100644 public/favicon.png diff --git a/components/ErrorPage.tsx b/components/ErrorPage.tsx index ee34724..2f5c6d5 100644 --- a/components/ErrorPage.tsx +++ b/components/ErrorPage.tsx @@ -1,6 +1,5 @@ import React from 'react' import Head from 'next/head' -import { defaultSiteFavicon } from 'lib/config' import { PageHead } from './PageHead' import styles from './styles.module.css' @@ -13,8 +12,6 @@ export const ErrorPage: React.FC<{ statusCode: number }> = ({ statusCode }) => { - - diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index f7190bf..5e7dad5 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -14,7 +14,7 @@ import { getBlockTitle } from 'notion-utils' import * as types from 'lib/types' import { mapPageUrl, getCanonicalPageUrl } from 'lib/map-page-url' import { mapNotionImageUrl } from 'lib/map-image-url' -// import { isDev } from 'lib/config' +import { isDev } from 'lib/config' // components import { CustomFont } from './CustomFont' @@ -65,19 +65,12 @@ export const NotionPage: React.FC = ({ } const title = getBlockTitle(block, recordMap) || site.name - let notionIcon = (block.format as any)?.page_icon - - if (notionIcon && isUrl(notionIcon)) { - notionIcon = mapNotionImageUrl(notionIcon, block) - } - - const icon = notionIcon - const iconUrl = (icon && isUrl(icon)) ?? icon console.log('notion page', { - // isDev, - rootNotionPageId: site.rootNotionPageId, + isDev, + title, pageId, + rootNotionPageId: site.rootNotionPageId, recordMap }) @@ -88,20 +81,18 @@ export const NotionPage: React.FC = ({ const siteMapPageUrl = mapPageUrl(site, recordMap, searchParams) - // const canonicalPageUrl = - // !isDev && getCanonicalPageUrl(site, recordMap)(pageId) + const canonicalPageUrl = + !isDev && getCanonicalPageUrl(site, recordMap)(pageId) return ( <> - {/* {iconUrl && } */} - - {/* {canonicalPageUrl && } */} + {canonicalPageUrl && } {title} diff --git a/components/Page404.tsx b/components/Page404.tsx index e95312c..ae933e8 100644 --- a/components/Page404.tsx +++ b/components/Page404.tsx @@ -1,7 +1,6 @@ import Head from 'next/head' import * as React from 'react' import * as types from 'lib/types' -import { defaultSiteFavicon } from 'lib/config' import { PageHead } from './PageHead' import styles from './styles.module.css' @@ -14,8 +13,6 @@ export const Page404: React.FC = ({ site, pageId, error }) => { - - diff --git a/lib/config.ts b/lib/config.ts index 5bfe308..7d4e77f 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -9,9 +9,6 @@ import { getEnv } from './get-env' export const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV -export const defaultSiteImage = '/social.jpg' -export const defaultSiteFavicon = '/favicon.ico' - export const fathomId = isDev ? null : getEnv('FATHOM_ID', null) export const fathomConfig = fathomId diff --git a/pages/_document.tsx b/pages/_document.tsx index 2d79703..b602082 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -1,18 +1,25 @@ import React from 'react' import Document, { Html, Head, Main, NextScript } from 'next/document' +import * as config from 'lib/env' export default class MyDocument extends Document { render() { return ( - + + uk(bT9}t7_B=YSu{Yo!Aj-S8a*CO3)g$ z_a?LmO0N6s{FQ`OT<5$F000=EnyN3aD*S(g7I>9^sYhH1 zlxMoy25Qw!JAvlPp>XviPm@8U!5SL=r_^>K&1A0#PC)9$*lYWntAe|A(&wAUCf z3qCHlKCbgw&$C>~dEM8ufvKD+D*2UDG+K{aD6Lr_|3B=_jzvaR5`X?!o!$6<;{OfK zPtUFv``?~)#VeeUh(~1NDVazlZxG3g8{`Edd2)qJSRjookou-bxXDu-fmBZ*RrZlE zy{8x)34O(SQrZ=9BxL=1a_Q7()bF&&-+5uH1z$GMQTw@Z2bee#CiS!;`LZ(cv6gxQ0BK@9ll!=f7zIF*@h^eL2ECmw|9GFaPvp+{BOeM^cZnrlDIT?xV><=x3acAH#hflYG~vyar5|q zxc_fwjy&J9(V9C_jcvyiwB%%9GtuRRnCiTW@`C2d@_~w~c}(R(E@mn-cO)C#lbG6( zm{1cNhDL@)hIs{lc5@GRwn4gBr@L68-K5dZTonOVihwHznko8R(OAx1PufN6k&m`)Fzo4P11Q2s z%j=c4n~Acs-g7sYlD(GVYv@z6=g)POq)nbavQm1aCnc^S{ZLgxSQP?#2@#MJ;(Y+- z5#`|ov)|@qVr0C2!^Pap!^$oc{wmD=CDKkQ+f6gi%^=@LyVO^=2BF&$XxWHxsYJM7 z5Uz!xz7;{fHJ|+JqXRm_K6b@<;-a0}VvKPSFM4Bif5hsJAYYCkO?r_ggf!F1G}DU)Hqe%v1@LVQoLKT^3+uFiaa=&dCzD<-C0Na8eArI?IExG%iT5RB z_;w*fFkj+x;<73~+6;SHqO1+lEVNO!);nd*XDy*8RZgujoU2!!gLuBw(ZAd!3=)10 z;4+YCq`vfj^wQ6@Uzs4#gM_t792yDN1S1N1NyHUGF9u=wmFzY~7l?{9- z3V&038cx*JAGi*E8=pJZWC{7{E@FV52s>_UYT^pm+uQryW{_jyeTA(jLSdHpXU~RY zUQPJ7O!3)KWt_Qk$hO^o&kMET@{Wk*wVt_`(`4gbo>|qau*M{+$UZw3=;tR>(r(dE zDpxu6_OX_{a0|+AE7Q0lXpo2%Emrg+!1@B{2E9tTwHk^QX7W3;7E1T*))hNIH;VV( zp-Udc9Zg<#JbHweKw_JZ1yK|p`}HdQ_hdW>JaVs5K5hEkIV=PCktsa73@U4v<4G1& zUSs5L=z+)>jor07AG4GDz0!3*{?O5g@vT0CU85-X$!YlG73KXtzUp+tyZcZlZqSk2 zsyFxUcnhuGSF-;}QnGg7dGtQe&E9P9n9uQWdf1NK@Wa3EJ6Xtr#~qt+akN}6BlgCp zTlN|b+uV>DtnjFHU|0U~7r$R%rAp^Qa}=*>l++}cPkM%5r%!)T3}E@1EI2&-0VE(i;PY2yM{d&?Nssvch9>RH<TQyomnBqyJ)1_tScq`tT zV~XqPMnX|}Kke7#Z*t=BLOZ<_Upup&BFC~Pz}G6Rcujr>e<3+hMsiP_)pohXVX57| z!7|2TIuffj3XU*J@2d(j=dtVpr$0wKU}eW?s2Jh{@u~FbmR~+a0-cY?>FcO2D%I4d z$@bA}hizm7qGgpwiduvb_xo$^@;qh7uwOr6RM2MqzPg|qrnk=R)&;@+;-s;m%%^N! zUss#R#C6A=`yv&1ryrA8^;8;>Yt|k8TeO@Z?8TrPRKqhf!(EJ-y5ld}^yrI9*3z5j zX9_FmAeMzy1%FxIls!+C&*K}rtHHwFEW~M@7_dQ>V)5cgx&69DsNJ^0Cz(8Zkz0p< z#94kRD0ddzW3>DqXQnBhbki}e&|?2qB+SC}TlrqjY0Ew74S9i=JHxodWO zJheaU2CZK}$BN3a(S?rP!EYI~!X%}`CJhXo!DX$?J5JpltiIE86_$Tj=@V10d9`k) z^O#krmdc4wElbuD*n0TKf4V%-J)e%R$jp-jO5RQSI`aIJ&$6+%<>&K$YtWV`#Fta0 zN@kMOmsT)W(rC@PjN7^1U7JXS7Acjb9gsV0jFOUZB} z@L#l)dEV639c|-TzG(Tn=ovB}Kv~ejpA)D<<3Q6K`xqSo-CKt5>{Du;YTa_$NMT|r zVf$Lt^+oAH-Hh^0zK*BAYuOfKJJ_MKE2~yuqYlUB5^m1h!c{^dDmAqh`PJov3+$-R zf<;4Fzqt1Wp4RHr?Zq_?w`{86h`;ng|9nXA!ImT%P@6IMI6tmkk|>Fe6i7F=$6_Ub zEOwGsTfx6+qUdgyT3GR%^{qmliGMN9xo8-agZU?Abg%LD`F;u z7%XQ359+T!hjCgXHf}jXjCzMMleGQ~y??5H%b!K^z|gYOJVtG#uP!}VjJdi~*}@=M zS+j*zZI%6Fr>t$chXcpZ-+W?>6l!TIh@2R>ci0ltB3PlMqACAV%@jYm=NrenP|{})%XMH$ zDiRX8ttK;3CA3MCJM@P(n_sB2v22@mZ!=yOStQ~pE&p*<^rPCPMucqs1@DdT$nPh-x8l0aRCQ`^qpI z!jYtpR(rPOK5v&S>5&P%F+=8m2T;S?RhR^^5mgKB_XGZ8mAI9`n3Qml1kaGsm_u3z z&bzwFvDtq_QF4O7&qlY-d6XK88Q0V@wx&@h6b0e~VNzK#R(eU83O;%dnS7u%6rv;} z5_^p6l8yhxIu_;9;QJC}Hn{zGrV?DV*7fTBSk4QXRNpYHh=?SN)k;BxgR5`TqI=W@ zblW$q;9hYjYF75eS^mJ5ZA`cyg0>)iCX0F|NM%sW4&n5n_cghx-E4@%i6+9`}6kD44; z;U7k+rfqm{hn%~3 zklprnh6SUr^s7Q~8DbyOxss`~J5QH^Vb&&JJQI%I3KTMWBIdk$tjsNR=bu&h&W(^f2Y_1?A7xi|C zv9w!O+*6qEE;$mXa0x+)%YT}0IdCd&ISrJOXbUq!&bIk8$d%g$d%$`o1BTX5EH8X0 zF862l1&RY7Zr7u4EDIf*TO|!paZd-#tqvo=evhUX!!fVwb?zM9Ahvl1Nzi_?AST}n zpZS{%xtGzZq@3<_*?+OuP#nlhUtZc_vhhy1ba{9DFEl8ye}bO556&eu4TUAcE0|T0?h7fOPcr0=ugV-{L7N_4VBj)pAo+qm6yMTtffA=n9`T530@r? z;UA#r)wi9T!~F@Xl(_u8ZQ!@MvI)A)wvw54QFnR2IjxWVD{#3q_FTyu>%FDI}>YR{l2Kq2Wr%ga;_B@lS@W)N8)_R?Q*g1gm%g8Ey(A9~50 z#btK+WoX>{_oIAj|Dn)2-f77`!>dm6Wgq8UCFy%y9j-cAgNNB((s)!N@L6VoWc6OzJYi}>J$%?h}ixC2Yjly`*DvEatyAhXPeav&X=-Je6Ql$)xNyk6AZ`CIMH)|)lK5OE zK~_jeT8YAdDJ${t%gOiOH5Rz`Xx9W8!S?X4Kd_2^?8ld{TysUq8<%m{xNsvEQo{iC zF(xnv3y;=7aQjb059&s6WVG?3In~!?abjMHDV3_tGB&+KWA3Ot)S;azf%_}n*KH^> zr_^vK;@V~JdC_Nq>A#TM4b;?FDj?vm!soUTw zq;3)(Q$&nJ1HekLOv;0rrt~NZE(8b=nWT}Qi7VM^j)=--S_A;NyMtjBQuexl>A~dd z%#;BgF_8dDPjpN;ub2Rwg;mc$9-%U=&~Ge8N6=ET7gTn{dAU9QcgWeLi@$?F8tLd* zmvx8IVxv(};LW?ZAVrx<$x8R)KL8r@fLc6VJLO}5YDT@Wy1c-UpM5e;?~nL3-Oj~Z z{WMB*g*{ZX6%X%5;$^~t*6nBN4I?V5KRdq`{xKPSa!u3grpEHEfNvbUd0VQ;F1z-s z;3EZlHdfLiqgCiQB|H#<2sW0$0Ca#<@`NnZkrIWPoJa@<&QV4jS0t52Nu!EmqWGIy zm*Ecu;+5lb_K<<6>(5bhK z%xu)ic7QiJ(c>I&k;+A*36Ap#lykFo24Ym15L)&!^-JpefX_m-d0>D?|Jf=f*BK<# z2&jz#e{{lmfHJIfLv{8zG z-rW!YK9mSslN25`HvzRXnN;M>tyh^$3r+JIfxtON@mjp0zI&FbACmRqV z%u9>hTjuRAi>6T=l5w?@*&>PQPckT9S|Q>}f`Vk&?o(Q$-u);e#S?aAZ1qofdO zI3Uv(uX8X6&OS24KH;26Rr!Rry)mL9>qBL$^oltjIp3&vj%VP~%mbc|xv953 z1=decAoWQz@rI}&vrlT29&;<>1c#xO@|jr(Sw(si@Od9Bnw2u#L1{T*7KYPZKO{Sd!LiQdS$aq-sf`%N0xO z41&d}RTWEM5W20Xtws$^Ye?EI(te%)Kb>`(_tIY54xin;do%yv_y4|`d70bo`1y9f zAR_B7N*Aq*-h~)r#9I4X=Y};#iAdyPaqj;bBC6jv6aq$vnd<>^fR2Rf0TJ@N3A?JirD3T~xljCd8@QM0&7taEK;()kzF_GTQ728jxF>{yP-*A{r(b_R}mh5-U zE!oO1(*cO1;ezEQ$-+Rk-+GPDB3c)_oe2SIEnK6SYNu+J^kSdN?cQjwV5wH;rdZIO0W0ngt>IXFT{nmR2APxw8X4{V0Uy3$FB@wd5 zJNuw7Q>mj+uBPkKe)zK3x*EXgKtBc14EueQeY?YYkQ+N#Y0HW`APxiW`Dp)&#D|9- zkT#9D6Z$J>#8w4M2VnqUKKkjtu?&FqQS!B>Fs)Y&f>1&$Ee;@_ddmw7^6c_sa_Grr zg0LK}Ax)9UcjYNJuMo~J8?J>lnbg>bWUBf2#Y%HBGq6JjSPTx}=!H15&n5>LfWT*{ zKTF~hG1ezCs~2hjXz`;n-YRD7t@qmr@y@B!vN%6a2mqi7ku~}OZX}acX}6Wgu!{)d zON+)Fr3(N%*iTB!FAc&yC-ZN=mbDadB9A;YFMA$ckd0s!*1KR&5CBm4-jIa$!bpN{ zjLHCj(LkMGH9tJ%zar$7}%9p5g8H zjzAnIAnZ@Vqp+P2CH!AC08r#g$~Slr zF(8c2M-$?r(%BJ0SX~XfhidL6z>r>q|#H{kOz?}QprvnL^yFL9Iir? z?fV*M1OHb?lqA?Fq2C)p`Jw3}Pq)#Jvj$TvXH7F@_V* zAnpN>IUE59CK?qF09qRY7}LvV&27FHg(iU70pPB#S4jtp`9e0>Ce3 z>ReiF3GnromX>$j9jR(7rRpRvG<%?k*)!68bVSU@A;b3o0D84y?_4=P^^?rIu;d^t z0PZy-7ZU>L8UPRn1OW(ATiT!JS0#%=I@jh7;LogoEW_U+j=;A3sSMZV{%V|=JiRv# zRxI{DAkcsY0PRg!4{-);M=t=ND6a#+I|gy@fCu2yeLk7n%>aa3tV1@w0RiAkfPn4y z>Q4Y}QRg6RW)NU-Ahds*`K+EO;~>XD!Up7)v#2{V9|IH`hZO6N?7jU6C$3oYe>=KM zM;|vTRelG+g-GXguY2fUAF=#71X9 g)fJN%(7Rpt4_o(^b07*qoM6N<$f`_BzP5=M^ literal 0 HcmV?d00001 diff --git a/public/manifest.json b/public/manifest.json index 71e2fa5..f641ac1 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -12,6 +12,11 @@ "type": "image/png", "sizes": "32x32" }, + { + "src": "/favicon-96x96.png", + "type": "image/png", + "sizes": "96x96" + }, { "src": "/apple-touch-icon.png", "type": "image/png",