fix: merge errors

src/routes/config.tsx

@@ -1,8 +1,15 @@
-import { Layout } from '@/components/Layout/Layout';
+import { Layout } from '@/components';
 import {
   AuthenticationPage,
   ForgetPasswordPage,
+  UserCompletionPage,
 } from '@/features/authorization';
+import {
+  ActiveDevicesPage,
+  SecurityPage,
+  SettingPage,
+  UserInformationPage,
+} from '@/features/profile';
 import {
   Calendar,
   Devices,
@@ -39,26 +46,22 @@ export const appRoutes: RouteConfig[] = [
   {
     path: '/login',
     element: <AuthenticationPage />,
-    authorize: l,
   },
+  { path: '/signup', element: <UserCompletionPage />, authorize: true },
   {
     path: '/forget-password',
     element: <ForgetPasswordPage />,
-    authorize: false,
-  },
-  {
-    path: '/',
-    element: <Navigate to="/setting/profile" replace />,
   },
+
   {
     path: '/setting',
     element: <Layout />,
+    authorize: true,
     children: [
-      // TODO: add route component to each route
       {
         path: '/setting/profile',
+        element: <UserInformationPage />,
         navConfig: {
-          // Profile component
           title: 'side.account',
           icon: ProfileCircle,
         },
@@ -88,7 +91,7 @@ export const appRoutes: RouteConfig[] = [
       },
       {
         path: '/setting/security',
-        // security component
+        element: <SecurityPage />,
         navConfig: {
           title: 'side.security',
           icon: Shield,
@@ -119,7 +122,7 @@ export const appRoutes: RouteConfig[] = [
       },
       {
         path: '/setting/active-sessions',
-        // active session component
+        element: <ActiveDevicesPage />,
         navConfig: {
           title: 'side.activeSessions',
           icon: Calendar,
@@ -127,7 +130,7 @@ export const appRoutes: RouteConfig[] = [
       },
       {
         path: '/setting/preferences',
-        // setting component
+        element: <SettingPage />,
         navConfig: {
           title: 'side.setting',
           icon: Setting,