diff --git a/apps/admin/app/dashboard/system/site.tsx b/apps/admin/app/dashboard/system/site.tsx index 9f3fe59..1fe56fa 100644 --- a/apps/admin/app/dashboard/system/site.tsx +++ b/apps/admin/app/dashboard/system/site.tsx @@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query'; import { Label } from '@workspace/ui/components/label'; import { Table, TableBody, TableCell, TableRow } from '@workspace/ui/components/table'; import { Textarea } from '@workspace/ui/components/textarea'; +import { JSONEditor } from '@workspace/ui/custom-components/editor'; import { EnhancedInput } from '@workspace/ui/custom-components/enhanced-input'; import { UploadImage } from '@workspace/ui/custom-components/upload-image'; import { useTranslations } from 'next-intl'; @@ -130,6 +131,49 @@ export default function Site() { /> + + + {t('customData')} + {t('customDataDescription')} + + + updateConfig('custom_data', value)} + /> + + ); diff --git a/apps/admin/app/dashboard/user/page.tsx b/apps/admin/app/dashboard/user/page.tsx index 69cb6a1..cfd4629 100644 --- a/apps/admin/app/dashboard/user/page.tsx +++ b/apps/admin/app/dashboard/user/page.tsx @@ -58,8 +58,21 @@ export default function Page() { { + const { + auth_methods, + user_devices, + enable_balance_notify, + enable_login_notify, + enable_subscribe_notify, + enable_trade_notify, + updated_at, + created_at, + id, + ...rest + } = row.original; await updateUserBasicInfo({ - ...row.original, + user_id: id, + ...rest, enable: checked, } as unknown as API.UpdateUserBasiceInfoRequest); toast.success(t('updateSuccess')); diff --git a/apps/admin/config/use-global.tsx b/apps/admin/config/use-global.tsx index 5ce3cc5..f280e36 100644 --- a/apps/admin/config/use-global.tsx +++ b/apps/admin/config/use-global.tsx @@ -16,6 +16,7 @@ export const useGlobalStore = create((set) => ({ site_logo: '', keywords: '', custom_html: '', + custom_data: '', }, verify: { turnstile_site_key: '', diff --git a/apps/admin/locales/cs-CZ/system.json b/apps/admin/locales/cs-CZ/system.json index 161e9f1..9095f02 100644 --- a/apps/admin/locales/cs-CZ/system.json +++ b/apps/admin/locales/cs-CZ/system.json @@ -13,6 +13,8 @@ "title": "Zásady ochrany osobních údajů" }, "site": { + "customData": "Vlastní data", + "customDataDescription": "Vlastní data, používaná pro vlastní data webu", "customHtml": "Vlastní HTML", "customHtmlDescription": "Vlastní HTML kód, který bude vložen na konec tagu body na stránce.", "keywords": "Klíčová slova", diff --git a/apps/admin/locales/de-DE/system.json b/apps/admin/locales/de-DE/system.json index d93445b..3e616b9 100644 --- a/apps/admin/locales/de-DE/system.json +++ b/apps/admin/locales/de-DE/system.json @@ -13,6 +13,8 @@ "title": "Datenschutzrichtlinie" }, "site": { + "customData": "Benutzerdefinierte Daten", + "customDataDescription": "Benutzerdefinierte Daten, die für benutzerdefinierte Daten der Website verwendet werden", "customHtml": "Benutzerdefiniertes HTML", "customHtmlDescription": "Benutzerdefinierter HTML-Code, der am Ende des body-Tags der Seite eingefügt werden soll.", "keywords": "Schlüsselwörter", diff --git a/apps/admin/locales/en-US/system.json b/apps/admin/locales/en-US/system.json index 2bd8404..5709c83 100644 --- a/apps/admin/locales/en-US/system.json +++ b/apps/admin/locales/en-US/system.json @@ -13,6 +13,8 @@ "title": "Privacy Policy" }, "site": { + "customData": "Custom Data", + "customDataDescription": "Custom Data, used for custom data of the site", "customHtml": "Custom HTML", "customHtmlDescription": "Custom HTML code to be injected into the bottom of the site's body tag.", "keywords": "Keywords", diff --git a/apps/admin/locales/es-ES/system.json b/apps/admin/locales/es-ES/system.json index babfde8..6bdc329 100644 --- a/apps/admin/locales/es-ES/system.json +++ b/apps/admin/locales/es-ES/system.json @@ -13,6 +13,8 @@ "title": "Política de Privacidad" }, "site": { + "customData": "Datos Personalizados", + "customDataDescription": "Datos Personalizados, utilizados para datos personalizados del sitio", "customHtml": "HTML personalizado", "customHtmlDescription": "Código HTML personalizado que se inyectará en la parte inferior de la etiqueta body del sitio.", "keywords": "Palabras clave", diff --git a/apps/admin/locales/es-MX/system.json b/apps/admin/locales/es-MX/system.json index 47b96bd..b0a6396 100644 --- a/apps/admin/locales/es-MX/system.json +++ b/apps/admin/locales/es-MX/system.json @@ -13,6 +13,8 @@ "title": "Política de Privacidad" }, "site": { + "customData": "Datos Personalizados", + "customDataDescription": "Datos Personalizados, utilizados para datos personalizados del sitio", "customHtml": "HTML personalizado", "customHtmlDescription": "Código HTML personalizado que se inyectará al final de la etiqueta body del sitio.", "keywords": "Palabras clave", diff --git a/apps/admin/locales/fa-IR/system.json b/apps/admin/locales/fa-IR/system.json index 0f63eb4..a252364 100644 --- a/apps/admin/locales/fa-IR/system.json +++ b/apps/admin/locales/fa-IR/system.json @@ -13,6 +13,8 @@ "title": "سیاست حفظ حریم خصوصی" }, "site": { + "customData": "دادههای سفارشی", + "customDataDescription": "دادههای سفارشی، استفاده شده برای دادههای سفارشی سایت", "customHtml": "HTML سفارشی", "customHtmlDescription": "کد HTML سفارشی که باید در انتهای تگ body سایت وارد شود.", "keywords": "کلمات کلیدی", diff --git a/apps/admin/locales/fi-FI/system.json b/apps/admin/locales/fi-FI/system.json index 583aa37..cc78b18 100644 --- a/apps/admin/locales/fi-FI/system.json +++ b/apps/admin/locales/fi-FI/system.json @@ -13,6 +13,8 @@ "title": "Tietosuojakäytäntö" }, "site": { + "customData": "Mukautettu tieto", + "customDataDescription": "Mukautettu tieto, jota käytetään sivuston mukautettuun tietoon", "customHtml": "Mukautettu HTML", "customHtmlDescription": "Mukautettu HTML-koodi, joka lisätään sivuston body -tagin loppuun.", "keywords": "Avainsanat", diff --git a/apps/admin/locales/fr-FR/system.json b/apps/admin/locales/fr-FR/system.json index 37c001d..1c130af 100644 --- a/apps/admin/locales/fr-FR/system.json +++ b/apps/admin/locales/fr-FR/system.json @@ -13,6 +13,8 @@ "title": "Politique de confidentialité" }, "site": { + "customData": "Données personnalisées", + "customDataDescription": "Données personnalisées, utilisées pour les données personnalisées du site", "customHtml": "HTML personnalisé", "customHtmlDescription": "Code HTML personnalisé à injecter dans le bas de la balise body du site.", "keywords": "Mots-clés", diff --git a/apps/admin/locales/hi-IN/system.json b/apps/admin/locales/hi-IN/system.json index 275f4f3..6823ef4 100644 --- a/apps/admin/locales/hi-IN/system.json +++ b/apps/admin/locales/hi-IN/system.json @@ -13,6 +13,8 @@ "title": "गोपनीयता नीति" }, "site": { + "customData": "कस्टम डेटा", + "customDataDescription": "कस्टम डेटा, साइट के कस्टम डेटा के लिए उपयोग किया जाता है", "customHtml": "कस्टम HTML", "customHtmlDescription": "साइट के bodyैग के नीचे इंजेक्ट करने के लिए कस्टम HTML कोड।", "keywords": "कीवर्ड", diff --git a/apps/admin/locales/hu-HU/system.json b/apps/admin/locales/hu-HU/system.json index ea944a3..9f24e60 100644 --- a/apps/admin/locales/hu-HU/system.json +++ b/apps/admin/locales/hu-HU/system.json @@ -13,6 +13,8 @@ "title": "Adatvédelmi irányelvek" }, "site": { + "customData": "Egyedi adatok", + "customDataDescription": "Egyedi adatok, a webhely egyedi adatainak használatára", "customHtml": "Egyedi HTML", "customHtmlDescription": "Egyedi HTML kód, amelyet a webhely bodyímkéjének aljára kell beilleszteni.", "keywords": "Kulcsszavak", diff --git a/apps/admin/locales/ja-JP/system.json b/apps/admin/locales/ja-JP/system.json index bfbc88b..eaf00bd 100644 --- a/apps/admin/locales/ja-JP/system.json +++ b/apps/admin/locales/ja-JP/system.json @@ -13,6 +13,8 @@ "title": "プライバシーポリシー" }, "site": { + "customData": "カスタムデータ", + "customDataDescription": "サイトのカスタムデータに使用されるカスタムデータ", "customHtml": "カスタムHTML", "customHtmlDescription": "サイトの body タグの下部に挿入されるカスタム HTML コード。", "keywords": "キーワード", diff --git a/apps/admin/locales/ko-KR/system.json b/apps/admin/locales/ko-KR/system.json index b7285ca..8a7890c 100644 --- a/apps/admin/locales/ko-KR/system.json +++ b/apps/admin/locales/ko-KR/system.json @@ -13,6 +13,8 @@ "title": "개인정보 처리방침" }, "site": { + "customData": "사용자 정의 데이터", + "customDataDescription": "사이트의 사용자 정의 데이터에 사용되는 사용자 정의 데이터", "customHtml": "사용자 정의 HTML", "customHtmlDescription": "사이트의 body그 하단에 삽입될 사용자 정의 HTML 코드입니다.", "keywords": "키워드", diff --git a/apps/admin/locales/no-NO/system.json b/apps/admin/locales/no-NO/system.json index 85062db..8c06072 100644 --- a/apps/admin/locales/no-NO/system.json +++ b/apps/admin/locales/no-NO/system.json @@ -13,6 +13,8 @@ "title": "Personvernerklæring" }, "site": { + "customData": "Egendata", + "customDataDescription": "Egendata, brukt for egendata på nettstedet", "customHtml": "Egendefinert HTML", "customHtmlDescription": "Egendefinert HTML-kode som skal settes inn i bunnen av nettstedets body-tag.", "keywords": "Nøkkelord", diff --git a/apps/admin/locales/pl-PL/system.json b/apps/admin/locales/pl-PL/system.json index 5177aff..9b2aafc 100644 --- a/apps/admin/locales/pl-PL/system.json +++ b/apps/admin/locales/pl-PL/system.json @@ -13,6 +13,8 @@ "title": "Polityka prywatności" }, "site": { + "customData": "Dane niestandardowe", + "customDataDescription": "Dane niestandardowe, używane do niestandardowych danych witryny", "customHtml": "Niestandardowy HTML", "customHtmlDescription": "Niestandardowy kod HTML, który ma być wstrzyknięty na końcu tagu bodyitryny.", "keywords": "Słowa kluczowe", diff --git a/apps/admin/locales/pt-BR/system.json b/apps/admin/locales/pt-BR/system.json index e015d51..ce2d7ca 100644 --- a/apps/admin/locales/pt-BR/system.json +++ b/apps/admin/locales/pt-BR/system.json @@ -13,6 +13,8 @@ "title": "Política de Privacidade" }, "site": { + "customData": "Dados Personalizados", + "customDataDescription": "Dados personalizados, usados para dados personalizados do site", "customHtml": "HTML Personalizado", "customHtmlDescription": "Código HTML personalizado a ser inserido no final da tag bodyo site.", "keywords": "Palavras-chave", diff --git a/apps/admin/locales/ro-RO/system.json b/apps/admin/locales/ro-RO/system.json index 2852170..ee93078 100644 --- a/apps/admin/locales/ro-RO/system.json +++ b/apps/admin/locales/ro-RO/system.json @@ -13,6 +13,8 @@ "title": "Politica de confidențialitate" }, "site": { + "customData": "Date personalizate", + "customDataDescription": "Date personalizate, utilizate pentru datele personalizate ale site-ului", "customHtml": "HTML personalizat", "customHtmlDescription": "Cod HTML personalizat care va fi injectat în partea de jos a etichetei body a site-ului.", "keywords": "Cuvinte cheie", diff --git a/apps/admin/locales/ru-RU/system.json b/apps/admin/locales/ru-RU/system.json index 8c932ad..c6907e7 100644 --- a/apps/admin/locales/ru-RU/system.json +++ b/apps/admin/locales/ru-RU/system.json @@ -13,6 +13,8 @@ "title": "Политика конфиденциальности" }, "site": { + "customData": "Пользовательские данные", + "customDataDescription": "Пользовательские данные, используемые для пользовательских данных сайта", "customHtml": "Пользовательский HTML", "customHtmlDescription": "Пользовательский HTML-код, который будет вставлен в конец тега body сайта.", "keywords": "Ключевые слова", diff --git a/apps/admin/locales/th-TH/system.json b/apps/admin/locales/th-TH/system.json index 40a39b7..4e0bf7c 100644 --- a/apps/admin/locales/th-TH/system.json +++ b/apps/admin/locales/th-TH/system.json @@ -13,6 +13,8 @@ "title": "นโยบายความเป็นส่วนตัว" }, "site": { + "customData": "ข้อมูลที่กำหนดเอง", + "customDataDescription": "ข้อมูลที่กำหนดเอง ใช้สำหรับข้อมูลที่กำหนดเองของเว็บไซต์", "customHtml": "HTML ที่กำหนดเอง", "customHtmlDescription": "รหัส HTML ที่กำหนดเองเพื่อแทรกลงในส่วนล่างของแท็ก body ของเว็บไซต์.", "keywords": "คำสำคัญ", diff --git a/apps/admin/locales/tr-TR/system.json b/apps/admin/locales/tr-TR/system.json index e1d17ba..ffd120e 100644 --- a/apps/admin/locales/tr-TR/system.json +++ b/apps/admin/locales/tr-TR/system.json @@ -13,6 +13,8 @@ "title": "Gizlilik Politikası" }, "site": { + "customData": "Özel Veri", + "customDataDescription": "Özel Veri, sitenin özel verileri için kullanılır", "customHtml": "Özel HTML", "customHtmlDescription": "Site'in body etiketinin altına yerleştirilecek özel HTML kodu.", "keywords": "Anahtar Kelimeler", diff --git a/apps/admin/locales/uk-UA/system.json b/apps/admin/locales/uk-UA/system.json index 41b4ae9..81dd31f 100644 --- a/apps/admin/locales/uk-UA/system.json +++ b/apps/admin/locales/uk-UA/system.json @@ -13,6 +13,8 @@ "title": "Політика конфіденційності" }, "site": { + "customData": "Користувацькі дані", + "customDataDescription": "Користувацькі дані, що використовуються для користувацьких даних сайту", "customHtml": "Користувацький HTML", "customHtmlDescription": "Користувацький HTML-код, який буде вставлено в кінець тегу body сайту.", "keywords": "Ключові слова", diff --git a/apps/admin/locales/vi-VN/system.json b/apps/admin/locales/vi-VN/system.json index 16e261b..69594ff 100644 --- a/apps/admin/locales/vi-VN/system.json +++ b/apps/admin/locales/vi-VN/system.json @@ -13,6 +13,8 @@ "title": "Chính sách bảo mật" }, "site": { + "customData": "Dữ liệu tùy chỉnh", + "customDataDescription": "Dữ liệu tùy chỉnh, được sử dụng cho dữ liệu tùy chỉnh của trang web", "customHtml": "HTML tùy chỉnh", "customHtmlDescription": "Mã HTML tùy chỉnh để được chèn vào cuối thẻ body của trang.", "keywords": "Từ khóa", diff --git a/apps/admin/locales/zh-CN/system.json b/apps/admin/locales/zh-CN/system.json index b1ac00f..8b66463 100644 --- a/apps/admin/locales/zh-CN/system.json +++ b/apps/admin/locales/zh-CN/system.json @@ -13,6 +13,8 @@ "title": "隐私政策" }, "site": { + "customData": "自定义数据", + "customDataDescription": "自定义数据,用于网站的自定义数据", "customHtml": "自定义HTML", "customHtmlDescription": "要注入到网站 body 标签底部的自定义 HTML 代码。", "keywords": "关键词", diff --git a/apps/admin/locales/zh-HK/system.json b/apps/admin/locales/zh-HK/system.json index ce28e4f..a626682 100644 --- a/apps/admin/locales/zh-HK/system.json +++ b/apps/admin/locales/zh-HK/system.json @@ -13,6 +13,8 @@ "title": "私隱政策" }, "site": { + "customData": "自定義數據", + "customDataDescription": "自定義數據,用於網站的自定義數據", "customHtml": "自定義HTML", "customHtmlDescription": "自定義 HTML 代碼,將注入到網站 body 標籤的底部。", "keywords": "關鍵字", diff --git a/apps/admin/services/admin/index.ts b/apps/admin/services/admin/index.ts index f9e3438..37cdd29 100644 --- a/apps/admin/services/admin/index.ts +++ b/apps/admin/services/admin/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间: // API 唯一标识: import * as ads from './ads'; diff --git a/apps/admin/services/admin/typings.d.ts b/apps/admin/services/admin/typings.d.ts index d03073d..e30db02 100644 --- a/apps/admin/services/admin/typings.d.ts +++ b/apps/admin/services/admin/typings.d.ts @@ -1269,6 +1269,13 @@ declare namespace API { site_logo: string; keywords: string; custom_html: string; + custom_data: string; + }; + + type SiteCustomDataContacts = { + email: string; + telephone: string; + address: string; }; type SortItem = { diff --git a/apps/admin/services/common/index.ts b/apps/admin/services/common/index.ts index 73b3bda..61ba129 100644 --- a/apps/admin/services/common/index.ts +++ b/apps/admin/services/common/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间: // API 唯一标识: import * as auth from './auth'; diff --git a/apps/admin/services/common/typings.d.ts b/apps/admin/services/common/typings.d.ts index 1958585..e1c5089 100644 --- a/apps/admin/services/common/typings.d.ts +++ b/apps/admin/services/common/typings.d.ts @@ -659,6 +659,13 @@ declare namespace API { site_logo: string; keywords: string; custom_html: string; + custom_data: string; + }; + + type SiteCustomDataContacts = { + email: string; + telephone: string; + address: string; }; type SortItem = { diff --git a/apps/user/config/use-global.tsx b/apps/user/config/use-global.tsx index 444a4fc..4033ab7 100644 --- a/apps/user/config/use-global.tsx +++ b/apps/user/config/use-global.tsx @@ -22,6 +22,7 @@ export const useGlobalStore = create((set, get) => ({ site_logo: '', keywords: '', custom_html: '', + custom_data: '', }, verify: { turnstile_site_key: '', diff --git a/apps/user/services/common/index.ts b/apps/user/services/common/index.ts index 73b3bda..61ba129 100644 --- a/apps/user/services/common/index.ts +++ b/apps/user/services/common/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间: // API 唯一标识: import * as auth from './auth'; diff --git a/apps/user/services/common/typings.d.ts b/apps/user/services/common/typings.d.ts index 1958585..e1c5089 100644 --- a/apps/user/services/common/typings.d.ts +++ b/apps/user/services/common/typings.d.ts @@ -659,6 +659,13 @@ declare namespace API { site_logo: string; keywords: string; custom_html: string; + custom_data: string; + }; + + type SiteCustomDataContacts = { + email: string; + telephone: string; + address: string; }; type SortItem = { diff --git a/apps/user/services/user/index.ts b/apps/user/services/user/index.ts index f988131..12fe8d0 100644 --- a/apps/user/services/user/index.ts +++ b/apps/user/services/user/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间: // API 唯一标识: import * as announcement from './announcement'; diff --git a/apps/user/services/user/typings.d.ts b/apps/user/services/user/typings.d.ts index fa7095a..2b77d7c 100644 --- a/apps/user/services/user/typings.d.ts +++ b/apps/user/services/user/typings.d.ts @@ -777,6 +777,13 @@ declare namespace API { site_logo: string; keywords: string; custom_html: string; + custom_data: string; + }; + + type SiteCustomDataContacts = { + email: string; + telephone: string; + address: string; }; type SortItem = {
{t('customDataDescription')}