From 5a2ba9c2e7605bb788bc406184547d22c6436867 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 23 Dec 2024 11:13:27 -0500 Subject: v2.1.0, refactor w/ crimson --- src/web/_views/_modal/about.php | 9 ++ src/web/_views/_modal/new_post.php | 56 +++++++ src/web/_views/_modal/register.php | 178 ++++++++++++++++++++++ src/web/_views/_template/comment.php | 12 ++ src/web/_views/_template/error.php | 12 ++ src/web/_views/_template/modal.php | 14 ++ src/web/_views/_template/post.php | 86 +++++++++++ src/web/_views/_template/posts.php | 32 ++++ src/web/_views/_template/toast.php | 22 +++ src/web/_views/apps/auth/login.php | 87 ----------- src/web/_views/apps/error/main.php | 6 - src/web/_views/apps/home/main.php | 27 ---- src/web/_views/apps/people/card.php | 15 -- src/web/_views/apps/people/footer.php | 3 - src/web/_views/apps/people/header.php | 6 - src/web/_views/apps/people/main.php | 72 --------- src/web/_views/apps/people/people.php | 7 - src/web/_views/apps/profile/main.php | 269 ---------------------------------- src/web/_views/apps/settings/main.php | 200 ------------------------- src/web/_views/auth/main.php | 87 +++++++++++ src/web/_views/error/main.php | 6 + src/web/_views/head.php | 15 +- src/web/_views/header.php | 38 ++--- src/web/_views/home/main.php | 27 ++++ src/web/_views/modal/about.php | 9 -- src/web/_views/modal/new_post.php | 59 -------- src/web/_views/modal/register.php | 178 ---------------------- src/web/_views/people/card.php | 15 ++ src/web/_views/people/footer.php | 3 + src/web/_views/people/header.php | 6 + src/web/_views/people/main.php | 76 ++++++++++ src/web/_views/people/people.php | 5 + src/web/_views/profile/main.php | 269 ++++++++++++++++++++++++++++++++++ src/web/_views/settings/main.php | 197 +++++++++++++++++++++++++ src/web/_views/template/comment.php | 15 -- src/web/_views/template/error.php | 12 -- src/web/_views/template/modal.php | 14 -- src/web/_views/template/post.php | 87 ----------- src/web/_views/template/posts.php | 25 ---- src/web/_views/template/toast.php | 26 ---- 40 files changed, 1127 insertions(+), 1155 deletions(-) create mode 100644 src/web/_views/_modal/about.php create mode 100644 src/web/_views/_modal/new_post.php create mode 100644 src/web/_views/_modal/register.php create mode 100644 src/web/_views/_template/comment.php create mode 100644 src/web/_views/_template/error.php create mode 100644 src/web/_views/_template/modal.php create mode 100644 src/web/_views/_template/post.php create mode 100644 src/web/_views/_template/posts.php create mode 100644 src/web/_views/_template/toast.php delete mode 100644 src/web/_views/apps/auth/login.php delete mode 100644 src/web/_views/apps/error/main.php delete mode 100644 src/web/_views/apps/home/main.php delete mode 100644 src/web/_views/apps/people/card.php delete mode 100644 src/web/_views/apps/people/footer.php delete mode 100644 src/web/_views/apps/people/header.php delete mode 100644 src/web/_views/apps/people/main.php delete mode 100644 src/web/_views/apps/people/people.php delete mode 100644 src/web/_views/apps/profile/main.php delete mode 100644 src/web/_views/apps/settings/main.php create mode 100644 src/web/_views/auth/main.php create mode 100644 src/web/_views/error/main.php create mode 100644 src/web/_views/home/main.php delete mode 100644 src/web/_views/modal/about.php delete mode 100644 src/web/_views/modal/new_post.php delete mode 100644 src/web/_views/modal/register.php create mode 100644 src/web/_views/people/card.php create mode 100644 src/web/_views/people/footer.php create mode 100644 src/web/_views/people/header.php create mode 100644 src/web/_views/people/main.php create mode 100644 src/web/_views/people/people.php create mode 100644 src/web/_views/profile/main.php create mode 100644 src/web/_views/settings/main.php delete mode 100644 src/web/_views/template/comment.php delete mode 100644 src/web/_views/template/error.php delete mode 100644 src/web/_views/template/modal.php delete mode 100644 src/web/_views/template/post.php delete mode 100644 src/web/_views/template/posts.php delete mode 100644 src/web/_views/template/toast.php (limited to 'src/web/_views') diff --git a/src/web/_views/_modal/about.php b/src/web/_views/_modal/about.php new file mode 100644 index 0000000..4bc7a4f --- /dev/null +++ b/src/web/_views/_modal/about.php @@ -0,0 +1,9 @@ + + + diff --git a/src/web/_views/_modal/new_post.php b/src/web/_views/_modal/new_post.php new file mode 100644 index 0000000..aff19a5 --- /dev/null +++ b/src/web/_views/_modal/new_post.php @@ -0,0 +1,56 @@ + + +
+
+
+ +
+ + +
+
+ +
+ +
+ diff --git a/src/web/_views/_modal/register.php b/src/web/_views/_modal/register.php new file mode 100644 index 0000000..2126d0d --- /dev/null +++ b/src/web/_views/_modal/register.php @@ -0,0 +1,178 @@ + + + +
+ + +
+ diff --git a/src/web/_views/_template/comment.php b/src/web/_views/_template/comment.php new file mode 100644 index 0000000..b947ff6 --- /dev/null +++ b/src/web/_views/_template/comment.php @@ -0,0 +1,12 @@ + + +
+ +
+
+ format_name($user)?> + format_date($comment['created'])?> +
+ +
+
diff --git a/src/web/_views/_template/error.php b/src/web/_views/_template/error.php new file mode 100644 index 0000000..2e02cb1 --- /dev/null +++ b/src/web/_views/_template/error.php @@ -0,0 +1,12 @@ + + + + <?=$code . ' - ' . $msg?> + + +
+

