Merge branch 'dev_nextjs' of https://github.com/GoodDayForSurf/devextreme-cli into dev_ng_standalone

Author: GoodDayForSurf

packages/devextreme-cli/src/templates/nextjs/application/src/app/actions/auth.ts

@@ -4,17 +4,39 @@ import defaultUser from '@/utils/default-user';
 import { createSession, deleteSession } from '@/app/lib/session'
 
 export async function signUp(email<%=#isTypeScript%>: string<%=/isTypeScript%>, password<%=#isTypeScript%>: string<%=/isTypeScript%>) {
-  // Create a user in the database
-  console.log(email, password);
+  try {
+    // Create a user in the database
+    console.log(email, password);
 
-  await signIn(email, password);
+    await signIn(email, password);
+
+    return {
+      isOk: true,
+    }
+  } catch {
+    return {
+      isOk: false,
+      message: 'Unable to create an account',
+    }
+  }
 }
 
 export async function signIn(email<%=#isTypeScript%>: string<%=/isTypeScript%>, password<%=#isTypeScript%>: string<%=/isTypeScript%>) {
-  // Verify that a user exists
-  console.log(email, password);
+  try {
+    // Verify that a user exists
+    console.log(email, password);
+
+    await createSession(defaultUser.id);
 
-  await createSession(defaultUser.id);
+    return {
+      isOk: true,
+    }
+  } catch {
+    return {
+      isOk: false,
+      message: 'Unable to sign in',
+    }
+  }
 }
 
 export async function signOut() {
@@ -23,11 +45,33 @@ export async function signOut() {
 }
 
 export async function changePassword(email<%=#isTypeScript%>: string<%=/isTypeScript%>, recoveryCode<%=#isTypeScript%>?: string<%=/isTypeScript%>) {
-  // Verify the recovery code
-  console.log(email, recoveryCode);
+  try {
+    // Verify the recovery code
+    console.log(email, recoveryCode);
+
+    return {
+      isOk: true,
+    }
+  } catch {
+    return {
+      isOk: false,
+      message: 'Unable to change the password',
+    }
+  }
 }
 
 export async function resetPassword(email<%=#isTypeScript%>: string<%=/isTypeScript%>) {
-  // Reset password
-  console.log(email);
+  try {
+    // Reset password
+    console.log(email);
+
+    return {
+      isOk: true,
+    }
+  } catch {
+    return {
+      isOk: false,
+      message: 'Unable to reset password',
+    }
+  }
 }

packages/devextreme-cli/src/templates/nextjs/application/src/components/login-form/LoginForm.tsx

@@ -34,7 +34,7 @@ export default function LoginForm() {
     } else {
       router.push('/');
     }
-  }, [signIn]);
+  }, [router]);
 
   const onCreateAccountClick = useCallback(() => {
     router.push('/auth/create-account');

packages/devextreme-cli/src/templates/nextjs/application/src/components/user-panel/UserPanel.tsx

@@ -25,7 +25,7 @@ export default function UserPanel({ menuMode }<%=#isTypeScript%>: UserPanelProps
       icon: 'runner',
       onClick: signOut
     }
-  ]), [navigateToProfile, signOut]);
+  ]), [navigateToProfile]);
 
   const dropDownButtonAttributes = {
     class: 'user-button'

packages/devextreme-cli/src/templates/nextjs/application/src/theme.tsx

@@ -48,7 +48,7 @@ export function useThemeContext() {
     if (typeof window !== 'undefined' && !document.body.className.includes(themeClassNamePrefix)) {
       document.body.classList.add(themeClassNamePrefix + theme);
     }
-  }, []);
+  }, [theme]);
 
   return useMemo(()=> ({ theme, switchTheme, isDark }), [theme, switchTheme, isDark]);
 }

packages/devextreme-cli/src/templates/nextjs/sample-pages/profile/page.tsx

@@ -2,6 +2,7 @@
 import React, { useState } from 'react';
 import './profile.scss';
 import Form from 'devextreme-react/form';
+import Image from 'next/image';
 
 export default function Page() {
   const [notes, setNotes] = useState(
@@ -26,7 +27,7 @@ export default function Page() {
 
       <div className={'content-block dx-card responsive-paddings'}>
         <div className={'form-avatar'}>
-          <img
+          <Image
             alt={''}
             src={`https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/${
               employee.Picture

packages/devextreme-cli/src/utility/latest-versions.js

@@ -1,8 +1,8 @@
 const packageJson = require('../../package.json');
 module.exports = {
-    'devextreme': '24.2-next',
-    'devextreme-react': '24.2-next',
-    'devextreme-vue': '24.2-next',
+    'devextreme': '24.2.6',
+    'devextreme-react': '24.2.6',
+    'devextreme-vue': '24.2.6',
     'create-vite': '6.4.1',
     'create-next-app': '15.3.1',
     'jose': '6.0.10',

packages/devextreme-schematics/src/utility/latest-versions.ts

@@ -1,6 +1,6 @@
 // TODO: implement
 export const latestVersions = {
-  'devextreme': '24.2-next',
-  'devextreme-angular': '24.2-next',
+  'devextreme': '24.2.6',
+  'devextreme-angular': '24.2.6',
   'devextreme-cli': 'latest'
 };