From d2d16790b807cd8db60b06472aa73536037b5e67 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 20:16:41 +0900 Subject: [PATCH 01/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0notion=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E6=9B=B4=E6=94=B9=E4=B8=BB=E9=A1=B5=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=EF=BC=8C=E6=9B=B4=E6=94=B9=E6=8E=A8=E7=89=B9?= =?UTF-8?q?=E6=AF=9B=E8=B1=A1=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site.config.ts b/site.config.ts index cded79c3bf..1ec2c66569 100644 --- a/site.config.ts +++ b/site.config.ts @@ -2,25 +2,25 @@ import { siteConfig } from './lib/site-config' export default siteConfig({ // the site's root Notion page (required) - rootNotionPageId: '7875426197cf461698809def95960ebf', + rootNotionPageId: '858447c91db0434282b31b8d08d8df83', // if you want to restrict pages to a single notion workspace (optional) // (this should be a Notion ID; see the docs for how to extract this) rootNotionSpaceId: null, // basic site info (required) - name: 'Next.js Notion Starter Kit', + name: 'KujiraTiku', domain: 'nextjs-notion-starter-kit.transitivebullsh.it', - author: 'Travis Fischer', + author: 'KujiraTiku', // open graph metadata (optional) - description: 'Example Next.js Notion Starter Kit Site', + description: '', // social usernames (optional) - twitter: 'transitive_bs', - github: 'transitive-bullshit', - linkedin: 'fisch2', - // mastodon: '#', // optional mastodon profile URL, provides link verification + twitter: 'KujiraTiku', + // github: 'transitive-bullshit', + // linkedin: 'fisch2', + mastodon: 'https://fedibird.com/@kujiTake', // optional mastodon profile URL, provides link verification // newsletter: '#', // optional newsletter URL // youtube: '#', // optional youtube channel name or `channel/UCGbXXXXXXXXXXXXXXXXXXXXXX` From 670d21e1c28aca42cba8d6b822c6207448bc5e57 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 20:34:56 +0900 Subject: [PATCH 02/77] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AA=E6=80=A7?= =?UTF-8?q?=E5=8C=96/=E6=B7=BB=E5=8A=A0HOMT=20ABOUT=20BLOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/site.config.ts b/site.config.ts index 1ec2c66569..70ec913911 100644 --- a/site.config.ts +++ b/site.config.ts @@ -50,16 +50,20 @@ export default siteConfig({ // whether to use the default notion navigation style or a custom one with links to // important pages. To use `navigationLinks`, set `navigationStyle` to `custom`. - navigationStyle: 'default' - // navigationStyle: 'custom', - // navigationLinks: [ - // { - // title: 'About', - // pageId: 'f1199d37579b41cbabfc0b5174f4256a' - // }, - // { - // title: 'Contact', - // pageId: '6a29ebcb935a4f0689fe661ab5f3b8d1' - // } - // ] + // navigationStyle: 'default' + navigationStyle: 'custom', + navigationLinks: [ + { + title: 'HOME', + pageId: '858447c91db0434282b31b8d08d8df83' + }, + { + title: 'ABOUT', + pageId: 'About-bd3e799e3ec14c28848511e4b5450d2a' + }, + { + title: 'BLOG', + pageId: '6ff6114a871849b785453bc706574282' + } + ] }) From 7fa4398481f67e1c6304e1c2c3debb30c651090d Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 20:36:38 +0900 Subject: [PATCH 03/77] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon-128x128.png | Bin 2964 -> 16458 bytes public/favicon-192x192.png | Bin 4812 -> 29592 bytes public/favicon.png | Bin 608 -> 2074 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon-128x128.png b/public/favicon-128x128.png index 8be6cf34869d0a6cf1455cf6fa888ab7d9ab92fb..aec39335fffa99cb205c615f6ed3ed3bb5a6b9a0 100644 GIT binary patch literal 16458 zcmd6OWmFtpw`L>39fAb!AR#!7yE}wn2@VZ3t_?H<4+Muma1R=s;54oY1b3I<+CXq0 z-cR0pXXehVnfW!nR&|}Kdd{}9_dZgm!Zp+taIs!s0RRA8B}G}yr*ptx2L|%fzpCLy z#?uMYSy2xP0ALgUbsz!KGROgdXSFuk@7><3sS2ArIdGU+IDsuWJRO{$&;Wp_gr~Ea zxt*mO9oW*!#!(D-)Z7lFv#}5ZzT;ElQgfEEw6;d=R{meSp031z z)^2Xj!knBi7>ol3;&5`c;^Y<*65{0I;pE|Ae?qWBy&T=lJlP$gFaJ$J))H#&YUAu? z?Ve?|+ATav2LVH?#je(!yLA;^gXJ_N1+igPD~jr?aCKknV3A3d=azJGnlw ze3A?FpYJQl$Y{7aL2T@w9zZn}r0JC8Wcay-`1#p+IJo~IsG6Fvk|Wg3%+cIZNmdN_ zWEl<{8w+7xUJx%oH#eBwjF*p}9mL1`SIJUuk z7XO#^-?-X5#h;n||1+JZIQb7#{F{o@lSa^|28RACiloh~{#CNK5&vhzS~!_MiTWQ^ z1-S$ueC7gz?7RX(5Oy$xm!DmbmzR%SNI(e8&&LDe7X*PtIsXcvClYl3Ed7%#=YJ6S zulWDNt%VhB{*uS*Us7mUy8JB<-9J28*v$N|2o(dG|K*yN7Qlbqw)uZ>nRLML>_&WGbh-Q^bq1L;bnftya z7cIw(<7hvWNB`t>w8l=?34p+R#}}(;18OLXrf{18N;Uyp=b+6(B**WIydAhn|6har zW?rlgd6>2&X8U~Ggq0(O?ew9QI_)$)p8C_&eqQNC14zo6oPy9}{PtoheLG<%E|f|=Y1{}I@E z*7fNjK3l{SVTguoDl3Z`N=bzm>pvCwpiZk%@=(R(AiIGFd`4chVv^m_D(7-3FeC}+ z_#JG?^G7Wv-9M7^_6N+_twJp`C5#K;|48fq+y6F|)3`;pVd=HR1KG->?@@EmZ=J&} zbyQ>|)RGU6>V{~pm3tMm4aVLo}6AMPc*)gF>c{MY0CDPKR9kOeoh zfKbZzfC<|ok8_V#1?`t7R@T)tg<41W0}sO{*QfqFD_7<)6eK)>mu8nGk9n6`o3K&5 zgPRZmyq6m1U$Dsc0`DPzI4xB^baQA!)eN()EzJ95E#1>wMVPvVE)Z3!YMce_- zqPz~=0HKJS7CwJTbyY(uG%`KF)tpJ&)ye~Y_ITi%$~OXywA_o#k0&eF3KF-woG9O2 z0fKl!7<6I^4lA`m@;Y#NDr2gJJy!?}#Y`htmX0yLh-XT=6T44CB&)-SHy z7GsbVCFx#E)+h^y?46~2MGWe+t6~6}Q%Omg3is-Z#P`ZeKYrc7>A_C+FmBbBk9XH{ zN9I-*AfKxmG9MB1-K2e7jFh&8RR(QuqwGTfd zcAP+=&whB_VY&HdQJ?Mg6ykJnaZfNht8s3C=KA1bk=3M-6gZ-4KEW=E7&K~%Z5ogI3*C;$M<4HdnRE_4QV z7OfTIGzQq;k2MuK+Uyz}?hIo=MXKGPlA-%0Ym1^CEeS7DwCMcq%<~($-qy;b{}9I4jORz1HLJ%QRcw}E2MKNhzY zw@&_RCklubyGbVC#M^ZiS)$NONxHuMe#Cxp1no2K(drul%VQsCg5TPR==I)!NM%Oz zO-E2(hp0#fWwCInmk1VMm8iJa!=XmtM`xs$D^+oNTcm{R{j^O-zPLv zQo|xxNItGQgYoFM=tTy7k?4Meq^`Po3hqN9Z9wX3Wf2-vUqHVw)VZsh;jF~O3!=0? zQZ%DbLqLnoV}f<-y=wsNwE9n-l)zwRr}<{x_MnE4Rzu62}`T z-x@wwqm&Bqj{RYVpdxeX97P~uXr|o7N+UVkXFlE!`rl+f`g(fb)Ej`)7YZ|R{SbeK z+waXkKNk2O_TMm68dHfsU~`J!u3h(bF3=p>diBD7Tl6AhR(rXiY8_EC#X)Hz zo;({QrQgF43t>>|WKYF(4CG8EhMe^+fgk&e8#)qD2z`3FNjzG}`vZ)_JNqeSU;l z^ETPuPNGWe3?S^5yqCQnef*EwZ?h%NP3{D;Z_wM1H&^@+$5X7gBU$j{ViVs@Y?HQn zFN3Drji=${v$-HBy%x|*q2iE`kgl>=_*LI6knyWEM)mDlD0|gBP z!;#_FGJC57=z6Pio>;L3R8=ihR;8E2D>LrcsP233yfKQl4$jd^fmqG*Y`&zdTR)k% zHa8cg_;y}5b~Ar9-uq7CeBkkb%lxfDGL8+M9EfQq@E9mGt-bf&&nJXylDdlOW&JBgM z3Dl71rN_Mt%P*wQ?e)ni2}dc(MjGVpmF+3i&BoMW4M^+EOp)tZO0oRjxhkoZkjcp3 znGwQ+3MQ{oOomo{ITghyOK=xI^8MgR5bR}nrUG9#w-tA|LU2cL3-bw7- znf?HZ+NLseP1Z<&c2;b*qI#a#NN2Nfg#yqSRI_QQWL0 zl}9ro)08r}RHV$-x`SliWk*d*mWdS<3i+is#e^DTRzt(GA2+xCu0bR9<`m&8-rMs> zx5p^7H>CMKn!owApwJN60x$L0opsXyL zth6edTLL8ciy2ek9MTrk4=fXIsOsAx69vB{BR$vd)!s!xS+j6@UNZ|ltI%XTJkG=% zY;ryaVj`)`Now^jtb9S1UNxvPIAW1(t0&8JkvA^rg?k=fHttZ1o$K$&WPI^^1CyI` ze~$}&GK8?ZJ&$dweh?wRTyU^+Fd23hpMB?QeIs4pVKH`+I77Ph+ZuZMkO2uYQGZFJ zG3moA?Czx?G;Z>6^3>V=oYgi0yATtcHfRv}y+m2O+@a-+Ad!AMR6>uzov1k(B`4cA zs2csrTvav-nH7r_FF$rs3}1*(Ey2{*7B4h4?X~TiyfzXV(Hj=USQ3TiWSCV=DQup5Z$HHi3%Pd88 z`|KD|G3eGWD{OWc=CS|tviA%>fDVOFlI4N*abwW`eC6@3RKzZ?eA0dUrysWBkO+te3V~FNs!wLf zSxnaZ&J^oobuN8w3I`G`#P+g%3$k14M0{#?ie7mX`}{Eb*=J`y=Kjj$W?>|I4!$24 zYWc-)MFH{HFY%Z&w!a&7=yB6E;Qg)w;q;k*nt7;-`1b|`n?!QauDJtnRlV%V>?qlM z;$3+_#UX5T*7QChCrpok6jhg%{+aq>G7U{Gsu}+Txg{^w9-NXVQkGCKg46`~xPjOk z2GYG2Liu6CYcLzTy?#=ceWkK;>Aei&T$Ovy;H5!InsbYodrc&9nO?a;wLl)kO2n3wjrP z*;LWlU=u)l4V7^J)5D)5a5zsgNH(8%?bmiS4>wB*YTe)dBG~_G8(C7?dfwFDXay8n zXp2+X*TO*l}~dT8dow|4YyqMzj?Uu89Oi<{4(5-H>u9A z)(sZ_W?D?0^R*<;M&C771QeJeWsksv5yjwSZa(Ad^zvK_za^Htq==QoA?^rEc!ebB zJ236g;3VO_<-Ba=h`srKvXYapyjXS&s)!BmRhN9RCgPqpM~7WnZ5c@eOz+$fhJ2ib$UbwY>AI=XF1P zJO0YmB`$3!vb=i51Tfv-Ss}rH{3LO^WHqwYehc$I5y%p1Zk79(E2Tj=3GMtSKlgctoEx`@bz@h!5^mQwqzE}cte-Rrj7I@#qXY+q4+}Csez^QH zwXTTpz3Q|JJ(&^rf2e7{K48vjSy%8o_C4~yb3;X5L}J!?2PA5%*eM@96G8vkZ*p7e z&lnqsN@F`gfY%W)m@xBWLd22!{^7`bwg1xJ6FP6~ceqv%`R)>b>mJ}4OP<1x%2~kL z3a?I*{z{T=d8#6-Mjw~{!?3w~;InA;c~2gUIGi|ev6vt?jR0-!+HhAZ`{5T^c5{!Y z<2s49GznNrjt_vwO-M{k2>O-~QIZ7gDSSQ1%_#7a>C+Zin#FbhlW4r+OEz2E{2|3b zv3+9^@riX3$Orm_5688n)8XUzQj>W#EV(62b0voY8CC?ITBK@B{nC7N-I*O6jBMH5c ztVXlN8o)o5~N`iORig@Ge2~kR$voK+V=Q!Kz1v6|i3O!yn#(zM#XH83X zMzZ{r470$=O(=ZFiJN_wxczbT5VqLFUmm7h{(3>B`L6x0)#P?+B*TH(fJ(6ypNJes zfL(u#0k3PYfCRWk$4Z1w{FafRXjh}U`6oG8c`&1<%Qpi|5#iOUWZ_7s1!7IoMxC&6ptQgyafK z5`g0aS*{Rnicut-V+7rZ1nfAn{Vef~-`@2p83aD+_L|%5Rb*jYiasBc0!~?oXu|oJ z{H_CR+w|x-@#ivh?Wf+nlS309uWhTx?3JrQr&f{~r$nanZet91)eo#G zwt+~VBAc{H-qY)r7u`!N-#tTsX4U=}gJegABFRNhrtm@h7z# zG^!4uUow>>*x~cewKlrcil(IhNjpW*zr$O?P|%Z%pH>WIVw6BT8FF(X@u4$ zgj&w~S!34s9M*f$DpPHPsUgD&vMiyy4GFQ!@He8Tcc+!Hs~i0j+r-zM(txWRI552@kDdm9sLZOziAPQ1OtI zov%;j&ua}rfuhH!D&eGI2Sw3IrOXY!&o4@wJAa9+I@kr@AOPEIj&=1ED%UcE6UCvd zC5_kC@ERB{Q7zEkcYnUyX}`H5MS&Pc$tJMXFr)f0D|7RtcZb`4_0N=NdvED}?g9xA z0hQrc?(`dh%}YMvr4tetqNF`dsQ>uib#IG5oIGCs>V3GX@=o*6EVIt)ZjKFpIaw17 zFk>-L72o%OMCysm8)s*rO_<(pkObirtOu0IXf>YoV#=^kbzAdH8^Cu}V7y=Qj#(+oqeR}6s9mrBOlnEU4V2a%{1ogo9mq9LJRw@e0*8_p z*iXjeb-s#f=wtS3Q{)w?VtgZhJt~I3?0^32cWO|nlu;1g@Y_i*#N^gAC87uk#HB~Yc!o*Du#IzR>7Bm@ zLIqFf(xVa*5`qQ_8ub=32`vZbpc1rn> ziaB;vZUHDZxA0f}l)kc_gh4Px$cgn~LpJ0ss`Y?`h zqxkc~`TSKc;ZIY{(-Ze7hChrpi5RL3i6YNH0y;(kSnxamknMg;-*e};7Hkpf9p`g$ zXLmdE;blOzU(aL=cG8i8fuRIJ{o${v(^9A^3W*qgyk{9M!OA872r9MZ zD993=#4roNa@RK5n3^?Shj*tkphZnTEyteEvyySN-;Om;e*s`KnVU21_Bz$iu=Is<)S0v-wXhyqzSx zM%Zia?^Vby{&a9hGu9$}!{~d8Ahya~-179r$uStZ5u_+|+PAm$!k86unW-{GPI2M% zeC}wVcjeF7ryiRrh~YXMfq?wNL3lEB< zY;}H3CHPabo(Iz!$&%n#LMOwYfi@0#&FdQ%H@wtTh|G59xT0uW1NRSr8ZJO+@pE=Z zUG0HbGe?N5Mcp_2k0L=~{i%wx8l@&A=X=hw!KtaUOWGjadj|pYjsjhK3q*?rhG1YW zs$hyIdG*$KE#^QOeoq)TznX2(S&#}SRdvQh6uPykB68GpG+bBD2;p&e1$*>3>D>qT z95_9&ubIljNlpi=&$<*qJlZUNT&0kcv;ZAgzVpif#nnzRaux+?mRIr_Dah^==rtnh zZ?f+?d>fXl+$~{`o6zLjGBstOS*lG{3OpH@*kABU2oxwqkE+85BXVK;Y#Zo(9=3)2 z8iJU@t!cJ<3pEEKr_2uRNApX{zE25LBoEGrG$;>_{?wnz*h3yc3IT5sNGnIfLqe89 z=9YEnYY%U*IcaIww(!L~2N;Mv>3D!<#|ug_{x{zqnt}<;d1pl3f`L@YmYrWdV}%C! zP=v9{Js&U|nL?!^PGS7muhvQu8}$5rn0Kzl=69Q4MzD;gqa1Jk`i02ttz^!l5Qe-u zC6f>36k&wK-(vg3lB-*2QK8JS1lWYcmMN9Fuky02p_c@~7zG=e5n;S)Jf-2$p#-bs zu8_hP+5m0Iu1VRR)xp88YPRpm*I&Z8RC-rk+XL{_aJ;y}?V4}9bN5%yJF0pRj_RFK zPI+%Q-`q$0XRp%X)AQ5Eei)Whqfq8+oYFcPc-=BY9o9$7coY8gY_X=44eI<3!4xA!eN8HZ6SyJQv1j+9(JOWJRYIM(PTwE>MVp-($o zV1y*o%aVDM4?bX?iOC)US+$?>9-=gt`jga819Z&JFl821wn2sgK{8E-+}!zEwbp}D z{4h-(07O@Zy;n_8mdHl_C1hLl+t^m>yGlNKQRk6*4JJjo$KB$`ryF>Q(+OJX}vP3B8?v%`T_(+?+VoyWD&KN_rSB4_PhpN}gm-W&^VD6_Dt- zU(SO|Y0E=)^3)A|G0lpH)U|Z#a!(25Prn$qUd>=g?dyhqaP7R3_uQ5>u7ZIz+*h;>OZjaQZ=o28 zs!WN(QreIGODZgC69jLE;R({JJqL(Av|NIua3>uBP^bnsCbGt_>ZFQyor3@^tq!5D zgY;cIQYPc9R+qF*+q2VY+CJ8)#g(ylPE=$Yd9?S|ho3=&MSfgdB7{F@H!|=q@Pma6 zf65t=`pUA-Cvq~2?5k)N?7b6R2v3z;oJGT}qOMef;a{K(r6=^wV4Q5op9V6&5x=M) zuCcpG+|Clp&;#kCM_D_Xx+4?h26S|_A$Kf_1)D+~5yx^Z~Gw+B4m{^mHvB1>6}&}9b0$Kd6@AhxikiylcleCyRPSN@irf?*`qD|w%ep) zQyss3cTnX@AM(@Ki&o?X8WYgWg%c7agrjTX)F&3S$4w7e-6_-&kgd&t7};jOX3|)R zAZGY9OCUQW7~-*rXsI7zI}E0dM3`Fj>|Thdw?6hqmwKa*WXbj$F78W{A!8p`xrbZZE;3F|Sl9WCXlkzjIg6g{dLn%Pb$){j)3 z)){s*L-uz;&aLv0d|jq^KG^qcd89eoNUCjZ7etpn4$7^B1O}dl071Ch#H|^i{}Q4cWnBT#$7VhsC2J62Fo<+5ptrWgkbw5JZ{@@6( z?cBs8#*>nsVP7PaE~|^G4C&u3f`w_7uDoLlT;-}sNK5!wtc=m4y(lCP zW`dTXQNQ=x^#T_edO_+f7xjsZW7KWyw3L-}cskZbQ9G~`8V`63B(qhPS;0oZ0 zdwX5B-M+~n7Z}YF70O6yV?=3j4F8bO$%n!Xi74J}?yXx|Dzsrh6*w(u>-Pz_D!-%l zeeM;ct5`}LCKs^lb~E1_dBCr~a-8#SUyU?!PHLjh_j37Sr~BKHV8Kkqb#G*7O=|rR z6Sn)cG6#rN4MTIE3F0acJM%yWKnq%&`l=gf4Pdm=Ddm`~L@D_EN5B{}?4x3@gl(>S z!ZUVOzPJ}$tMfh95ZS<#rZzhTwGhM+JEHZrrhcfGB*E$c5?tpB#;hG|x*3(i@*>LIKG#qX<|pi^iRJZ5d7Y`Y z`!|wZ1DvpJKdxEgPu$VGXwq=o*{@HLB7rknhO9vXYB=;d39*XW)Y8LTTAr=-J#<>^ zLNl+dA#Z`~+qB=Y;3~0WgL`ttaN5dRf9(}OU+I=UJBv2oc7`-gPCq=wTkhFRj6;_1 zNdyIr->U4_XQ>2ZSUKMXjB-wx(3~sDyRl-S5MamlX?JYe?!4R1trpZ*K;6%Ph?7-kf2XE4dg;p64~`DPNxY16iu57$3tU&R{qE)<(d*g6H-4*u z-FlC`oT4j--V0@M7MBq;l*FMOY&~5N=Y|g1bCFAOb7h-UFji?v8uexZLSgRoPsudu z^gAp6RJXD;EWS6-G&oVe`#j`+3QMckbF0bOcst+Z<8ZW5PTAn(K+yL&VqeD}xw3tA zrX5KEBtHcNbQfUS)^XQ?C=QD@@KqP?}BceUrEKqlc4{A z9@Q1Bld|`*Tq%a& z_q7Bd40r;;N6(lcYctowug%-T#OW_3^u=mKhn!Z^e2h@o8fFY(%oUt&DJjxX1sjW; zn(?xzh_8$)R;d`}W#8RoOzx4x=+Q_w#u?x~yV5h%_V$&XAByM1;-nnn7|`&$dBq=HFqxZ!SGQG3QPq@uMA12~MsZi8 zQMAqUZ7s4QAZCv3={T(QJ--`3YVx=vWk*Wt_`0JG#ZYapf}mHX0NOFQ*38RnUg?=f6Fy!-(yo8&8f_F|8u(RPBL8%?Jiqm*<= zPKF52aqH0H$yet;-7hJu_-@PFQw?Uc1dwYBRjiaCEhdLH)EB<~Lm&;Jc~fy{yx-hw zAu48@JB=A)X~FdHx-!)AMBeZbW$>3L4>crGC7HvCc412rEtFD=mz~i{9Y{s){M>aV zZS?4x46!UuGo0yvSQlvolRT!QN6X3CzwOQfFjFyt+^5vI4M=rabT;|bWZG2kFin}D zS~XZBW46X|snlrSC!e~79wLigBU4E6=%2JxG$W|+s8$z6G=409C)3J=={ z7d3k8Lvap=RaI$2=Cov+sOERUc^@5%CgEwRMAU>4%DCs;)536mE6pf5mA7i#Jdx=- zw}jj^o0<`>pfuMAG7jUG+bn}Ol?psBA&dfl_JyKXzF_Oy_!awl5HVrV*R5}v!mQp8 zD#RvQEVQ-4tbwsjki0quPUqmt(X-eso|gJiD?a>>|3I+xnv(cdgr}YNv@Q zimlNL;y@iY>mj&ie*k`=lZ%|X z$A=6Oy}!vAQqxs42Xu95HkgoC(cXiHiU)HTi6z;%`kOG~z}6h?9@mpq=d8`302=R^ za9x1lBBtt!AV#|!NV@_^IK^PY`{MBM;I)hG3#JO+0Y=5951ouv1zqz~_`)3)&XPqb zyo*mukmJt;3->840?8*eOlk2%iWJkNiL~%>Hl)y(GHQ>!);1jQvpp~1WF|f*L< zefMmB^Yr5v`IkVKSn0hU&4Mbn({am$q~{6xPD+-k0fd_N7nKNga9Db}>?^%+X%QNm z_U~r&aY6)DaP*k5&hS6?%rmqfc6tzX*qkP_Vzuip4B*}E65BRt@QGThgmW*A+}AP^}5QPYQ4FMG1Ir>gHCg*X2o4adX z)Z8B9*FTj2hvP*T6E^4icLCQuY6WLSW)~c0rllwJhq<=NdGXoQE4*Gwvwzxoey>}j z=_pcnzk$9YM)Co{x{bfJ^kY6msM^DUwF)=V7zM~V;6g+Sf=-c`M|a~@?y8BM(lw@{ z62=+2(wS9&7+)};Ds9;!y4H-XrtQhmz_3t7FsaV|O^g93ynAs4`pBM6%&hZ`VTO@$ zB?(Cv(zuM)LqABCSsX2IPA|Vi;vD=;X!Yx6A+|o>sf*EX2$v-(SX?lp%2_1yL%%GQ z=9j{^r`Kj=;Di+03<1G#a-aDg{I<&&bi}+TBGoEe!s(}al*})>DXCv&NM$9Ny0JlN zaH(LafxW>=L5w}0FNy^*iJHifB_$>Bz%aQzhz4OPUXcjK~u!DiZ#EL%%9?S520CN{+rj^*#-vf z(N&Im%?Mi@>-4xVZ9v6%ese|XxtMJl3%I^#Y0xN==xqd2DNkdrXMsgWBi=&U>*n`n z$CjxZJycq(9~I5&MQXm#`j4CvD-|7J zvGEzIV4}}`F{#>EtZM!kE-M%;zTar`wF&CpV3R%@!-l^hkDw1r7fO*SgYeDFXazcAdXnM+JpxY+L5U57;`f~-x)fKOVUl=NQQC$se0gjR%YFe84cf#&_@En(p69xgJc}h@ za)`gpp>3KCwydPmt=g~rWNFtF2Q7|#H%O?7mG(0a!kvC(*vd0E8+O=uhRuzxG1wsm zF7b;hMhHJ&v&KN&Lu8Kb5itK<)@>8d-Gi;^`B%{@QZq39!NjHK&S<$9gf`_f*6`GP z;~^$S(&FT=NfUL1t*BepaM>yk4BL^psIACn0rfVl51<6FYW(h&Y6P?Y+45m+uvHRo zsHN6}BCV76`1;NarZ)4PVDQ_8lHHbUkW}zHZLFYoA8+@KEH4>PzVi@GstO|G)%Cmi zjE-!DqQ~zt+IwMY}wr@NKiAlCr_P+>+--bS2!Tb5kdbFfs&Cvp+ts{#op;xO_MZ!B~+4t~iAn zf4#tm)ipb^?7Iq)`uX6^E=)jd_QUSCBrE4SM2s%x?E=BY^Ah7skz^<`;W`GDqcRs+BM1fKd0?SJ z1q9q-r1TY35H?QQsb7J~0q?DaV)7}R>>aw!ra)Gb)&kRp)-83zEO_@hcK9=v%qY%Z z*}MZN`d|*fvhM;F>IH_64t@R17i0M)-~EazX7nT}MwQdzo7zwRktjhZn zdC862t)Xm|D~hu;T51#9;jR@`B0>lyjt6mu;JI7pA45lu{2xw3@kn6MXHn&6qswM^ zrTNiLKLJkGy%Rj`yjGG=Z|^3Mc_a*RygJwLhVEDK;$9K$A6-Rg?-~;`qkq(L#V>Yv zlOZbAmCR}K8or&-!J8Jf%6J+2y+wL_PZ9+O=M5Ld)-_@s=J%)|?s-`EZ5y34dZNhW z6*@g;;)nNA0t5`f!i3BDvXV3*SSmf_jHm>uI=RXb+*_JdMFu!_R!lt@(llu7Sh@8! zX)cb7SL1WtbaBs|&2!iI-_z_g;muOwoi|t!K_FikgG_*NXO@li z{^c7nspiDVytVt1(^J&Qgp+-Vm~pS(bA0J4zg!#&tpWwvahhe)u+8PzNwSN6sCy&f{IH&`Rq3zYa+poS<1*ZoDKd)ZJ{uw zHX%V%wV32EREj~hkQmbFy->gIp}iud7GbORO^7p_V#(Lym8sD4i%d`Xe`a0A&jMv>~Ui-A8@in}NPClPM-{hV-JwP?H zm92Y^_?#^&PVu?IuyJ;Tlq7vrIV$TEh`;m}0R2S=D*6y-&1mfP$CvhcLgGy3v>UW^ z;5?r78mj;aja*enXUU#CM89a`OC%+Fp!e7>Z|7onfa$#fhLTO*ojfj87Ncw(zuiWVSgj4!i3qdb!~AQ8FuqLIhPQBZBD<3YI@m>)3HLzbe z<;*ssLJ)rbS{2UTiC@viKX?($KGxS+N4tl3X*)l5<$L5U-KCyw5?G?wyraS*r!tny zS0^yVU{+4uKqY6Cp*VEI#s)X}2zx7y2+cUP7A;}X7}k?^uFG+gds?x5ZP}xEN)Q$f zgi;o`??<0$&h5F1Wuj33+v}^=lytD8a#>xbTiJ7Xk3;|%znMQNA6nP1 z&8BX|rK_BD{fhUo)9`J)wjg^0GR7xL@%@DY| z(I?Tteq2PY`24}e%^D-$ms^>M&gy7Q$`muSnpaZNMR~Nwp**_i-`jTQ-(UaEgsnXGb<^%Zl8Eef zTRbygo;;s=pCZeU%(DRwNGq{%SPv$DEolL9m(TgbSklb`$LS_uAQ*eA$Au#^Q48cf zlUad9_GWabsfxVg5WhbV0<6ks-R%0~J4<4&cBoXQH;cLjglj{VDD@Df*R2Aqe8#ptj>`^kEDZxvORebX%>%NBm$>%oDa{L_dghajCLwWaC> zzyRB@VM-H;_Gy{5iO%ZiOnZ^wb7o&}0RXGM+#y?mhp?VVXV__LCXX8+L(#WR-RD}z zq)8Bo0BG}Loo)>6d~L|$zNbIF=DzjaNZXfkXPmq->)Y8EA?nRE$5=@G6K}sM+SHJw z4nbH#>TO)3n~rl!Y*k)J#ZL0lhy3!yWeIG2UrxS6!RJsgqZh+LKUtMKg`STUm!z5E zB}zjmgdN)FXz9x%eEMs-^6rKLeRirylVq?q+YT0s?{Rx?H_h2}ZMHHLv1!O-+w}cT z|9slaRzpU?O6Y`G)>Rc5e(wyi0sXo>j-ET9wc0?wq-D2C->C@YM%*yVc?Vj z(JVdAngj2~p(D7bLUnN{a(~SHio5_-B3SEx9_r>6!6_XzdfCz?&7?^A1YiuI?O*k! zlY!(~idEw$c4S(SCAI`g+*9q2TH$1fEGYMc@Y@=O?^j=V=iMXceB|9p(4ST+1(urf zX6ka#Lp`Dd>5~>OYv#)KNsXIUgCzH-aH*sP_ts2~!gj2M*LU{qChwWP@&TYmhgfuz z#nwsv7V$!OGTf|Pbz@+YQ~UZm6&S;+B3n|V)hBpZM%#UTUEO&k8RswzmJ{*n9_-@j zFd{}Q75h@)_^s^=!WT_`+}RCkT5yQA0C%dcwB1-4gg&AfUkJri??zUiAKtn#etD0@ zY9#d*5D>AbbLzGPUUui^SLG4ODE+`4k#}*o*~;14$SiTu{rGE?HlHAU_k@X$zW!jI z6K_jqIAY9=y+?P*_Qe~Oq~C;?gic$Ze7sb4hUz{u;?`IHNxmi_BA6xYL@`dQ;{Li&cvWH2IO(@$kr85;oe<5k83P$`)6|9awz7rt7!jxP9-g2WXB& zDREM9!yO35Od5Z8;_|Mc>v{hBiblQbYyqX5)S3JWBHAjh8|~r`agXIHn(-*fpwrCLZ7Uu z%;Mgn6#Thp%soz7Z7)1Y3%TSMod61_*WNi1sOD+4&T+X!$j%Zx<75lbfBYzId|*fM eLSN07z{3#tEZ>e-Q8VRSJ&R&UR71) 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 Q1ONa407*qoM6N<$f=P>I;Q#;t literal 4812 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 B*joSq delta 594 zcmV-Y09 zBQCA+p11P+Fy__Fo9$7_YeSgsXL2Lfnb3x%)L)Z@* zZh@Y(xuK=O8Rf48(-YuEQ$iR!9r284df6d0v7(gf|s?{^Jse zo*>c~MD{7Sb7C*IZ&H`FxaGKI`Nv@F+w}P-hyX{^fmZ2}LU~7vqtxSl`pVz7vq#B6 z75s%#zPYe~cz=t~Rc2hkCw8YX#l2*kSQrr+#O@Q|?cIc|do<#NF_7YJD$*icfk4{! z+5UK7&hNG_At-;Du$%8dL!AVh*hUOoIs)(J&&b zs{qcJ85;l&Sw}R8#sRt400T4d4WZuxxDROD1UMi>V1GmqPTK%mCcGkiH8Xx`LgmCl z1HsJT6^lyk#H}zM?ESl$apjT#>M$0GQ~`7d2Qy>O5leH*L@HAmTi|LwXlTt0k1^M& zTo#i7Fr$oC7dta!pTDbOvU2VymmPgBVFMh18|nRXUCwnwd0*VEyf~Q|ZQW3)TN=AU zo3cW`AWJx`rCqJ1J!z^HW%oq_LQmOL|G2F;2rq!I+Ilrux~GGsp-0w}YBgB?a Date: Fri, 26 Apr 2024 20:44:58 +0900 Subject: [PATCH 04/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=95=BF=E6=AF=9B?= =?UTF-8?q?=E8=B1=A1=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/PageSocial.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/components/PageSocial.tsx b/components/PageSocial.tsx index 36ec81900c..11721d4830 100644 --- a/components/PageSocial.tsx +++ b/components/PageSocial.tsx @@ -12,7 +12,7 @@ interface SocialLink { icon: React.ReactNode href?: string } - +// SNS图标管理部分 const socialLinks: SocialLink[] = [ config.twitter && { name: 'twitter', @@ -67,6 +67,17 @@ const socialLinks: SocialLink[] = [ ) + }, + + config.mastodon && { + name: 'mastodon', + href: `${config.mastodon}`, + title: `Mastodon ${config.mastodon}`, + icon: ( + + + + ) } ].filter(Boolean) From 41d42f6fa28f6a6ecac3b63e952196b43afc0a92 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 21:18:13 +0900 Subject: [PATCH 05/77] =?UTF-8?q?=E8=BF=BD=E5=8A=A0P=E7=AB=99=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Footer.tsx | 11 +++++++++++ components/PageSocial.tsx | 11 +++++++++++ components/styles.module.css | 4 +++- lib/config.ts | 1 + lib/site-config.ts | 1 + package.json | 1 + site.config.ts | 1 + 7 files changed, 29 insertions(+), 1 deletion(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 2e5452627b..127c972c5e 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -4,6 +4,7 @@ import { FaEnvelopeOpenText } from '@react-icons/all-files/fa/FaEnvelopeOpenText import { FaGithub } from '@react-icons/all-files/fa/FaGithub' import { FaLinkedin } from '@react-icons/all-files/fa/FaLinkedin' import { FaMastodon } from '@react-icons/all-files/fa/FaMastodon' +import { SiPixiv } from '@react-icons/all-files/si/SiPixiv' import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter' import { FaYoutube } from '@react-icons/all-files/fa/FaYoutube' import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu' @@ -76,6 +77,16 @@ export const FooterImpl: React.FC = () => { )} + {config.pixiv && ( + + + + )} + {config.zhihu && ( ) + }, + + config.pixiv && { + name: 'pixiv', + href: `${config.pixiv}`, + title: `Pixiv ${config.pixiv}`, + icon: ( + + + + ) } ].filter(Boolean) diff --git a/components/styles.module.css b/components/styles.module.css index bea8ff1ed9..a6d44483f4 100644 --- a/components/styles.module.css +++ b/components/styles.module.css @@ -97,7 +97,9 @@ .mastodon:hover { color: #5a4be1; } - +.pixiv:hover { + color: #0096fa; +} .zhihu:hover { color: #0066ff; } diff --git a/lib/config.ts b/lib/config.ts index bab17e983c..71e217608d 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -56,6 +56,7 @@ export const language: string = getSiteConfig('language', 'en') // social accounts export const twitter: string | null = getSiteConfig('twitter', null) export const mastodon: string | null = getSiteConfig('mastodon', null) +export const pixiv: string | null = getSiteConfig('pixiv', null) export const github: string | null = getSiteConfig('github', null) export const youtube: string | null = getSiteConfig('youtube', null) export const linkedin: string | null = getSiteConfig('linkedin', null) diff --git a/lib/site-config.ts b/lib/site-config.ts index b8c4fb60a1..826c3089be 100644 --- a/lib/site-config.ts +++ b/lib/site-config.ts @@ -17,6 +17,7 @@ export interface SiteConfig { youtube?: string zhihu?: string mastodon?: string; + pixiv?: string; defaultPageIcon?: string | null defaultPageCover?: string | null diff --git a/package.json b/package.json index 022285a387..557edd60ac 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "react": "^18.2.0", "react-body-classname": "^1.3.1", "react-dom": "^18.2.0", + "react-icons": "^5.1.0", "react-notion-x": "^6.15.6", "react-tweet-embed": "^2.0.0", "react-use": "^17.4.2", diff --git a/site.config.ts b/site.config.ts index 70ec913911..fd3444e082 100644 --- a/site.config.ts +++ b/site.config.ts @@ -23,6 +23,7 @@ export default siteConfig({ mastodon: 'https://fedibird.com/@kujiTake', // optional mastodon profile URL, provides link verification // newsletter: '#', // optional newsletter URL // youtube: '#', // optional youtube channel name or `channel/UCGbXXXXXXXXXXXXXXXXXXXXXX` + pixiv: '2781527', // default notion icon and cover images for site-wide consistency (optional) // page-specific values will override these site-wide defaults From 021fc1fcdc8d62a9aff5699e8711f473dbf8e390 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 22:14:48 +0900 Subject: [PATCH 06/77] =?UTF-8?q?BLOG=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index fd3444e082..f20eaa00a4 100644 --- a/site.config.ts +++ b/site.config.ts @@ -14,7 +14,7 @@ export default siteConfig({ author: 'KujiraTiku', // open graph metadata (optional) - description: '', + description: '清熱鯨騰草', // social usernames (optional) twitter: 'KujiraTiku', From d524e6e25d12fc163aa1e514270adfc438f8428e Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 23:08:31 +0900 Subject: [PATCH 07/77] =?UTF-8?q?icon=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 15086 -> 4286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index ea2f437d9db6552726693be6cc2943a32dc5a964..dd79a927a6a579e50492291167c5a6e3e51f2cbc 100644 GIT binary patch literal 4286 zcmeI0IY?ex5XZjV^?>F&WjGEZx@xUW<&$)BYo&U`L%*_4JX8X(j=kIUhYWv5< zW^=RIY$0~Bt88g@L9fI9>~E(Z@&CJZm;^LyLt*r^;`ubXKZf-15Cd7 z2NnCy&(CFRYfDyFSLNj7L|R*0B_$eKu8@6|8-$<57`o}M1TE^+;C@ErfHuCARX8|=IGP3+6d%gVFKm*eAOX>4p1A0Ho$89Z>oWF{97;zqKvvLrn{ zUGwGv@U6nc&8@*@y|S{Ryqg@Ho}Sh`^78Vsat*BH}sYuMG*RU#uJtsJ|H%^F-&Z{WiL`h|ssyQVchY7lH@hVczta-XrZv?T5A z?E=?1cX#34kdP25D=U*PU%qIq zjE#+Ho%4NzKe!{uOg>wI+%AY2!GCbDhcD<{TwL@V;KcrWK^z<$!q)+ zPv+<6ts13PTUuJwztYlD-S_F!r{Ch&)zwLDZLNI%{8?)Z{!;Dzf^T$5Nr^NyHA#1O zx5hUNSTKFL46_E}iL5mO)AEZS| zhz??kp>#q_Pa+X9S9!)q#7v>f>h;_1zJ2P{J?EY~6zP?$I_K=Y*ZTkWKIiUX?Ol$O z;bc0!dO3Q{aq`JLhPRsE;xZ>o<~Kd63*DEFk1M;XdugYEZ_Oa-Nh{-%0D^{MKAR3)TR78`8wfiHZP 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 From 9fbde2b3f1701e8bc7221765199205feca383225 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 23:10:31 +0900 Subject: [PATCH 08/77] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.config.ts b/site.config.ts index f20eaa00a4..66c89c6d0c 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,11 +60,11 @@ export default siteConfig({ }, { title: 'ABOUT', - pageId: 'About-bd3e799e3ec14c28848511e4b5450d2a' + pageId: 'About-8ff57d87b0654b0b8c38b5e05947d5d7' }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282' + pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' } ] }) From 1cfc0f27f87a80913966c1ad84ff61e4859c9412 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 23:35:52 +0900 Subject: [PATCH 09/77] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=B3=E4=B8=8AGIT?= =?UTF-8?q?=20LOGO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/GitHubShareButton.tsx | 49 ++------------------------------ 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/components/GitHubShareButton.tsx b/components/GitHubShareButton.tsx index 4a84d9104f..d8b26ffe9e 100644 --- a/components/GitHubShareButton.tsx +++ b/components/GitHubShareButton.tsx @@ -1,48 +1,5 @@ import * as React from 'react' -import styles from './styles.module.css' - -export const GitHubShareButton: React.FC = () => { - return ( - - - - ) -} +export const GitHubShareButton = () => { + return null; // 仅返回 null，表示此组件不会渲染任何内容 +} \ No newline at end of file From 0dfcc85c0ecb6bf8fbcc260198f30c867e0e9962 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 26 Apr 2024 23:52:33 +0900 Subject: [PATCH 10/77] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8A=E6=96=B9?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site.config.ts b/site.config.ts index 66c89c6d0c..464b5400b0 100644 --- a/site.config.ts +++ b/site.config.ts @@ -54,10 +54,6 @@ export default siteConfig({ // navigationStyle: 'default' navigationStyle: 'custom', navigationLinks: [ - { - title: 'HOME', - pageId: '858447c91db0434282b31b8d08d8df83' - }, { title: 'ABOUT', pageId: 'About-8ff57d87b0654b0b8c38b5e05947d5d7' From ef4e872ef898fadd6eacd5178194411a4ba42b39 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:04:13 +0900 Subject: [PATCH 11/77] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E5=8F=B3?= =?UTF-8?q?=E4=B8=8AGIT=20LOGO"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1cfc0f27f87a80913966c1ad84ff61e4859c9412. --- components/GitHubShareButton.tsx | 49 ++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/components/GitHubShareButton.tsx b/components/GitHubShareButton.tsx index d8b26ffe9e..4a84d9104f 100644 --- a/components/GitHubShareButton.tsx +++ b/components/GitHubShareButton.tsx @@ -1,5 +1,48 @@ import * as React from 'react' -export const GitHubShareButton = () => { - return null; // 仅返回 null，表示此组件不会渲染任何内容 -} \ No newline at end of file +import styles from './styles.module.css' + +export const GitHubShareButton: React.FC = () => { + return ( + + + + ) +} From bd35adcd59520ac3b68cf81459755ac6573217a6 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:06:55 +0900 Subject: [PATCH 12/77] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=B3=E4=B8=8AGIT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/GitHubShareButton.tsx | 48 ++------------------------------ components/NotionPage.tsx | 3 -- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/components/GitHubShareButton.tsx b/components/GitHubShareButton.tsx index 4a84d9104f..e3075fdd0b 100644 --- a/components/GitHubShareButton.tsx +++ b/components/GitHubShareButton.tsx @@ -1,48 +1,6 @@ import * as React from 'react' - import styles from './styles.module.css' -export const GitHubShareButton: React.FC = () => { - return ( - - - - ) -} +export const GitHubShareButton = () => { + return null; // 仅返回 null，表示此组件不会渲染任何内容 +} \ No newline at end of file diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 3cbbe2bcdf..b3d4512c35 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -20,7 +20,6 @@ import { searchNotion } from '@/lib/search-notion' import { useDarkMode } from '@/lib/use-dark-mode' import { Footer } from './Footer' -import { GitHubShareButton } from './GitHubShareButton' import { Loading } from './Loading' import { NotionPageHeader } from './NotionPageHeader' import { Page404 } from './Page404' @@ -280,8 +279,6 @@ export const NotionPage: React.FC = ({ pageAside={pageAside} footer={footer} /> - - ) } From 4bb4113ad577d79b0ddbc41d680200cabeb86d78 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:09:33 +0900 Subject: [PATCH 13/77] =?UTF-8?q?=E6=9B=B4=E6=96=B0BLOG=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 464b5400b0..bc348f7994 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' + pageId: '6ff6114a871849b785453bc706574282?v=c886560a15b74d298e44d5d5d7aa2878&pvs=4' } ] }) From f7fe8ab70598252add1149113ad592712c219cb5 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:16:25 +0900 Subject: [PATCH 14/77] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E5=8F=B3?= =?UTF-8?q?=E4=B8=8AGIT"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bd35adcd59520ac3b68cf81459755ac6573217a6. --- components/GitHubShareButton.tsx | 48 ++++++++++++++++++++++++++++++-- components/NotionPage.tsx | 1 + 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/components/GitHubShareButton.tsx b/components/GitHubShareButton.tsx index e3075fdd0b..4a84d9104f 100644 --- a/components/GitHubShareButton.tsx +++ b/components/GitHubShareButton.tsx @@ -1,6 +1,48 @@ import * as React from 'react' + import styles from './styles.module.css' -export const GitHubShareButton = () => { - return null; // 仅返回 null，表示此组件不会渲染任何内容 -} \ No newline at end of file +export const GitHubShareButton: React.FC = () => { + return ( + + + + ) +} diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index b3d4512c35..3bd257b36e 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -20,6 +20,7 @@ import { searchNotion } from '@/lib/search-notion' import { useDarkMode } from '@/lib/use-dark-mode' import { Footer } from './Footer' +import { GitHubShareButton } from './GitHubShareButton' import { Loading } from './Loading' import { NotionPageHeader } from './NotionPageHeader' import { Page404 } from './Page404' From bb0a803fd8a2f6e22cf73d6be56fc466e513349d Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:27:35 +0900 Subject: [PATCH 15/77] =?UTF-8?q?Revert=20"=E9=93=BE=E6=8E=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9fbde2b3f1701e8bc7221765199205feca383225. # Conflicts: # site.config.ts --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index bc348f7994..2cd1b4169f 100644 --- a/site.config.ts +++ b/site.config.ts @@ -14,7 +14,7 @@ export default siteConfig({ author: 'KujiraTiku', // open graph metadata (optional) - description: '清熱鯨騰草', + description: '清熱鯨騰草1', // social usernames (optional) twitter: 'KujiraTiku', From 707fdac3619e752cfa8434a8ca70908eb7c7b769 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:30:18 +0900 Subject: [PATCH 16/77] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E5=A4=8D=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 2 ++ site.config.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 3bd257b36e..3cbbe2bcdf 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -280,6 +280,8 @@ export const NotionPage: React.FC = ({ pageAside={pageAside} footer={footer} /> + + ) } diff --git a/site.config.ts b/site.config.ts index 2cd1b4169f..bc348f7994 100644 --- a/site.config.ts +++ b/site.config.ts @@ -14,7 +14,7 @@ export default siteConfig({ author: 'KujiraTiku', // open graph metadata (optional) - description: '清熱鯨騰草1', + description: '清熱鯨騰草', // social usernames (optional) twitter: 'KujiraTiku', From 6668faf4784aeb8c380723a5601bd465438196f4 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:36:28 +0900 Subject: [PATCH 17/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index bc348f7994..710aa5907a 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c886560a15b74d298e44d5d5d7aa2878&pvs=4' + pageId: '6ff6114a871849b785453bc706574282' } ] }) From 475cec4789376e47a6370e55d36045a43f45930a Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:42:53 +0900 Subject: [PATCH 18/77] =?UTF-8?q?BLOG=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=96=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 710aa5907a..bc348f7994 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282' + pageId: '6ff6114a871849b785453bc706574282?v=c886560a15b74d298e44d5d5d7aa2878&pvs=4' } ] }) From 7e0f7a7d75d2256f4d7949eb2938e1711b32b5ae Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 00:50:33 +0900 Subject: [PATCH 19/77] =?UTF-8?q?BLOG=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index bc348f7994..710aa5907a 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c886560a15b74d298e44d5d5d7aa2878&pvs=4' + pageId: '6ff6114a871849b785453bc706574282' } ] }) From c33ab02d7a8caa6baeb31e47cc6981a30e7f0e71 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:02:44 +0900 Subject: [PATCH 20/77] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=86=85=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=A0=87=E9=A2=98=E5=B1=85=E4=B8=AD=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index 94a7f309fe..36eaad4ab1 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -30,7 +30,7 @@ } .notion-asset-caption { - text-align: center; + /* text-align: center; */ } .notion-asset-wrapper { From 3e7edb8f14b2141a41d45ff6768d73e0b1497295 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:04:32 +0900 Subject: [PATCH 21/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 710aa5907a..464b5400b0 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282' + pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' } ] }) From b5f1297ea5e88fc3a64a351fb5ed027075a495e0 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:05:27 +0900 Subject: [PATCH 22/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 464b5400b0..911787e20b 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' + pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5' } ] }) From f7bdc71ca8a62484bab2f7ac372d1ae8432150d3 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:16:00 +0900 Subject: [PATCH 23/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 911787e20b..36d6d97c88 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5' + pageId: 'blog-6ff6114a871849b785453bc706574282' } ] }) From df49d1182805a638b7f059adb548a00269667170 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:19:44 +0900 Subject: [PATCH 24/77] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=B3=E4=B8=8AGIT?= =?UTF-8?q?=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 3cbbe2bcdf..08822fa23e 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -281,7 +281,6 @@ export const NotionPage: React.FC = ({ footer={footer} /> - ) } From d4b64c508896d4824384ff15ec97aec27da84f77 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:25:42 +0900 Subject: [PATCH 25/77] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=8F=B3=E4=B8=8AGIT?= =?UTF-8?q?=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 3cbbe2bcdf..08822fa23e 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -281,7 +281,6 @@ export const NotionPage: React.FC = ({ footer={footer} /> - ) } From 44dbda06055202e8f120efa42e1297814d498617 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:30:32 +0900 Subject: [PATCH 26/77] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=8F=B3=E4=B8=8Agit?= =?UTF-8?q?=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 08822fa23e..3cbbe2bcdf 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -281,6 +281,7 @@ export const NotionPage: React.FC = ({ footer={footer} /> + ) } From 909e2282e119a5ee1a74c1ec398c2d0733bb702e Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:36:21 +0900 Subject: [PATCH 27/77] =?UTF-8?q?=E5=8F=B3=E4=B8=8AGIT=E5=88=A0=E9=99=A4?= =?UTF-8?q?=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 3cbbe2bcdf..a967dcd609 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -20,7 +20,6 @@ import { searchNotion } from '@/lib/search-notion' import { useDarkMode } from '@/lib/use-dark-mode' import { Footer } from './Footer' -import { GitHubShareButton } from './GitHubShareButton' import { Loading } from './Loading' import { NotionPageHeader } from './NotionPageHeader' import { Page404 } from './Page404' @@ -281,7 +280,6 @@ export const NotionPage: React.FC = ({ footer={footer} /> - ) } From ae3f18ffdbd6e58bfcf4973a41b80a6a58eb8b1f Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:41:53 +0900 Subject: [PATCH 28/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A55?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index 36d6d97c88..ac9b97a119 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,7 +60,8 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: 'blog-6ff6114a871849b785453bc706574282' + pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5' } ] }) +// https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 From dc07697632292086b7bbae9f690223efe4c162b9 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:51:06 +0900 Subject: [PATCH 29/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index ac9b97a119..d973a669c9 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,8 +60,12 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5' + pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' } ] }) +// 6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5 +// 6ff6114a871849b785453bc706574282 +// c3696e99a7074b45a1a39ea0afdc32d5 +// 3696e99a7074b45a1a39ea0afdc32d5 // https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 From 3abab43293c62302e087de9c37229fa29287eb03 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 01:55:48 +0900 Subject: [PATCH 30/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A57?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/site.config.ts b/site.config.ts index d973a669c9..bdd9413663 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,12 +60,13 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: '6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' + pageId: 'https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' } ] }) // 6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5 // 6ff6114a871849b785453bc706574282 -// c3696e99a7074b45a1a39ea0afdc32d5 +// c3696e99a7074b45a1a39ea0afdc32d +// 6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 // 3696e99a7074b45a1a39ea0afdc32d5 // https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 From 500baf95eb8cff52d3ec932ede05f8bf127aa88d Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 02:05:59 +0900 Subject: [PATCH 31/77] =?UTF-8?q?Blog=E9=93=BE=E6=8E=A58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/site.config.ts b/site.config.ts index bdd9413663..e7852a6b7d 100644 --- a/site.config.ts +++ b/site.config.ts @@ -60,13 +60,7 @@ export default siteConfig({ }, { title: 'BLOG', - pageId: 'https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4' + pageId: 'Blog-1d5ee83bb5cc4956b1544d578e92beb6' } ] -}) -// 6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5 -// 6ff6114a871849b785453bc706574282 -// c3696e99a7074b45a1a39ea0afdc32d -// 6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 -// 3696e99a7074b45a1a39ea0afdc32d5 -// https://whale-tiku.notion.site/6ff6114a871849b785453bc706574282?v=c3696e99a7074b45a1a39ea0afdc32d5&pvs=4 +}) \ No newline at end of file From c85755d11b5023752fe2824698cedeef1663d307 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 15:46:56 +0900 Subject: [PATCH 32/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=8F=B3=E9=94=AE=EF=BC=8C=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=96=87=E5=AD=97=EF=BC=8C=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index a967dcd609..70ba74bb57 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -1,4 +1,5 @@ -import * as React from 'react' +import React from 'react' + import dynamic from 'next/dynamic' import Image from 'next/image' import Link from 'next/link' @@ -149,6 +150,30 @@ export const NotionPage: React.FC = ({ }) => { const router = useRouter() const lite = useSearchParam('lite') +// 添加禁止鼠标右键、禁止选中和禁止文字复制粘贴的逻辑 +React.useEffect(() => { + const handleContextMenu = (event: MouseEvent) => { + event.preventDefault(); + }; + + const handleSelectStart = (event: Event) => { + event.preventDefault(); + }; + + const handleCopy = (event: ClipboardEvent) => { + event.preventDefault(); + }; + + document.addEventListener('contextmenu', handleContextMenu); + document.addEventListener('selectstart', handleSelectStart); + document.addEventListener('copy', handleCopy); + + return () => { + document.removeEventListener('contextmenu', handleContextMenu); + document.removeEventListener('selectstart', handleSelectStart); + document.removeEventListener('copy', handleCopy); + }; +}, []); const components = React.useMemo( () => ({ From 878ddb78f57c06323a891cf74eaab0a6532a797e Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 20:02:23 +0900 Subject: [PATCH 33/77] =?UTF-8?q?=E5=8F=B3=E4=BE=A7link=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E8=A7=A6=E7=A2=B0=E5=8F=98=E8=89=B2=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?pivix=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/PageSocial.module.css | 13 ++++++++++++- components/PageSocial.tsx | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/PageSocial.module.css b/components/PageSocial.module.css index 87113e258a..64459328ea 100644 --- a/components/PageSocial.module.css +++ b/components/PageSocial.module.css @@ -85,7 +85,18 @@ .twitter:hover { border-color: #2795e9; } - +.mastodon .actionBgPane { + background: #6364FF; +} +.mastodon:hover { + border-color: #6364FF; +} +.pixiv .actionBgPane { + background: #0096fa; +} +.pixiv:hover { + border-color: #0096fa; +} .linkedin .actionBgPane { background: #0077b5; } diff --git a/components/PageSocial.tsx b/components/PageSocial.tsx index 481cd5d76d..f293c00078 100644 --- a/components/PageSocial.tsx +++ b/components/PageSocial.tsx @@ -82,7 +82,7 @@ const socialLinks: SocialLink[] = [ config.pixiv && { name: 'pixiv', - href: `${config.pixiv}`, + href: `https://www.pixiv.net/users/${config.pixiv}`, title: `Pixiv ${config.pixiv}`, icon: ( From 2b59abd5462b8988041f11fae31334f6ed8092e1 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sat, 27 Apr 2024 20:07:19 +0900 Subject: [PATCH 34/77] =?UTF-8?q?=E6=AF=9B=E8=B1=A1logo=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/styles.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/styles.module.css b/components/styles.module.css index a6d44483f4..e7189099a8 100644 --- a/components/styles.module.css +++ b/components/styles.module.css @@ -95,7 +95,7 @@ } .mastodon:hover { - color: #5a4be1; + color: #6364FF; } .pixiv:hover { color: #0096fa; From 4a41bdd3f986862c70966832279ca7745b63eaa6 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 5 May 2024 21:47:01 +0900 Subject: [PATCH 35/77] =?UTF-8?q?=E5=9C=A8=E4=B8=BB=E9=A1=B5=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=8F=E6=B7=BB=E5=8A=A0HOME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site.config.ts b/site.config.ts index e7852a6b7d..402d9a053a 100644 --- a/site.config.ts +++ b/site.config.ts @@ -54,6 +54,10 @@ export default siteConfig({ // navigationStyle: 'default' navigationStyle: 'custom', navigationLinks: [ + { + title: 'HOME', + pageId: '858447c91db0434282b31b8d08d8df83' + }, { title: 'ABOUT', pageId: 'About-8ff57d87b0654b0b8c38b5e05947d5d7' From f4f89be2b24a5de23bae16b753b003266ea1be34 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Mon, 6 May 2024 00:03:26 +0900 Subject: [PATCH 36/77] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index 36eaad4ab1..62c80ee572 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -37,7 +37,9 @@ margin-top: 1em; margin-bottom: 1em; } - +.notion-asset-wrapper img { + border-radius: 8px; +} .notion-asset-wrapper-video > div, .notion-asset-wrapper-video video { width: 100% !important; From 5c856938991293b9eacd889ffa6d2063a4c32372 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 12 May 2024 20:31:16 +0900 Subject: [PATCH 37/77] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E4=B8=8E=E4=B8=8B?= =?UTF-8?q?=E4=BE=A7=E6=B7=BB=E5=8A=A0MyCat=E9=93=BE=E6=8E=A5=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8B=E9=83=A8=E9=93=BE=E6=8E=A5=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=92=E7=89=88=EF=BC=88=E9=98=B2=E6=AD=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=BF=87=E5=A4=9A=E4=BA=A7=E7=94=9F=E5=A0=86=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Footer.tsx | 11 +++++++++++ components/PageSocial.module.css | 18 ++++++------------ components/PageSocial.tsx | 9 ++++++++- components/styles.module.css | 7 ++++--- lib/config.ts | 1 + lib/site-config.ts | 1 + site.config.ts | 5 +++++ 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 127c972c5e..bdb1e20787 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -5,6 +5,7 @@ import { FaGithub } from '@react-icons/all-files/fa/FaGithub' import { FaLinkedin } from '@react-icons/all-files/fa/FaLinkedin' import { FaMastodon } from '@react-icons/all-files/fa/FaMastodon' import { SiPixiv } from '@react-icons/all-files/si/SiPixiv' +import { FaCat } from '@react-icons/all-files/fa/FaCat' import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter' import { FaYoutube } from '@react-icons/all-files/fa/FaYoutube' import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu' @@ -54,6 +55,16 @@ export const FooterImpl: React.FC = () => {
+ {config.myCat && ( + + + + )} + {config.twitter && ( + ) + }, config.twitter && { name: 'twitter', href: `https://twitter.com/${config.twitter}`, @@ -24,7 +32,6 @@ const socialLinks: SocialLink[] = [ ) }, - config.github && { name: 'github', href: `https://github.com/${config.github}`, diff --git a/components/styles.module.css b/components/styles.module.css index e7189099a8..88d42ac9b3 100644 --- a/components/styles.module.css +++ b/components/styles.module.css @@ -70,7 +70,7 @@ .social a { cursor: pointer; font-size: 2em; - display: inline-flex; + display: table-cell; padding: 0.25em; margin-right: 1vw; transition: color 250ms ease-out; @@ -89,11 +89,12 @@ .toggleDarkMode:hover { color: #2795e9; } - +.myCat:hover { + color: #ffbf5a; +} .twitter:hover { color: #2795e9; } - .mastodon:hover { color: #6364FF; } diff --git a/lib/config.ts b/lib/config.ts index 71e217608d..b2a4ee7221 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -55,6 +55,7 @@ export const language: string = getSiteConfig('language', 'en') // social accounts export const twitter: string | null = getSiteConfig('twitter', null) +export const myCat: string | null = getSiteConfig('myCat', null) export const mastodon: string | null = getSiteConfig('mastodon', null) export const pixiv: string | null = getSiteConfig('pixiv', null) export const github: string | null = getSiteConfig('github', null) diff --git a/lib/site-config.ts b/lib/site-config.ts index 826c3089be..a269181f69 100644 --- a/lib/site-config.ts +++ b/lib/site-config.ts @@ -11,6 +11,7 @@ export interface SiteConfig { language?: string twitter?: string + myCat?: string github?: string linkedin?: string newsletter?: string diff --git a/site.config.ts b/site.config.ts index 402d9a053a..dbb4d0f2cb 100644 --- a/site.config.ts +++ b/site.config.ts @@ -17,6 +17,7 @@ export default siteConfig({ description: '清熱鯨騰草', // social usernames (optional) + myCat:'3e2f077098284288ae4778c0070e652f', twitter: 'KujiraTiku', // github: 'transitive-bullshit', // linkedin: 'fisch2', @@ -65,6 +66,10 @@ export default siteConfig({ { title: 'BLOG', pageId: 'Blog-1d5ee83bb5cc4956b1544d578e92beb6' + }, + { + title: 'GALLERY', + pageId: 'Gallery-ef6cd60929ab4ba097569da47d42a903' } ] }) \ No newline at end of file From 6c56736ed870345824c7fbe34cf88e940d2377cd Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 12 May 2024 21:47:19 +0900 Subject: [PATCH 38/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9blog=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index 62c80ee572..a96152c7bc 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -50,35 +50,45 @@ margin: 0 auto; overflow-x: auto; } - +/*blog 不显示标题*/ +.notion-collection-header { + display: none; +} .notion-nav-header-rhs { gap: 0.5rem; } - +/*blog间隔尺寸*/ .notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(360px, 1fr)); - grid-gap: 6vmin; - gap: 6vmin; + grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); + grid-gap: 3vmin; + gap: 3vmin; +} +.notion-collection-card-property:first-child { + font-size: 14px; + font-weight: 700; } - .notion-gallery-grid .notion-page-icon-inline { display: none; } - .notion-gallery-grid .notion-page-title-text { font-size: 2em; white-space: unset; } - .notion-gallery-grid .notion-collection-card-property { white-space: unset; text-overflow: unset; } - .notion-gallery-grid .notion-property-text { font-size: 14px; } - +/* 列表状态影藏多余的标题 */ +.notion-list-item-body .notion-property-title { + display: none; +} +/* 看板布局 影响下方左右拉动条*/ +.notion-board { + overflow: hidden; +} .notion-collection-card { border-radius: 16px; box-shadow: none; @@ -106,9 +116,15 @@ .notion-collection-card:hover .notion-collection-card-cover { filter: brightness(120%); } +.notion-collection-card-cover { + height: 140px; +} +.notion-collection-card-property { + padding: 2px 0; +} .notion-collection-card-body { - padding: 10px; + padding: 3px; } /* only target safari */ @@ -405,3 +421,14 @@ .notion-equation.notion-equation-block{ align-items: center; } +@media screen and (max-width:768px) { + .notion-gallery-grid .notion-property-text { + font-size: 16px; + } + .notion-header .notion-nav-header { + font-size: 12px; + } + .notion-header .button { + padding: 5px; + } +} \ No newline at end of file From 780ca4ef5f9daf5abc8598db4217b3684f9d5c0c Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 12 May 2024 23:05:20 +0900 Subject: [PATCH 39/77] =?UTF-8?q?=E5=9B=9E=E6=BA=AF=E8=A7=82=E5=AF=9F?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 51 +++++++++++------------------------------------ 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index a96152c7bc..aaf78ae267 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -7,7 +7,7 @@ * places to add some flare. */ -.notion { + .notion { --notion-max-width: 720px; --notion-header-height: 54px; } @@ -50,45 +50,35 @@ margin: 0 auto; overflow-x: auto; } -/*blog 不显示标题*/ -.notion-collection-header { - display: none; -} + .notion-nav-header-rhs { gap: 0.5rem; } -/*blog间隔尺寸*/ + .notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); - grid-gap: 3vmin; - gap: 3vmin; -} -.notion-collection-card-property:first-child { - font-size: 14px; - font-weight: 700; + grid-template-columns: repeat(auto-fill, minmax(360px, 1fr)); + grid-gap: 6vmin; + gap: 6vmin; } + .notion-gallery-grid .notion-page-icon-inline { display: none; } + .notion-gallery-grid .notion-page-title-text { font-size: 2em; white-space: unset; } + .notion-gallery-grid .notion-collection-card-property { white-space: unset; text-overflow: unset; } + .notion-gallery-grid .notion-property-text { font-size: 14px; } -/* 列表状态影藏多余的标题 */ -.notion-list-item-body .notion-property-title { - display: none; -} -/* 看板布局 影响下方左右拉动条*/ -.notion-board { - overflow: hidden; -} + .notion-collection-card { border-radius: 16px; box-shadow: none; @@ -116,15 +106,9 @@ .notion-collection-card:hover .notion-collection-card-cover { filter: brightness(120%); } -.notion-collection-card-cover { - height: 140px; -} -.notion-collection-card-property { - padding: 2px 0; -} .notion-collection-card-body { - padding: 3px; + padding: 10px; } /* only target safari */ @@ -421,14 +405,3 @@ .notion-equation.notion-equation-block{ align-items: center; } -@media screen and (max-width:768px) { - .notion-gallery-grid .notion-property-text { - font-size: 16px; - } - .notion-header .notion-nav-header { - font-size: 12px; - } - .notion-header .button { - padding: 5px; - } -} \ No newline at end of file From c0c45aec7af41147a0e9e5073cfaeff63036710e Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 12 May 2024 23:13:55 +0900 Subject: [PATCH 40/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=9B=E4=B8=9C?= =?UTF-8?q?=E4=B8=93=E7=94=A8=E9=A1=B5=E9=9D=A2=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.config.ts b/site.config.ts index dbb4d0f2cb..d9a3642b8b 100644 --- a/site.config.ts +++ b/site.config.ts @@ -17,7 +17,7 @@ export default siteConfig({ description: '清熱鯨騰草', // social usernames (optional) - myCat:'3e2f077098284288ae4778c0070e652f', + myCat:'https://seto-life.vercel.app/', twitter: 'KujiraTiku', // github: 'transitive-bullshit', // linkedin: 'fisch2', From 576b008a7f2917ad008f5cc3a410bdd9e4963559 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 12 May 2024 23:59:03 +0900 Subject: [PATCH 41/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9blog=E6=8E=92=E7=89=88?= =?UTF-8?q?=20=E8=BF=98=E5=8E=9F=EF=BC=88=E6=8E=A8=E6=B5=8B=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index aaf78ae267..1383d7ed4a 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -50,35 +50,45 @@ margin: 0 auto; overflow-x: auto; } - +/*blog 不显示标题*/ +.notion-collection-header { + display: none; +} .notion-nav-header-rhs { gap: 0.5rem; } - +/*blog间隔尺寸*/ .notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(360px, 1fr)); - grid-gap: 6vmin; - gap: 6vmin; + grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); + grid-gap: 3vmin; + gap: 3vmin; +} +.notion-collection-card-property:first-child { + font-size: 14px; + font-weight: 700; } - .notion-gallery-grid .notion-page-icon-inline { display: none; } - .notion-gallery-grid .notion-page-title-text { font-size: 2em; white-space: unset; } - .notion-gallery-grid .notion-collection-card-property { white-space: unset; text-overflow: unset; } - .notion-gallery-grid .notion-property-text { font-size: 14px; } - +/* 列表状态影藏多余的标题 */ +.notion-list-item-body .notion-property-title { + display: none; +} +/* 看板布局 影响下方左右拉动条*/ +.notion-board { + overflow: hidden; +} .notion-collection-card { border-radius: 16px; box-shadow: none; @@ -106,9 +116,15 @@ .notion-collection-card:hover .notion-collection-card-cover { filter: brightness(120%); } +.notion-collection-card-cover { + height: 140px; +} +.notion-collection-card-property { + padding: 2px 0; +} .notion-collection-card-body { - padding: 10px; + padding: 3px; } /* only target safari */ @@ -405,3 +421,14 @@ .notion-equation.notion-equation-block{ align-items: center; } +@media screen and (max-width:768px) { + .notion-gallery-grid .notion-property-text { + font-size: 16px; + } + .notion-header .notion-nav-header { + font-size: 12px; + } + .notion-header .button { + padding: 5px; + } +} \ No newline at end of file From 1b821692aaba035f011c295fb78e7b6dcf0abb6f Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 15:22:06 +0900 Subject: [PATCH 42/77] =?UTF-8?q?blog=E5=8E=BB=E9=99=A4=E5=BD=B1=E8=97=8F?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=88=E8=A7=82=E5=AF=9F?= =?UTF-8?q?=E7=BD=91=E9=A1=B5=E7=AB=AF=E6=98=AF=E5=90=A6=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 48 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index 1383d7ed4a..aa695b776e 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -50,13 +50,6 @@ margin: 0 auto; overflow-x: auto; } -/*blog 不显示标题*/ -.notion-collection-header { - display: none; -} -.notion-nav-header-rhs { - gap: 0.5rem; -} /*blog间隔尺寸*/ .notion-gallery-grid { grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); @@ -67,28 +60,34 @@ font-size: 14px; font-weight: 700; } +.notion-nav-header-rhs { + gap: 0.5rem; +} + +.notion-gallery-grid { + grid-template-columns: repeat(auto-fill, minmax(360px, 1fr)); + grid-gap: 6vmin; + gap: 6vmin; +} + .notion-gallery-grid .notion-page-icon-inline { display: none; } + .notion-gallery-grid .notion-page-title-text { font-size: 2em; white-space: unset; } + .notion-gallery-grid .notion-collection-card-property { white-space: unset; text-overflow: unset; } + .notion-gallery-grid .notion-property-text { font-size: 14px; } -/* 列表状态影藏多余的标题 */ -.notion-list-item-body .notion-property-title { - display: none; -} -/* 看板布局 影响下方左右拉动条*/ -.notion-board { - overflow: hidden; -} + .notion-collection-card { border-radius: 16px; box-shadow: none; @@ -116,15 +115,9 @@ .notion-collection-card:hover .notion-collection-card-cover { filter: brightness(120%); } -.notion-collection-card-cover { - height: 140px; -} -.notion-collection-card-property { - padding: 2px 0; -} .notion-collection-card-body { - padding: 3px; + padding: 10px; } /* only target safari */ @@ -420,15 +413,4 @@ .notion-equation.notion-equation-block{ align-items: center; -} -@media screen and (max-width:768px) { - .notion-gallery-grid .notion-property-text { - font-size: 16px; - } - .notion-header .notion-nav-header { - font-size: 12px; - } - .notion-header .button { - padding: 5px; - } } \ No newline at end of file From 5e3c10409b9357b07a1ff9e819edd7aea717b945 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 15:30:02 +0900 Subject: [PATCH 43/77] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E8=BF=98=E5=8E=9Fblog?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index aa695b776e..aaf78ae267 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -50,16 +50,7 @@ margin: 0 auto; overflow-x: auto; } -/*blog间隔尺寸*/ -.notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); - grid-gap: 3vmin; - gap: 3vmin; -} -.notion-collection-card-property:first-child { - font-size: 14px; - font-weight: 700; -} + .notion-nav-header-rhs { gap: 0.5rem; } @@ -413,4 +404,4 @@ .notion-equation.notion-equation-block{ align-items: center; -} \ No newline at end of file +} From adde4f3d59974a4b8e09ad7ec834b0dfe9ea92f8 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 15:55:16 +0900 Subject: [PATCH 44/77] =?UTF-8?q?blog=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E5=B0=8F=E7=8C=AB=E9=A1=B5=E9=9D=A2=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index aaf78ae267..1383d7ed4a 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -50,35 +50,45 @@ margin: 0 auto; overflow-x: auto; } - +/*blog 不显示标题*/ +.notion-collection-header { + display: none; +} .notion-nav-header-rhs { gap: 0.5rem; } - +/*blog间隔尺寸*/ .notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(360px, 1fr)); - grid-gap: 6vmin; - gap: 6vmin; + grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); + grid-gap: 3vmin; + gap: 3vmin; +} +.notion-collection-card-property:first-child { + font-size: 14px; + font-weight: 700; } - .notion-gallery-grid .notion-page-icon-inline { display: none; } - .notion-gallery-grid .notion-page-title-text { font-size: 2em; white-space: unset; } - .notion-gallery-grid .notion-collection-card-property { white-space: unset; text-overflow: unset; } - .notion-gallery-grid .notion-property-text { font-size: 14px; } - +/* 列表状态影藏多余的标题 */ +.notion-list-item-body .notion-property-title { + display: none; +} +/* 看板布局 影响下方左右拉动条*/ +.notion-board { + overflow: hidden; +} .notion-collection-card { border-radius: 16px; box-shadow: none; @@ -106,9 +116,15 @@ .notion-collection-card:hover .notion-collection-card-cover { filter: brightness(120%); } +.notion-collection-card-cover { + height: 140px; +} +.notion-collection-card-property { + padding: 2px 0; +} .notion-collection-card-body { - padding: 10px; + padding: 3px; } /* only target safari */ @@ -405,3 +421,14 @@ .notion-equation.notion-equation-block{ align-items: center; } +@media screen and (max-width:768px) { + .notion-gallery-grid .notion-property-text { + font-size: 16px; + } + .notion-header .notion-nav-header { + font-size: 12px; + } + .notion-header .button { + padding: 5px; + } +} \ No newline at end of file From ef6c34d9515dedcb62b8fefdb00991b6449b74ee Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 16:19:40 +0900 Subject: [PATCH 45/77] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E6=96=B0=E5=BB=BAblog?= =?UTF-8?q?=E5=92=8Cgallery=E9=A1=B5=E9=9D=A2=E8=A7=A3=E5=86=B3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.config.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/site.config.ts b/site.config.ts index d9a3642b8b..b6e9679184 100644 --- a/site.config.ts +++ b/site.config.ts @@ -21,7 +21,7 @@ export default siteConfig({ twitter: 'KujiraTiku', // github: 'transitive-bullshit', // linkedin: 'fisch2', - mastodon: 'https://fedibird.com/@kujiTake', // optional mastodon profile URL, provides link verification + mastodon: 'https://fedibird.com/@kujiTake', // optional mastodon profile URL, provides link verification // newsletter: '#', // optional newsletter URL // youtube: '#', // optional youtube channel name or `channel/UCGbXXXXXXXXXXXXXXXXXXXXXX` pixiv: '2781527', @@ -56,20 +56,20 @@ export default siteConfig({ navigationStyle: 'custom', navigationLinks: [ { - title: 'HOME', + title: 'Home', pageId: '858447c91db0434282b31b8d08d8df83' }, - { - title: 'ABOUT', + { + title: 'About', pageId: 'About-8ff57d87b0654b0b8c38b5e05947d5d7' }, - { - title: 'BLOG', - pageId: 'Blog-1d5ee83bb5cc4956b1544d578e92beb6' - }, - { - title: 'GALLERY', - pageId: 'Gallery-ef6cd60929ab4ba097569da47d42a903' - } - ] + { + title: 'Blog', + pageId: 'Blog-6d3fa135bc944d3d93d5c71007f874c9' + }, + { + title: 'Gallery', + pageId: 'Gallery-8135fc5f12fb4115970586bd53484963' + } + ] }) \ No newline at end of file From be30fc36570d72e0c87ac54747c85971b8eb7d0d Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 16:51:55 +0900 Subject: [PATCH 46/77] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=91=E5=A4=9C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index 1383d7ed4a..f3ec6ea729 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -389,7 +389,7 @@ /* Workaround for Firefox not supporting backdrop-filter yet */ @-moz-document url-prefix() { .dark-mode .notion-header { - background: hsla(203, 8%, 20%, 0.8); + background: hsla(0, 0%, 11%, 0.8); } } From 4abd0089f0449726002883374becf78de5b801a1 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 17:31:33 +0900 Subject: [PATCH 47/77] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=91=E5=A4=9C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=A2=9C=E8=89=B22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 2 +- styles/prism-theme.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index f3ec6ea729..1383d7ed4a 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -389,7 +389,7 @@ /* Workaround for Firefox not supporting backdrop-filter yet */ @-moz-document url-prefix() { .dark-mode .notion-header { - background: hsla(0, 0%, 11%, 0.8); + background: hsla(203, 8%, 20%, 0.8); } } diff --git a/styles/prism-theme.css b/styles/prism-theme.css index a38996278f..89ec7e9dd1 100644 --- a/styles/prism-theme.css +++ b/styles/prism-theme.css @@ -8,7 +8,7 @@ } .dark-mode .notion-code { - background-color: rgba(17, 24, 39, 1); + background-color: #2b2b2b; border-color: rgba(55, 65, 81, 1); } .notion code { From b3b560d91755c9a0aff5988ed61919b45da355e1 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 17:42:40 +0900 Subject: [PATCH 48/77] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index 1383d7ed4a..f70ad9f4bf 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -8,7 +8,7 @@ */ .notion { - --notion-max-width: 720px; + --notion-max-width: 1080px; --notion-header-height: 54px; } From f49e32119995da46a7e624201f746d8b5ff44d98 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 17:58:42 +0900 Subject: [PATCH 49/77] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=94=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=BD=E5=BA=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b3b560d91755c9a0aff5988ed61919b45da355e1. --- styles/notion.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index f70ad9f4bf..1383d7ed4a 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -8,7 +8,7 @@ */ .notion { - --notion-max-width: 1080px; + --notion-max-width: 720px; --notion-header-height: 54px; } From 683e906b405341f0bf90031e5e411bbba7b3294a Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 20:14:42 +0900 Subject: [PATCH 50/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 70ba74bb57..cb53686b28 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -150,7 +150,7 @@ export const NotionPage: React.FC = ({ }) => { const router = useRouter() const lite = useSearchParam('lite') -// 添加禁止鼠标右键、禁止选中和禁止文字复制粘贴的逻辑 + // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和禁止长按的逻辑 React.useEffect(() => { const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); @@ -164,17 +164,30 @@ React.useEffect(() => { event.preventDefault(); }; + const handleTouchStart = (event: TouchEvent) => { + event.preventDefault(); + }; + + const handleTouchEnd = (event: TouchEvent) => { + event.preventDefault(); + }; + document.addEventListener('contextmenu', handleContextMenu); document.addEventListener('selectstart', handleSelectStart); document.addEventListener('copy', handleCopy); + document.addEventListener('touchstart', handleTouchStart, { passive: false }); + document.addEventListener('touchend', handleTouchEnd, { passive: false }); return () => { document.removeEventListener('contextmenu', handleContextMenu); document.removeEventListener('selectstart', handleSelectStart); document.removeEventListener('copy', handleCopy); + document.removeEventListener('touchstart', handleTouchStart); + document.removeEventListener('touchend', handleTouchEnd); }; }, []); + const components = React.useMemo( () => ({ nextImage: Image, From 549fd5311d2d649e4b21f61db9734ff2a71681b3 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 20:26:16 +0900 Subject: [PATCH 51/77] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=EF=BC=88=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles/notion.css b/styles/notion.css index 1383d7ed4a..9cc9e97748 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -350,6 +350,9 @@ } /* disable highlighting in dark mode */ +.dark-mode { + --bg-color: #2f2f2f; +} .dark-mode .notion-red_background, .dark-mode .notion-pink_background, .dark-mode .notion-blue_background, From 78600f59848370ef86e419d6ab69366b1f5f5042 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 20:30:43 +0900 Subject: [PATCH 52/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index cb53686b28..5ff56465d4 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -150,7 +150,8 @@ export const NotionPage: React.FC = ({ }) => { const router = useRouter() const lite = useSearchParam('lite') - // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和禁止长按的逻辑 + + // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和长按的逻辑 React.useEffect(() => { const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); @@ -164,12 +165,21 @@ React.useEffect(() => { event.preventDefault(); }; + // 用于记录 touchstart 的计时器 + let touchTimer: NodeJS.Timeout; + const handleTouchStart = (event: TouchEvent) => { - event.preventDefault(); + touchTimer = setTimeout(() => { + event.preventDefault(); + }, 500); // 500ms 长按阈值，可以根据需要调整 }; - const handleTouchEnd = (event: TouchEvent) => { - event.preventDefault(); + const handleTouchEnd = () => { + clearTimeout(touchTimer); // 在 touchend 时清除计时器 + }; + + const handleTouchMove = () => { + clearTimeout(touchTimer); // 在 touchmove 时清除计时器，避免滑动时触发长按 }; document.addEventListener('contextmenu', handleContextMenu); @@ -177,6 +187,7 @@ React.useEffect(() => { document.addEventListener('copy', handleCopy); document.addEventListener('touchstart', handleTouchStart, { passive: false }); document.addEventListener('touchend', handleTouchEnd, { passive: false }); + document.addEventListener('touchmove', handleTouchMove, { passive: false }); return () => { document.removeEventListener('contextmenu', handleContextMenu); @@ -184,10 +195,12 @@ React.useEffect(() => { document.removeEventListener('copy', handleCopy); document.removeEventListener('touchstart', handleTouchStart); document.removeEventListener('touchend', handleTouchEnd); + document.removeEventListener('touchmove', handleTouchMove); }; }, []); + const components = React.useMemo( () => ({ nextImage: Image, From 4b25f47f3b5bde270feabf66aa71610dee39d36a Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 20:45:27 +0900 Subject: [PATCH 53/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=863?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 89 +++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 5ff56465d4..a676c10f7b 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -152,53 +152,50 @@ export const NotionPage: React.FC = ({ const lite = useSearchParam('lite') // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和长按的逻辑 -React.useEffect(() => { - const handleContextMenu = (event: MouseEvent) => { - event.preventDefault(); - }; - - const handleSelectStart = (event: Event) => { - event.preventDefault(); - }; - - const handleCopy = (event: ClipboardEvent) => { - event.preventDefault(); - }; - - // 用于记录 touchstart 的计时器 - let touchTimer: NodeJS.Timeout; - - const handleTouchStart = (event: TouchEvent) => { - touchTimer = setTimeout(() => { + React.useEffect(() => { + const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); - }, 500); // 500ms 长按阈值，可以根据需要调整 - }; - - const handleTouchEnd = () => { - clearTimeout(touchTimer); // 在 touchend 时清除计时器 - }; - - const handleTouchMove = () => { - clearTimeout(touchTimer); // 在 touchmove 时清除计时器，避免滑动时触发长按 - }; - - document.addEventListener('contextmenu', handleContextMenu); - document.addEventListener('selectstart', handleSelectStart); - document.addEventListener('copy', handleCopy); - document.addEventListener('touchstart', handleTouchStart, { passive: false }); - document.addEventListener('touchend', handleTouchEnd, { passive: false }); - document.addEventListener('touchmove', handleTouchMove, { passive: false }); - - return () => { - document.removeEventListener('contextmenu', handleContextMenu); - document.removeEventListener('selectstart', handleSelectStart); - document.removeEventListener('copy', handleCopy); - document.removeEventListener('touchstart', handleTouchStart); - document.removeEventListener('touchend', handleTouchEnd); - document.removeEventListener('touchmove', handleTouchMove); - }; -}, []); - + }; + const handleSelectStart = (event: Event) => { + event.preventDefault(); + }; + const handleCopy = (event: ClipboardEvent) => { + event.preventDefault(); + }; + let touchTimer: NodeJS.Timeout | null = null; + const handleTouchStart = (event: TouchEvent) => { + touchTimer = setTimeout(() => { + // 阻止长按菜单的默认行为 + event.preventDefault(); + }, 500); // 500ms 长按阈值，可以根据需要调整 + }; + const clearTouchTimer = () => { + if (touchTimer) { + clearTimeout(touchTimer); + touchTimer = null; + } + }; + const handleTouchEnd = () => { + clearTouchTimer(); // 在 touchend 时清除计时器 + }; + const handleTouchMove = () => { + clearTouchTimer(); // 在 touchmove 时清除计时器，避免滑动时触发长按 + }; + document.addEventListener('contextmenu', handleContextMenu); + document.addEventListener('selectstart', handleSelectStart); + document.addEventListener('copy', handleCopy); + document.addEventListener('touchstart', handleTouchStart, { passive: false }); + document.addEventListener('touchend', handleTouchEnd, { passive: false }); + document.addEventListener('touchmove', handleTouchMove, { passive: false }); + return () => { + document.removeEventListener('contextmenu', handleContextMenu); + document.removeEventListener('selectstart', handleSelectStart); + document.removeEventListener('copy', handleCopy); + document.removeEventListener('touchstart', handleTouchStart); + document.removeEventListener('touchend', handleTouchEnd); + document.removeEventListener('touchmove', handleTouchMove); + }; + }, []); const components = React.useMemo( From f2e7aba8fa3e280ab776edd83f354a658c3792ef Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 21:01:38 +0900 Subject: [PATCH 54/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=864?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index a676c10f7b..46e435ba28 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -156,37 +156,52 @@ export const NotionPage: React.FC = ({ const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); }; + const handleSelectStart = (event: Event) => { event.preventDefault(); }; + const handleCopy = (event: ClipboardEvent) => { event.preventDefault(); }; + let touchTimer: NodeJS.Timeout | null = null; + const handleTouchStart = (event: TouchEvent) => { touchTimer = setTimeout(() => { // 阻止长按菜单的默认行为 event.preventDefault(); + event.stopPropagation(); }, 500); // 500ms 长按阈值，可以根据需要调整 }; + const clearTouchTimer = () => { if (touchTimer) { clearTimeout(touchTimer); touchTimer = null; } }; + const handleTouchEnd = () => { clearTouchTimer(); // 在 touchend 时清除计时器 }; + const handleTouchMove = () => { clearTouchTimer(); // 在 touchmove 时清除计时器，避免滑动时触发长按 }; + + const handleTouchCancel = () => { + clearTouchTimer(); // 在 touchcancel 时清除计时器 + }; + document.addEventListener('contextmenu', handleContextMenu); document.addEventListener('selectstart', handleSelectStart); document.addEventListener('copy', handleCopy); document.addEventListener('touchstart', handleTouchStart, { passive: false }); document.addEventListener('touchend', handleTouchEnd, { passive: false }); document.addEventListener('touchmove', handleTouchMove, { passive: false }); + document.addEventListener('touchcancel', handleTouchCancel, { passive: false }); + return () => { document.removeEventListener('contextmenu', handleContextMenu); document.removeEventListener('selectstart', handleSelectStart); @@ -194,9 +209,10 @@ export const NotionPage: React.FC = ({ document.removeEventListener('touchstart', handleTouchStart); document.removeEventListener('touchend', handleTouchEnd); document.removeEventListener('touchmove', handleTouchMove); + document.removeEventListener('touchcancel', handleTouchCancel); }; }, []); - + const components = React.useMemo( () => ({ From 1a8a04c47baa4c989879cc2d5cb7821351f5a457 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 21:11:29 +0900 Subject: [PATCH 55/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 42 +++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 46e435ba28..093712cf46 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -153,6 +153,8 @@ export const NotionPage: React.FC = ({ // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和长按的逻辑 React.useEffect(() => { + const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); }; @@ -168,11 +170,12 @@ export const NotionPage: React.FC = ({ let touchTimer: NodeJS.Timeout | null = null; const handleTouchStart = (event: TouchEvent) => { - touchTimer = setTimeout(() => { - // 阻止长按菜单的默认行为 - event.preventDefault(); - event.stopPropagation(); - }, 500); // 500ms 长按阈值，可以根据需要调整 + if (isIOS) { + touchTimer = setTimeout(() => { + event.preventDefault(); + event.stopPropagation(); + }, 500); // 500ms 长按阈值，可以根据需要调整 + } }; const clearTouchTimer = () => { @@ -183,37 +186,42 @@ export const NotionPage: React.FC = ({ }; const handleTouchEnd = () => { - clearTouchTimer(); // 在 touchend 时清除计时器 + clearTouchTimer(); }; const handleTouchMove = () => { - clearTouchTimer(); // 在 touchmove 时清除计时器，避免滑动时触发长按 + clearTouchTimer(); }; const handleTouchCancel = () => { - clearTouchTimer(); // 在 touchcancel 时清除计时器 + clearTouchTimer(); }; document.addEventListener('contextmenu', handleContextMenu); document.addEventListener('selectstart', handleSelectStart); document.addEventListener('copy', handleCopy); - document.addEventListener('touchstart', handleTouchStart, { passive: false }); - document.addEventListener('touchend', handleTouchEnd, { passive: false }); - document.addEventListener('touchmove', handleTouchMove, { passive: false }); - document.addEventListener('touchcancel', handleTouchCancel, { passive: false }); + + if (isIOS) { + document.addEventListener('touchstart', handleTouchStart, { passive: false }); + document.addEventListener('touchend', handleTouchEnd, { passive: false }); + document.addEventListener('touchmove', handleTouchMove, { passive: false }); + document.addEventListener('touchcancel', handleTouchCancel, { passive: false }); + } return () => { document.removeEventListener('contextmenu', handleContextMenu); document.removeEventListener('selectstart', handleSelectStart); document.removeEventListener('copy', handleCopy); - document.removeEventListener('touchstart', handleTouchStart); - document.removeEventListener('touchend', handleTouchEnd); - document.removeEventListener('touchmove', handleTouchMove); - document.removeEventListener('touchcancel', handleTouchCancel); + + if (isIOS) { + document.removeEventListener('touchstart', handleTouchStart); + document.removeEventListener('touchend', handleTouchEnd); + document.removeEventListener('touchmove', handleTouchMove); + document.removeEventListener('touchcancel', handleTouchCancel); + } }; }, []); - const components = React.useMemo( () => ({ nextImage: Image, From b93e31494bc52626ff62b8e1c24488bbbadc4fcf Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 21:15:35 +0900 Subject: [PATCH 56/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=866?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 093712cf46..fb1d9f8dde 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -153,7 +153,8 @@ export const NotionPage: React.FC = ({ // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和长按的逻辑 React.useEffect(() => { - const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + // 检测是否是 iOS 设备 + const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent); const handleContextMenu = (event: MouseEvent) => { event.preventDefault(); @@ -221,6 +222,7 @@ export const NotionPage: React.FC = ({ } }; }, []); + const components = React.useMemo( () => ({ From 6eed19dee8fc9d95f5d56a0f2a9971a1675070f8 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 21:31:48 +0900 Subject: [PATCH 57/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=867?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 118 +++++++++++++++----------------------- 1 file changed, 46 insertions(+), 72 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index fb1d9f8dde..309f7e31ae 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -150,80 +150,54 @@ export const NotionPage: React.FC = ({ }) => { const router = useRouter() const lite = useSearchParam('lite') - - // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和长按的逻辑 - React.useEffect(() => { - // 检测是否是 iOS 设备 - const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent); - - const handleContextMenu = (event: MouseEvent) => { - event.preventDefault(); - }; - - const handleSelectStart = (event: Event) => { + // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和禁止长按的逻辑 +React.useEffect(() => { + const handleContextMenu = (event: MouseEvent) => { + event.preventDefault(); + }; + + const handleSelectStart = (event: Event) => { + event.preventDefault(); + }; + + const handleCopy = (event: ClipboardEvent) => { + event.preventDefault(); + }; + + const handleTouchStart = (event: TouchEvent) => { + event.preventDefault(); + // Record the start time of the touch event + startTime = event.timeStamp; + }; + + const handleTouchEnd = (event: TouchEvent) => { + event.preventDefault(); + // Calculate the duration of the touch event + const touchDuration = event.timeStamp - startTime; + if (touchDuration > 500) { event.preventDefault(); - }; - - const handleCopy = (event: ClipboardEvent) => { - event.preventDefault(); - }; - - let touchTimer: NodeJS.Timeout | null = null; - - const handleTouchStart = (event: TouchEvent) => { - if (isIOS) { - touchTimer = setTimeout(() => { - event.preventDefault(); - event.stopPropagation(); - }, 500); // 500ms 长按阈值，可以根据需要调整 - } - }; - - const clearTouchTimer = () => { - if (touchTimer) { - clearTimeout(touchTimer); - touchTimer = null; - } - }; - - const handleTouchEnd = () => { - clearTouchTimer(); - }; - - const handleTouchMove = () => { - clearTouchTimer(); - }; - - const handleTouchCancel = () => { - clearTouchTimer(); - }; - - document.addEventListener('contextmenu', handleContextMenu); - document.addEventListener('selectstart', handleSelectStart); - document.addEventListener('copy', handleCopy); - - if (isIOS) { - document.addEventListener('touchstart', handleTouchStart, { passive: false }); - document.addEventListener('touchend', handleTouchEnd, { passive: false }); - document.addEventListener('touchmove', handleTouchMove, { passive: false }); - document.addEventListener('touchcancel', handleTouchCancel, { passive: false }); } - - return () => { - document.removeEventListener('contextmenu', handleContextMenu); - document.removeEventListener('selectstart', handleSelectStart); - document.removeEventListener('copy', handleCopy); - - if (isIOS) { - document.removeEventListener('touchstart', handleTouchStart); - document.removeEventListener('touchend', handleTouchEnd); - document.removeEventListener('touchmove', handleTouchMove); - document.removeEventListener('touchcancel', handleTouchCancel); - } - }; - }, []); - - + }; + + // Variable to store the start time of the touch event + let startTime: number; + + document.addEventListener('contextmenu', handleContextMenu); + document.addEventListener('selectstart', handleSelectStart); + document.addEventListener('copy', handleCopy); + document.addEventListener('touchstart', handleTouchStart, { passive: false }); + document.addEventListener('touchend', handleTouchEnd, { passive: false }); + + return () => { + document.removeEventListener('contextmenu', handleContextMenu); + document.removeEventListener('selectstart', handleSelectStart); + document.removeEventListener('copy', handleCopy); + document.removeEventListener('touchstart', handleTouchStart); + document.removeEventListener('touchend', handleTouchEnd); + }; +}, []); + + const components = React.useMemo( () => ({ nextImage: Image, From 26d900733a2e58642fff11d59ce4db3138cd5e28 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 22:28:21 +0900 Subject: [PATCH 58/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=868?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 309f7e31ae..b3bd975bea 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -164,29 +164,30 @@ React.useEffect(() => { event.preventDefault(); }; + let touchStartTime: number; + const handleTouchStart = (event: TouchEvent) => { - event.preventDefault(); - // Record the start time of the touch event - startTime = event.timeStamp; + touchStartTime = Date.now(); }; const handleTouchEnd = (event: TouchEvent) => { - event.preventDefault(); - // Calculate the duration of the touch event - const touchDuration = event.timeStamp - startTime; + const touchDuration = Date.now() - touchStartTime; if (touchDuration > 500) { event.preventDefault(); } }; - // Variable to store the start time of the touch event - let startTime: number; + const handleTouchMove = (event: TouchEvent) => { + // Reset touch start time on move to allow scrolling + touchStartTime = null; + }; document.addEventListener('contextmenu', handleContextMenu); document.addEventListener('selectstart', handleSelectStart); document.addEventListener('copy', handleCopy); - document.addEventListener('touchstart', handleTouchStart, { passive: false }); + document.addEventListener('touchstart', handleTouchStart, { passive: true }); document.addEventListener('touchend', handleTouchEnd, { passive: false }); + document.addEventListener('touchmove', handleTouchMove, { passive: true }); return () => { document.removeEventListener('contextmenu', handleContextMenu); @@ -194,6 +195,7 @@ React.useEffect(() => { document.removeEventListener('copy', handleCopy); document.removeEventListener('touchstart', handleTouchStart); document.removeEventListener('touchend', handleTouchEnd); + document.removeEventListener('touchmove', handleTouchMove); }; }, []); From 0bde7db9bc2014b8d12043a1bff57606235f3d36 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 22:54:05 +0900 Subject: [PATCH 59/77] =?UTF-8?q?blog=20=E8=8B=B9=E6=9E=9C=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E7=82=B9=E5=87=BB=E5=A4=84=E7=90=869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index b3bd975bea..e4facf7681 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -164,16 +164,18 @@ React.useEffect(() => { event.preventDefault(); }; - let touchStartTime: number; + let touchStartTime: number | null = null; // Initialize as null const handleTouchStart = (event: TouchEvent) => { touchStartTime = Date.now(); }; const handleTouchEnd = (event: TouchEvent) => { - const touchDuration = Date.now() - touchStartTime; - if (touchDuration > 500) { - event.preventDefault(); + if (touchStartTime) { // Check if touchStartTime is not null + const touchDuration = Date.now() - touchStartTime; + if (touchDuration > 500) { + event.preventDefault(); + } } }; From 25b738513c44b92c0fdcb6e4f5378ab4035a6515 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 23:00:15 +0900 Subject: [PATCH 60/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E6=97=A0=E6=B3=95=E9=95=BF=E6=8C=89=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=8610?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index e4facf7681..068d193e64 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -153,14 +153,17 @@ export const NotionPage: React.FC = ({ // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和禁止长按的逻辑 React.useEffect(() => { const handleContextMenu = (event: MouseEvent) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; - + const handleSelectStart = (event: Event) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; - + const handleCopy = (event: ClipboardEvent) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; From 47990a6a6b49eb3b9e4c1b0e6acc8871bd00da98 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 23:03:06 +0900 Subject: [PATCH 61/77] =?UTF-8?q?=E5=9B=9E=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 068d193e64..70ba74bb57 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -150,61 +150,31 @@ export const NotionPage: React.FC = ({ }) => { const router = useRouter() const lite = useSearchParam('lite') - // 添加禁止鼠标右键、禁止选中、禁止文字复制粘贴和禁止长按的逻辑 +// 添加禁止鼠标右键、禁止选中和禁止文字复制粘贴的逻辑 React.useEffect(() => { const handleContextMenu = (event: MouseEvent) => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; - + const handleSelectStart = (event: Event) => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; - + const handleCopy = (event: ClipboardEvent) => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars event.preventDefault(); }; - let touchStartTime: number | null = null; // Initialize as null - - const handleTouchStart = (event: TouchEvent) => { - touchStartTime = Date.now(); - }; - - const handleTouchEnd = (event: TouchEvent) => { - if (touchStartTime) { // Check if touchStartTime is not null - const touchDuration = Date.now() - touchStartTime; - if (touchDuration > 500) { - event.preventDefault(); - } - } - }; - - const handleTouchMove = (event: TouchEvent) => { - // Reset touch start time on move to allow scrolling - touchStartTime = null; - }; - document.addEventListener('contextmenu', handleContextMenu); document.addEventListener('selectstart', handleSelectStart); document.addEventListener('copy', handleCopy); - document.addEventListener('touchstart', handleTouchStart, { passive: true }); - document.addEventListener('touchend', handleTouchEnd, { passive: false }); - document.addEventListener('touchmove', handleTouchMove, { passive: true }); return () => { document.removeEventListener('contextmenu', handleContextMenu); document.removeEventListener('selectstart', handleSelectStart); document.removeEventListener('copy', handleCopy); - document.removeEventListener('touchstart', handleTouchStart); - document.removeEventListener('touchend', handleTouchEnd); - document.removeEventListener('touchmove', handleTouchMove); }; }, []); - const components = React.useMemo( () => ({ nextImage: Image, From adbebd9ab8f27469e2e048dfafa680cb33070caa Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 23:08:44 +0900 Subject: [PATCH 62/77] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E9=95=BF=E6=8C=891?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 70ba74bb57..2f2ad71a50 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -308,3 +308,52 @@ React.useEffect(() => { ) } + +interface Props {} +interface State { + longpress: boolean; + presstimeout: any; +} +class LongPressComponent extends React.Component { + constructor(props: Props) { + super(props); + this.state = { + longpress: false, + presstimeout: null + }; + } + + handleMouseDown = (event: React.MouseEvent) => { + this.setState({ + presstimeout: setTimeout(() => { + this.setState({ longpress: true }); + // 在这里添加你需要执行的长按后的操作，比如禁止默认行为 + event.preventDefault(); + }, 500) // 设置长按时间阈值，单位为毫秒，这里设置为500毫秒 + }); + }; + + handleMouseUp = () => { + clearTimeout(this.state.presstimeout); + if (this.state.longpress) { + // 如果是长按，则重置长按标志 + this.setState({ longpress: false }); + } else { + // 如果不是长按，则执行正常的左键点击操作 + // 在这里添加你需要执行的左键点击后的操作 + } + }; + + render() { + return ( +
+ {/* 在这里编写组件的 JSX 结构 */} +
+ ); + } +} + +export default LongPressComponent; From 1fdbbb09ca770865b9661770b5b869b342b1d985 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 23:19:20 +0900 Subject: [PATCH 63/77] =?UTF-8?q?=E5=9B=9E=E6=BA=AF2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/NotionPage.tsx | 49 --------------------------------------- 1 file changed, 49 deletions(-) diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index 2f2ad71a50..70ba74bb57 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -308,52 +308,3 @@ React.useEffect(() => { ) } - -interface Props {} -interface State { - longpress: boolean; - presstimeout: any; -} -class LongPressComponent extends React.Component { - constructor(props: Props) { - super(props); - this.state = { - longpress: false, - presstimeout: null - }; - } - - handleMouseDown = (event: React.MouseEvent) => { - this.setState({ - presstimeout: setTimeout(() => { - this.setState({ longpress: true }); - // 在这里添加你需要执行的长按后的操作，比如禁止默认行为 - event.preventDefault(); - }, 500) // 设置长按时间阈值，单位为毫秒，这里设置为500毫秒 - }); - }; - - handleMouseUp = () => { - clearTimeout(this.state.presstimeout); - if (this.state.longpress) { - // 如果是长按，则重置长按标志 - this.setState({ longpress: false }); - } else { - // 如果不是长按，则执行正常的左键点击操作 - // 在这里添加你需要执行的左键点击后的操作 - } - }; - - render() { - return ( -
- {/* 在这里编写组件的 JSX 结构 */} -
- ); - } -} - -export default LongPressComponent; From d726a24423cb98e7696b8c7996baace8c2fa00e6 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 19 May 2024 23:23:32 +0900 Subject: [PATCH 64/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BBcss=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index 9cc9e97748..54c0d6d806 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -6,7 +6,14 @@ * whereas our goal with this site is to adjust Notion's styling in a few key * places to add some flare. */ - + img{ + /* SPの長押し禁止 */ + -webkit-touch-callout:none; + -webkit-user-select:none; + -moz-touch-callout:none; + -moz-user-select:none; + user-select:none; +} .notion { --notion-max-width: 720px; --notion-header-height: 54px; From 4450b8fbaf8d7a658637700ebf6e2aeb04852c2e Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Tue, 30 Jul 2024 23:52:25 +0900 Subject: [PATCH 65/77] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index 54c0d6d806..a631f90a13 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -15,7 +15,7 @@ user-select:none; } .notion { - --notion-max-width: 720px; + --notion-max-width: 960px; --notion-header-height: 54px; } @@ -26,10 +26,12 @@ .notion-page { padding-bottom: calc(max(5vh, 32px)) !important; line-height: 1.65; + padding-left: 0; + padding-right: 0; } .index-page { - --notion-max-width: 900px; + --notion-max-width: 960px; } .notion-text { From 79321c30c80b7f4fc632502288095e11c34cb3f1 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 2 Aug 2024 00:05:11 +0900 Subject: [PATCH 66/77] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index a631f90a13..aadb01128f 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -15,7 +15,7 @@ user-select:none; } .notion { - --notion-max-width: 960px; + --notion-max-width: 920px; --notion-header-height: 54px; } @@ -31,7 +31,7 @@ } .index-page { - --notion-max-width: 960px; + --notion-max-width: 920px; } .notion-text { From c3756f08c7a48cda100cc77065cbe3485a669eb8 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 2 Aug 2024 00:11:32 +0900 Subject: [PATCH 67/77] =?UTF-8?q?blog=20=E5=9B=BE=E7=89=87=E5=85=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index aadb01128f..1898d49fc9 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -47,7 +47,10 @@ margin-bottom: 1em; } .notion-asset-wrapper img { - border-radius: 8px; + border-radius: 5px; +} +.notion-asset-wrapper div { + height: 100%; } .notion-asset-wrapper-video > div, .notion-asset-wrapper-video video { From 36096b3d00a4fc75e39041c1ad5b9005509a5e51 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Fri, 2 Aug 2024 00:35:54 +0900 Subject: [PATCH 68/77] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A63?= =?UTF-8?q?=EF=BC=8Cblog=20=E5=9B=BE=E7=89=87=E5=85=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index 1898d49fc9..e7365cb679 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -15,7 +15,7 @@ user-select:none; } .notion { - --notion-max-width: 920px; + --notion-max-width: 960px; --notion-header-height: 54px; } @@ -31,7 +31,7 @@ } .index-page { - --notion-max-width: 920px; + --notion-max-width: 960px; } .notion-text { @@ -49,9 +49,11 @@ .notion-asset-wrapper img { border-radius: 5px; } -.notion-asset-wrapper div { +.notion-asset-wrapper > div { height: 100%; + display: contents !important; } + .notion-asset-wrapper-video > div, .notion-asset-wrapper-video video { width: 100% !important; From f9238c938cec4f56937ef550dc071e6d5d6492c4 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Tue, 27 Aug 2024 00:11:19 +0900 Subject: [PATCH 69/77] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index e7365cb679..4b24e7c21c 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -15,7 +15,7 @@ user-select:none; } .notion { - --notion-max-width: 960px; + --notion-max-width: 840px; --notion-header-height: 54px; } @@ -25,17 +25,16 @@ .notion-page { padding-bottom: calc(max(5vh, 32px)) !important; - line-height: 1.65; padding-left: 0; padding-right: 0; } .index-page { - --notion-max-width: 960px; + --notion-max-width: 840px; } .notion-text { - padding: 0.5em 2px; + padding: 0.3em 2px; } .notion-asset-caption { @@ -73,7 +72,7 @@ } /*blog间隔尺寸*/ .notion-gallery-grid { - grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); grid-gap: 3vmin; gap: 3vmin; } From b4875d6d80be7ca34b5499b0d024f20ea7a21d51 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Tue, 27 Aug 2024 00:27:00 +0900 Subject: [PATCH 70/77] =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A65=20?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B0=8F=E6=A0=87=E9=A2=98=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index 4b24e7c21c..dca2b44c01 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -32,7 +32,12 @@ .index-page { --notion-max-width: 840px; } - +.notion-aside { + top: 120px; +} +.notion-aside-table-of-contents { + max-height: calc(100vh - 120px - 18px); +} .notion-text { padding: 0.3em 2px; } @@ -84,7 +89,7 @@ display: none; } .notion-gallery-grid .notion-page-title-text { - font-size: 2em; + font-size: 1.8em; white-space: unset; } .notion-gallery-grid .notion-collection-card-property { From 5b96fb84b6678fea469454a4e824d3d195bdb152 Mon Sep 17 00:00:00 2001 From: WhaleTiku Date: Sun, 24 Nov 2024 17:11:42 +0900 Subject: [PATCH 71/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98logo?= =?UTF-8?q?=E5=8F=98=E5=BD=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/styles/notion.css b/styles/notion.css index dca2b44c01..a40071a5f0 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -395,7 +395,9 @@ .notion-page-icon-hero.notion-page-icon-image img { border-radius: 50%; } - +.notion-page-icon-hero.notion-page-icon-image img { + object-fit: none; +} .notion-header { background: hsla(0, 0%, 100%, 0.8); backdrop-filter: saturate(180%) blur(16px); From 7eef3da8316f3fdaa28bcdc341b1cfd9d63788b5 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 02:29:02 +0900 Subject: [PATCH 72/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98logo?= =?UTF-8?q?=E5=8F=98=E5=BD=A2=E9=97=AE=E9=A2=982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/notion.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/styles/notion.css b/styles/notion.css index a40071a5f0..2bc167b0d5 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -395,9 +395,6 @@ .notion-page-icon-hero.notion-page-icon-image img { border-radius: 50%; } -.notion-page-icon-hero.notion-page-icon-image img { - object-fit: none; -} .notion-header { background: hsla(0, 0%, 100%, 0.8); backdrop-filter: saturate(180%) blur(16px); From f8ec5ed67e89aa6bbeb6957ebd5ebf468e406aa0 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 03:32:18 +0900 Subject: [PATCH 73/77] =?UTF-8?q?=E8=A7=84=E5=AE=9Anode=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 557edd60ac..a9005d7980 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "repository": "transitive-bullshit/nextjs-notion-starter-kit", "license": "MIT", "engines": { - "node": ">=16" + "node": "18.17.0" }, "scripts": { "dev": "next dev", From b586a5677847e5c37c3887830b61500b2ece2250 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 03:56:44 +0900 Subject: [PATCH 74/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.ts | 4 ++++ site.config.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/config.ts b/lib/config.ts index 10199118fe..bea1032fdf 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -20,6 +20,10 @@ import { type Site } from './types' +export const config = { + myCat: "https://seto-life.vercel.app/" +} + export const rootNotionPageId: string = parsePageId( getSiteConfig('rootNotionPageId'), { uuid: false } diff --git a/site.config.ts b/site.config.ts index b6e9679184..2ab78900f9 100644 --- a/site.config.ts +++ b/site.config.ts @@ -21,7 +21,7 @@ export default siteConfig({ twitter: 'KujiraTiku', // github: 'transitive-bullshit', // linkedin: 'fisch2', - mastodon: 'https://fedibird.com/@kujiTake', // optional mastodon profile URL, provides link verification + mastodon: 'https://fedibird.com/@TikuTalk', // optional mastodon profile URL, provides link verification // newsletter: '#', // optional newsletter URL // youtube: '#', // optional youtube channel name or `channel/UCGbXXXXXXXXXXXXXXXXXXXXXX` pixiv: '2781527', From a2edee4b7de64f7a229f692f57f0bc6972533173 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 04:04:39 +0900 Subject: [PATCH 75/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/config.ts b/lib/config.ts index bea1032fdf..90452c1a58 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -20,9 +20,7 @@ import { type Site } from './types' -export const config = { - myCat: "https://seto-life.vercel.app/" -} +export const myCat = "https://seto-life.vercel.app/" export const rootNotionPageId: string = parsePageId( getSiteConfig('rootNotionPageId'), From 23e04acb91257cb881f71f28bae6be4169114241 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 04:09:12 +0900 Subject: [PATCH 76/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Footer.tsx | 1 - lib/config.ts | 1 + lib/site-config.ts | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 400d6c978d..5a7c0962bf 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -13,7 +13,6 @@ import * as React from 'react' import * as config from '@/lib/config' import { useDarkMode } from '@/lib/use-dark-mode' - import styles from './styles.module.css' // TODO: merge the data and icons from PageSocial with the social links in Footer diff --git a/lib/config.ts b/lib/config.ts index 90452c1a58..66e4fcba0c 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -20,6 +20,7 @@ import { type Site } from './types' +export const pixiv = '2781527' export const myCat = "https://seto-life.vercel.app/" export const rootNotionPageId: string = parsePageId( diff --git a/lib/site-config.ts b/lib/site-config.ts index 983d39bd7e..e33a1ba82b 100644 --- a/lib/site-config.ts +++ b/lib/site-config.ts @@ -12,6 +12,7 @@ export interface SiteConfig { twitter?: string myCat?: string + pixiv?: string github?: string linkedin?: string newsletter?: string From e9f397f0bb716bf2ef24bd75277a12696f71c581 Mon Sep 17 00:00:00 2001 From: WhaleKun <40340321+whalejun@users.noreply.github.com> Date: Tue, 23 Sep 2025 04:19:53 +0900 Subject: [PATCH 77/77] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Footer.tsx | 5 +++-- components/NotionPage.tsx | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 5a7c0962bf..ccdaf4e92f 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,18 +1,19 @@ +import { FaCat } from '@react-icons/all-files/fa/FaCat' import { FaEnvelopeOpenText } from '@react-icons/all-files/fa/FaEnvelopeOpenText' import { FaGithub } from '@react-icons/all-files/fa/FaGithub' import { FaLinkedin } from '@react-icons/all-files/fa/FaLinkedin' import { FaMastodon } from '@react-icons/all-files/fa/FaMastodon' -import { SiPixiv } from '@react-icons/all-files/si/SiPixiv' -import { FaCat } from '@react-icons/all-files/fa/FaCat' import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter' import { FaYoutube } from '@react-icons/all-files/fa/FaYoutube' import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu' import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp' import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline' +import { SiPixiv } from '@react-icons/all-files/si/SiPixiv' import * as React from 'react' import * as config from '@/lib/config' import { useDarkMode } from '@/lib/use-dark-mode' + import styles from './styles.module.css' // TODO: merge the data and icons from PageSocial with the social links in Footer diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx index d6de330db4..5326c822a2 100644 --- a/components/NotionPage.tsx +++ b/components/NotionPage.tsx @@ -1,6 +1,5 @@ import cs from 'classnames' - import dynamic from 'next/dynamic' import Image from 'next/legacy/image' import Link from 'next/link'