diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4727fdc..6aeab2a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,6 +11,7 @@ import { ThreadPage } from '../pages/thread/thread';
import { SettingsPage } from '../pages/settings/settings';
import { AboutPage } from '../pages/about/about';
import { ProfilePage } from '../pages/profile/profile';
+import { UserListPage } from '../pages/user-list/user-list';
import { PostComponent } from '../components/post/post';
import { SplashScreen } from '@ionic-native/splash-screen';
@@ -31,6 +32,7 @@ import { ParserPipe } from '../pipes/parser/parser';
SettingsPage,
AboutPage,
ProfilePage,
+ UserListPage,
TimeagoPipe,
NewPostModal,
PostMenu,
@@ -51,6 +53,7 @@ import { ParserPipe } from '../pipes/parser/parser';
SettingsPage,
AboutPage,
ProfilePage,
+ UserListPage,
NewPostModal,
PostMenu
],
diff --git a/src/components/post/post.scss b/src/components/post/post.scss
index 437d298..9e0c2b0 100644
--- a/src/components/post/post.scss
+++ b/src/components/post/post.scss
@@ -1,3 +1,14 @@
post {
-
+ .item-md ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
+ .item-wp ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
+ .item-ios ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
}
diff --git a/src/pages/profile/profile.html b/src/pages/profile/profile.html
index 3e23216..0bc9262 100644
--- a/src/pages/profile/profile.html
+++ b/src/pages/profile/profile.html
@@ -23,7 +23,10 @@
{{ user.name }}
@{{ user.username }}
-
+
+
+ {{ user.follows_you ? "Follows you" : ""}}
+
@@ -33,7 +36,7 @@
-
+
@@ -41,7 +44,7 @@
-
+
diff --git a/src/pages/profile/profile.ts b/src/pages/profile/profile.ts
index e1d7e1c..871461a 100644
--- a/src/pages/profile/profile.ts
+++ b/src/pages/profile/profile.ts
@@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
+import { UserListPage } from '../user-list/user-list';
import * as pnut from 'pnut-butter';
@@ -22,6 +23,7 @@ export class ProfilePage {
private before_id_post: string;
private before_id_stars: string;
private myUsername: string;
+ public activeTab: string = 'posts';
constructor(public navCtrl: NavController, public navParams: NavParams) {
this.user = this.navParams.data.user;
@@ -30,6 +32,8 @@ export class ProfilePage {
ionViewDidLoad() {
console.log('ionViewDidLoad ProfilePage');
+ // console.log(JSON.stringify(this.user));
+ // console.log('-----');
let params = {
include_deleted: 0,
include_raw: 1,
@@ -81,10 +85,13 @@ export class ProfilePage {
if (data[i]['repost_of']) {
data[i] = data[i]['repost_of']
var reposted_by_string = "";
- for (var j = 0; j < data[i]['reposted_by'].length; j++) {
+ let rplen = 0;
+ if (typeof data[i]['reposted_by'] !== "undefined") {
+ rplen = data[i]['reposted_by'].length;
+ }
+ for (var j = 0; j < rplen; j++) {
reposted_by_string = reposted_by_string + data[i]['reposted_by'][j]['username'] + ", ";
}
- // data[i]['reposted_by_string'] = "Reposted by: " + reposted_by_string;
}
if (data[i].content) {
for (var k = 0; k < data[i]['content']['entities']['mentions'].length; k++) {
@@ -100,4 +107,11 @@ export class ProfilePage {
return pdata;
}
+ showUserList(list) {
+ this.navCtrl.push(UserListPage, {
+ userid: this.user.id,
+ username: this.myUsername,
+ list: list});
+ }
+
}
diff --git a/src/pages/thread/thread.scss b/src/pages/thread/thread.scss
index cad6f48..d55beec 100644
--- a/src/pages/thread/thread.scss
+++ b/src/pages/thread/thread.scss
@@ -1,14 +1,14 @@
page-thread {
.item-md ion-avatar img {
- border-radius: 0;
+ border-radius: 10px;
background-color: #e9e9e9;
}
.item-wp ion-avatar img {
- border-radius: 0;
+ border-radius: 10px;
background-color: #e9e9e9;
}
.item-ios ion-avatar img {
- border-radius: 0;
+ border-radius: 10px;
background-color: #e9e9e9;
}
}
diff --git a/src/pages/user-list/user-list.html b/src/pages/user-list/user-list.html
new file mode 100644
index 0000000..b967f84
--- /dev/null
+++ b/src/pages/user-list/user-list.html
@@ -0,0 +1,35 @@
+
+
+
+
+ {{ list }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ user.name }}
+ @{{ user.username }}
+
+
+ {{ user.follows_you ? "Follows you" : ""}}
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/user-list/user-list.scss b/src/pages/user-list/user-list.scss
new file mode 100644
index 0000000..e61f10f
--- /dev/null
+++ b/src/pages/user-list/user-list.scss
@@ -0,0 +1,14 @@
+page-user-list {
+ .item-md ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
+ .item-wp ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
+ .item-ios ion-avatar img {
+ border-radius: 10px;
+ background-color: #e9e9e9;
+ }
+}
diff --git a/src/pages/user-list/user-list.ts b/src/pages/user-list/user-list.ts
new file mode 100644
index 0000000..931b085
--- /dev/null
+++ b/src/pages/user-list/user-list.ts
@@ -0,0 +1,71 @@
+import { Component } from '@angular/core';
+import { NavController, NavParams } from 'ionic-angular';
+import { ProfilePage } from '../../pages/profile/profile';
+
+import * as pnut from 'pnut-butter';
+
+/**
+ * Generated class for the UserListPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@Component({
+ selector: 'page-user-list',
+ templateUrl: 'user-list.html',
+})
+export class UserListPage {
+
+ private list: string;
+ private userid: string;
+ private users: Array