diff --git a/config.xml b/config.xml index 5ea5366..d77488c 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + JubaBox JubaBox-Connect your interest. Fluxtra Team diff --git a/package.json b/package.json index 82418b8..6b38118 100644 --- a/package.json +++ b/package.json @@ -92,4 +92,4 @@ "ios" ] } -} +} \ No newline at end of file diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 6f96066..bed3700 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index fa71fae..4d6dc76 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 966eae0..dc68a80 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index c3b25b4..bdfc8a5 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 58482ff..b209ec4 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 3aa5c3a..4df20d6 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png index 941a69f..a911c84 100644 Binary files a/resources/ios/icon/icon-1024.png and b/resources/ios/icon/icon-1024.png differ diff --git a/resources/ios/icon/icon-108@2x.png b/resources/ios/icon/icon-108@2x.png index 5040529..40b114d 100644 Binary files a/resources/ios/icon/icon-108@2x.png and b/resources/ios/icon/icon-108@2x.png differ diff --git a/resources/ios/icon/icon-20.png b/resources/ios/icon/icon-20.png index 1f7e2fb..04a0f93 100644 Binary files a/resources/ios/icon/icon-20.png and b/resources/ios/icon/icon-20.png differ diff --git a/resources/ios/icon/icon-20@2x.png b/resources/ios/icon/icon-20@2x.png index d7aa2e4..ebaa21e 100644 Binary files a/resources/ios/icon/icon-20@2x.png and b/resources/ios/icon/icon-20@2x.png differ diff --git a/resources/ios/icon/icon-20@3x.png b/resources/ios/icon/icon-20@3x.png index ecae3c8..68db1fc 100644 Binary files a/resources/ios/icon/icon-20@3x.png and b/resources/ios/icon/icon-20@3x.png differ diff --git a/resources/ios/icon/icon-24@2x.png b/resources/ios/icon/icon-24@2x.png index 966eae0..dc68a80 100644 Binary files a/resources/ios/icon/icon-24@2x.png and b/resources/ios/icon/icon-24@2x.png differ diff --git a/resources/ios/icon/icon-27.5@2x.png b/resources/ios/icon/icon-27.5@2x.png index b63f6d6..5ffef34 100644 Binary files a/resources/ios/icon/icon-27.5@2x.png and b/resources/ios/icon/icon-27.5@2x.png differ diff --git a/resources/ios/icon/icon-29.png b/resources/ios/icon/icon-29.png index 113b47d..2fd0806 100644 Binary files a/resources/ios/icon/icon-29.png and b/resources/ios/icon/icon-29.png differ diff --git a/resources/ios/icon/icon-29@2x.png b/resources/ios/icon/icon-29@2x.png index 7add4d1..884bbf7 100644 Binary files a/resources/ios/icon/icon-29@2x.png and b/resources/ios/icon/icon-29@2x.png differ diff --git a/resources/ios/icon/icon-29@3x.png b/resources/ios/icon/icon-29@3x.png index eb095fa..f38c52a 100644 Binary files a/resources/ios/icon/icon-29@3x.png and b/resources/ios/icon/icon-29@3x.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index d7aa2e4..ebaa21e 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index 3b9b0cb..f807535 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png index a2f0fde..1685539 100644 Binary files a/resources/ios/icon/icon-40@3x.png and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-44@2x.png b/resources/ios/icon/icon-44@2x.png index 7ca837e..7fa2ce1 100644 Binary files a/resources/ios/icon/icon-44@2x.png and b/resources/ios/icon/icon-44@2x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 91dcd3a..5e5afc9 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index 82afde4..574c16a 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index ecae3c8..68db1fc 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index a2f0fde..1685539 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index a3aa4af..d876c4f 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index 6f96066..bed3700 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index 58482ff..b209ec4 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index 61701e0..534ef21 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index f8451d6..ca6f81e 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png index 05a9e9c..1c5e622 100644 Binary files a/resources/ios/icon/icon-83.5@2x.png and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-86@2x.png b/resources/ios/icon/icon-86@2x.png index a3d244f..bb85b22 100644 Binary files a/resources/ios/icon/icon-86@2x.png and b/resources/ios/icon/icon-86@2x.png differ diff --git a/resources/ios/icon/icon-98@2x.png b/resources/ios/icon/icon-98@2x.png index edfc0f4..67a81c7 100644 Binary files a/resources/ios/icon/icon-98@2x.png and b/resources/ios/icon/icon-98@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png index 113b47d..2fd0806 100644 Binary files a/resources/ios/icon/icon-small.png and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png index 7add4d1..884bbf7 100644 Binary files a/resources/ios/icon/icon-small@2x.png and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png index eb095fa..f38c52a 100644 Binary files a/resources/ios/icon/icon-small@3x.png and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index f2d12d3..85d469f 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index 6f0b5ac..6f5ff61 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0a57fdf..ca5cbb6 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,7 +2,11 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ - { path: '', loadChildren: './tabs/tabs.module#TabsPageModule' } + { path: '', loadChildren: './tabs/tabs.module#TabsPageModule' }, + { path: 'settings', loadChildren: './users/settings/settings.module#SettingsPageModule' }, + { path: 'login', loadChildren: './login/login.module#LoginPageModule' }, + { path: 'start', loadChildren: './start/start.module#StartPageModule' }, + { path: 'signup', loadChildren: './signup/signup.module#SignupPageModule' } ]; @NgModule({ imports: [RouterModule.forRoot(routes)], diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts new file mode 100644 index 0000000..be78c38 --- /dev/null +++ b/src/app/login/login.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; + +import { LoginPage } from './login.page'; + +const routes: Routes = [ + { + path: '', + component: LoginPage + } +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild(routes) + ], + declarations: [LoginPage] +}) +export class LoginPageModule {} diff --git a/src/app/login/login.page.html b/src/app/login/login.page.html new file mode 100644 index 0000000..16d1acb --- /dev/null +++ b/src/app/login/login.page.html @@ -0,0 +1,9 @@ + + + Login + + + + + + diff --git a/src/app/login/login.page.scss b/src/app/login/login.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/login/login.page.spec.ts b/src/app/login/login.page.spec.ts new file mode 100644 index 0000000..e6ff074 --- /dev/null +++ b/src/app/login/login.page.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginPage } from './login.page'; + +describe('LoginPage', () => { + let component: LoginPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ LoginPage ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginPage); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/login/login.page.ts b/src/app/login/login.page.ts new file mode 100644 index 0000000..141f59e --- /dev/null +++ b/src/app/login/login.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-login', + templateUrl: './login.page.html', + styleUrls: ['./login.page.scss'], +}) +export class LoginPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/signup/signup.module.ts b/src/app/signup/signup.module.ts new file mode 100644 index 0000000..940b86a --- /dev/null +++ b/src/app/signup/signup.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; + +import { SignupPage } from './signup.page'; + +const routes: Routes = [ + { + path: '', + component: SignupPage + } +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild(routes) + ], + declarations: [SignupPage] +}) +export class SignupPageModule {} diff --git a/src/app/signup/signup.page.html b/src/app/signup/signup.page.html new file mode 100644 index 0000000..8ddb8c5 --- /dev/null +++ b/src/app/signup/signup.page.html @@ -0,0 +1,9 @@ + + + Signup + + + + + + diff --git a/src/app/signup/signup.page.scss b/src/app/signup/signup.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/signup/signup.page.spec.ts b/src/app/signup/signup.page.spec.ts new file mode 100644 index 0000000..0697e60 --- /dev/null +++ b/src/app/signup/signup.page.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SignupPage } from './signup.page'; + +describe('SignupPage', () => { + let component: SignupPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SignupPage ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SignupPage); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/signup/signup.page.ts b/src/app/signup/signup.page.ts new file mode 100644 index 0000000..34a3c38 --- /dev/null +++ b/src/app/signup/signup.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-signup', + templateUrl: './signup.page.html', + styleUrls: ['./signup.page.scss'], +}) +export class SignupPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/start/start.module.ts b/src/app/start/start.module.ts new file mode 100644 index 0000000..d9249c9 --- /dev/null +++ b/src/app/start/start.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; + +import { StartPage } from './start.page'; + +const routes: Routes = [ + { + path: '', + component: StartPage + } +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild(routes) + ], + declarations: [StartPage] +}) +export class StartPageModule {} diff --git a/src/app/start/start.page.html b/src/app/start/start.page.html new file mode 100644 index 0000000..bae095a --- /dev/null +++ b/src/app/start/start.page.html @@ -0,0 +1,9 @@ + + + Start + + + + + + diff --git a/src/app/start/start.page.scss b/src/app/start/start.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/start/start.page.spec.ts b/src/app/start/start.page.spec.ts new file mode 100644 index 0000000..2ab50ab --- /dev/null +++ b/src/app/start/start.page.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StartPage } from './start.page'; + +describe('StartPage', () => { + let component: StartPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StartPage ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StartPage); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/start/start.page.ts b/src/app/start/start.page.ts new file mode 100644 index 0000000..e831364 --- /dev/null +++ b/src/app/start/start.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-start', + templateUrl: './start.page.html', + styleUrls: ['./start.page.scss'], +}) +export class StartPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/users/settings/settings.module.ts b/src/app/users/settings/settings.module.ts new file mode 100644 index 0000000..b8e1960 --- /dev/null +++ b/src/app/users/settings/settings.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; + +import { SettingsPage } from './settings.page'; + +const routes: Routes = [ + { + path: '', + component: SettingsPage + } +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild(routes) + ], + declarations: [SettingsPage] +}) +export class SettingsPageModule {} diff --git a/src/app/users/settings/settings.page.html b/src/app/users/settings/settings.page.html new file mode 100644 index 0000000..74c39a4 --- /dev/null +++ b/src/app/users/settings/settings.page.html @@ -0,0 +1,9 @@ + + + Settings + + + + + + diff --git a/src/app/users/settings/settings.page.scss b/src/app/users/settings/settings.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/settings/settings.page.spec.ts b/src/app/users/settings/settings.page.spec.ts new file mode 100644 index 0000000..d85a2f3 --- /dev/null +++ b/src/app/users/settings/settings.page.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SettingsPage } from './settings.page'; + +describe('SettingsPage', () => { + let component: SettingsPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SettingsPage ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SettingsPage); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/settings/settings.page.ts b/src/app/users/settings/settings.page.ts new file mode 100644 index 0000000..7bc0fd2 --- /dev/null +++ b/src/app/users/settings/settings.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-settings', + templateUrl: './settings.page.html', + styleUrls: ['./settings.page.scss'], +}) +export class SettingsPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}