+
+
+ + diff --git a/src/web/_views/_template/modal.php b/src/web/_views/_template/modal.php new file mode 100644 index 0000000..8e4545d --- /dev/null +++ b/src/web/_views/_template/modal.php @@ -0,0 +1,14 @@ + + + diff --git a/src/web/_views/_template/post.php b/src/web/_views/_template/post.php new file mode 100644 index 0000000..f7f5de2 --- /dev/null +++ b/src/web/_views/_template/post.php @@ -0,0 +1,86 @@ + + +
+
+ +
+ + format_date($post['created'])?> +
+
+

+ +

+ $post['id'] + ); + if ($post['like_id'] !== NULL) { + $post_attrs['likeId'] = $post['like_id']; + } +?> + + +
+
+ + +
+
+ +
+ $post['id']); + $cdata = $this->comments(); + + $loaded = $cdata['loaded']; + $max = $cdata['max']; + $page_size = $cdata['page_size']; + $total = $post['comment_count']; + + if ($loaded >= $page_size && $page_size < $total) { + echo ilang('action_load_comments', + class: 'action-load-comments btn btn-blend mt', + attrs: array( + 'postId' => $post['id'], + 'loaded' => $loaded, + 'pageSize' => $page_size, + 'commentCount' => $total, + 'commentMax' => $max, + ) + ); + } + + ?> +
+ +
+ +
+ + +
+
+ +
+ + diff --git a/src/web/_views/_template/posts.php b/src/web/_views/_template/posts.php new file mode 100644 index 0000000..4202e67 --- /dev/null +++ b/src/web/_views/_template/posts.php @@ -0,0 +1,32 @@ +
+posts(); + + $loaded = $pdata['loaded']; + $page_size = $pdata['page_size']; + $total = $pdata['total']; + $max = $pdata['max']; + $filterUid = $pdata['filter_uid']; +?> + +
+ + +
+ += $page_size && $page_size < $total) { + echo ilang('action_load_posts', + id: 'action-load-posts', + class: 'btn btn-blend grow mb mt', + attrs: array( + 'loaded' => $loaded, + 'pageSize' => $page_size, + 'postCount' => $total, + 'postMax' => $max, + 'userId' => $filterUid ? json_encode($filterUid) : '' + ) + ); + } +?> +
diff --git a/src/web/_views/_template/toast.php b/src/web/_views/_template/toast.php new file mode 100644 index 0000000..902955c --- /dev/null +++ b/src/web/_views/_template/toast.php @@ -0,0 +1,22 @@ + + + +
+ + +
diff --git a/src/web/_views/apps/auth/login.php b/src/web/_views/apps/auth/login.php deleted file mode 100644 index ac4cd02..0000000 --- a/src/web/_views/apps/auth/login.php +++ /dev/null @@ -1,87 +0,0 @@ - - -
-
-

