From b6ae609ee3186148836f96260aa203202f230d6a Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 5 Apr 2024 12:58:11 -0400 Subject: follow ppl --- src/web/_model/apps/people.php | 6 +- src/web/_model/apps/profile.php | 28 ++++ src/web/_views/apps/home/main.php | 2 +- src/web/_views/apps/profile/main.php | 254 +++++++++++++++++++++++++---------- src/web/helper/lang.php | 4 + src/web/lang/en_US/apps/profile.php | 9 ++ 6 files changed, 227 insertions(+), 76 deletions(-) (limited to 'src/web') diff --git a/src/web/_model/apps/people.php b/src/web/_model/apps/people.php index ade59d3..4287094 100644 --- a/src/web/_model/apps/people.php +++ b/src/web/_model/apps/people.php @@ -24,13 +24,15 @@ class People_model extends Model { case 'follower': { $query = $query ->join('admin.follow f', 'f.follower_id = u.id AND f.followee_id', 'INNER') - ->eq($filter_uid); + ->eq($filter_uid) + ->where('f.value = TRUE'); } break; case 'followee': { $query = $query ->join('admin.follow f', 'f.followee_id = u.id AND f.follower_id', 'INNER') - ->eq($filter_uid); + ->eq($filter_uid) + ->where('f.value = TRUE'); } break; } } diff --git a/src/web/_model/apps/profile.php b/src/web/_model/apps/profile.php index 592fbcb..97b0150 100644 --- a/src/web/_model/apps/profile.php +++ b/src/web/_model/apps/profile.php @@ -29,8 +29,36 @@ class Profile_model extends Model { return NULL; } + $following = FALSE; + $followed = FALSE; + $follow_id = NULL; + + if ($this->main->session) { + $sid = $this->main->user()['id']; + $res = $this->db->select('f.value, f.id') + ->from('admin.follow f') + ->where('f.follower_id') + ->eq($sid) + ->where('f.followee_id') + ->eq($uid) + ->row(); + $following = $res ? $res['value'] : FALSE; + $follow_id = $res ? $res['id'] : NULL; + $res = $this->db->select('f.value') + ->from('admin.follow f') + ->where('f.follower_id') + ->eq($uid) + ->where('f.followee_id') + ->eq($sid) + ->row(); + $followed = $res ? $res['value'] : FALSE; + } + $data = parent::get_data(); $data['user'] = $user; + $data['following'] = $following; + $data['followed'] = $followed; + $data['follow_id'] = $follow_id; $data['title'] = lang('title', sub: [$user['first_name']]); return $data; } diff --git a/src/web/_views/apps/home/main.php b/src/web/_views/apps/home/main.php index 735e3d8..60c3eb9 100644 --- a/src/web/_views/apps/home/main.php +++ b/src/web/_views/apps/home/main.php @@ -1,6 +1,6 @@ -
+
diff --git a/src/web/_views/apps/profile/main.php b/src/web/_views/apps/profile/main.php index e3d65b5..6671d87 100644 --- a/src/web/_views/apps/profile/main.php +++ b/src/web/_views/apps/profile/main.php @@ -8,9 +8,116 @@
-
- format_model->name($user)?> - +
+
+
+ format_model->name($user)?> + +
+ +
+ + + + +
+ + +
0): ?>
@@ -43,78 +150,79 @@
-
+
+
+ post_controller->index(); + ?> +
+
+

+ + + + + + + + + + + + + + + + + + + + + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
post_controller->index(); + $_GET['filter'] = 'follower'; + $_GET['uid'] = $user['id']; + $this->people_controller->content(); ?> -
-
-

- - - - - - - - - - - - - - - - - - - - - -
-

- - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- people_controller->content(); - ?> -
-
- people_controller->content(); - ?> -
+
+
+ people_controller->content(); + ?> +