From 932e42edc0f50eec82c079b4c0a2837abdf9185c Mon Sep 17 00:00:00 2001
From: grandeljay <github.jay@grandel.anonaddy.me>
Date: Wed, 23 Feb 2022 22:07:53 +0100
Subject: [PATCH] Combine wishlist create and view

---
 .../js/{wishlist-view.js => wishlists.js}     |  0
 src/classes/page.php                          |  6 +-
 src/pages/wishlist-create.php                 | 55 -------------------
 .../{wishlist-view.php => wishlists.php}      | 53 ++++++++++++++++--
 4 files changed, 50 insertions(+), 64 deletions(-)
 rename src/assets/js/{wishlist-view.js => wishlists.js} (100%)
 delete mode 100644 src/pages/wishlist-create.php
 rename src/pages/{wishlist-view.php => wishlists.php} (54%)

diff --git a/src/assets/js/wishlist-view.js b/src/assets/js/wishlists.js
similarity index 100%
rename from src/assets/js/wishlist-view.js
rename to src/assets/js/wishlists.js
diff --git a/src/classes/page.php b/src/classes/page.php
index 120d4e3c..9155c15a 100644
--- a/src/classes/page.php
+++ b/src/classes/page.php
@@ -208,11 +208,7 @@ class Page
                     Wishlist
                     <i class="dropdown icon"></i>
                     <div class="menu">
-                        <a class="item" href="/?page=wishlist-create">
-                            <i class="list icon"></i>
-                            Create
-                        </a>
-                        <a class="item" href="/?page=wishlist-view">
+                        <a class="item" href="/?page=wishlists">
                             <i class="list icon"></i>
                             View
                         </a>
diff --git a/src/pages/wishlist-create.php b/src/pages/wishlist-create.php
deleted file mode 100644
index 3e666a87..00000000
--- a/src/pages/wishlist-create.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * wishlist.php
- *
- * @author Jay Trees <github.jay@grandel.anonaddy.me>
- */
-
-use wishthis\Page;
-
-$page = new page(__FILE__, 'Create a wishlist');
-
-if (isset($_POST['name'])) {
-    $database->query('INSERT INTO `wishlists`
-        (
-            `user`,
-            `name`,
-            `hash`
-        ) VALUES (
-            ' . $_SESSION['user']['id'] . ',
-            "' . $_POST['name'] . '",
-            "' . sha1(time() . $_SESSION['user']['id'] . $_POST['name']) . '"
-        )
-    ;');
-
-    header('Location: /?page=wishlist-product-add');
-    die();
-}
-
-$page->header();
-$page->navigation();
-?>
-<main>
-    <div class="ui container">
-        <h1 class="ui header"><?= $page->title ?></h1>
-
-        <div class="ui segment">
-            <form class="ui form" method="post">
-                <div class="field">
-                    <label>Name</label>
-                    <input type="text"
-                           name="name"
-                           placeholder="<?= getCurrentSeason() ?>"
-                           value="<?= getCurrentSeason() ?>"
-                    />
-                </div>
-
-                <input class="ui primary button" type="submit" value="Create" />
-            </form>
-        </div>
-    </div>
-</main>
-
-<?php
-$page->footer();
diff --git a/src/pages/wishlist-view.php b/src/pages/wishlists.php
similarity index 54%
rename from src/pages/wishlist-view.php
rename to src/pages/wishlists.php
index 39ec61e3..ed06742a 100644
--- a/src/pages/wishlist-view.php
+++ b/src/pages/wishlists.php
@@ -1,19 +1,39 @@
 <?php
 
 /**
- * Template for viewing wishlists.
+ * Template for wishlists.
  *
  * @author Jay Trees <github.jay@grandel.anonaddy.me>
  */
 
 use wishthis\{Page, User, Wishlist};
 
-$page = new page(__FILE__, 'View wishlist');
+$page = new page(__FILE__, 'Wishlists');
 $page->header();
 $page->navigation();
 
 /**
- * Delete wishlist
+ * Create
+ */
+if (isset($_POST['wishlist-create'], $_POST['name'])) {
+    $database->query('INSERT INTO `wishlists`
+        (
+            `user`,
+            `name`,
+            `hash`
+        ) VALUES (
+            ' . $_SESSION['user']['id'] . ',
+            "' . $_POST['name'] . '",
+            "' . sha1(time() . $_SESSION['user']['id'] . $_POST['name']) . '"
+        )
+    ;');
+
+    header('Location: /?page=wishlist-product-add');
+    die();
+}
+
+/**
+ * Delete
  */
 if (isset($_POST['wishlist_delete_id'])) {
     $database->query('DELETE FROM `wishlists`
@@ -25,9 +45,34 @@ if (isset($_POST['wishlist_delete_id'])) {
     <div class="ui container">
         <h1 class="ui header"><?= $page->title ?></h1>
 
+        <div class="ui segment">
+            <h2 class="ui header">Create</h2>
+            <p>
+                Choose a new name for your wishlist.
+                Here's a suggestion to get you started!
+            </p>
+
+            <form class="ui form" method="post">
+                <div class="field">
+                    <label>Name</label>
+                    <input type="text"
+                           name="name"
+                           placeholder="<?= getCurrentSeason() ?>"
+                           value="<?= getCurrentSeason() ?>"
+                    />
+                </div>
+
+                <input class="ui primary button"
+                       type="submit"
+                       name="wishlist-create"
+                       value="Create"
+                />
+            </form>
+        </div>
+
         <div class="ui horizontal stackable segments">
             <div class="ui segment">
-                <h2 class="ui header">Wishlists</h2>
+                <h2 class="ui header">View</h2>
                 <p>Please select a wishlist to view.</p>
 
                 <div class="field">