move refactor shared folder file structure into containers and compon…

…ents

src/app/app-routing.module.ts

@@ -5,8 +5,8 @@ import { SettingsComponent } from "./features/settings/components/settings.compo
 import { SaveAndLoadComponent } from "./features/save-and-load/components/save-and-load/save-and-load.component";
 
 const routes: Routes = [
-  { path: "game", redirectTo: "", pathMatch: "full" },
-  { path: "", component: MainGameComponent },
+  { path: "", redirectTo: "settings", pathMatch: "full" },
+  { path: "game", component: MainGameComponent },
   { path: "settings", component: SettingsComponent },
   { path: "save-load", component: SaveAndLoadComponent },
 ];

src/app/app.module.ts

@@ -12,19 +12,13 @@ import { metaReducers, reducers } from "../app/state";
 import { StorageService } from "./services/storage.service";
 import { SettingsComponent } from "./features/settings/components/settings.component";
 import { ReactiveFormsModule } from "@angular/forms";
-import { HeaderComponent } from "./features/shared/header/header.component";
 import { TimerService } from "./services/timer.service";
 import { SaveAndLoadComponent } from "./features/save-and-load/components/save-and-load/save-and-load.component";
 import { GameModule } from "./features/game/game.module";
 import { SharedModule } from "./features/shared/shared.module";
 
 @NgModule({
-  declarations: [
-    AppComponent,
-    HeaderComponent,
-    SettingsComponent,
-    SaveAndLoadComponent,
-  ],
+  declarations: [AppComponent, SettingsComponent, SaveAndLoadComponent],
   imports: [
     SharedModule,
     BrowserModule,

src/app/features/settings/components/settings.component.html

@@ -46,7 +46,7 @@
         type="button"
         (click)="saveForm()"
       >
-        Save Settings
+        Save setings and start game
       </button>
     </div>
   </form>

src/app/features/shared/header/header.component.html → src/app/features/shared/containers/header/header.component.html

@@ -2,21 +2,21 @@
   <nav>
     <a
       class="block mt-4 lg:inline-block lg:mt-0 text-white hover:text-white mr-4"
-      routerLink="/game"
+      routerLink="game"
       >Game</a
     >
   </nav>
   <nav>
     <a
       class="block mt-4 lg:inline-block lg:mt-0 text-white hover:text-white mr-4"
-      routerLink="/settings"
+      routerLink="settings"
       >Settings</a
     >
   </nav>
   <nav>
     <a
       class="block mt-4 lg:inline-block lg:mt-0 text-white hover:text-white mr-4"
-      routerLink="/save-load"
+      routerLink="save-load"
       >Save and Load</a
     >
   </nav>

src/app/features/shared/shared.module.ts

@@ -1,11 +1,13 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { ErrorComponent } from "./error/error.component";
-import { LoaderComponent } from "./loader/loader.component";
+import { ErrorComponent } from "./containers/error/error.component";
+import { LoaderComponent } from "./containers/loader/loader.component";
+import { HeaderComponent } from "./containers/header/header.component";
+import { RouterModule } from "@angular/router";
 
 @NgModule({
-  declarations: [ErrorComponent, LoaderComponent],
-  imports: [CommonModule],
-  exports: [ErrorComponent, LoaderComponent],
+  declarations: [ErrorComponent, LoaderComponent, HeaderComponent],
+  imports: [CommonModule, RouterModule],
+  exports: [ErrorComponent, LoaderComponent, HeaderComponent],
 })
 export class SharedModule {}