Почетна Преглед Помоћ
Пријавите се
SPIN
/
HOSN-app
11
1
Креирај огранак 0
Датотеке Дискусије 3 Захтеви за спајање 0 Вики
Преглед изворни кода

fix navigation issus and show user profile in menu

Carsten Porth пре 6 година
родитељ
402244c28f
комит
172a7b8595
6 измењених фајлова са 65 додато и 8 уклоњено
Један поглед Покажи статистику Diff
  1. 19 4
      app/src/app/app.component.ts
  2. 12 0
      app/src/app/app.html
  3. 31 2
      app/src/app/app.scss
  4. 1 1
      app/src/pages/login/login.ts
  5. 1 1
      app/src/pages/write-tweet/write-tweet.ts
  6. 1 0
      app/src/providers/auth/auth.ts

+ 19 - 4
app/src/app/app.component.ts
Прегледај датотеку 

@@ -2,6 +2,7 @@ import { Component, ViewChild } from '@angular/core';
 
 import { Nav, Platform } from 'ionic-angular';
 
 import { Nav, Platform } from 'ionic-angular';
 
 import { StatusBar } from '@ionic-native/status-bar';
 
 import { StatusBar } from '@ionic-native/status-bar';
 
 import { SplashScreen } from '@ionic-native/splash-screen';
 
 import { SplashScreen } from '@ionic-native/splash-screen';
 
+import { Storage } from '@ionic/storage';
 
 
 
 import { AuthProvider } from '../providers/auth/auth';
 
 import { AuthProvider } from '../providers/auth/auth';
 
 
 
@@ -9,6 +10,8 @@ import { HomePage } from '../pages/home/home';
 
 import { SearchPage } from '../pages/search/search';
 
 import { SearchPage } from '../pages/search/search';
 
 import { SettingsPage } from '../pages/settings/settings';
 
 import { SettingsPage } from '../pages/settings/settings';
 
 import { LoginPage } from '../pages/login/login';
 
 import { LoginPage } from '../pages/login/login';
 
+import { ProfilePage } from '../pages/profile/profile';
 
