From 1f04b83be337cc91a3fabcf4e574e2306f3d2eaa Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sat, 30 Mar 2024 12:14:42 -0400 Subject: refactor --- web/views/apps/error/main.php | 6 ++++++ web/views/apps/home/main.php | 30 +++++++++++++++++++++++++++ web/views/footer.php | 2 ++ web/views/header.php | 14 +++++++++++-- web/views/modal/new-post.php | 28 ------------------------- web/views/modal/new_post.php | 46 ++++++++++++++++++++++++++++++++++++++++++ web/views/template/comment.php | 2 ++ web/views/template/error.php | 12 +++++++++++ web/views/template/modal.php | 2 ++ web/views/template/pfp.php | 2 ++ web/views/template/post.php | 2 ++ web/views/template/toast.php | 19 +++++++++++++++++ 12 files changed, 135 insertions(+), 30 deletions(-) create mode 100644 web/views/apps/error/main.php create mode 100644 web/views/apps/home/main.php delete mode 100644 web/views/modal/new-post.php create mode 100644 web/views/modal/new_post.php create mode 100644 web/views/template/error.php create mode 100644 web/views/template/toast.php (limited to 'web/views') diff --git a/web/views/apps/error/main.php b/web/views/apps/error/main.php new file mode 100644 index 0000000..81051bd --- /dev/null +++ b/web/views/apps/error/main.php @@ -0,0 +1,6 @@ + + +
+

+ +
diff --git a/web/views/apps/home/main.php b/web/views/apps/home/main.php new file mode 100644 index 0000000..b1c1efc --- /dev/null +++ b/web/views/apps/home/main.php @@ -0,0 +1,30 @@ + + +
+ +
+
+ view('template/pfp', array('user' => $self))?> + + + +
+ +
+ +
+ posts()?> +
+ +
diff --git a/web/views/footer.php b/web/views/footer.php index 6cbe21b..1266b9a 100644 --- a/web/views/footer.php +++ b/web/views/footer.php @@ -1,2 +1,4 @@ + + diff --git a/web/views/header.php b/web/views/header.php index 183f4f4..891e27e 100644 --- a/web/views/header.php +++ b/web/views/header.php @@ -1,10 +1,18 @@ - + + main->user(); ?> + main->link_js($js); @@ -71,4 +79,6 @@ menu.toggleClass('visible'); }); - + +
+
diff --git a/web/views/modal/new-post.php b/web/views/modal/new-post.php deleted file mode 100644 index 7215862..0000000 --- a/web/views/modal/new-post.php +++ /dev/null @@ -1,28 +0,0 @@ -main->user(); -?> -
-
-
- view('template/pfp', array('user' => $user))?> -
- - -
-
- -
-
- 'submit'), - button: TRUE - )?> -
-
diff --git a/web/views/modal/new_post.php b/web/views/modal/new_post.php new file mode 100644 index 0000000..82243fb --- /dev/null +++ b/web/views/modal/new_post.php @@ -0,0 +1,46 @@ + + +main->user(); +?> +
+
+
+ view('template/pfp', array('user' => $user))?> +
+ + +
+
+ +
+
+ 'submit'), + button: TRUE + )?> +
+
+ diff --git a/web/views/template/comment.php b/web/views/template/comment.php index ef7a081..943f232 100644 --- a/web/views/template/comment.php +++ b/web/views/template/comment.php @@ -1,3 +1,5 @@ + +
view('template/pfp', array('user' => $user))?>
diff --git a/web/views/template/error.php b/web/views/template/error.php new file mode 100644 index 0000000..2e02cb1 --- /dev/null +++ b/web/views/template/error.php @@ -0,0 +1,12 @@ + + + + <?=$code . ' - ' . $msg?> + + +
+

+
+
+ + diff --git a/web/views/template/modal.php b/web/views/template/modal.php index 4f47400..e3ce6fe 100644 --- a/web/views/template/modal.php +++ b/web/views/template/modal.php @@ -1,3 +1,5 @@ + +
diff --git a/web/views/template/pfp.php b/web/views/template/pfp.php index 842fc92..aec7318 100644 --- a/web/views/template/pfp.php +++ b/web/views/template/pfp.php @@ -1,3 +1,5 @@ + + diff --git a/web/views/template/post.php b/web/views/template/post.php index d9c7c92..40a3c1d 100644 --- a/web/views/template/post.php +++ b/web/views/template/post.php @@ -1,3 +1,5 @@ + +
view('template/pfp', array('user' => $user))?> diff --git a/web/views/template/toast.php b/web/views/template/toast.php new file mode 100644 index 0000000..1f74602 --- /dev/null +++ b/web/views/template/toast.php @@ -0,0 +1,19 @@ + + + +
+ + +
-- cgit v1.2.3-freya