123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350
  1. commit c27507ae2759e2483aba5b0321e1d4cd65432524
  2. Author: Kris Blassingame <krisbl@zipcoders-MacBook-Pro-6.local>
  3. Date: Sat Jul 21 14:00:51 2018 -0400
  4. revert changes
  5. diff --git a/frontEnd/src/app/app.component.ts b/frontEnd/src/app/app.component.ts
  6. index ab78376..0aef735 100644
  7. --- a/frontEnd/src/app/app.component.ts
  8. +++ b/frontEnd/src/app/app.component.ts
  9. @@ -1,14 +1,14 @@
  10. import { Component } from '@angular/core';
  11. -import { Platform } from 'ionic-angular';
  12. +import { Platform } from 'ionic-angular/umd';
  13. import { StatusBar } from '@ionic-native/status-bar';
  14. import { SplashScreen } from '@ionic-native/splash-screen';
  15. +import { LoginPage } from '../pages/login/login';
  16. -import { HomePage } from '../pages/home/home';
  17. @Component({
  18. templateUrl: 'app.html'
  19. })
  20. export class MyApp {
  21. - rootPage:any = HomePage;
  22. + rootPage:any = LoginPage;
  23. constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
  24. platform.ready().then(() => {
  25. diff --git a/frontEnd/src/app/app.module.ts b/frontEnd/src/app/app.module.ts
  26. index ec5f607..ff175fe 100644
  27. --- a/frontEnd/src/app/app.module.ts
  28. +++ b/frontEnd/src/app/app.module.ts
  29. @@ -1,19 +1,20 @@
  30. import { BrowserModule } from '@angular/platform-browser';
  31. import { ErrorHandler, NgModule } from '@angular/core';
  32. -import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
  33. +import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular/umd';
  34. import { SplashScreen } from '@ionic-native/splash-screen';
  35. import { StatusBar } from '@ionic-native/status-bar';
  36. import { MyApp } from './app.component';
  37. -import { HomePage } from '../pages/home/home';
  38. import { GoogleMapComponent } from '../components/google-map/google-map';
  39. +import { LoginPage } from '../pages/login/login';
  40. @NgModule({
  41. declarations: [
  42. MyApp,
  43. - HomePage,
  44. - GoogleMapComponent
  45. + LoginPage,
  46. + GoogleMapComponent,
  47. +
  48. ],
  49. imports: [
  50. BrowserModule,
  51. @@ -22,7 +23,8 @@ import { GoogleMapComponent } from '../components/google-map/google-map';
  52. bootstrap: [IonicApp],
  53. entryComponents: [
  54. MyApp,
  55. - HomePage
  56. + LoginPage,
  57. +
  58. ],
  59. providers: [
  60. StatusBar,
  61. diff --git a/frontEnd/src/pages/googleMap/googleMap.ts b/frontEnd/src/pages/googleMap/googleMap.ts
  62. index 16d63bd..e8cfdc3 100644
  63. --- a/frontEnd/src/pages/googleMap/googleMap.ts
  64. +++ b/frontEnd/src/pages/googleMap/googleMap.ts
  65. @@ -1,11 +1,11 @@
  66. import { Component } from '@angular/core';
  67. -import { NavController } from 'ionic-angular';
  68. +import { NavController } from 'ionic-angular/umd';
  69. @Component({
  70. - selector: 'page-map',
  71. - templateUrl: 'map.html'
  72. + selector: 'page-google-map',
  73. + templateUrl: 'google-Map.html'
  74. })
  75. -export class MapPage {
  76. +export class GoogleMapPage {
  77. constructor(public navCtrl: NavController) {
  78. diff --git a/frontEnd/src/pages/home/home.html b/frontEnd/src/pages/home/home.html
  79. deleted file mode 100644
  80. index e3d5f99..0000000
  81. --- a/frontEnd/src/pages/home/home.html
  82. +++ /dev/null
  83. @@ -1,5 +0,0 @@
  84. -<ion-content text-center padding class="bg-image">
  85. - <div class="head" text-center>
  86. - <h1>Happy Trails</h1>
  87. - </div>
  88. -</ion-content>
  89. \ No newline at end of file
  90. diff --git a/frontEnd/src/pages/home/home.scss b/frontEnd/src/pages/home/home.scss
  91. deleted file mode 100644
  92. index 98977a7..0000000
  93. --- a/frontEnd/src/pages/home/home.scss
  94. +++ /dev/null
  95. @@ -1,27 +0,0 @@
  96. -@import url('https://fonts.googleapis.com/css?family=Permanent+Marker');
  97. -page-home {
  98. - .bg-image {
  99. - background-image: url('../assets/imgs/autumn-daylight-environment-218820.jpg');
  100. - background-repeat: no-repeat;
  101. - background-position: center;
  102. - background-size: cover;
  103. - }
  104. - .head {
  105. - position: absolute;
  106. - display: block;
  107. - //color: rgb(255, 124, 1);
  108. - top: 22%;
  109. - left: 50%;
  110. - transform: translate(-50%, -50%);
  111. - width: 100%;
  112. - font-size: 100px;
  113. - background-image: linear-gradient(to bottom,rgb(207, 0, 0), rgb(0, 172, 0));
  114. - -webkit-background-clip: text;
  115. - color: transparent;
  116. - }
  117. - .head h1 {
  118. - font-size: 7vh !important;
  119. - font-weight: lighter !important;
  120. - font-family: 'Permanent Marker', cursive;
  121. - }
  122. -}
  123. \ No newline at end of file
  124. diff --git a/frontEnd/src/pages/home/home.ts b/frontEnd/src/pages/home/home.ts
  125. deleted file mode 100644
  126. index 1d510dd..0000000
  127. --- a/frontEnd/src/pages/home/home.ts
  128. +++ /dev/null
  129. @@ -1,14 +0,0 @@
  130. -import { Component } from '@angular/core';
  131. -import { NavController } from 'ionic-angular';
  132. -
  133. -@Component({
  134. - selector: 'page-home',
  135. - templateUrl: 'home.html'
  136. -})
  137. -export class HomePage {
  138. -
  139. - constructor(public navCtrl: NavController) {
  140. -
  141. - }
  142. -
  143. -}
  144. diff --git a/frontEnd/src/pages/login/login.html b/frontEnd/src/pages/login/login.html
  145. new file mode 100644
  146. index 0000000..20071f2
  147. --- /dev/null
  148. +++ b/frontEnd/src/pages/login/login.html
  149. @@ -0,0 +1,24 @@
  150. +<ion-content text-center padding class="bg-image">
  151. + <div class="head" text-center>
  152. + <h1>Happy Trails</h1>
  153. + </div>
  154. + <div class="inputs">
  155. + <ion-item>
  156. + <ion-input type="text" placeholder="Email"></ion-input>
  157. + </ion-item>
  158. + <ion-item class="password">
  159. + <ion-input type="password" placeholder="Password"></ion-input>
  160. + </ion-item>
  161. + <button ion-button block>
  162. + <b>Login</b>
  163. + </button>
  164. + <p>Forgot Username/Password?
  165. + <b>Tap here!</b>
  166. + </p>
  167. + <p>OR</p>
  168. + <div class="google" text-center>
  169. + <ion-icon name="logo-google" text-center></ion-icon>
  170. + Login/Signup with Google
  171. + </div>
  172. + </div>
  173. +</ion-content>
  174. \ No newline at end of file
  175. diff --git a/frontEnd/src/pages/login/login.scss b/frontEnd/src/pages/login/login.scss
  176. new file mode 100644
  177. index 0000000..41cbea6
  178. --- /dev/null
  179. +++ b/frontEnd/src/pages/login/login.scss
  180. @@ -0,0 +1,55 @@
  181. +@import url('https://fonts.googleapis.com/css?family=Permanent+Marker');
  182. +page-home {
  183. + .bg-image {
  184. + background-image: url('../assets/imgs/autumn-daylight-environment-218820.jpg');
  185. + background-repeat: no-repeat;
  186. + background-position: center;
  187. + background-size: cover;
  188. + }
  189. + .head {
  190. + position: absolute;
  191. + display: block; //color: rgb(255, 124, 1);
  192. + top: 22%;
  193. + left: 50%;
  194. + transform: translate(-50%, -50%);
  195. + width: 100%;
  196. + font-size: 100px;
  197. + background-image: linear-gradient(to bottom, rgb(207, 0, 0), rgb(0, 172, 0));
  198. + -webkit-background-clip: text;
  199. + color: transparent;
  200. + }
  201. + .head h1 {
  202. + font-size: 8vh !important;
  203. + font-weight: lighter !important;
  204. + font-family: 'Permanent Marker', cursive;
  205. + }
  206. + .inputs {
  207. + position: absolute;
  208. + display: block;
  209. + top: 50%;
  210. + left: 50%;
  211. + transform: translate(-50%, -50%);
  212. + width: 90%;
  213. + color: #fff;
  214. + opacity: 0.6;
  215. + }
  216. + ion-item {
  217. + background: transparent!important;
  218. + border: 1px solid #fff!important;
  219. + ion-input {
  220. + color: #fff;
  221. + }
  222. + ion-label{
  223. + color: #fff!important;
  224. + }
  225. + .item-inner {
  226. + border: 0!important;
  227. + }
  228. + }
  229. + button {
  230. + position: absolute;
  231. + display: block;
  232. + top: 50%;
  233. + background-color: green!important;
  234. + }
  235. +}
  236. \ No newline at end of file
  237. diff --git a/frontEnd/src/pages/login/login.ts b/frontEnd/src/pages/login/login.ts
  238. new file mode 100644
  239. index 0000000..dcdb1c9
  240. --- /dev/null
  241. +++ b/frontEnd/src/pages/login/login.ts
  242. @@ -0,0 +1,14 @@
  243. +import { Component } from '@angular/core';
  244. +import { NavController } from 'ionic-angular/umd';
  245. +
  246. +@Component({
  247. + selector: 'page-login',
  248. + templateUrl: 'login.html'
  249. +})
  250. +export class LoginPage {
  251. +
  252. + constructor(public navCtrl: NavController) {
  253. +
  254. + }
  255. +
  256. +}
  257. diff --git a/frontEnd/src/pages/main-menu/main-menu.html b/frontEnd/src/pages/main-menu/main-menu.html
  258. new file mode 100644
  259. index 0000000..0438edc
  260. --- /dev/null
  261. +++ b/frontEnd/src/pages/main-menu/main-menu.html
  262. @@ -0,0 +1,18 @@
  263. +<!--
  264. + Generated template for the MainMenuPage page.
  265. +
  266. + See http://ionicframework.com/docs/components/#navigation for more info on
  267. + Ionic pages and navigation.
  268. +-->
  269. +<ion-header>
  270. +
  271. + <ion-navbar>
  272. + <ion-title>mainMenu</ion-title>
  273. + </ion-navbar>
  274. +
  275. +</ion-header>
  276. +
  277. +
  278. +<ion-content padding>
  279. +
  280. +</ion-content>
  281. diff --git a/frontEnd/src/pages/main-menu/main-menu.module.ts b/frontEnd/src/pages/main-menu/main-menu.module.ts
  282. new file mode 100644
  283. index 0000000..8be851d
  284. --- /dev/null
  285. +++ b/frontEnd/src/pages/main-menu/main-menu.module.ts
  286. @@ -0,0 +1,13 @@
  287. +import { NgModule } from '@angular/core';
  288. +import { IonicPageModule } from 'ionic-angular/umd';
  289. +import { MainMenuPage } from './main-menu';
  290. +
  291. +@NgModule({
  292. + declarations: [
  293. + MainMenuPage,
  294. + ],
  295. + imports: [
  296. + IonicPageModule.forChild(MainMenuPage),
  297. + ],
  298. +})
  299. +export class MainMenuPageModule {}
  300. diff --git a/frontEnd/src/pages/main-menu/main-menu.scss b/frontEnd/src/pages/main-menu/main-menu.scss
  301. new file mode 100644
  302. index 0000000..7819355
  303. --- /dev/null
  304. +++ b/frontEnd/src/pages/main-menu/main-menu.scss
  305. @@ -0,0 +1,3 @@
  306. +page-main-menu {
  307. +
  308. +}
  309. diff --git a/frontEnd/src/pages/main-menu/main-menu.ts b/frontEnd/src/pages/main-menu/main-menu.ts
  310. new file mode 100644
  311. index 0000000..d166401
  312. --- /dev/null
  313. +++ b/frontEnd/src/pages/main-menu/main-menu.ts
  314. @@ -0,0 +1,25 @@
  315. +import { Component } from '@angular/core';
  316. +import { IonicPage, NavController, NavParams } from 'ionic-angular/umd';
  317. +
  318. +/**
  319. + * Generated class for the MainMenuPage page.
  320. + *
  321. + * See https://ionicframework.com/docs/components/#navigation for more info on
  322. + * Ionic pages and navigation.
  323. + */
  324. +
  325. +@IonicPage()
  326. +@Component({
  327. + selector: 'page-main-menu',
  328. + templateUrl: 'main-menu.html',
  329. +})
  330. +export class MainMenuPage {
  331. +
  332. + constructor(public navCtrl: NavController, public navParams: NavParams) {
  333. + }
  334. +
  335. + ionViewDidLoad() {
  336. + console.log('ionViewDidLoad MainMenuPage');
  337. + }
  338. +
  339. +}