+import { TwitterApiProvider } from '../providers/twitter-api/twitter-api';
 
 
 
 @Component({
 
 @Component({
 
   templateUrl: 'app.html'
 
   templateUrl: 'app.html'
 
@@ -17,14 +20,16 @@ export class MyApp {
 
   @ViewChild(Nav) nav: Nav;
 
   @ViewChild(Nav) nav: Nav;
 
 
 
   rootPage: any;
 
   rootPage: any;
 
-
 
   pages: Array<{ title: string, icon: string, component: any }>;
 
   pages: Array<{ title: string, icon: string, component: any }>;
 
+  user: any;
 
 
 
   constructor(
 
   constructor(
 
     platform: Platform,
 
     platform: Platform,
 
     statusBar: StatusBar,
 
     statusBar: StatusBar,
 
     splashScreen: SplashScreen,
 
     splashScreen: SplashScreen,
 
-    private authProvider: AuthProvider
 
+    private authProvider: AuthProvider,
 
+    private twitter: TwitterApiProvider,
 
+    private storage: Storage
 
   ) {
 
   ) {
 
     platform.ready().then(() => {
 
     platform.ready().then(() => {
 
       // Okay, so the platform is ready and our plugins are available.
 
       // Okay, so the platform is ready and our plugins are available.
 
@@ -35,6 +40,13 @@ export class MyApp {
 
       splashScreen.hide();
 
       splashScreen.hide();
 
       authProvider.isLoggedIn().then(isLoggedIn => {
 
       authProvider.isLoggedIn().then(isLoggedIn => {
 
         this.rootPage = isLoggedIn ? HomePage : LoginPage;
 
         this.rootPage = isLoggedIn ? HomePage : LoginPage;
 
+        storage.get("userId")
 
+          .then(userId => {
 
+            twitter.fetchUser(userId)
 
+              .then(res => {
 
+                this.user = res;
 
+              });
 
+          });
 
       })
 
       })
 
     });
 
     });
 
 
 
@@ -45,14 +57,17 @@ export class MyApp {
 
     ];
 
     ];
 
   }
 
   }
 
 
 
+  showProfile(userId) {
 
+    this.nav.push(ProfilePage, { userId });
 
+  }
 
+
 
   openPage(page) {
 
   openPage(page) {
 
-    // Reset the content nav to have just this page
 
-    // we wouldn't want the back button to show in this scenario
 
     this.nav.setRoot(page.component);
 
     this.nav.setRoot(page.component);
 
   }
 
   }
 
 
 
   logout() {
 
   logout() {
 
     this.authProvider.logout();
 
     this.authProvider.logout();
 
+    this.nav.setRoot(LoginPage);
 
   }
 
   }
 
 }
 
 }

+ 12 - 0
app/src/app/app.html
Прегледај датотеку 

@@ -6,6 +6,18 @@
 
   </ion-header>
 
   </ion-header>
 
 
 
   <ion-content>
 
   <ion-content>
 
+    <div class="user-info" *ngIf="user" (click)="showProfile(user.id)" menuClose>
 
+      <div class="user-banner" [style.background]="'url('+ user.profile_background_image_url_https +')'">
 
+        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 300 100"
 
+          xml:space="preserve" width="100%" class="svg-triangle">
 
+          <polygon points="0,75  0,100 300,100 300,99" fill="#FFFFFF" />
 
+        </svg>
 
+        <img src="{{ user.profile_image_url_https }}" alt="User" class="user-avatar">
 
+      </div>
 
+      <div class="user-info">
 
+        {{user.name}}<br><span class="handle">@{{user.screen_name}}</span>
 
+      </div>
 
+    </div>
 
     <ion-list>
 
     <ion-list>
 
       <button menuClose ion-item icon-start *ngFor="let page of pages" (click)="openPage(page)">
 
       <button menuClose ion-item icon-start *ngFor="let page of pages" (click)="openPage(page)">
 
         <ion-icon name="{{page.icon}}"></ion-icon>{{page.title}}
 
         <ion-icon name="{{page.icon}}"></ion-icon>{{page.title}}

+ 31 - 2
app/src/app/app.scss
Прегледај датотеку 

@@ -1,6 +1,4 @@
 
 // http://ionicframework.com/docs/theming/
 
 // http://ionicframework.com/docs/theming/
 
-
 
-
 
 // App Global Sass
 
 // App Global Sass
 
 // --------------------------------------------------
 
 // --------------------------------------------------
 
 // Put style rules here that you want to apply globally. These
 
 // Put style rules here that you want to apply globally. These
 
@@ -16,4 +14,35 @@
 
 // automatically applied to the <body> element in the app.
 
 // automatically applied to the <body> element in the app.
 
 .hashtag {
 
 .hashtag {
 
     color: color($colors, primary, base);
 
     color: color($colors, primary, base);
 
+}
 
+
 
+#sideNav {
 
+    .user-info {
 
+        .user-banner {
 
+            position: relative;
 
+            height: 140px;
 
+            margin-bottom: 20px;
 
+            .svg-triangle {
 
+                position: absolute;
 
+                bottom: 0;
 
+            }
 
+            .user-avatar {
 
+                position: absolute;
 
+                bottom: -10px;
 
+                left: 15px;
 
+                border-radius: 50%;
 
+            }
 
+        }
 
+        .user-info {
 
+            padding: 0 15px;
 
+            font-size: 15px;
 
+            font-weight: 500;
 
+            margin-bottom: 10px;
 
+            .handle {
 
+                color: #ababab;
 
+                font-weight: 300;
 
+                font-size: 11px;
 
+            }
 
+        }
 
+    }
 
 }
 
 }

+ 1 - 1
app/src/pages/login/login.ts
Прегледај датотеку 

@@ -32,7 +32,7 @@ export class LoginPage {
 
   login() {
 
   login() {
 
     this.authProvider.login().then(isSuccessfull => {
 
     this.authProvider.login().then(isSuccessfull => {
 
       if (isSuccessfull) {
 
       if (isSuccessfull) {
 
-        this.navCtrl.push(HomePage);
 
+        this.navCtrl.setRoot(HomePage);
 
       } else {
 
       } else {
 
         let alert = this.alertCtrl.create({
 
         let alert = this.alertCtrl.create({
 
           title: 'Login failed',
 
           title: 'Login failed',

+ 1 - 1
app/src/pages/write-tweet/write-tweet.ts
Прегледај датотеку 

@@ -1,5 +1,5 @@
 
 import { Component } from '@angular/core';
 
 import { Component } from '@angular/core';
 
-import { IonicPage, NavController, NavParams, AlertController, LoadingController } from 'ionic-angular';
 
+import { IonicPage, NavController, NavParams, AlertController } from 'ionic-angular';
 
 import { FormBuilder, Validators, FormGroup } from '@angular/forms';
 
 import { FormBuilder, Validators, FormGroup } from '@angular/forms';
 
 import { TwitterApiProvider } from '../../providers/twitter-api/twitter-api';
 
 import { TwitterApiProvider } from '../../providers/twitter-api/twitter-api';

+ 1 - 0
app/src/providers/auth/auth.ts
Прегледај датотеку 

@@ -41,6 +41,7 @@ export class AuthProvider {
 
     .then(result => {
 
     .then(result => {
 
       this.storage.set('accessTokenKey', result.credential["accessToken"]);
 
       this.storage.set('accessTokenKey', result.credential["accessToken"]);
 
       this.storage.set('accessTokenSecret', result.credential["secret"]);
 
       this.storage.set('accessTokenSecret', result.credential["secret"]);
 
+      this.storage.set('userId', result.additionalUserInfo["profile"]["id"]);
 
       return true;
 
       return true;
 
     })
 
     })
 
     .catch(error => {
 
     .catch(error => {