shiv-365
/
wyd-on-my-network
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

added menu with disfunctional buttons

Shivam Patel 6 years ago
parent
29e3d1c3d9
commit
98f25a2fe0
29 changed files with 433 additions and 9 deletions
Split View Show Diff Stats
  1. 14
    0
      package-lock.json
  2. 1
    0
      package.json
  3. 15
    1
      src/app/app.component.ts
  4. 3
    0
      src/app/app.module.ts
  5. 2
    0
      src/app/app.scss
  6. 1
    0
      src/index.html
  7. 18
    0
      src/pages/active/active.html
  8. 13
    0
      src/pages/active/active.module.ts
  9. 3
    0
      src/pages/active/active.scss
  10. 25
    0
      src/pages/active/active.ts
  11. 18
    0
      src/pages/history/history.html
  12. 13
    0
      src/pages/history/history.module.ts
  13. 3
    0
      src/pages/history/history.scss
  14. 25
    0
      src/pages/history/history.ts
  15. 4
    5
      src/pages/home/home.html
  16. 16
    0
      src/pages/home/home.module.ts
  17. 8
    0
      src/pages/home/home.ts
  18. 1
    1
      src/pages/list/list.html
  19. 130
    0
      src/pages/loginRegister/register.html
  20. 0
    0
      src/pages/loginRegister/register.ts
  21. 18
    0
      src/pages/notes/notes.html
  22. 13
    0
      src/pages/notes/notes.module.ts
  23. 3
    0
      src/pages/notes/notes.scss
  24. 25
    0
      src/pages/notes/notes.ts
  25. 18
    0
      src/pages/settings/settings.html
  26. 13
    0
      src/pages/settings/settings.module.ts
  27. 3
    0
      src/pages/settings/settings.scss
  28. 25
    0
      src/pages/settings/settings.ts
  29. 2
    2
      src/theme/variables.scss

+ 14
- 0
package-lock.json View File 

@@ -240,6 +240,15 @@
240 240 
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
241 241 
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
242 242 
     },
243 
+    "angular-oauth2-oidc": {
244 
+      "version": "4.0.2",
245 
+      "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-4.0.2.tgz",
246 
+      "integrity": "sha512-ZPBUSOv8w+/nHNVaOiSwkm486eEaCVa013mSOLiiBQhfng9p7zi+8iXCa0LdbvTU3rXc0EGhr26K/N7CrualNA==",
247 
+      "requires": {
248 
+        "jsrsasign": "^8.0.12",
249 
+        "tslib": "^1.9.0"
250 
+      }
251 
+    },
243 252 
     "ansi-regex": {
244 253 
       "version": "2.1.1",
245 254 
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 
@@ -3160,6 +3169,11 @@
3160 3169 
         }
3161 3170 
       }
3162 3171 
     },
