refactor

Author: GoodDayForSurf

packages/devextreme-cli/src/applications/application.nextjs.js

@@ -93,16 +93,16 @@ const create = async(appName, options) => {
     }
 
     addTemplate(appPath, appName, templateOptions);
-    modifyIndexHtml(appPath, templateOptions);
+    modifyAppFiles(appPath, templateOptions);
 };
 
-const modifyIndexHtml = (appPath, { project, isTypeScript }) => {
-    const indexHtmlPath = path.join(appPath, `src/app/layout.${isTypeScript ? 'tsx' : 'jsx'}`);
+const modifyAppFiles = (appPath, { project, isTypeScript }) => {
+    const entryFilePath = path.join(appPath, `src/app/layout.${isTypeScript ? 'tsx' : 'jsx'}`);
 
-    let htmlContent = fs.readFileSync(indexHtmlPath).toString();
-    htmlContent = htmlContent.replace(/<title>[^<]+<\/title>/, `<title>${project}<\/title>`);
+    let content = fs.readFileSync(entryFilePath).toString();
+    content = content.replace(/<title>[^<]+<\/title>/, `<title>${project}<\/title>`);
 
-    fs.writeFileSync(indexHtmlPath, htmlContent);
+    fs.writeFileSync(entryFilePath, content);
 };
 
 const getCorrectPath = (extension, pathToApp, isTypeScript) => {
@@ -192,7 +192,7 @@ const addSamplePages = (appPath, templateOptions) => {
     );
 
     const pagesPath = path.join(appPath, 'src', 'app/pages');
-    // fs.mkdirSync(pagesPath);
+
     templateCreator.moveTemplateFilesToProject(samplePageTemplatePath, pagesPath, {
         isTypeScript: templateOptions.isTypeScript
     }, getCorrectPath);

packages/devextreme-cli/src/templates/nextjs/application/next.config.mjs

@@ -7,6 +7,21 @@ const nextConfig = {
         destination: '/pages/home',
         permanent: true,
       },
+      {
+        source: '/login',
+        destination: '/auth/login',
+        permanent: true,
+      },
+      {
+        source: '/reset-password',
+        destination: '/auth/reset-password',
+        permanent: true,
+      },
+      {
+        source: '/create-account',
+        destination: '/auth/create-account',
+        permanent: true,
+      },
     ]
   },
 }

packages/devextreme-cli/src/templates/nextjs/application/public/favicon.ico

@@ -2,9 +2,9 @@
 
 import { usePathname } from 'next/navigation';
 import LoadPanel from 'devextreme-react/load-panel';
-import { AuthProvider, useAuth} from '../contexts/auth';
-import { NavigationProvider } from '../contexts/navigation';
-import { ThemeContext, useThemeContext} from "../theme";
+import { AuthProvider, useAuth} from '@/contexts/auth';
+import { NavigationProvider } from '@/contexts/navigation';
+import { ThemeContext, useThemeContext} from "@/theme";
 
 function Page({ children }) {
   const { loading } = useAuth();

packages/devextreme-cli/src/templates/nextjs/application/src/app/layout.tsx

@@ -12,7 +12,7 @@ export default function Content({children}) {
 
   useEffect(() => {
     if (!loading && !user) {
-      router.push('/auth/login');
+      router.push('/login');
     }
   }, [user, loading, router]);
 

packages/devextreme-cli/src/templates/nextjs/application/src/app/pages/layout.tsx

@@ -96,7 +96,7 @@ export default function CreateAccountForm() {
         </ButtonItem>
       </Form>
       <div className={'login-link'}>
-        Have an account? <Link href={'/auth/login'}>Sign In</Link>
+        Have an account? <Link href={'/login'}>Sign In</Link>
       </div>
     </form>
   );

packages/devextreme-cli/src/templates/nextjs/application/src/components/create-account-form/CreateAccountForm.tsx

@@ -32,6 +32,8 @@ export default function LoginForm() {
     if (!result.isOk) {
       setLoading(false);
       notify(result.message, 'error', 2000);
+    } else {
+      router.push('/');
     }
   }, [signIn]);
 

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

@@ -68,7 +68,7 @@ export default function ResetPasswordForm() {
         </ButtonItem>
       </Form>
       <div className={'login-link'}>
-        Return to <Link href={'/auth/login'}>Sign In</Link>
+        Return to <Link href={'/login'}>Sign In</Link>
       </div>
     </form>
   );

packages/devextreme-cli/src/templates/nextjs/application/src/components/reset-password-form/ResetPasswordForm.tsx

@@ -7,14 +7,18 @@ const Mustache = require('mustache');
 const applyTemplateToFile = (filePath, templateOptions) => {
     const tags = ['<%=', '%>'];
     const fileContent = fs.readFileSync(filePath);
-    const content = Mustache.render(fileContent.toString(), templateOptions, {}, tags);
 
-    return content;
+    if(fileContent.includes(tags[0])) {
+        return Mustache.render(fileContent.toString(), templateOptions, {}, tags);
+    }
+
+    return fileContent;
 };
 
-const addPageToApp = (pageName, pageDir, templatePagesPath, getCorrectExtension, { getPageFileName = () => pageName }) => {
+const addPageToApp = (pageName, pageDir, templatePagesPath, getCorrectExtension, { getPageFileName = () => pageName } = {}) => {
     fs.readdirSync(templatePagesPath).forEach((pageItem) => {
         const pagePath = path.join(pageDir, `${getPageFileName(pageName, pageItem)}${getCorrectExtension(extname(pageItem))}`);
+
         if(fs.existsSync(pagePath)) {
             console.error('The page already exists');
             process.exit();