4 files changed, 75 insertions, 81 deletions

diff --git a/src/web/_views/apps/people/card.php b/src/web/_views/apps/people/card.php
index a44b0d4..eda49b5 100644
--- a/src/web/_views/apps/people/card.php
+++ b/src/web/_views/apps/people/card.php
@@ -4,32 +4,12 @@
 	class="card profile"
 	href="/profile?id=<?=$user['id']?>"
 >
-	<div class="row">
-		<?php $this->view('template/pfp', array('user' => $user, 'link' => FALSE)); ?>
+	<div class="col">
+		<?=pfp($user, FALSE)?>
 		<div class="col ml">
 			<strong class=""><?=$this->format_model->name($user)?></strong>
-			<span class="dim"><?=lang('joined') . ' ' . $this->format_model->date($user['created'])?></span>
-			<span class="dim"><?=lang('seen') . ' ' . $this->format_model->date($user['seen'])?></span>
+			<span class="dim"><?=$user['username']?></span>
 		</div>
 	</div>
-	<hr>
-	<table>
-		<tr>
-			<td><?=lang('tbl_username')?></td>
-			<td><?=$user['username']?></td>
-		<tr>
-		<tr>
-			<td><?=lang('tbl_email')?></td>
-			<td><?=$user['email']?></td>
-		<tr>
-		<tr>
-			<td><?=lang('tbl_gender')?></td>
-			<td><?=$user['gender']?></td>
-		<tr>
-		<tr>
-			<td><?=lang('tbl_uid')?></td>
-			<td><?=$user['id']?></td>
-		<tr>
-	</table>
 </a>
 <?
diff --git a/src/web/_views/apps/people/footer.php b/src/web/_views/apps/people/footer.php
new file mode 100644
index 0000000..ff93026
--- /dev/null
+++ b/src/web/_views/apps/people/footer.php
@@ -0,0 +1,3 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?php /* vi: syntax=php */ ?>
+</div>
diff --git a/src/web/_views/apps/people/header.php b/src/web/_views/apps/people/header.php
new file mode 100644
index 0000000..7f3d95b
--- /dev/null
+++ b/src/web/_views/apps/people/header.php
@@ -0,0 +1,6 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?php /* vi: syntax=php */ ?>
+<div id="main-content" class="col">
+	<h1 class="title"><?=lang('title')?></h1>
+	<h3 class="desc"><?=lang('desc')?></h3>
+	<hr>
diff --git a/src/web/_views/apps/people/main.php b/src/web/_views/apps/people/main.php
index 171f25c..deec4c2 100644
--- a/src/web/_views/apps/people/main.php
+++ b/src/web/_views/apps/people/main.php
@@ -1,67 +1,72 @@
 <?php /* Copyright (c) 2024 Freya Murphy */ ?>
 <?php /* vi: syntax=php */ ?>
-<div id="main-content" class="col">
-	<h1 class="title"><?=lang('title')?></h1>
-	<h3 class="desc"><?=lang('desc')?></h3>
-	<hr>
-	<div id="people-container" class="col">
-	<?php
-		$pdata = $this->people();
-	?>
-	</div>
-	<?php
-		$loaded = count($pdata['users']);
-		$page_size = $pdata['page_size'];
-		$total = $pdata['count'];
-		$max = $pdata['max_id'];
-	?>
-	<?php if ($loaded >= $page_size && $page_size < $total): ?>
-		<?=ilang('action_load_users',
-				id: 'action-load-users',
-				class: 'btn btn-line btn-wide mb',
-				attrs: array(
-					'loaded' => $loaded,
-					'pageSize' => $page_size,
-					'userCount' => $total,
-					'userMax' => $max
-				)
-		)?>
-		<script>
+<div id="people-container" class="col">
+<?php
+	$pdata = $this->people();
+?>
+</div>
+<?php
+	$loaded = count($pdata['users']);
+	$page_size = $pdata['page_size'];
+	$total = $pdata['count'];
+	$max = $pdata['max_id'];
+	$filter_uid = $pdata['filter_uid'];
+	$filer_type = $pdata['filter_type'];
+?>
+<?php if ($loaded >= $page_size && $page_size < $total): ?>
+	<?=ilang('action_load_users',
+			id: 'action-load-users',
+			class: 'btn btn-line btn-wide mb',
+			attrs: array(
+				'loaded' => $loaded,
+				'pageSize' => $page_size,
+				'userCount' => $total,
+				'userMax' => $max,
+				'filterUid' => $filter_uid,
+				'filterType' => $filer_type
+			)
+	)?>
+	<script>
 
-			var urlParams = new URLSearchParams(window.location.search).toString();
+		$('#action-load-users').on('click', function() {
+			let me = $(this);
+			let page = me.attr('page');
+			if (!page) {
+				page = '1';
+			}
+			let newPage = Number(page) + 1;
+			me.attr('page', newPage + '');
 
-			$('#action-load-users').on('click', function() {
-				let me = $(this);
-				let page = me.attr('page');
-				if (!page) {
-					page = '1';
-				}
-				let newPage = Number(page) + 1;
-				me.attr('page', newPage + '');
+			let loaded = Number(me.attr('loaded'));
+			let pageSize = Number(me.attr('pageSize'));
+			let userCount = Number(me.attr('userCount'));
+			let userMax = Number(me.attr('userMax'));
 
-				let loaded = Number(me.attr('loaded'));
-				let pageSize = Number(me.attr('pageSize'));
-				let userCount = Number(me.attr('userCount'));
-				let userMax = Number(me.attr('userMax'));
+			let filterType = me.attr('filterType');
+			let filterUid = me.attr('filterUid');
 
-				let url = '/people/people?page=' + page + '&max=' + userMax + '&' + urlParams;
-				$.get(url, function (data) {
-					if (data === '') {
-						me.remove();
-						return;
-					}
+			let url = '/people/people?page=' + page + '&max=' + userMax;
 
-					let container = $('#people-container');
-					container.append(data);
+			if (filterType && filterUid) {
+				url += '&filter=' + filterType + '&uid=' + filterUid;
+			}
+
+			$.get(url, function (data) {
+				if (data === '') {
+					me.remove();
+					return;
+				}
 
-					loaded += pageSize;
-					if (loaded >= userCount) {
-						me.remove();
-					} else {
-						me.attr('loaded', loaded + '');
-					}
-				});
+				let container = $('#people-container');
+				container.append(data);
+
+				loaded += pageSize;
+				if (loaded >= userCount) {
+					me.remove();
+				} else {
+					me.attr('loaded', loaded + '');
+				}
 			});
-		</script>
-	<?php endif ?>
-</div>
+		});
+	</script>
+<?php endif ?>