Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

detect current user #69

Merged
merged 1 commit into from
May 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/components/comment/comment.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, Input } from '@angular/core';
import { AlertController,
import { App,
AlertController,
NavController,
ActionSheetController,
LoadingController,
Expand Down Expand Up @@ -29,7 +30,8 @@ export class CommentComponent {
private is_voting: boolean = false;
private current_user: string = '';

constructor(private alerts: AlertsProvider,
constructor(private app: App,
private alerts: AlertsProvider,
private steemActions: SteeemActionsProvider,
private navCtrl: NavController,
private modalCtrl: ModalController,
Expand Down Expand Up @@ -147,9 +149,24 @@ export class CommentComponent {
* @param {String} author: author of the post
*/
private openProfile(author: string): void {
this.navCtrl.push('AuthorProfilePage', {
author: author
});
if (this.steemConnect.user_object !== undefined) {
if ((this.steemConnect.user_object as any).user == author) {
this.app.getRootNav().push('ProfilePage', {
author: (this.steemConnect.user_object as any).user
});
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}

}

/**
Expand Down
30 changes: 24 additions & 6 deletions src/components/user-item/user-item.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Component, Input } from '@angular/core';
import { UtilProvider } from 'providers/util/util';
import { SteeemActionsProvider } from 'providers/steeem-actions/steeem-actions';
import { NavController } from 'ionic-angular';
import { App, NavController } from 'ionic-angular';
import { AlertsProvider } from 'providers/alerts/alerts';
import { SteemConnectProvider } from 'providers/steemconnect/steemconnect';

/**
* Class for user item
Expand All @@ -20,9 +21,11 @@ export class UserItemComponent {
@Input('item') private item: any;
private is_loading: boolean = false;

constructor(public util: UtilProvider,
constructor(private app: App,
public util: UtilProvider,
private steemActions: SteeemActionsProvider,
private alerts: AlertsProvider,
private steemConnect: SteemConnectProvider,
private navCtrl: NavController) {}

/**
Expand Down Expand Up @@ -62,10 +65,25 @@ export class UserItemComponent {
* Method to open author profile page
* @param {String} author: author of the post
*/
private openProfile(): void {
this.navCtrl.push('AuthorProfilePage', {
author: this.item.name
})
private openProfile(author: string): void {
if (this.steemConnect.user_object !== undefined) {
if ((this.steemConnect.user_object as any).user == author) {
this.app.getRootNav().push('ProfilePage', {
author: (this.steemConnect.user_object as any).user
});
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}

}

}
35 changes: 24 additions & 11 deletions src/pages/follow-list/follow-list.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, MenuController } from 'ionic-angular';
import { App, IonicPage, NavController, NavParams, MenuController } from 'ionic-angular';
import { SteemiaProvider } from 'providers/steemia/steemia';
import { UtilProvider } from 'providers/util/util';
import { SteemConnectProvider } from 'providers/steemconnect/steemconnect';

/**
* Following/followers page
Expand All @@ -24,10 +25,12 @@ export class FollowListPage {
private loading: boolean = true;
private is_more_post: boolean = true;

constructor(public navCtrl: NavController,
constructor(private app: App,
public navCtrl: NavController,
public navParams: NavParams,
public menu: MenuController,
private util: UtilProvider,
private steemConnect: SteemConnectProvider,
private steemiaProvider: SteemiaProvider) {

}
Expand Down Expand Up @@ -81,13 +84,23 @@ export class FollowListPage {
* @param {String} author: author of the post
*/
private openProfile(author: string): void {
this.navCtrl.push('AuthorProfilePage', {
author: author
});
}

doInfinite(event) {
this.fetchData(event);
if (this.steemConnect.user_object !== undefined) {
if ((this.steemConnect.user_object as any).user == author) {
this.app.getRootNav().push('ProfilePage', {
author: (this.steemConnect.user_object as any).user
});
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}

}

}
}
31 changes: 25 additions & 6 deletions src/pages/modals/votes/votes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import { IonicPage,
import { App,
IonicPage,
ViewController,
NavController,
NavParams,
Expand All @@ -9,6 +10,7 @@ import { SteemiaProvider } from 'providers/steemia/steemia';
import { UtilProvider } from 'providers/util/util';
import { SettingsProvider } from 'providers/settings/settings';
import { Subscription } from 'rxjs';
import { SteemConnectProvider } from 'providers/steemconnect/steemconnect';

@IonicPage({
priority: 'medium'
Expand All @@ -30,7 +32,9 @@ export class VotesPage {
chosenTheme: string;
subs: Subscription;

constructor(public navCtrl: NavController,
constructor(private app: App,
private steemConnect: SteemConnectProvider,
public navCtrl: NavController,
public navParams: NavParams,
public util: UtilProvider,
private _settings: SettingsProvider,
Expand Down Expand Up @@ -97,14 +101,29 @@ export class VotesPage {
this.viewCtrl.dismiss();
}

/**
/**
* Method to open author profile page
* @param {String} author: author of the post
*/
private openProfile(author: string): void {
this.navCtrl.push('AuthorProfilePage', {
author: author
})
if (this.steemConnect.user_object !== undefined) {
if ((this.steemConnect.user_object as any).user == author) {
this.app.getRootNav().push('ProfilePage', {
author: (this.steemConnect.user_object as any).user
});
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}

}

}
30 changes: 24 additions & 6 deletions src/pages/post-single/post-single.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, NgZone, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core';
import {
import {
App,
IonicPage,
NavController,
NavParams,
Expand Down Expand Up @@ -53,7 +54,8 @@ export class PostSinglePage {

private commentsTree: Array<any> = [];

constructor(private zone: NgZone,
constructor(private app: App,
private zone: NgZone,
private cdr: ChangeDetectorRef,
public navCtrl: NavController,
public navParams: NavParams,
Expand Down Expand Up @@ -162,11 +164,27 @@ export class PostSinglePage {

/**
* Method to open author profile page
* @param {String} author: author of the post
*/
private openProfile(): void {
this.navCtrl.push(AuthorProfilePage, {
author: this.post.author
});
private openProfile(author: string): void {
if (this.steemConnect.user_object !== undefined) {
if ((this.steemConnect.user_object as any).user == author) {
this.app.getRootNav().push('ProfilePage', {
author: (this.steemConnect.user_object as any).user
});
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}
}
else {
this.app.getRootNav().push('AuthorProfilePage', {
author: author
});
}

}

/**
Expand Down