remove var

src/public/css/common.css

@@ -219,6 +219,7 @@ input.btn:focus {
 .nav-center {
 	position: absolute;
 	left: 50%;
+	top: 0;
 	transform: translateX(-50%);
 	flex: 1;
 	justify-content: center;
@@ -542,6 +543,8 @@ input:not(:placeholder-shown) + label:not(.static) {
 
 input[type=radio] {
 	padding: 3rem !important;
+	width: 1rem !important;
+	outline: none !important;
 }
 
 .radio {

src/public/css/people.css

@@ -14,19 +14,39 @@
 	margin-left: auto;
 	margin-right: auto;
 	padding: 1rem 2rem;
-	display: grid;
+	padding-bottom: 0;
-	grid-template-columns: 1fr 1fr 1fr;
+	flex-direction: row;
-	grid-row-gap: 2rem;
-	grid-auto-rows: 1fr;
-	flex-direction: column;
 	align-items: center;
+	flex-wrap: wrap;
 	max-width: 90rem;
 }
 
+.profile {
+	width: 25rem;
+}
+
+@media(max-width: 1400px) {
+	#people-container {
+		max-width: 70rem;
+	}
+	.profile {
+		width: 25rem;
+	}
+}
+
+@media(max-width: 1000px) {
+	#people-container {
+		max-width: 50rem;
+	}
+	.profile {
+		width: 20rem;
+	}
+}
+
 .profile {
 	margin: 1rem;
 	text-decoration: none;
-	height: 100%;
+	height: fit-content;
 }
 
 .profile:hover {
@@ -44,20 +64,6 @@
 	border-radius: .3rem;
 }
 
-@media(max-width: 1400px) {
-	#people-container {
-		max-width: 90rem;
-		grid-template-columns: 1fr 1fr;
-	}
-}
-
-@media(max-width: 1000px) {
-	#people-container {
-		max-width: 50rem;
-		grid-template-columns: 1fr;
-	}
-}
-
 td:nth-child(1) {
 	font-weight: bold;
 	color: var(--subtext);

src/public/css/profile.css

@@ -0,0 +1,77 @@
+#main-content {
+	display: flex;
+	flex-direction: column;
+	padding: 0;
+}
+
+#profile-header {
+	background-color: var(--surface0);
+	margin-bottom: 2rem;
+}
+
+#profile-header .banner {
+	width: 100%;
+	min-height: 20rem;
+	aspect-ratio: 5;
+}
+
+#profile-header .info .pfp-wrapper .pfp,
+#profile-header .info .pfp-wrapper .pfp img {
+	height: 12.5rem;
+}
+
+#profile-header .info {
+	position: relative;
+	margin-bottom: 6rem;
+}
+
+#profile-header .info .pfp-wrapper {
+	padding: .5rem;
+	background-color: var(--surface0);
+	height: fit-content;
+	border-radius: 100%;
+	position: absolute;
+	top: -2.5rem;
+	left: 2rem;
+}
+
+#profile-header .info .content {
+	margin-left: 17rem;
+	margin-top: 2rem;
+}
+
+#profile-header .info .content .name {
+	font-size: 2rem;
+}
+
+#profile-header > hr {
+	border-bottom: 1px solid var(--surface1);
+	height: 0;
+	margin-bottom: 0;
+}
+
+.options {
+	width: 100%;
+	height: 3rem;
+}
+
+.options .btn {
+	height: 100%;
+	width: 10rem;
+}
+
+.options .btn span {
+	width: 100%;
+	text-align: center;
+}
+
+#tab-posts,
+#post-container {
+	width: 40rem;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#post-container .post {
+	margin-bottom: 1rem;
+}

src/web/_controller/_util/post.php

