Merge branch 'revert/ced5c1d-liquid-glass'

Author: ppanel-web

apps/admin/src/sections/auth-control/forms/apple-form.tsx

@@ -287,7 +287,7 @@ export default function AppleForm() {
                     <FormDescription>
                       {t(
                         "apple.redirectUriDescription",
-                        "Backend API callback URL that Apple will POST to (e.g. https://api.example.com/v1/auth/oauth/callback/apple). Must be registered in Apple Developer Portal."
+                        "API address for redirect URL after successful Apple authentication. Do not end with /"
                       )}
                     </FormDescription>
                     <FormMessage />

apps/admin/src/sections/auth-control/forms/google-form.tsx

@@ -33,9 +33,15 @@ import { toast } from "sonner";
 import { z } from "zod";
 
 const googleSchema = z.object({
-  enabled: z.boolean(),
-  client_id: z.string().optional(),
-  client_secret: z.string().optional(),
+  id: z.number(),
+  method: z.string().default("google").optional(),
+  enabled: z.boolean().default(false).optional(),
+  config: z
+    .object({
+      client_id: z.string().optional(),
+      client_secret: z.string().optional(),
+    })
+    .optional(),
 });
 
 type GoogleFormData = z.infer<typeof googleSchema>;
@@ -59,34 +65,26 @@ export default function GoogleForm() {
   const form = useForm<GoogleFormData>({
     resolver: zodResolver(googleSchema),
     defaultValues: {
+      id: 0,
+      method: "google",
       enabled: false,
-      client_id: "",
-      client_secret: "",
+      config: {
+        client_id: "",
+        client_secret: "",
+      },
     },
   });
 
   useEffect(() => {
     if (data) {
-      form.reset({
-        enabled: data.enabled,
-        client_id: data.config?.client_id || "",
-        client_secret: data.config?.client_secret || "",
-      });
+      form.reset(data);
     }
   }, [data, form]);
 
   async function onSubmit(values: GoogleFormData) {
     setLoading(true);
     try {
-      await updateAuthMethodConfig({
-        ...data,
-        enabled: values.enabled,
-        config: {
-          ...data?.config,
-          client_id: values.client_id,
-          client_secret: values.client_secret,
-        },
-      } as API.UpdateAuthMethodConfigRequest);
+      await updateAuthMethodConfig(values as API.UpdateAuthMethodConfigRequest);
       toast.success(t("common.saveSuccess", "Saved successfully"));
       refetch();
       setOpen(false);
@@ -157,7 +155,7 @@ export default function GoogleForm() {
 
               <FormField
                 control={form.control}
-                name="client_id"
+                name="config.client_id"
                 render={({ field }) => (
                   <FormItem>
                     <FormLabel>{t("google.clientId", "Client ID")}</FormLabel>
@@ -181,7 +179,7 @@ export default function GoogleForm() {
 
               <FormField
                 control={form.control}
-                name="client_secret"
+                name="config.client_secret"
                 render={({ field }) => (
                   <FormItem>
                     <FormLabel>

apps/user/src/components/not-found.tsx

@@ -20,16 +20,7 @@ export default function Header() {
     </Link>
   );
   return (
-    <header
-      className="sticky top-0 z-50 border-b"
-      style={{
-        background: "var(--glass-bg)",
-        backdropFilter: "var(--glass-blur)",
-        WebkitBackdropFilter: "var(--glass-blur)",
-        borderBottomColor: "var(--glass-border)",
-        boxShadow: "var(--glass-shadow)",
-      }}
-    >
+    <header className="sticky top-0 z-50 border-b backdrop-blur-md">
       <div className="container flex h-16 items-center justify-between">
         <nav className="flex-col gap-6 font-medium text-lg md:flex md:flex-row md:items-center md:gap-5 md:text-sm lg:gap-6">
           {Logo}