xssbook

- -
-
-
-
- - -
-
- - -
- 'submit') - )?> - -
-
- 'submit') - )?> -
- -
diff --git a/src/web/_views/apps/error/main.php b/src/web/_views/apps/error/main.php deleted file mode 100644 index bcc6f90..0000000 --- a/src/web/_views/apps/error/main.php +++ /dev/null @@ -1,6 +0,0 @@ - - -
-

- -
diff --git a/src/web/_views/apps/home/main.php b/src/web/_views/apps/home/main.php deleted file mode 100644 index 864034a..0000000 --- a/src/web/_views/apps/home/main.php +++ /dev/null @@ -1,27 +0,0 @@ - - -
- -
-
- - - - -
- -
- - post_controller->index(); ?> -
diff --git a/src/web/_views/apps/people/card.php b/src/web/_views/apps/people/card.php deleted file mode 100644 index 93b1350..0000000 --- a/src/web/_views/apps/people/card.php +++ /dev/null @@ -1,15 +0,0 @@ - - - -
- -
- format_model->name($user)?> - -
-
-
- - - diff --git a/src/web/_views/apps/people/header.php b/src/web/_views/apps/people/header.php deleted file mode 100644 index b1099ec..0000000 --- a/src/web/_views/apps/people/header.php +++ /dev/null @@ -1,6 +0,0 @@ - - -
-

-

-
diff --git a/src/web/_views/apps/people/main.php b/src/web/_views/apps/people/main.php deleted file mode 100644 index ec84ab9..0000000 --- a/src/web/_views/apps/people/main.php +++ /dev/null @@ -1,72 +0,0 @@ - - -
-people(); -?> -
- -= $page_size && $page_size < $total): ?> - $loaded, - 'pageSize' => $page_size, - 'userCount' => $total, - 'userMax' => $max, - 'filterUid' => $filter_uid, - 'filterType' => $filer_type - ) - )?> - - diff --git a/src/web/_views/apps/people/people.php b/src/web/_views/apps/people/people.php deleted file mode 100644 index 5fc0d17..0000000 --- a/src/web/_views/apps/people/people.php +++ /dev/null @@ -1,7 +0,0 @@ - - -view('apps/people/card', array('user' => $user)); - } -?> diff --git a/src/web/_views/apps/profile/main.php b/src/web/_views/apps/profile/main.php deleted file mode 100644 index b2ad496..0000000 --- a/src/web/_views/apps/profile/main.php +++ /dev/null @@ -1,269 +0,0 @@ - - -
-
-
- -
-
- -
-
-
-
- format_model->name($user)?> - -
- main->session && - (!isset($self) || $self['id'] != $user['id']) - ): ?> - - - -
- 0): ?> -
- - - -
-
-
-
- - - - -
-
-
-
-
- post_controller->index(); - ?> -
-
-

- - - - - - - - - - - - - - - - - - - - - -
main->date($user['birth_date'])?>
-

