Skip to content

Commit

Permalink
Added entry screen
Browse files Browse the repository at this point in the history
  • Loading branch information
liorva committed Apr 4, 2018
1 parent 18920aa commit ad34801
Show file tree
Hide file tree
Showing 12 changed files with 1,605 additions and 1,443 deletions.
2 changes: 1 addition & 1 deletion AgudaApp/.sourcemaps/main.js.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions AgudaApp/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import { Platform } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';

import { TabsPage } from '../pages/tabs/tabs';
import { EntryScreenPage } from './../pages/entry-screen/entry-screen';

@Component({
templateUrl: 'app.html'
})
export class MyApp {
rootPage:any = TabsPage;

rootPage:any = EntryScreenPage;

constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
platform.ready().then(() => {
Expand Down
10 changes: 7 additions & 3 deletions AgudaApp/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ import { BrowserModule } from '@angular/platform-browser';
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
import { MyApp } from './app.component';

import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';

import { HomePage } from '../pages/home/home';
import { InfoPage } from '../pages/info/info';
import { TabsPage } from '../pages/tabs/tabs';
import { CalendarPage } from '../pages/calendar/calendar';
import { GalleryPage } from '../pages/gallery/gallery';

import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';
import { RefreshComponent } from '../components/refresh/refresh';
import { HomeDataComponent } from '../components/home-data/home-data';

import { ComponentsModule } from '../components/components.module';
import { EntryScreenPageModule } from './../pages/entry-screen/entry-screen.module';

@NgModule({
declarations: [
Expand All @@ -28,7 +31,8 @@ import { ComponentsModule } from '../components/components.module';
imports: [
BrowserModule,
IonicModule.forRoot(MyApp),
ComponentsModule
ComponentsModule,
EntryScreenPageModule
],
bootstrap: [IonicApp],
entryComponents: [
Expand Down
1 change: 1 addition & 0 deletions AgudaApp/src/pages/entry-screen/entry-screen.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<img id='enter' src="./../../assets/imgs/logo.jpg">
13 changes: 13 additions & 0 deletions AgudaApp/src/pages/entry-screen/entry-screen.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { EntryScreenPage } from './entry-screen';

@NgModule({
declarations: [
EntryScreenPage,
],
imports: [
IonicPageModule.forChild(EntryScreenPage),
],
})
export class EntryScreenPageModule {}
10 changes: 10 additions & 0 deletions AgudaApp/src/pages/entry-screen/entry-screen.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
page-entry-screen {
padding: 0;
margin: 0;
}

#enter {
width: 100%;
height: 100%;
position: absolute;
}
22 changes: 22 additions & 0 deletions AgudaApp/src/pages/entry-screen/entry-screen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { TabsPage } from './../tabs/tabs';
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';

@IonicPage()
@Component({
selector: 'page-entry-screen',
templateUrl: 'entry-screen.html',
})
export class EntryScreenPage {

constructor(public navCtrl: NavController, public navParams: NavParams) {
setTimeout(function() {
navCtrl.setRoot(TabsPage);
}, 5000);
}

ionViewDidLoad() {
console.log('ionViewDidLoad EntryScreenPage');
}

}
11 changes: 11 additions & 0 deletions AgudaApp/www/build/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -25686,6 +25686,17 @@ button {
background: transparent;
}

page-entry-screen {
padding: 0;
margin: 0;
}

#enter {
width: 100%;
height: 100%;
position: absolute;
}

main {
text-align: center;
}
Expand Down
Loading

0 comments on commit ad34801

Please sign in to comment.