3172 
+    "jsrsasign": {
3173 
+      "version": "8.0.12",
3174 
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz",
3175 
+      "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
3176 
+    },
3163 3177 
     "jstransform": {
3164 3178 
       "version": "3.0.0",
3165 3179 
       "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz",

+ 1
- 0
package.json View File 

@@ -26,6 +26,7 @@
26 26 
     "@ionic-native/status-bar": "4.9.1",
27 27 
     "@ionic/pro": "1.0.20",
28 28 
     "@ionic/storage": "2.1.3",
29 
+    "angular-oauth2-oidc": "^4.0.2",
29 30 
     "ionic-angular": "3.9.2",
30 31 
     "ionicons": "3.0.0",
31 32 
     "rxjs": "5.5.11",

+ 15
- 1
src/app/app.component.ts View File 

@@ -5,6 +5,13 @@ import { SplashScreen } from '@ionic-native/splash-screen';
5 5
6 6 
 import { HomePage } from '../pages/home/home';
7 7 
 import { ListPage } from '../pages/list/list';
8 
+import { ActiveConnections } from '../pages/active/active';
9 
+import { History } from '../pages/history/history';
10 
+import { Notes } from '../pages/notes/notes';
11 
+import {SettingsPage} from '../pages/settings/settings'
12 
+
13 
+
14 
+
8 15
9 16 
 @Component({
10 17 
   templateUrl: 'app.html'
 
@@ -17,12 +24,19 @@ export class MyApp {
17 24 
   pages: Array<{title: string, component: any}>;
18 25
19 26 
   constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen) {
27 
+
28 
+
20 29 
     this.initializeApp();
21 30
31 
+
22 32 
     // used for an example of ngFor and navigation
23 33 
     this.pages = [
24 34 
       { title: 'Home', component: HomePage },
25 
-      { title: 'List', component: ListPage }
35 
+      //{ title: 'ListOfLists', component: ListPage },
36 
+      { title: 'Active Connections', component: ActiveConnections },
37 
+      { title: 'History', component: History },
38 
+      { title: 'Notes', component: Notes },
39 
+      {title: 'Settings', component: SettingsPage}
26 40 
     ];
27 41
28 42 
   }

+ 3
- 0
src/app/app.module.ts View File 

@@ -8,6 +8,8 @@ import { ListPage } from '../pages/list/list';
8 8
9 9 
 import { StatusBar } from '@ionic-native/status-bar';
10 10 
 import { SplashScreen } from '@ionic-native/splash-screen';
11 
+import { HttpModule } from '@angular/http';
12 
+
11 13
12 14 
 @NgModule({
13 15 
   declarations: [
 
@@ -17,6 +19,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
17 19 
   ],
18 20 
   imports: [
19 21 
     BrowserModule,
22 
+    HttpModule,
20 23 
     IonicModule.forRoot(MyApp),
21 24 
   ],
22 25 
   bootstrap: [IonicApp],

+ 2
- 0
src/app/app.scss View File 

@@ -14,3 +14,5 @@
14 14 
 // To declare rules for a specific mode, create a child rule
15 15 
 // for the .md, .ios, or .wp mode classes. The mode class is
16 16 
 // automatically applied to the <body> element in the app.
17 
+
18 
+

+ 1
- 0
src/index.html View File 

@@ -45,5 +45,6 @@
45 45 
   <!-- The main bundle js is generated during the build process -->
46 46 
   <script src="build/main.js"></script>
47 47
48 
+
48 49 
 </body>
49 50 
 </html>

+ 18
- 0
src/pages/active/active.html View File 

@@ -0,0 +1,18 @@
1 
+<!--
2 
+  Generated template for the ActivePage page.
3 
+
4 
+  See http://ionicframework.com/docs/components/#navigation for more info on
5 
+  Ionic pages and navigation.
6 
+-->
7 
+<ion-header>
8 
+
9 
+  <ion-navbar>
10 
+    <ion-title>Active</ion-title>
11 
+  </ion-navbar>
12 
+
13 
+</ion-header>
14 
+
15 
+
16 
+<ion-content padding>
17 
+
18 
+</ion-content>

+ 13
- 0
src/pages/active/active.module.ts View File 

@@ -0,0 +1,13 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { IonicPageModule } from 'ionic-angular';
3 
+import { ActivePage } from './active';
4 
+
5 
+@NgModule({
6 
+  declarations: [
7 
+    ActivePage,
8 
+  ],
9 
+  imports: [
10 
+    IonicPageModule.forChild(ActivePage),
11 
+  ],
12 
+})
13 
+export class ActivePageModule {}

+ 3
- 0
src/pages/active/active.scss View File 

@@ -0,0 +1,3 @@
1 
+page-active {
2 
+
3 
+}

+ 25
- 0
src/pages/active/active.ts View File 

@@ -0,0 +1,25 @@
1 
+import { Component } from '@angular/core';
2 
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3 
+
4 
+/**
5 
+ * Generated class for the ActivePage page.
6 
+ *
7 
+ * See https://ionicframework.com/docs/components/#navigation for more info on
8 
+ * Ionic pages and navigation.
9 
+ */
10 
+
11 
+@IonicPage()
12 
+@Component({
13 
+  selector: 'page-active',
14 
+  templateUrl: 'active.html',
15 
+})
16 
+export class ActiveConnections {
17 
+
18 
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
19 
+  }
20 
+
21 
+  ionViewDidLoad() {
22 
+    console.log('ionViewDidLoad ActivePage');
23 
+  }
24 
+
25 
+}

+ 18
- 0
src/pages/history/history.html View File 

@@ -0,0 +1,18 @@
1 
+<!--
2 
+  Generated template for the HistoryPage page.
3 
+
4 
+  See http://ionicframework.com/docs/components/#navigation for more info on
5 
+  Ionic pages and navigation.
6 
+-->
7 
+<ion-header>
8 
+
9 
+  <ion-navbar>
10 
+    <ion-title>History</ion-title>
11 
+  </ion-navbar>
12 
+
13 
+</ion-header>
14 
+
15 
+
16 
+<ion-content padding>
17 
+
18 
+</ion-content>

+ 13
- 0
src/pages/history/history.module.ts View File 

@@ -0,0 +1,13 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { IonicPageModule } from 'ionic-angular';
3 
+import { HistoryPage } from './history';
4 
+
5 
+@NgModule({
6 
+  declarations: [
7 
+    HistoryPage,
8 
+  ],
9 
+  imports: [
10 
+    IonicPageModule.forChild(HistoryPage),
11 
+  ],
12 
+})
13 
+export class HistoryPageModule {}

+ 3
- 0
src/pages/history/history.scss View File 

@@ -0,0 +1,3 @@
1 
+page-history {
2 
+
3 
+}

+ 25
- 0
src/pages/history/history.ts View File 

@@ -0,0 +1,25 @@
1 
+import { Component } from '@angular/core';
2 
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3 
+
4 
+/**
5 
+ * Generated class for the HistoryPage page.
6 
+ *
7 
+ * See https://ionicframework.com/docs/components/#navigation for more info on
8 
+ * Ionic pages and navigation.
9 
+ */
10 
+
11 
+@IonicPage()
12 
+@Component({
13 
+  selector: 'page-history',
14 
+  templateUrl: 'history.html',
15 
+})
16 
+export class History {
17 
+
18 
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
19 
+  }
20 
+
21 
+  ionViewDidLoad() {
22 
+    console.log('ionViewDidLoad HistoryPage');
23 
+  }
24 
+
25 
+}

+ 4
- 5
src/pages/home/home.html View File 

@@ -8,11 +8,10 @@
8 8 
 </ion-header>
9 9
10 10 
 <ion-content padding>
11 
-  <h3>Ionic Menu Starter</h3>
11 
+  <h1>WYD on my network</h1>
12 12
13 
-  <p>
14 
-    If you get lost, the <a href="http://ionicframework.com/docs/v2">docs</a> will show you the way.
15 
-  </p>
16 13
17 
-  <button ion-button secondary menuToggle>Toggle Menu</button>
14 
+  <p>This is the wyds homepage</p>
15 
+
16 
+  <button ion-button secondary menuToggle>Click for Menu</button>
18 17 
 </ion-content>

+ 16
- 0
src/pages/home/home.module.ts View File 

@@ -0,0 +1,16 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { IonicPageModule } from 'ionic-angular';
3 
+import { HomePage } from './home';
4 
+
5 
+@NgModule({
6 
+  declarations: [
7 
+    HomePage
8 
+  ],
9 
+  imports: [
10 
+    IonicPageModule.forChild(HomePage),
11 
+  ],
12 
+  exports: [
13 
+    HomePage
14 
+  ]
15 
+})
16 
+export class HomeModule {}

+ 8
- 0
src/pages/home/home.ts View File 

@@ -7,6 +7,14 @@ import { NavController } from 'ionic-angular';
7 7 
 })
8 8 
 export class HomePage {
9 9
10 
+  tab1Root: any = 'Home';
11 
+  tab2Root: any = 'Active Connections'
12 
+  tab3Root: any = 'History';
13 
+  tab4Root: any = 'Notes';
14 
+  tab5Root: any = 'Settings';
15 
+
16 
+
17 
+
10 18 
   constructor(public navCtrl: NavController) {
11 19
12 20 
   }

+ 1
- 1
src/pages/list/list.html View File 

@@ -3,7 +3,7 @@
3 3 
     <button ion-button menuToggle>
4 4 
       <ion-icon name="menu"></ion-icon>
5 5 
     </button>
6 
-    <ion-title>List</ion-title>
6 
+    <ion-title>Dropdown</ion-title>
7 7 
   </ion-navbar>
8 8 
 </ion-header>
9 9

+ 130
- 0
src/pages/loginRegister/register.html View File 

@@ -0,0 +1,130 @@
1 
+<!DOCTYPE html>
2 
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
3 
+      xmlns:th="http://www.thymeleaf.org">
4 
+
5 
+<head>
6 
+    <meta charset="utf-8" />
7 
+    <meta http-equiv="X-UA-Compatible" content="google-Chrome" />
8 
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
9 
+    <meta name="description" content="User account registration" />
10 
+
11 
+    <title>Registration Page</title>
12 
+
13 
+    <!-- Bootstrap core CSS -->
14 
+    <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
15 
+          rel="stylesheet"
16 
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
17 
+          crossorigin="anonymous" />
18 
+
19 
+    <link th:href="@{css/style.css}" rel="stylesheet" />
20 
+</head>
21 
+
22 
+<body class="gray-bg">
23 
+
24 
+<div class="middle-box text-center loginscreen animated fadeInDown">
25 
+    <div>
26 
+
27 
+        <h4>New User Registration</h4>
28 
+
29 
+        <form autocomplete="off" action="#" th:action="@{/register}"
30 
+              th:object="${user}" method="post" class="m-t" role="form"
31 
+              data-toggle="validator">
32 
+
33 
+
34 
+            <div th:if="${#fields.hasErrors('firstName')}"
35 
+                 th:errors="*{firstName}"
36 
+                 class="validation-message alert alert-danger" role="alert"></div>
37 
+
38 
+            <div th:if="${#fields.hasErrors('lastName')}"
39 
+                 th:errors="*{lastName}"
40 
+                 class="validation-message alert alert-danger" role="alert"></div>
41 
+
42 
+            <div th:if="${#fields.hasErrors('email')}" th:errors="*{email}"
43 
+                 class="validation-message alert alert-danger" role="alert"></div>
44 
+
45 
+            <div class="form-group input-group has-feedback">
46 
+                <label th:if="${#fields.hasErrors('firstName')}"
47 
+                       th:errors="*{firstName}" class="validation-message"></label>
48 
+                <span class="input-group-addon">
49 
+            <span class="glyphicon glyphicon-user"></span>
50 
+          </span>
51 
+
52 
+                <input type="text" th:field="*{firstName}"
53 
+                       placeholder="First Name" class="form-control" required />
54 
+                <span class="glyphicon form-control-feedback"
55 
+                      aria-hidden="true"></span>
56 
+            </div>
57 
+
58 
+            <div class="form-group input-group has-feedback">
59 
+          <span class="input-group-addon">
60 
+            <span class="glyphicon glyphicon-user"></span>
61 
+          </span>
62 
+
63 
+
64 
+                <input type="text" th:field="*{lastName}"
65 
+                       placeholder="Last Name" class="form-control" required />
66 
+                <span class="glyphicon form-control-feedback"
67 
+                      aria-hidden="true"></span>
68 
+            </div>
69 
+
70 
+            <div class="form-group input-group has-feedback">
71 
+          <span class="input-group-addon">
72 
+            <span class="glyphicon glyphicon-envelope"></span>
73 
+          </span>
74 
+                <input type="email" th:field="*{email}"
75 
+                       placeholder="Email Address" class="form-control"
76 
+                       data-error="This email address is invalid" required />
77 
+                <span class="glyphicon form-control-feedback"
78 
+                      aria-hidden="true"></span>
79 
+
80 
+            </div>
81 
+
82 
+            <div class="form-group input-group has-feedback">
83 
+          <span class="input-group-addon">
84 
+            <span class="glyphicon glyphicon-lock"></span>
85 
+          </span>
86 
+                <input name="password" type="password" id="password"
87 
+                       placeholder="Password" class="form-control" required />
88 
+                <span class="glyphicon form-control-feedback"
89 
+                      aria-hidden="true"></span>
90 
+            </div>
91 
+            <div class="form-group input-group has-feedback">
92 
+          <span class="input-group-addon">
93 
+            <span class="glyphicon glyphicon-lock"></span>
94 
+          </span>
95 
+                <input type="password" class="form-control" id="signup-password-confirm" placeholder="Confirm Password" name="ConfirmPassword" data-fv-notempty="true"
96 
+                       data-fv-notempty-message="Please confirm password"
97 
+                       data-fv-identical="true"
98 
+                       data-fv-identical-field="password"
99 
+                       data-fv-identical-message="Both passwords must be identical" />
100 
+
101 
+                <div class="help-block with-errors"></div>
102 
+            </div>
103 
+
104 
+
105 
+
106 
+
107 
+            <button type="submit"
108 
+                    class="btn btn-primary block full-width m-b">Register</button>
109 
+
110 
+        </form>
111 
+
112 
+    </div>
113 
+</div>
114 
+
115 
+<!-- jQuery-->
116 
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
117 
+
118 
+<!-- Bootstrap -->
119 
+<script
120 
+        src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
121 
+        integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
122 
+        crossorigin="anonymous"></script>
123 
+
124 
+<!-- Bootstrap Validator plugin -->
125 
+<script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
126 
+
127 
+
128 
+</body>
129 
+
130 
+</html>

+ 0
- 0
src/pages/loginRegister/register.ts View File


+ 18
- 0
src/pages/notes/notes.html View File 

@@ -0,0 +1,18 @@
1 
+<!--
2 
+  Generated template for the NotesPage page.
3 
+
4 
+  See http://ionicframework.com/docs/components/#navigation for more info on
5 
+  Ionic pages and navigation.
6 
+-->
7 
+<ion-header>
8 
+
9 
+  <ion-navbar>
10 
+    <ion-title>Notes</ion-title>
11 
+  </ion-navbar>
12 
+
13 
+</ion-header>
14 
+
15 
+
16 
+<ion-content padding>
17 
+
18 
+</ion-content>

+ 13
- 0
src/pages/notes/notes.module.ts View File 

@@ -0,0 +1,13 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { IonicPageModule } from 'ionic-angular';
3 
+import { NotesPage } from './notes';
4 
+
5 
+@NgModule({
6 
+  declarations: [
7 
+    NotesPage,
8 
+  ],
9 
+  imports: [
10 
+    IonicPageModule.forChild(NotesPage),
11 
+  ],
12 
+})
13 
+export class NotesPageModule {}

+ 3
- 0
src/pages/notes/notes.scss View File 

@@ -0,0 +1,3 @@
1 
+page-notes {
2 
+
3 
+}

+ 25
- 0
src/pages/notes/notes.ts View File 

@@ -0,0 +1,25 @@
1 
+import { Component } from '@angular/core';
2 
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3 
+
4 
+/**
5 
+ * Generated class for the NotesPage page.
6 
+ *
7 
+ * See https://ionicframework.com/docs/components/#navigation for more info on
8 
+ * Ionic pages and navigation.
9 
+ */
10 
+
11 
+@IonicPage()
12 
+@Component({
13 
+  selector: 'page-notes',
14 
+  templateUrl: 'notes.html',
15 
+})
16 
+export class Notes {
17 
+
18 
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
19 
+  }
20 
+
21 
+  ionViewDidLoad() {
22 
+    console.log('ionViewDidLoad NotesPage');
23 
+  }
24 
+
25 
+}

+ 18
- 0
src/pages/settings/settings.html View File 

@@ -0,0 +1,18 @@
1 
+<!--
2 
+  Generated template for the SettingsPage page.
3 
+
4 
+  See http://ionicframework.com/docs/components/#navigation for more info on
5 
+  Ionic pages and navigation.
6 
+-->
7 
+<ion-header>
8 
+
9 
+  <ion-navbar>
10 
+    <ion-title>Settings</ion-title>
11 
+  </ion-navbar>
12 
+
13 
+</ion-header>
14 
+
15 
+
16 
+<ion-content padding>
17 
+
18 
+</ion-content>

+ 13
- 0
src/pages/settings/settings.module.ts View File 

@@ -0,0 +1,13 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { IonicPageModule } from 'ionic-angular';
3 
+import { SettingsPage } from './settings';
4 
+
5 
+@NgModule({
6 
+  declarations: [
7 
+    SettingsPage,
8 
+  ],
9 
+  imports: [
10 
+    IonicPageModule.forChild(SettingsPage),
11 
+  ],
12 
+})
13 
+export class SettingsPageModule {}

+ 3
- 0
src/pages/settings/settings.scss View File 

@@ -0,0 +1,3 @@
1 
+page-settings {
2 
+
3 
+}

+ 25
- 0
src/pages/settings/settings.ts View File 

@@ -0,0 +1,25 @@
1 
+import { Component } from '@angular/core';
2 
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3 
+
4 
+/**
5 
+ * Generated class for the SettingsPage page.
6 
+ *
7 
+ * See https://ionicframework.com/docs/components/#navigation for more info on
8 
+ * Ionic pages and navigation.
9 
+ */
10 
+
11 
+@IonicPage()
12 
+@Component({
13 
+  selector: 'page-settings',
14 
+  templateUrl: 'settings.html',
15 
+})
16 
+export class Settings {
17 
+
18 
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
19 
+  }
20 
+
21 
+  ionViewDidLoad() {
22 
+    console.log('ionViewDidLoad SettingsPage');
23 
+  }
24 
+
25 
+}

+ 2
- 2
src/theme/variables.scss View File 

@@ -38,7 +38,7 @@ $colors: (
38 38 
   secondary:  #32db64,
39 39 
   danger:     #f53d3d,
40 40 
   light:      #f4f4f4,
41 
-  dark:       #222
41 
+  dark:       rgb(145, 145, 145)
42 42 
 );
43 43
44 44 
 
@@ -70,7 +70,7 @@ $colors: (
70 70 
 // so that the above variables are used and Ionic's
71 71 
 // default are overridden.
72 72
73 
-@import "ionic.theme.default";
73 
+@import "ionic.theme.dark";
74 74
75 75
76 76 
 // Ionicons