- - - - - - - - - - - - - - - - - - - - - - - - - -
main->date($user['created'])?>
main->date($user['seen'])?>
-
-
- people_controller->content(); - ?> -
-
- people_controller->content(); - ?> -
-
- -
diff --git a/src/web/_views/apps/settings/main.php b/src/web/_views/apps/settings/main.php deleted file mode 100644 index 2033acc..0000000 --- a/src/web/_views/apps/settings/main.php +++ /dev/null @@ -1,200 +0,0 @@ - - - -main->user(); - -function __create_form($user, $col) { - $ph = ucfirst(lang('ph_' . $col)); - $val = $user[$col]; - return "
-
- - -
- - - -
"; -} - -?> - - - -
-
-

-
-

- - - - - - - -
-

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

- -

-
- -
- - -
-
-

-
- -
- - -
-
-
-
diff --git a/src/web/_views/auth/main.php b/src/web/_views/auth/main.php new file mode 100644 index 0000000..9604770 --- /dev/null +++ b/src/web/_views/auth/main.php @@ -0,0 +1,87 @@ + + +
+
+

xssbook

+ +
+
+
+
+ + +
+
+ + +
+ 'submit') + )?> + +
+
+ 'submit') + )?> +
+ +
diff --git a/src/web/_views/error/main.php b/src/web/_views/error/main.php new file mode 100644 index 0000000..bcc6f90 --- /dev/null +++ b/src/web/_views/error/main.php @@ -0,0 +1,6 @@ + + +
+

+ +
diff --git a/src/web/_views/head.php b/src/web/_views/head.php index cca43a1..809ab36 100644 --- a/src/web/_views/head.php +++ b/src/web/_views/head.php @@ -4,23 +4,14 @@ - main->link_js($js); - } - foreach ($css_files as $css) { - echo $this->main->link_css($css); - } - ?> + <?=$title?> - -
diff --git a/src/web/_views/header.php b/src/web/_views/header.php index 7315afb..4ba15ed 100644 --- a/src/web/_views/header.php +++ b/src/web/_views/header.php @@ -1,7 +1,6 @@ main->user(); $this->view('head', $data); ?>
diff --git a/src/web/_views/modal/about.php b/src/web/_views/modal/about.php deleted file mode 100644 index 4bc7a4f..0000000 --- a/src/web/_views/modal/about.php +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/web/_views/modal/new_post.php b/src/web/_views/modal/new_post.php deleted file mode 100644 index 66e6561..0000000 --- a/src/web/_views/modal/new_post.php +++ /dev/null @@ -1,59 +0,0 @@ - - -main->user(); -?> -
-
-
- -
- - -
-
- -
- -
- diff --git a/src/web/_views/modal/register.php b/src/web/_views/modal/register.php deleted file mode 100644 index 5c76fe9..0000000 --- a/src/web/_views/modal/register.php +++ /dev/null @@ -1,178 +0,0 @@ - - - -
- - -
- diff --git a/src/web/_views/people/card.php b/src/web/_views/people/card.php new file mode 100644 index 0000000..7e040ba --- /dev/null +++ b/src/web/_views/people/card.php @@ -0,0 +1,15 @@ + + + +
+ +
+ format_name($user)?> + +
+
+
+ + + diff --git a/src/web/_views/people/header.php b/src/web/_views/people/header.php new file mode 100644 index 0000000..b1099ec --- /dev/null +++ b/src/web/_views/people/header.php @@ -0,0 +1,6 @@ + + +
+

+

+
diff --git a/src/web/_views/people/main.php b/src/web/_views/people/main.php new file mode 100644 index 0000000..c602b2c --- /dev/null +++ b/src/web/_views/people/main.php @@ -0,0 +1,76 @@ + +
+ people(); ?> +
+ + +
+ +
+ += $page_size && $page_size < $total): ?> + $loaded, + 'pageSize' => $page_size, + 'userCount' => $total, + 'userMax' => $max, + 'filterUid' => $filter_uid, + 'filterType' => $filer_type + ) + )?> + + diff --git a/src/web/_views/people/people.php b/src/web/_views/people/people.php new file mode 100644 index 0000000..8726f1d --- /dev/null +++ b/src/web/_views/people/people.php @@ -0,0 +1,5 @@ +view('people/card', array('user' => $user)); +} +?> diff --git a/src/web/_views/profile/main.php b/src/web/_views/profile/main.php new file mode 100644 index 0000000..3e7129c --- /dev/null +++ b/src/web/_views/profile/main.php @@ -0,0 +1,269 @@ + + +
+
+
+ +
+
+ +
+
+
+
+ format_name($user)?> + +
+ + + + +
+ 0): ?> +
+ + + +
+
+
+
+ + + + +
+
+
+
+
+ post_controller->index(); + ?> +
+
+

