Compare commits

..
10 Commits
11 changed files with 53 additions and 22 deletions

No files matched your search

@@ -28,10 +28,9 @@ export const LoginSettingsContent: React.FC<LoginSettingsContentProps> = ({
const { t } = useTranslation();
const { updateClientConfig } = usePlatformConfig();
// 验证至少有一种登录方式启用
// check if at least one login method is enabled
const validateLoginMethods = (config: LoginConfig): boolean => {
const isGoogleEnabled =
config.google?.is_enabled && config.google?.client_id;
const isGoogleEnabled = config.google?.is_enabled;
const isEmailEnabled = config.email?.is_enabled;
const enabledCount = [isGoogleEnabled, isEmailEnabled].filter(
-2
View File
@@ -19,10 +19,8 @@ import {
Home,
Settings,
Users,
LogIn,
ServerIcon,
} from "lucide-react";
import { LoginSettingsContent } from "@/components/console/LoginSettingsContent";
import ConsoleSidebar from "./Sidebar";
const ConsoleContent: React.FC = () => {
@@ -21,7 +21,7 @@ interface EmailConfigFormProps {
emailConfig: EmailConfig;
onSave: (config: LoginConfig) => Promise<void>;
isLoading?: boolean;
onTabNavigate?: (tab: TabKey) => void;
onTabNavigate?: (tab: TabKey, subTab?: string) => void;
}
export const EmailConfigForm: React.FC<EmailConfigFormProps> = ({
@@ -180,7 +180,7 @@ export const EmailConfigForm: React.FC<EmailConfigFormProps> = ({
<Link
className="text-sm underline cursor-pointer"
onPress={() => {
onTabNavigate?.(TabKey.SYSTEM_SETTINGS);
onTabNavigate?.(TabKey.SYSTEM_SETTINGS, "email-admin");
}}
>
{t("Go to Settings")}
@@ -23,19 +23,21 @@ interface FaqSettingsProps {
onSave?: (config: FaqItem[]) => void;
config?: FaqItem[];
}
const defaultFaqs = [{ question: "", answer: "" }];
export const FaqSettings: React.FC<FaqSettingsProps> = ({
onSave,
config = [],
}) => {
const { t } = useTranslation();
const [faqs, setFaqs] = useState<FaqItem[]>(config || []);
const [faqs, setFaqs] = useState<FaqItem[]>(
config && config.length > 0 ? config : defaultFaqs
);
const [isSaving, setIsSaving] = useState(false);
const [focusedAnswer, setFocusedAnswer] = useState<number | null>(null);
const draggedItem = useRef<number | null>(null);
const draggedOverItem = useRef<number | null>(null);
useEffect(() => {
setFaqs(config);
setFaqs(config && config.length > 0 ? config : defaultFaqs);
}, [config]);
const handleQuestionChange = (index: number, value: string) => {
@@ -54,6 +56,10 @@ export const FaqSettings: React.FC<FaqSettingsProps> = ({
const handleDelete = (index: number) => {
setFaqs((prev) => {
// Ensure at least one record remains
if (prev.length <= 1) {
return defaultFaqs;
}
return prev.filter((_, idx) => idx !== index);
});
};
@@ -27,19 +27,24 @@ interface TopNavigationSettingsProps {
onSave?: (config: TopNavigationItem[]) => void;
config?: TopNavigationItem[];
}
const defaultNavigationItems = [
{ title: "", link: "", target: TopNavigationTargetEnum.BLANK },
];
export const TopNavigationSettings: React.FC<TopNavigationSettingsProps> = ({
onSave,
config = [],
}) => {
const { t } = useTranslation();
const [navigationItems, setNavigationItems] =
useState<TopNavigationItem[]>(config);
const [navigationItems, setNavigationItems] = useState<TopNavigationItem[]>(
config && config.length > 0 ? config : defaultNavigationItems
);
const [isSaving, setIsSaving] = useState(false);
const draggedItem = useRef<number | null>(null);
const draggedOverItem = useRef<number | null>(null);
useEffect(() => {
setNavigationItems(config);
setNavigationItems(
config && config.length > 0 ? config : defaultNavigationItems
);
}, [config]);
const handleTitleChange = (index: number, value: string) => {
@@ -67,6 +72,10 @@ export const TopNavigationSettings: React.FC<TopNavigationSettingsProps> = ({
const handleDelete = (index: number) => {
setNavigationItems((prev) => {
// Ensure at least one record remains
if (prev.length <= 1) {
return defaultNavigationItems;
}
return prev.filter((_, idx) => idx !== index);
});
};
+1 -1
View File
@@ -17,7 +17,7 @@ echo "login qiniu..."
qshell account ${AccessKey} ${SecretKey} ${QINIU_NAME}
echo "qshell rput ${QINIU_BUCKET} \"xpack/images/${Tar}\" ${Tar}"
qshell rput ${QINIU_BUCKET} "xpack/images/${Tar}" ${Tar}
qshell rput --overwrite ${QINIU_BUCKET} "xpack/images/${Tar}" ${Tar}
rm -f ${Tar}
docker rmi -f ${ImageName}:${Version}
-1
View File
@@ -21,4 +21,3 @@ ALTER TABLE `user_wallet_history` MODIFY COLUMN `balance_after` decimal(16, 6) N
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-version','version', '1.0.0', 'User wallet history max count', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
+20
View File
@@ -0,0 +1,20 @@
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-is_showcased','is_showcased', '1', 'Is showcase', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-login_google_enable','login_google_enable', '1', 'Login google enable', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-login_email_enable','login_email_enable', '1', 'Login email enable', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-login_email_mode','email_mode', 'password', 'Login email mode', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
INSERT INTO `sys_config` (`id`,`key`, `value`,`description`,`created_at`,`updated_at`)
VALUES ('xpack-version','version', '1.0.1', 'User wallet history max count', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
ON DUPLICATE KEY UPDATE `value` = VALUES(`value`), `description` = VALUES(`description`), `updated_at` = CURRENT_TIMESTAMP;
+1 -1
View File
@@ -5,7 +5,7 @@
"downloads": {
"program": {
"xpack_mcp_market": {
"version": "v1.0.0",
"version": "v1.0.1",
"docker": "xpackai/xpack-mcp-market",
"tar": "xpack-mcp-market.tar.gz",
"url": "https://public.eolinker.com/xpack/images/xpack-mcp-market.${VERSION}.${ARCH}.tar.gz"
@@ -37,7 +37,7 @@ async def payment_channel_list(
"name": item.name,
"config": cfg,
"is_enabled": enable,
"updated_time": item.update_at,
"updated_time": item.updated_at,
}
)
return ResponseUtils.success_page(data=result, total=total, page_num=page, page_size=page_size)
@@ -65,7 +65,7 @@ async def payment_channel_enable(
"name": data.name,
"config": data.config,
"is_enabled": data.status == 1,
"updated_time": data.update_at,
"updated_time": data.updated_at,
}
)
return ResponseUtils.success(data={})
@@ -92,7 +92,7 @@ async def payment_channel_disable(
"name": data.name,
"config": data.config,
"is_enabled": data.status == 1,
"updated_time": data.update_at,
"updated_time": data.updated_at,
}
)
return ResponseUtils.success(data={})
@@ -119,7 +119,7 @@ async def payment_channel_config(
"name": data.name,
"config": config,
"is_enabled": data.status == 1,
"updated_time": data.update_at,
"updated_time": data.updated_at,
}
)
return ResponseUtils.success(data={})
+1 -1
View File
@@ -15,4 +15,4 @@ class PaymentChannel(Base):
name: Mapped[str] = mapped_column(String(255), nullable=False, comment="Channel name")
status: Mapped[int] = mapped_column(Integer, nullable=False, comment="Channel status, 0: disabled, 1: enabled")
config: Mapped[str] = mapped_column(Text, nullable=True, comment="Channel config")
update_at: Mapped[datetime] = mapped_column(DateTime, nullable=True, comment="Update time")
updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=True, comment="Update time")