@@ -61,6 +61,7 @@ class Post_controller extends Controller {
 		$page = $this->request_model->get_int('page', 0);
 		$max = $this->request_model->get_int('max');
 		$offset = $page * $this->page_size;
+		$filter_uid = $this->request_model->get_int('user_id', FALSE);
 
 		$user = $this->main->user();
 		$uid = isset($user) ? $user['id'] : NULL;
@@ -78,6 +79,11 @@ class Post_controller extends Controller {
 				->where('p.id')->le($max);
 		}
 
+		if ($uid) {
+			$query = $query
+				->where('p.user_id')->eq($uid);
+		}
+
 		$posts = $query
 			->order_by('p.id', 'DESC')
 			->limit($this->page_size)
@@ -96,9 +102,16 @@ class Post_controller extends Controller {
 			$this->view('template/post', $data);
 		}
 
-		$pc = $this->db
+		$query = $this->db
 			->select('COUNT(p.id) as pc')
-			->from('api.post p')
+			->from('api.post p');
+
+		if ($uid) {
+			$query = $query
+				->where('p.user_id')->eq($uid);
+		}
+
+		$pc = $query
 			->row()['pc'];
 
 		return array(
@@ -106,6 +119,7 @@ class Post_controller extends Controller {
 			'total' => $pc,
 			'page_size' => $this->page_size,
 			'max' => $max,
+			'filter_uid' => $filter_uid
 		);
 	}
 

src/web/_controller/apps/profile.php

@@ -0,0 +1,35 @@
+<?php /* Copyright (c) 2024 Freya Murphy */
+class Profile_controller extends Controller {
+
+	// the home model
+	private $profile_model;
+
+	// the format model
+	protected $format_model;
+
+	// the post model
+	protected $post_controller;
+
+	function __construct($load) {
+		parent::__construct($load);
+		$this->profile_model = $this->load->model('apps/profile');
+		$this->format_model = $this->load->model('format');
+		$this->post_controller = $this->load->controller('_util/post');
+	}
+
+	public function index(): void {
+		parent::index();
+		$data = $this->profile_model->get_data();
+
+		if (!$data) {
+			$this->error(404);
+		}
+
+		$this->view('header', $data);
+		$this->view('apps/profile/main', $data);
+		$this->view('footer', $data);
+	}
+
+}
+
+?>

src/web/_model/apps/auth.php

@@ -5,7 +5,7 @@ class Auth_model extends Model {
 		parent::__construct($load);
 	}
 
-	public function get_data(): array {
+	public function get_data(): ?array {
 		$data = parent::get_data();
 		$data['title'] = lang('login');
 		return $data;

src/web/_model/apps/error.php

@@ -22,7 +22,7 @@ class Error_model extends Model {
 		}
 	}
 
-	public function get_data(): array {
+	public function get_data(): ?array {
 		$data = parent::get_data();
 		$this->get_msg($data);
 		return $data;

src/web/_model/apps/home.php

@@ -13,7 +13,7 @@ class Home_model extends Model {
 			->rows();
 	}
 
-	public function get_data(): array {
+	public function get_data(): ?array {
 		$data = parent::get_data();
 		$data['title'] = lang('title');
 		$data['posts'] = $this->get_posts();

src/web/_model/apps/people.php

@@ -80,7 +80,7 @@ class People_model extends Model {
 		);
 	}
 
-	public function get_data(): array {
+	public function get_data(): ?array {
 		$data = parent::get_data();
 		$data['title'] = lang('title');
 		return $data;

src/web/_model/apps/profile.php

@@ -0,0 +1,37 @@
+<?php /* Copyright (c) 2024 Freya Murphy */
+class Profile_model extends Model {
+
+	private $request_model;
+
+	function __construct($load) {
+		parent::__construct($load);
+		$this->request_model = $this->load->model('request');
+	}
+
+	public function get_data(): ?array {
+		$uid = $this->request_model->get_int('id', FALSE);
+		if ($uid === FALSE) {
+			if ($this->main->session) {
+				$uid = $this->main->user()['id'];
+			} else {
+				return NULL;
+			}
+		}
+
+		$user = $this->db
+			->select('*')
+			->from('api.user u')
+			->where('u.id')
+			->eq($uid)
+			->row();
+
+		if (!$user) {
+			return NULL;
+		}
+
+		$data = parent::get_data();
+		$data['user'] = $user;
+		$data['title'] = lang('title', sub: [$user['first_name']]);
+		return $data;
+	}
+}

src/web/_views/apps/auth/login.php

@@ -48,7 +48,7 @@
 	</div>
 	<script>
 
-		var onLogin = function(data) {
+		const onLogin = function(data) {
 			let jwt = data.token;
 
 			$.ajax({

src/web/_views/apps/people/main.php

@@ -18,7 +18,7 @@
 	<?php if ($loaded >= $page_size && $page_size < $total): ?>
 		<?=ilang('action_load_users',
 				id: 'action-load-users',
-				class: 'btn btn-line btn-wide mt mb',
+				class: 'btn btn-line btn-wide mb',
 				attrs: array(
 					'loaded' => $loaded,
 					'pageSize' => $page_size,

src/web/_views/apps/profile/main.php

@@ -0,0 +1,37 @@
+<div id="main-content">
+	<div id="profile-header" class="col">
+		<div class="banner image-loading">
+			<img src="/api/rpc/profile_banner?user_id=<?=$user['id']?>">
+		</div>
+		<div class="info row">
+			<div class="pfp-wrapper">
+				<?php $this->view('template/pfp', array('user' => $user)); ?>
+			</div>
+			<div class="col content">
+				<strong class="name"><?=$this->format_model->name($user)?></strong>
+				<span class="dim"><?=lang('joined') . $this->format_model->date($user['created'])?></span>
+			</div>
+		</div>
+		<hr>
+		<div class="row options">
+			<?=ilang('action_posts',
+				sub: [$user['first_name']],
+				class: 'btn'
+			)?>
+			<?=ilang('action_about',
+				sub: [$user['first_name']],
+				class: 'btn'
+			)?>
+			<?=ilang('action_friends',
+				sub: [$user['first_name']],
+				class: 'btn'
+			)?>
+		</div>
+	</div>
+	<div id="#tab-posts">
+		<?php
+			$_GET['user_id'] = $user['id'];
+			$this->post_controller->index();
+		?>
+	</div>
+</div>

src/web/_views/header.php

@@ -1,5 +1,5 @@
 <?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<?php /* vi: syntax=php */ ?>
+<?php /* vim: syntax=php */ ?>
 <?php
 	$self = $this->main->user();
 	$this->view('header_empty', $data);

src/web/_views/modal/register.php

@@ -133,8 +133,8 @@
 	$('#register-form').submit(function(e) {
 		e.preventDefault();
 
-		const form = event.target;
+		let form = event.target;
-		const formFields = form.elements;
+		let formFields = form.elements;
 
 		let first_name = formFields.first_name.value.trim();
 		let last_name = formFields.last_name.value.trim();
@@ -149,7 +149,7 @@
 			return;
 		}
 
-		const onSuccess = () => {
+		const onSuccess = function() {
 			$.ajax({
 				url: '/api/rpc/login',
 				method: 'POST',
@@ -164,8 +164,13 @@
 			url: '/api/user',
 			method: 'POST',
 			data: JSON.stringify({
-				first_name, last_name, username, password,
+				first_name,
-				email, birth_date, gender
+				last_name,
+				username,
+				password,
+				email,
+				birth_date,
+				gender,
 			}),
 			success: onSuccess
 		});

src/web/_views/template/posts.php

@@ -6,16 +6,18 @@
 	$page_size = $pdata['page_size'];
 	$total = $pdata['total'];
 	$max = $pdata['max'];
+	$filterUid = $pdata['filter_uid'];
 
 	if ($loaded >= $page_size && $page_size < $total) {
 		ilang('action_load_posts',
 			id: 'action-load-posts',
-			class: 'btn btn-line btn-wide mb',
+			class: 'btn btn-line btn-wide mb mt',
 			attrs: array(
 				'loaded' => $loaded,
 				'pageSize' => $page_size,
 				'postCount' => $total,
 				'postMax' => $max,
+				'userId' => $filterUid
 			)
 		);
 	}

src/web/config/aesthetic.php

@@ -22,7 +22,6 @@ class Aesthetic {
 			),
 			'home' => array(
 				'js' => [
-					'js/routes/home.js',
 					'js/post.js',
 				],
 				'css' => [
@@ -40,6 +39,15 @@ class Aesthetic {
 					'css/people.css'
 				],
 			),
+			'profile' => array(
+				'js' => [
+					'js/post.js',
+				],
+				'css' => [
+					'css/profile.css',
+					'css/post.css'
+				],
+			),
 		);
 	}
     /**

src/web/config/routes.php

@@ -5,5 +5,6 @@ $routes['home'] = 'apps/home';
 $routes['error'] = 'apps/error';
 $routes['auth'] = 'apps/auth';
 $routes['people'] = 'apps/people';
+$routes['profile'] = 'apps/profile';
 
 $routes[''] = '_index';

src/web/core/_model.php

@@ -24,7 +24,7 @@ abstract class Model {
 	/**
 	 * @returns the base model data
 	 */
-	public function get_data(): array {
+	public function get_data(): ?array {
 		$data = array();
 		$data['self'] = $this->main->user();
 

src/web/helper/lang.php

@@ -26,7 +26,7 @@ function ilang($key,
 	$button = FALSE,
 ) {
 	$text = lang($key . "_text", FALSE, sub: $sub);
-	$tip = lang($key . "_tip", FALSE);
+	$tip = lang($key . "_tip", FALSE, sub: $sub);
 	$icon = lang($key . "_icon", FALSE);
 	$content = lang($key . "_content", FALSE);
 

src/web/lang/en_US/apps/profile.php

@@ -0,0 +1,18 @@
+<?php
+
+$lang['title'] = '%s\'s profile';
+
+$lang['joined'] = 'Joined: ';
+$lang['seen'] = 'Seen: ';
+
+$lang['action_posts_text'] = 'Posts';
+$lang['action_posts_tip'] = 'View %s\'s posts';
+$lang['action_about_text'] = 'About';
+$lang['action_about_tip'] = 'View %s\'s information';
+$lang['action_friends_text'] = 'Friends';
+$lang['action_friends_tip'] = 'View %s\'s friends';
+
+$lang['action_load_posts_text'] = 'Load more posts';
+$lang['action_load_posts_tip'] = 'Load more posts';
+
+?>