Skip to content

feat(email encrypt): implement base64 encoding for contact email conf… #3330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(email encrypt): implement base64 encoding for contact email conf… #3330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8024e03
feat(email encrypt): implement base64 encoding for contact email conf…
qixing-jk Apr 11, 2025
3a2c1da
feat(email encrypt): implement base64 encoding for contact email config
qixing-jk Apr 11, 2025
23b66bf
feat(simplify ENABLE_RSS checks): remove useless JSON.parse calls
qixing-jk Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion conf/contact.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
*/
module.exports = {
// 社交链接，不需要可留空白，例如 CONTACT_WEIBO:''
CONTACT_EMAIL: process.env.NEXT_PUBLIC_CONTACT_EMAIL || '', // 邮箱地址 例如[email protected]
CONTACT_EMAIL:
(process.env.NEXT_PUBLIC_CONTACT_EMAIL &&
btoa(
unescape(encodeURIComponent(process.env.NEXT_PUBLIC_CONTACT_EMAIL))
)) ||
'', // 邮箱地址 例如[email protected]
CONTACT_WEIBO: process.env.NEXT_PUBLIC_CONTACT_WEIBO || '', // 你的微博个人主页
CONTACT_TWITTER: process.env.NEXT_PUBLIC_CONTACT_TWITTER || '', // 你的twitter个人主页
CONTACT_GITHUB: process.env.NEXT_PUBLIC_CONTACT_GITHUB || '', // 你的github个人主页 例如 https://github.com/tangly1024
Expand Down
11 changes: 8 additions & 3 deletions lib/notion/getNotionConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,14 @@ export async function getConfigMapFromConfigPage(allPages) {
// 只导入生效的配置
if (config.enable) {
// console.log('[Notion配置]', config.key, config.value)
notionConfig[config.key] =
parseTextToJson(config.value) || config.value || null
// 配置不能是undefined，至少是null
if (config.key === 'CONTACT_EMAIL') {
notionConfig[config.key] =
(config.value && btoa(unescape(encodeURIComponent(config.value)))) || null
} else {
notionConfig[config.key] =
parseTextToJson(config.value) || config.value || null
// 配置不能是undefined，至少是null
}
}
}
}
Expand Down
58 changes: 39 additions & 19 deletions themes/commerce/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,97 @@
import { siteConfig } from '@/lib/config'
import { useEffect, useRef } from 'react'
/**
* 社交联系方式按钮组
* @returns {JSX.Element}
* @constructor
*/
const SocialButton = () => {
const CONTACT_GITHUB = siteConfig('CONTACT_GITHUB')
const CONTACT_TWITTER = siteConfig('CONTACT_TWITTER')
const CONTACT_TELEGRAM = siteConfig('CONTACT_TELEGRAM')
const CONTACT_LINKEDIN = siteConfig('CONTACT_LINKEDIN')
const CONTACT_WEIBO = siteConfig('CONTACT_WEIBO')
const CONTACT_INSTAGRAM = siteConfig('CONTACT_INSTAGRAM')
const CONTACT_EMAIL = siteConfig('CONTACT_EMAIL')
const ENABLE_RSS = siteConfig('ENABLE_RSS')
const CONTACT_BILIBILI = siteConfig('CONTACT_BILIBILI')
const CONTACT_YOUTUBE = siteConfig('CONTACT_YOUTUBE')

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])
return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-3 text-xl text-gray-600 dark:text-gray-300 '>
{siteConfig('CONTACT_GITHUB') && (
{CONTACT_GITHUB && (
<a
target='_blank'
rel='noreferrer'
title={'github'}
href={siteConfig('CONTACT_GITHUB')}>
href={CONTACT_GITHUB}>
<i className='transform hover:scale-125 duration-150 fab fa-github dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_TWITTER') && (
{CONTACT_TWITTER && (
<a
target='_blank'
rel='noreferrer'
title={'twitter'}
href={siteConfig('CONTACT_TWITTER')}>
href={CONTACT_TWITTER}>
<i className='transform hover:scale-125 duration-150 fab fa-twitter dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_TELEGRAM') && (
{CONTACT_TELEGRAM && (
<a
target='_blank'
rel='noreferrer'
href={siteConfig('CONTACT_TELEGRAM')}
href={CONTACT_TELEGRAM}
title={'telegram'}>
<i className='transform hover:scale-125 duration-150 fab fa-telegram dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_LINKEDIN') && (
{CONTACT_LINKEDIN && (
<a
target='_blank'
rel='noreferrer'
href={siteConfig('CONTACT_LINKEDIN')}
href={CONTACT_LINKEDIN}
title={'linkIn'}>
<i className='transform hover:scale-125 duration-150 fab fa-linkedin dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_WEIBO') && (
{CONTACT_WEIBO && (
<a
target='_blank'
rel='noreferrer'
title={'weibo'}
href={siteConfig('CONTACT_WEIBO')}>
href={CONTACT_WEIBO}>
<i className='transform hover:scale-125 duration-150 fab fa-weibo dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_INSTAGRAM') && (
{CONTACT_INSTAGRAM && (
<a
target='_blank'
rel='noreferrer'
title={'instagram'}
href={siteConfig('CONTACT_INSTAGRAM')}>
href={CONTACT_INSTAGRAM}>
<i className='transform hover:scale-125 duration-150 fab fa-instagram dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_EMAIL') && (
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${siteConfig('CONTACT_EMAIL')}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{JSON.parse(siteConfig('ENABLE_RSS')) && (
{ENABLE_RSS && (
<a
target='_blank'
rel='noreferrer'
Expand All @@ -80,21 +100,21 @@ const SocialButton = () => {
<i className='transform hover:scale-125 duration-150 fas fa-rss dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_BILIBILI') && (
{CONTACT_BILIBILI && (
<a
target='_blank'
rel='noreferrer'
title={'bilibili'}
href={siteConfig('CONTACT_BILIBILI')}>
href={CONTACT_BILIBILI}>
<i className='transform hover:scale-125 duration-150 fab fa-bilibili dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
{siteConfig('CONTACT_YOUTUBE') && (
{CONTACT_YOUTUBE && (
<a
target='_blank'
rel='noreferrer'
title={'youtube'}
href={siteConfig('CONTACT_YOUTUBE')}>
href={CONTACT_YOUTUBE}>
<i className='transform hover:scale-125 duration-150 fab fa-youtube dark:hover:text-red-400 hover:text-red-600' />
</a>
)}
Expand Down
13 changes: 11 additions & 2 deletions themes/fukasawa/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QrCode from '@/components/QrCode'
import { siteConfig } from '@/lib/config'
import { useState } from 'react'
import { useEffect, useRef, useState } from 'react'

/**
* 社交联系方式按钮组
Expand Down Expand Up @@ -32,6 +32,14 @@ const SocialButton = () => {
setQrCodeShow(false)
}

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])

return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-3 text-xl flex items-center text-gray-600 dark:text-gray-300 '>
Expand Down Expand Up @@ -91,10 +99,11 @@ const SocialButton = () => {
)}
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${CONTACT_EMAIL}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-green-400 hover:text-green-600' />
</a>
)}
Expand Down
13 changes: 11 additions & 2 deletions themes/gitbook/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QrCode from '@/components/QrCode'
import { siteConfig } from '@/lib/config'
import { useState } from 'react'
import { useEffect, useState } from 'react'

/**
* 社交联系方式按钮组
Expand Down Expand Up @@ -32,6 +32,14 @@ const SocialButton = () => {
setQrCodeShow(false)
}

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])

return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-3 text-xl flex items-center text-gray-600 dark:text-gray-300 '>
Expand Down Expand Up @@ -91,10 +99,11 @@ const SocialButton = () => {
)}
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${CONTACT_EMAIL}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-green-400 hover:text-green-600' />
</a>
)}
Expand Down
15 changes: 13 additions & 2 deletions themes/heo/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { siteConfig } from '@/lib/config'
import { useEffect, useRef } from 'react'

/**
* 社交联系方式按钮组
Expand All @@ -16,6 +17,15 @@ const SocialButton = () => {
const ENABLE_RSS = siteConfig('ENABLE_RSS')
const CONTACT_BILIBILI = siteConfig('CONTACT_BILIBILI')
const CONTACT_YOUTUBE = siteConfig('CONTACT_YOUTUBE')

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])

return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-12 text-3xl text-gray-600 dark:text-gray-300 '>
Expand Down Expand Up @@ -75,14 +85,15 @@ const SocialButton = () => {
)}
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${CONTACT_EMAIL}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-indigo-400 hover:text-indigo-600' />
</a>
)}
{JSON.parse(ENABLE_RSS) && (
{ENABLE_RSS && (
<a
target='_blank'
rel='noreferrer'
Expand Down
14 changes: 12 additions & 2 deletions themes/hexo/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QrCode from '@/components/QrCode'
import { siteConfig } from '@/lib/config'
import { useState } from 'react'
import { useEffect, useRef, useState } from 'react'

/**
* 社交联系方式按钮组
Expand Down Expand Up @@ -32,6 +32,15 @@ const SocialButton = () => {
const closePopover = () => {
setQrCodeShow(false)
}

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])

return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-3 text-xl flex items-center text-gray-600 dark:text-gray-300 '>
Expand Down Expand Up @@ -91,10 +100,11 @@ const SocialButton = () => {
)}
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${CONTACT_EMAIL}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-indigo-400 hover:text-indigo-600' />
</a>
)}
Expand Down
13 changes: 11 additions & 2 deletions themes/magzine/components/SocialButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QrCode from '@/components/QrCode'
import { siteConfig } from '@/lib/config'
import { useState } from 'react'
import { useEffect, useRef, useState } from 'react'

/**
* 社交联系方式按钮组
Expand Down Expand Up @@ -31,6 +31,14 @@ const SocialButton = () => {
setQrCodeShow(false)
}

const emailIcon = useRef(null)
useEffect(() => {
if (CONTACT_EMAIL && emailIcon.current) {
emailIcon.current.href =
'mailto:' + decodeURIComponent(escape(atob(CONTACT_EMAIL)))
}
}, [CONTACT_EMAIL])

return (
<div className='w-full justify-center flex-wrap flex'>
<div className='space-x-3 text-xl flex items-center text-white dark:text-gray-300 '>
Expand Down Expand Up @@ -90,10 +98,11 @@ const SocialButton = () => {
)}
{CONTACT_EMAIL && (
<a
ref={emailIcon}
target='_blank'
rel='noreferrer'
title={'email'}
href={`mailto:${CONTACT_EMAIL}`}>
href={CONTACT_EMAIL}>
<i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-green-400 hover:text-green-600' />
</a>
)}
Expand Down
Loading
Loading