+ + + + + + + + + + + + + + + + + + + + + +
format_date($user['birth_date'])?>
+

+ + + + + + + + + + + + + + + + + + + + + + + + + +
format_date($user['created'])?>
format_date($user['seen'])?>
+
+
+ people_controller->content(); + ?> +
+
+ people_controller->content(); + ?> +
+
+ +
diff --git a/src/web/_views/settings/main.php b/src/web/_views/settings/main.php new file mode 100644 index 0000000..4401fe1 --- /dev/null +++ b/src/web/_views/settings/main.php @@ -0,0 +1,197 @@ + +
+ + +
+ + + + "; +} + +?> + + + +
+
+

+
+

+ + + + + + + +
+

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

+ +

+
+ +
+ + +
+
+

+
+ +
+ + +
+
+
+
diff --git a/src/web/_views/template/comment.php b/src/web/_views/template/comment.php deleted file mode 100644 index ceac588..0000000 --- a/src/web/_views/template/comment.php +++ /dev/null @@ -1,15 +0,0 @@ - - -load->model('format'); -?> -
- -
-
- name($user)?> - main->date($comment['created'])?> -
- -
-
diff --git a/src/web/_views/template/error.php b/src/web/_views/template/error.php deleted file mode 100644 index 2e02cb1..0000000 --- a/src/web/_views/template/error.php +++ /dev/null @@ -1,12 +0,0 @@ - - - - <?=$code . ' - ' . $msg?> - - -
-

-
-
- - diff --git a/src/web/_views/template/modal.php b/src/web/_views/template/modal.php deleted file mode 100644 index 2a041a7..0000000 --- a/src/web/_views/template/modal.php +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/web/_views/template/post.php b/src/web/_views/template/post.php deleted file mode 100644 index 48f8bb6..0000000 --- a/src/web/_views/template/post.php +++ /dev/null @@ -1,87 +0,0 @@ - - -
-
- -
- - main->date($post['created'])?> -
-
-

- -

-main->user(); - $liked = $post['like_id'] ? 'btn-primary' : ''; - $post_attrs = array( - 'postId' => $post['id'] - ); - if ($post['like_id'] !== NULL) { - $post_attrs['likeId'] = $post['like_id']; - } -?> - - -
-
- - -
-
- -
- $post['id']); - $cdata = $this->comments(); - - $loaded = $cdata['loaded']; - $max = $cdata['max']; - $page_size = $cdata['page_size']; - $total = $post['comment_count']; - - if ($loaded >= $page_size && $page_size < $total) { - ilang('action_load_comments', - class: 'action-load-comments btn btn-blend mt', - attrs: array( - 'postId' => $post['id'], - 'loaded' => $loaded, - 'pageSize' => $page_size, - 'commentCount' => $total, - 'commentMax' => $max, - ) - ); - } - - ?> -
- -
- -
- - -
-
- -
- - diff --git a/src/web/_views/template/posts.php b/src/web/_views/template/posts.php deleted file mode 100644 index ed79688..0000000 --- a/src/web/_views/template/posts.php +++ /dev/null @@ -1,25 +0,0 @@ -
-posts(); - - $loaded = $pdata['loaded']; - $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-blend grow mb mt', - attrs: array( - 'loaded' => $loaded, - 'pageSize' => $page_size, - 'postCount' => $total, - 'postMax' => $max, - 'userId' => $filterUid ? json_encode($filterUid) : '' - ) - ); - } -?> -
diff --git a/src/web/_views/template/toast.php b/src/web/_views/template/toast.php deleted file mode 100644 index 0a6a82f..0000000 --- a/src/web/_views/template/toast.php +++ /dev/null @@ -1,26 +0,0 @@ - - - -
- - -
-- cgit v1.2.3-freya