123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350 |
- commit c27507ae2759e2483aba5b0321e1d4cd65432524
- Author: Kris Blassingame <krisbl@zipcoders-MacBook-Pro-6.local>
- Date: Sat Jul 21 14:00:51 2018 -0400
-
- revert changes
-
- diff --git a/frontEnd/src/app/app.component.ts b/frontEnd/src/app/app.component.ts
- index ab78376..0aef735 100644
- --- a/frontEnd/src/app/app.component.ts
- +++ b/frontEnd/src/app/app.component.ts
- @@ -1,14 +1,14 @@
- import { Component } from '@angular/core';
- -import { Platform } from 'ionic-angular';
- +import { Platform } from 'ionic-angular/umd';
- import { StatusBar } from '@ionic-native/status-bar';
- import { SplashScreen } from '@ionic-native/splash-screen';
- +import { LoginPage } from '../pages/login/login';
-
- -import { HomePage } from '../pages/home/home';
- @Component({
- templateUrl: 'app.html'
- })
- export class MyApp {
- - rootPage:any = HomePage;
- + rootPage:any = LoginPage;
-
- constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
- platform.ready().then(() => {
- diff --git a/frontEnd/src/app/app.module.ts b/frontEnd/src/app/app.module.ts
- index ec5f607..ff175fe 100644
- --- a/frontEnd/src/app/app.module.ts
- +++ b/frontEnd/src/app/app.module.ts
- @@ -1,19 +1,20 @@
- import { BrowserModule } from '@angular/platform-browser';
- import { ErrorHandler, NgModule } from '@angular/core';
- -import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
- +import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular/umd';
- import { SplashScreen } from '@ionic-native/splash-screen';
- import { StatusBar } from '@ionic-native/status-bar';
-
- import { MyApp } from './app.component';
- -import { HomePage } from '../pages/home/home';
- import { GoogleMapComponent } from '../components/google-map/google-map';
- +import { LoginPage } from '../pages/login/login';
-
- @NgModule({
- declarations: [
- MyApp,
- - HomePage,
- - GoogleMapComponent
- + LoginPage,
- + GoogleMapComponent,
-
- +
- ],
- imports: [
- BrowserModule,
- @@ -22,7 +23,8 @@ import { GoogleMapComponent } from '../components/google-map/google-map';
- bootstrap: [IonicApp],
- entryComponents: [
- MyApp,
- - HomePage
- + LoginPage,
- +
- ],
- providers: [
- StatusBar,
- diff --git a/frontEnd/src/pages/googleMap/googleMap.ts b/frontEnd/src/pages/googleMap/googleMap.ts
- index 16d63bd..e8cfdc3 100644
- --- a/frontEnd/src/pages/googleMap/googleMap.ts
- +++ b/frontEnd/src/pages/googleMap/googleMap.ts
- @@ -1,11 +1,11 @@
- import { Component } from '@angular/core';
- -import { NavController } from 'ionic-angular';
- +import { NavController } from 'ionic-angular/umd';
-
- @Component({
- - selector: 'page-map',
- - templateUrl: 'map.html'
- + selector: 'page-google-map',
- + templateUrl: 'google-Map.html'
- })
- -export class MapPage {
- +export class GoogleMapPage {
-
- constructor(public navCtrl: NavController) {
-
- diff --git a/frontEnd/src/pages/home/home.html b/frontEnd/src/pages/home/home.html
- deleted file mode 100644
- index e3d5f99..0000000
- --- a/frontEnd/src/pages/home/home.html
- +++ /dev/null
- @@ -1,5 +0,0 @@
- -<ion-content text-center padding class="bg-image">
- - <div class="head" text-center>
- - <h1>Happy Trails</h1>
- - </div>
- -</ion-content>
- \ No newline at end of file
- diff --git a/frontEnd/src/pages/home/home.scss b/frontEnd/src/pages/home/home.scss
- deleted file mode 100644
- index 98977a7..0000000
- --- a/frontEnd/src/pages/home/home.scss
- +++ /dev/null
- @@ -1,27 +0,0 @@
- -@import url('https://fonts.googleapis.com/css?family=Permanent+Marker');
- -page-home {
- - .bg-image {
- - background-image: url('../assets/imgs/autumn-daylight-environment-218820.jpg');
- - background-repeat: no-repeat;
- - background-position: center;
- - background-size: cover;
- - }
- - .head {
- - position: absolute;
- - display: block;
- - //color: rgb(255, 124, 1);
- - top: 22%;
- - left: 50%;
- - transform: translate(-50%, -50%);
- - width: 100%;
- - font-size: 100px;
- - background-image: linear-gradient(to bottom,rgb(207, 0, 0), rgb(0, 172, 0));
- - -webkit-background-clip: text;
- - color: transparent;
- - }
- - .head h1 {
- - font-size: 7vh !important;
- - font-weight: lighter !important;
- - font-family: 'Permanent Marker', cursive;
- - }
- -}
- \ No newline at end of file
- diff --git a/frontEnd/src/pages/home/home.ts b/frontEnd/src/pages/home/home.ts
- deleted file mode 100644
- index 1d510dd..0000000
- --- a/frontEnd/src/pages/home/home.ts
- +++ /dev/null
- @@ -1,14 +0,0 @@
- -import { Component } from '@angular/core';
- -import { NavController } from 'ionic-angular';
- -
- -@Component({
- - selector: 'page-home',
- - templateUrl: 'home.html'
- -})
- -export class HomePage {
- -
- - constructor(public navCtrl: NavController) {
- -
- - }
- -
- -}
- diff --git a/frontEnd/src/pages/login/login.html b/frontEnd/src/pages/login/login.html
- new file mode 100644
- index 0000000..20071f2
- --- /dev/null
- +++ b/frontEnd/src/pages/login/login.html
- @@ -0,0 +1,24 @@
- +<ion-content text-center padding class="bg-image">
- + <div class="head" text-center>
- + <h1>Happy Trails</h1>
- + </div>
- + <div class="inputs">
- + <ion-item>
- + <ion-input type="text" placeholder="Email"></ion-input>
- + </ion-item>
- + <ion-item class="password">
- + <ion-input type="password" placeholder="Password"></ion-input>
- + </ion-item>
- + <button ion-button block>
- + <b>Login</b>
- + </button>
- + <p>Forgot Username/Password?
- + <b>Tap here!</b>
- + </p>
- + <p>OR</p>
- + <div class="google" text-center>
- + <ion-icon name="logo-google" text-center></ion-icon>
- + Login/Signup with Google
- + </div>
- + </div>
- +</ion-content>
- \ No newline at end of file
- diff --git a/frontEnd/src/pages/login/login.scss b/frontEnd/src/pages/login/login.scss
- new file mode 100644
- index 0000000..41cbea6
- --- /dev/null
- +++ b/frontEnd/src/pages/login/login.scss
- @@ -0,0 +1,55 @@
- +@import url('https://fonts.googleapis.com/css?family=Permanent+Marker');
- +page-home {
- + .bg-image {
- + background-image: url('../assets/imgs/autumn-daylight-environment-218820.jpg');
- + background-repeat: no-repeat;
- + background-position: center;
- + background-size: cover;
- + }
- + .head {
- + position: absolute;
- + display: block; //color: rgb(255, 124, 1);
- + top: 22%;
- + left: 50%;
- + transform: translate(-50%, -50%);
- + width: 100%;
- + font-size: 100px;
- + background-image: linear-gradient(to bottom, rgb(207, 0, 0), rgb(0, 172, 0));
- + -webkit-background-clip: text;
- + color: transparent;
- + }
- + .head h1 {
- + font-size: 8vh !important;
- + font-weight: lighter !important;
- + font-family: 'Permanent Marker', cursive;
- + }
- + .inputs {
- + position: absolute;
- + display: block;
- + top: 50%;
- + left: 50%;
- + transform: translate(-50%, -50%);
- + width: 90%;
- + color: #fff;
- + opacity: 0.6;
- + }
- + ion-item {
- + background: transparent!important;
- + border: 1px solid #fff!important;
- + ion-input {
- + color: #fff;
- + }
- + ion-label{
- + color: #fff!important;
- + }
- + .item-inner {
- + border: 0!important;
- + }
- + }
- + button {
- + position: absolute;
- + display: block;
- + top: 50%;
- + background-color: green!important;
- + }
- +}
- \ No newline at end of file
- diff --git a/frontEnd/src/pages/login/login.ts b/frontEnd/src/pages/login/login.ts
- new file mode 100644
- index 0000000..dcdb1c9
- --- /dev/null
- +++ b/frontEnd/src/pages/login/login.ts
- @@ -0,0 +1,14 @@
- +import { Component } from '@angular/core';
- +import { NavController } from 'ionic-angular/umd';
- +
- +@Component({
- + selector: 'page-login',
- + templateUrl: 'login.html'
- +})
- +export class LoginPage {
- +
- + constructor(public navCtrl: NavController) {
- +
- + }
- +
- +}
- diff --git a/frontEnd/src/pages/main-menu/main-menu.html b/frontEnd/src/pages/main-menu/main-menu.html
- new file mode 100644
- index 0000000..0438edc
- --- /dev/null
- +++ b/frontEnd/src/pages/main-menu/main-menu.html
- @@ -0,0 +1,18 @@
- +<!--
- + Generated template for the MainMenuPage page.
- +
- + See http://ionicframework.com/docs/components/#navigation for more info on
- + Ionic pages and navigation.
- +-->
- +<ion-header>
- +
- + <ion-navbar>
- + <ion-title>mainMenu</ion-title>
- + </ion-navbar>
- +
- +</ion-header>
- +
- +
- +<ion-content padding>
- +
- +</ion-content>
- diff --git a/frontEnd/src/pages/main-menu/main-menu.module.ts b/frontEnd/src/pages/main-menu/main-menu.module.ts
- new file mode 100644
- index 0000000..8be851d
- --- /dev/null
- +++ b/frontEnd/src/pages/main-menu/main-menu.module.ts
- @@ -0,0 +1,13 @@
- +import { NgModule } from '@angular/core';
- +import { IonicPageModule } from 'ionic-angular/umd';
- +import { MainMenuPage } from './main-menu';
- +
- +@NgModule({
- + declarations: [
- + MainMenuPage,
- + ],
- + imports: [
- + IonicPageModule.forChild(MainMenuPage),
- + ],
- +})
- +export class MainMenuPageModule {}
- diff --git a/frontEnd/src/pages/main-menu/main-menu.scss b/frontEnd/src/pages/main-menu/main-menu.scss
- new file mode 100644
- index 0000000..7819355
- --- /dev/null
- +++ b/frontEnd/src/pages/main-menu/main-menu.scss
- @@ -0,0 +1,3 @@
- +page-main-menu {
- +
- +}
- diff --git a/frontEnd/src/pages/main-menu/main-menu.ts b/frontEnd/src/pages/main-menu/main-menu.ts
- new file mode 100644
- index 0000000..d166401
- --- /dev/null
- +++ b/frontEnd/src/pages/main-menu/main-menu.ts
- @@ -0,0 +1,25 @@
- +import { Component } from '@angular/core';
- +import { IonicPage, NavController, NavParams } from 'ionic-angular/umd';
- +
- +/**
- + * Generated class for the MainMenuPage page.
- + *
- + * See https://ionicframework.com/docs/components/#navigation for more info on
- + * Ionic pages and navigation.
- + */
- +
- +@IonicPage()
- +@Component({
- + selector: 'page-main-menu',
- + templateUrl: 'main-menu.html',
- +})
- +export class MainMenuPage {
- +
- + constructor(public navCtrl: NavController, public navParams: NavParams) {
- + }
- +
- + ionViewDidLoad() {
- + console.log('ionViewDidLoad MainMenuPage');
- + }
- +
- +}
|