diff --git a/apps/disney-planner/.eslintrc.json b/apps/disney-planner/.eslintrc.json index 0890d99..f9463b3 100644 --- a/apps/disney-planner/.eslintrc.json +++ b/apps/disney-planner/.eslintrc.json @@ -13,7 +13,7 @@ "error", { "type": "attribute", - "prefix": "app", + "prefix": "disney", "style": "camelCase" } ], @@ -21,7 +21,7 @@ "error", { "type": "element", - "prefix": "app", + "prefix": "disney", "style": "kebab-case" } ], diff --git a/apps/disney-planner/project.json b/apps/disney-planner/project.json index beed841..d5a06c7 100644 --- a/apps/disney-planner/project.json +++ b/apps/disney-planner/project.json @@ -4,7 +4,7 @@ "projectType": "application", "prefix": "disney", "sourceRoot": "apps/disney-planner/src", - "tags": [], + "tags": [], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/disney-planner/src/app/account/account.page.ts b/apps/disney-planner/src/app/account/account.page.ts new file mode 100644 index 0000000..84b2359 --- /dev/null +++ b/apps/disney-planner/src/app/account/account.page.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'disney-account', + standalone: true, + template: ` +
Account
+ `, + styles: `` +}) +export class AccountPage {} \ No newline at end of file diff --git a/apps/disney-planner/src/app/app.module.ts b/apps/disney-planner/src/app/app.module.ts deleted file mode 100644 index 4255dd8..0000000 --- a/apps/disney-planner/src/app/app.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { RouteReuseStrategy } from '@angular/router'; - -import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; - -import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './app.component'; - -@NgModule({ - declarations: [AppComponent], - imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule], - providers: [{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }], - bootstrap: [AppComponent], -}) -export class AppModule {} diff --git a/apps/disney-planner/src/app/app.routes.ts b/apps/disney-planner/src/app/app.routes.ts index 4f48439..9970155 100644 --- a/apps/disney-planner/src/app/app.routes.ts +++ b/apps/disney-planner/src/app/app.routes.ts @@ -1,4 +1,3 @@ -import { NgModule } from '@angular/core'; import {Routes} from '@angular/router'; export const appRoutes: Routes = [ diff --git a/apps/disney-planner/src/app/explore-container/explore-container.component.spec.ts b/apps/disney-planner/src/app/explore-container/explore-container.component.spec.ts deleted file mode 100644 index d422a34..0000000 --- a/apps/disney-planner/src/app/explore-container/explore-container.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ExploreContainerComponent } from './explore-container.component'; - -describe('ExploreContainerComponent', () => { - let component: ExploreContainerComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ExploreContainerComponent], - imports: [IonicModule.forRoot()], - }).compileComponents(); - - fixture = TestBed.createComponent(ExploreContainerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/disney-planner/src/app/explore-container/explore-container.component.ts b/apps/disney-planner/src/app/explore-container/explore-container.component.ts deleted file mode 100644 index de03a03..0000000 --- a/apps/disney-planner/src/app/explore-container/explore-container.component.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { Component, Input } from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {IonicModule} from '@ionic/angular'; - -@Component({ - selector: 'disney-explore-container', - standalone: true, - imports: [ CommonModule, FormsModule, IonicModule ], - template: ` -
- {{ name }} -

Explore UI Components

-
- `, - styles: ` - #container { - text-align: center; - - position: absolute; - left: 0; - right: 0; - top: 50%; - transform: translateY(-50%); - } - - #container strong { - font-size: 20px; - line-height: 26px; - } - - #container p { - font-size: 16px; - line-height: 22px; - - color: #8c8c8c; - - margin: 0; - } - - #container a { - text-decoration: none; - } - ` -}) -export class ExploreContainerComponent { - - @Input() name?: string; - -} diff --git a/apps/disney-planner/src/app/home/home.page.ts b/apps/disney-planner/src/app/home/home.page.ts new file mode 100644 index 0000000..1c8c96c --- /dev/null +++ b/apps/disney-planner/src/app/home/home.page.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +@Component({ + selector: 'disney-home', + template: ` +
Home Page
+ `, + standalone: true, + imports: [CommonModule], + styles: `` +}) +export class HomePage {} diff --git a/apps/disney-planner/src/app/map/map.page.ts b/apps/disney-planner/src/app/map/map.page.ts new file mode 100644 index 0000000..65055fe --- /dev/null +++ b/apps/disney-planner/src/app/map/map.page.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +@Component({ + selector: 'disney-map', + standalone: true, + imports: [CommonModule], + template: ` +
Map
+ ` +}) +export class MapPage {} diff --git a/apps/disney-planner/src/app/search/search.page.ts b/apps/disney-planner/src/app/search/search.page.ts new file mode 100644 index 0000000..1861e1f --- /dev/null +++ b/apps/disney-planner/src/app/search/search.page.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'disney-search', + template: ` +
Search
+ `, + styles: ``, + standalone: true +}) +export class SearchPage {} \ No newline at end of file diff --git a/apps/disney-planner/src/app/tab1/tab1.page.spec.ts b/apps/disney-planner/src/app/tab1/tab1.page.spec.ts deleted file mode 100644 index 19debb6..0000000 --- a/apps/disney-planner/src/app/tab1/tab1.page.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ExploreContainerComponentModule } from '../explore-container/explore-container.module'; - -import { Tab1Page } from './tab1.page'; - -describe('Tab1Page', () => { - let component: Tab1Page; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [Tab1Page], - imports: [IonicModule.forRoot(), ExploreContainerComponentModule], - }).compileComponents(); - - fixture = TestBed.createComponent(Tab1Page); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/disney-planner/src/app/tab1/tab1.page.ts b/apps/disney-planner/src/app/tab1/tab1.page.ts deleted file mode 100644 index 5afc4d5..0000000 --- a/apps/disney-planner/src/app/tab1/tab1.page.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Component } from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {IonicModule} from '@ionic/angular'; -import {ExploreContainerComponent} from '../explore-container/explore-container.component'; - -@Component({ - selector: 'disney-tab1', - standalone: true, - imports: [ - IonicModule, - CommonModule, - FormsModule, - ExploreContainerComponent - ], - template: ` - - - - Tab 1 - - - - - - - - Tab 1 - - - - - - `, - styles: ` - - ` -}) -export class Tab1Page { - - constructor() {} - -} diff --git a/apps/disney-planner/src/app/tab1/tab1.routes.ts b/apps/disney-planner/src/app/tab1/tab1.routes.ts deleted file mode 100644 index 7a4fbc1..0000000 --- a/apps/disney-planner/src/app/tab1/tab1.routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Routes } from '@angular/router'; - -export const routes: Routes = [ - { - path: '', - loadComponent: () => import('./tab1.page').then(p => p.Tab1Page) - } -]; - diff --git a/apps/disney-planner/src/app/tab2/tab2.page.spec.ts b/apps/disney-planner/src/app/tab2/tab2.page.spec.ts deleted file mode 100644 index 9c15731..0000000 --- a/apps/disney-planner/src/app/tab2/tab2.page.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ExploreContainerComponentModule } from '../explore-container/explore-container.module'; - -import { Tab2Page } from './tab2.page'; - -describe('Tab2Page', () => { - let component: Tab2Page; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [Tab2Page], - imports: [IonicModule.forRoot(), ExploreContainerComponentModule], - }).compileComponents(); - - fixture = TestBed.createComponent(Tab2Page); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/disney-planner/src/app/tab2/tab2.page.ts b/apps/disney-planner/src/app/tab2/tab2.page.ts deleted file mode 100644 index e600089..0000000 --- a/apps/disney-planner/src/app/tab2/tab2.page.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component } from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {IonicModule} from '@ionic/angular'; -import {ExploreContainerComponent} from '../explore-container/explore-container.component'; - -@Component({ - selector: 'disney-tab2', - standalone: true, - imports: [ - IonicModule, - CommonModule, - FormsModule, - ExploreContainerComponent, - ], - template: ` - - - - Tab 2 - - - - - - - - Tab 2 - - - - - - - `, - styles: `` -}) -export class Tab2Page { - - constructor() {} - -} diff --git a/apps/disney-planner/src/app/tab2/tab2.routes.ts b/apps/disney-planner/src/app/tab2/tab2.routes.ts deleted file mode 100644 index 7ee3f1a..0000000 --- a/apps/disney-planner/src/app/tab2/tab2.routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Routes } from '@angular/router'; - -export const routes: Routes = [ - { - path: '', - loadComponent: () => import('./tab2.page').then(p => p.Tab2Page), - } -]; - diff --git a/apps/disney-planner/src/app/tab3/tab3.page.spec.ts b/apps/disney-planner/src/app/tab3/tab3.page.spec.ts deleted file mode 100644 index 5d97de7..0000000 --- a/apps/disney-planner/src/app/tab3/tab3.page.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ExploreContainerComponentModule } from '../explore-container/explore-container.module'; - -import { Tab3Page } from './tab3.page'; - -describe('Tab3Page', () => { - let component: Tab3Page; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [Tab3Page], - imports: [IonicModule.forRoot(), ExploreContainerComponentModule], - }).compileComponents(); - - fixture = TestBed.createComponent(Tab3Page); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/disney-planner/src/app/tab3/tab3.page.ts b/apps/disney-planner/src/app/tab3/tab3.page.ts deleted file mode 100644 index 0aa6414..0000000 --- a/apps/disney-planner/src/app/tab3/tab3.page.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component } from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {IonicModule} from '@ionic/angular'; -import {ExploreContainerComponent} from '../explore-container/explore-container.component'; - -@Component({ - selector: 'disney-tab3', - standalone: true, - imports: [ - IonicModule, - CommonModule, - FormsModule, - ExploreContainerComponent, - ], - template: ` - - - - Tab 3 - - - - - - - - Tab 3 - - - - - - `, - styles: `` -}) -export class Tab3Page { - - constructor() {} - -} diff --git a/apps/disney-planner/src/app/tab3/tab3.routes.ts b/apps/disney-planner/src/app/tab3/tab3.routes.ts deleted file mode 100644 index 2af698a..0000000 --- a/apps/disney-planner/src/app/tab3/tab3.routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Routes } from '@angular/router'; - -export const routes: Routes = [ - { - path: '', - loadComponent: () => import('./tab3.page').then(p => p.Tab3Page) - } -]; - diff --git a/apps/disney-planner/src/app/tabs/tabs.page.ts b/apps/disney-planner/src/app/tabs/tabs.page.ts index be486b8..a59d872 100644 --- a/apps/disney-planner/src/app/tabs/tabs.page.ts +++ b/apps/disney-planner/src/app/tabs/tabs.page.ts @@ -15,20 +15,22 @@ import {IonicModule} from '@ionic/angular'; - - - Tab 1 + + - - - Tab 2 + + - - - Tab 3 + + + + + + + diff --git a/apps/disney-planner/src/app/tabs/tabs.routes.ts b/apps/disney-planner/src/app/tabs/tabs.routes.ts index b87ff51..56813ae 100644 --- a/apps/disney-planner/src/app/tabs/tabs.routes.ts +++ b/apps/disney-planner/src/app/tabs/tabs.routes.ts @@ -6,27 +6,31 @@ export const routes: Routes = [ loadComponent: () => import('./tabs.page').then(p => p.TabsPage), children: [ { - path: 'tab1', - loadChildren: () => import('../tab1/tab1.routes').then(r => r.routes) + path: 'home', + loadComponent: () => import('../home/home.page').then(p => p.HomePage) }, { - path: 'tab2', - loadChildren: () => import('../tab2/tab2.routes').then(r => r.routes) + path: 'map', + loadComponent: () => import('../map/map.page').then(p => p.MapPage) }, { - path: 'tab3', - loadChildren: () => import('../tab3/tab3.routes').then(r => r.routes) + path: 'search', + loadComponent: () => import('../search/search.page').then(p => p.SearchPage) + }, + { + path: 'account', + loadComponent: () => import('../account/account.page').then(p => p.AccountPage) }, { path: '', - redirectTo: '/tabs/tab1', + redirectTo: '/tabs/home', pathMatch: 'full' } ] }, { path: '', - redirectTo: '/tabs/tab1', + redirectTo: '/tabs/home', pathMatch: 'full' } ]; diff --git a/nx.json b/nx.json index 8a6c7a6..dca8240 100644 --- a/nx.json +++ b/nx.json @@ -72,7 +72,8 @@ "unitTestRunner": "jest" }, "@nx/angular:component": { - "style": "scss" + "style": "scss", + "skipTests": true }, "@nx/react": { "application": {