fix:app.routes.ts

novel-app/src/app/app.routes.ts

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouteReuseStrategy, RouterModule, Routes } from '@angular/router';
@@ -33,28 +32,26 @@ export const routes: Routes = [
     path: 'short-generator',
     loadComponent: () => import('./short-generator/short-generator.page').then(m => m.ShortGeneratorPage)
   },
-  {
-    path: 'short-novel',
-    loadComponent: () => import('./short-novel/short-novel.page').then(m => m.ShortNovelPage)
-  },
   {
     path: 'character',
-    loadComponent: () => import('./character/character.page').then( m => m.CharacterPage)
+    loadComponent: () => import('./character/character.page').then(m => m.CharacterPage)
   },
   {
     path: 'character-creator',
     loadComponent: () => import('./character-creator/character-creator.page').then(m => m.CharacterCreatorPage)
   },
   {
-    path: 'chat-panel',
-    loadComponent: () => import('./chat-panel/chat-panel.component').then(m => m.ChatPanelComponent)
+    path: 'chapter-generator',
+    loadComponent: () => import('./chapter-generator/chapter-generator.page').then( m => m.ChapterGeneratorPage)
   },
   {
-    path: 'character-detail/:id', // 确保这里的路径是正确的
+    path: 'character-detail/:id', 
     loadComponent: () => import('./character-detail/character-detail.component').then(m => m.CharacterDetailComponent)
   }
 
-]
+
+
+];
 
 
 
@@ -67,69 +64,4 @@ export const routes: Routes = [
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
   ],
 })
-export class AppRoutingModule { }
-=======
-import { HttpClientModule } from '@angular/common/http';
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouteReuseStrategy, RouterModule, Routes } from '@angular/router';
-import { IonicRouteStrategy } from '@ionic/angular';
-
-export const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./tabs/tabs.routes').then((m) => m.routes),
-  },
-  {
-    path: 'story-generator',
-    loadComponent: () => import('./story-generator/story-generator.page').then(m => m.StoryGeneratorPage)
-  },
-  {
-    path: 'toolbox',
-    loadComponent: () => import('./toolbox/toolbox.page').then(m => m.ToolboxPage)
-  },
-  {
-    path: '',
-    loadChildren: () => import('./tabs/tabs.routes').then((m) => m.routes),
-  },
-  {
-    path: 'register',
-    loadComponent: () => import('./register/register.page').then(m => m.RegisterPage)
-  },
-  {
-    path: 'login',
-    loadComponent: () => import('./login/login.page').then(m => m.LoginPage)
-  },
-  {
-    path: 'short-generator',
-    loadComponent: () => import('./short-generator/short-generator.page').then(m => m.ShortGeneratorPage)
-  },
-  {
-    path: 'character',
-    loadComponent: () => import('./character/character.page').then(m => m.CharacterPage)
-  },
-  {
-    path: 'character-creator',
-    loadComponent: () => import('./character-creator/character-creator.page').then(m => m.CharacterCreatorPage)
-  },
  {
-    path: 'chapter-generator',
-    loadComponent: () => import('./chapter-generator/chapter-generator.page').then( m => m.ChapterGeneratorPage)
-  }
-
-
-
-
-];
-
-
-
-
-
-@NgModule({
-  imports: [RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }), HttpClientModule],
-  exports: [RouterModule],
-  providers: [
-    { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
-  ],
-})
-export class AppRoutingModule { }
->>>>>>> 92bb7a7a89d34e8fc2085197f481d5b5758947d2
+export class AppRoutingModule { }