diff --git a/assets/less/manage/classes/changelog-change.less b/assets/less/manage/classes/changelog-change.less new file mode 100644 index 00000000..cf7e49ee --- /dev/null +++ b/assets/less/manage/classes/changelog-change.less @@ -0,0 +1,47 @@ +.changelog-change { + display: flex; + justify-content: space-between; + align-items: flex-start; + + &__datetime, + &__text { + margin: 2px 5px; + } + + &__text { + font-size: 1.2em; + line-height: 1.5em; + } + + &__tags { + list-style: none; + display: flex; + margin-top: 4px; + } + + &__tag { + padding: 2px 5px; + margin: 1px; + background-color: #444; + border-radius: 2px; + + &--dark { + color: #000; + } + } + + &__contributor { + display: flex; + align-items: center; + } + + &__avatar { + width: 50px; + height: 50px; + } + + &__username { + font-size: 1.2em; + margin: 2px 5px; + } +} diff --git a/assets/less/manage/classes/changelog-tags.less b/assets/less/manage/classes/changelog-tags.less new file mode 100644 index 00000000..67ededc9 --- /dev/null +++ b/assets/less/manage/classes/changelog-tags.less @@ -0,0 +1,27 @@ +.changelog-tags { + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + + &__entry { + margin: 2px; + width: 296px; + } + + &__content { + height: 100%; + padding: 5px; + display: flex; + flex-direction: column; + justify-content: center; + } + + &__text { + font-size: 1.2em; + line-height: 1.5em; + } + + &__description { + font-size: .9em; + } +} diff --git a/assets/less/manage/main.less b/assets/less/manage/main.less index 645d9923..a46c181c 100644 --- a/assets/less/manage/main.less +++ b/assets/less/manage/main.less @@ -30,3 +30,6 @@ body { @import "classes/pagination"; @import "classes/user-listing"; + +@import "classes/changelog-change"; +@import "classes/changelog-tags"; diff --git a/database/2018_07_06_031800_changelog_tables.php b/database/2018_07_06_031800_changelog_tables.php index 73c938cc..0cffd412 100644 --- a/database/2018_07_06_031800_changelog_tables.php +++ b/database/2018_07_06_031800_changelog_tables.php @@ -47,8 +47,10 @@ function migrate_up(PDO $conn): void `tag_name` VARCHAR(255) NOT NULL, `tag_description` TEXT NULL, `tag_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `tag_archived` TIMESTAMP NULL DEFAULT NULL, PRIMARY KEY (`tag_id`), - UNIQUE INDEX `tag_name` (`tag_name`) + UNIQUE INDEX `tag_name` (`tag_name`), + INDEX `tag_archived` (`tag_archived`) ) "); @@ -56,8 +58,8 @@ function migrate_up(PDO $conn): void CREATE TABLE `msz_changelog_change_tags` ( `change_id` INT(10) UNSIGNED NOT NULL, `tag_id` INT(10) UNSIGNED NOT NULL, - INDEX `tag_id_foreign_key` (`tag_id`), - INDEX `change_tag_constraint` (`change_id`, `tag_id`), + INDEX `tag_id_foreign_key` (`tag_id`), + UNIQUE INDEX `change_tag_unique` (`change_id`, `tag_id`), CONSTRAINT `change_id_foreign_key` FOREIGN KEY (`change_id`) REFERENCES `msz_changelog_changes` (`change_id`) diff --git a/public/manage/changelog.php b/public/manage/changelog.php new file mode 100644 index 00000000..11b7df76 --- /dev/null +++ b/public/manage/changelog.php @@ -0,0 +1,369 @@ +getTemplating(); + +$queryOffset = (int)($_GET['o'] ?? 0); + +switch ($_GET['v'] ?? null) { + case 'changes': + $changesTake = 20; + + $changesCount = (int)$db->query(' + SELECT COUNT(`change_id`) + FROM `msz_changelog_changes` + ')->fetchColumn(); + + $getChanges = $db->prepare(' + SELECT + c.`change_id`, c.`change_log`, c.`change_created`, + a.`action_name`, a.`action_colour`, a.`action_class`, + u.`user_id`, u.`username`, + COALESCE(r.`role_colour`, CAST(0x40000000 AS UNSIGNED)) as `user_colour` + FROM `msz_changelog_changes` as c + LEFT JOIN `msz_changelog_actions` as a + ON a.`action_id` = c.`action_id` + LEFT JOIN `msz_users` as u + ON u.`user_id` = c.`user_id` + LEFT JOIN `msz_roles` as r + ON r.`role_id` = u.`display_role` + ORDER BY c.`change_id` DESC + LIMIT :offset, :take + '); + $getChanges->bindValue('take', $changesTake); + $getChanges->bindValue('offset', $queryOffset); + $changes = $getChanges->execute() ? $getChanges->fetchAll(PDO::FETCH_ASSOC) : []; + + $getTags = $db->prepare(' + SELECT + t.`tag_id`, t.`tag_name`, t.`tag_description` + FROM `msz_changelog_change_tags` as ct + LEFT JOIN `msz_changelog_tags` as t + ON t.`tag_id` = ct.`tag_id` + WHERE ct.`change_id` = :change_id + '); + + // grab tags + for ($i = 0; $i < count($changes); $i++) { + $getTags->bindValue('change_id', $changes[$i]['change_id']); + $changes[$i]['tags'] = $getTags->execute() ? $getTags->fetchAll(PDO::FETCH_ASSOC) : []; + } + + echo $tpl->render('@manage.changelog.changes', [ + 'changelog_changes' => $changes, + 'changelog_changes_count' => $changesCount, + 'changelog_offset' => $queryOffset, + 'changelog_take' => $changesTake, + ]); + break; + + case 'change': + $changeId = (int)($_GET['c'] ?? 0); + + if ($_SERVER['REQUEST_METHOD'] === 'POST' && tmp_csrf_verify($_POST['csrf'] ?? '')) { + if (!empty($_POST['change']) && is_array($_POST['change'])) { + if ($changeId > 0) { + $postChange = $db->prepare(' + UPDATE `msz_changelog_changes` + SET `change_log` = :log, + `change_text` = :text, + `action_id` = :action, + `user_id` = :user, + `change_created` = :created + WHERE `change_id` = :change_id + '); + $postChange->bindValue('change_id', $changeId); + } else { + $postChange = $db->prepare(' + INSERT INTO `msz_changelog_changes` + (`change_log`, `change_text`, `action_id`, `user_id`, `change_created`) + VALUES + (:log, :text, :action, :user, :created) + '); + } + + $postChange->bindValue('log', $_POST['change']['log']); + $postChange->bindValue('action', $_POST['change']['action']); + $postChange->bindValue('text', strlen($_POST['change']['text']) + ? $_POST['change']['text'] + : null); + $postChange->bindValue('user', is_numeric($_POST['change']['user']) + ? $_POST['change']['user'] + : null); + $postChange->bindValue('created', strlen($_POST['change']['created']) + ? $_POST['change']['created'] + : null); + $postChange->execute(); + + if ($changeId < 1) { + header('Location: ?v=change&c=' . $db->lastInsertId()); + return; + } + } + + if (!empty($_POST['add_tag']) && is_numeric($_POST['add_tag'])) { + $addTag = $db->prepare('REPLACE INTO `msz_changelog_change_tags` VALUES (:change_id, :tag_id)'); + $addTag->bindValue('change_id', $changeId); + $addTag->bindValue('tag_id', $_POST['add_tag']); + $addTag->execute(); + } + + if (!empty($_POST['remove_tag']) && is_numeric($_POST['remove_tag'])) { + $removeTag = $db->prepare(' + DELETE FROM `msz_changelog_change_tags` + WHERE `change_id` = :change_id + AND `tag_id` = :tag_id + '); + $removeTag->bindValue('change_id', $changeId); + $removeTag->bindValue('tag_id', $_POST['remove_tag']); + $removeTag->execute(); + } + } + + $actions = $db->query(' + SELECT `action_id`, `action_name` + FROM `msz_changelog_actions` + ')->fetchAll(PDO::FETCH_ASSOC); + $tpl->var('changelog_actions', $actions); + + if ($changeId > 0) { + $getChange = $db->prepare(' + SELECT `change_id`, `change_log`, `change_text`, `user_id`, `action_id`, `change_created` + FROM `msz_changelog_changes` + WHERE `change_id` = :change_id + '); + $getChange->bindValue('change_id', $changeId); + $change = $getChange->execute() ? $getChange->fetch(PDO::FETCH_ASSOC) : []; + + if ($change) { + $tpl->var('edit_change', $change); + + $assignedTags = $db->prepare(' + SELECT `tag_id`, `tag_name` + FROM `msz_changelog_tags` + WHERE `tag_id` IN ( + SELECT `tag_id` + FROM `msz_changelog_change_tags` + WHERE `change_id` = :change_id + ) + '); + $assignedTags->bindValue('change_id', $change['change_id']); + $assignedTags = $assignedTags->execute() ? $assignedTags->fetchAll(PDO::FETCH_ASSOC) : []; + + $availableTags = $db->prepare(' + SELECT `tag_id`, `tag_name` + FROM `msz_changelog_tags` + WHERE `tag_id` NOT IN ( + SELECT `tag_id` + FROM `msz_changelog_change_tags` + WHERE `change_id` = :change_id + ) + AND `tag_archived` IS NULL + '); + $availableTags->bindValue('change_id', $change['change_id']); + $availableTags = $availableTags->execute() ? $availableTags->fetchAll(PDO::FETCH_ASSOC) : []; + + $tpl->vars([ + 'edit_change_assigned_tags' => $assignedTags, + 'edit_change_available_tags' => $availableTags, + ]); + } else { + header('Location: ?v=changes'); + return; + } + } + + echo $tpl->render('@manage.changelog.change_edit'); + break; + + case 'tags': + $tagsTake = 32; + + $tagsCount = (int)$db->query(' + SELECT COUNT(`tag_id`) + FROM `msz_changelog_tags` + ')->fetchColumn(); + + $getTags = $db->prepare(' + SELECT + t.`tag_id`, t.`tag_name`, t.`tag_description`, t.`tag_created`, + ( + SELECT COUNT(ct.`change_id`) + FROM `msz_changelog_change_tags` as ct + WHERE ct.`tag_id` = t.`tag_id` + ) as `tag_count` + FROM `msz_changelog_tags` as t + ORDER BY t.`tag_id` ASC + LIMIT :offset, :take + '); + $getTags->bindValue('take', $tagsTake); + $getTags->bindValue('offset', $queryOffset); + $tags = $getTags->execute() ? $getTags->fetchAll(PDO::FETCH_ASSOC) : []; + + echo $tpl->render('@manage.changelog.tags', [ + 'changelog_tags' => $tags, + 'changelog_tags_count' => $tagsCount, + 'changelog_take' => $tagsTake, + 'changelog_offset' => $queryOffset, + ]); + break; + + case 'tag': + $tagId = (int)($_GET['t'] ?? 0); + + if ($_SERVER['REQUEST_METHOD'] === 'POST' && tmp_csrf_verify($_POST['csrf'] ?? '')) { + if (!empty($_POST['tag']) && is_array($_POST['tag'])) { + if ($tagId > 0) { + $updateTag = $db->prepare(' + UPDATE `msz_changelog_tags` + SET `tag_name` = :name, + `tag_description` = :description, + `tag_archived` = :archived + WHERE `tag_id` = :id + '); + $updateTag->bindValue('id', $tagId); + } else { + $updateTag = $db->prepare(' + INSERT INTO `msz_changelog_tags` + (`tag_name`, `tag_description`, `tag_archived`) + VALUES + (:name, :description, :archived) + '); + } + + $updateTag->bindValue('name', $_POST['tag']['name']); + $updateTag->bindValue('description', $_POST['tag']['description']); + $updateTag->bindValue('archived', empty($_POST['tag']['description']) ? null : date('Y-m-d H:i:s')); + $updateTag->execute(); + + if ($tagId < 1) { + header('Location: ?v=tag&t=' . $db->lastInsertId()); + return; + } + } + } + + if ($tagId > 0) { + $getTag = $db->prepare(' + SELECT `tag_id`, `tag_name`, `tag_description`, `tag_archived`, `tag_created` + FROM `msz_changelog_tags` + WHERE `tag_id` = :tag_id + '); + $getTag->bindValue('tag_id', $tagId); + $tag = $getTag->execute() ? $getTag->fetch(PDO::FETCH_ASSOC) : []; + + if ($tag) { + $tpl->var('edit_tag', $tag); + } else { + header('Location: ?v=tags'); + return; + } + } + + echo $tpl->render('@manage.changelog.tag_edit'); + break; + + case 'actions': + $actionTake = 32; + + $actionCount = (int)$db->query(' + SELECT COUNT(`action_id`) + FROM `msz_changelog_actions` + ')->fetchColumn(); + + $getActions = $db->prepare(' + SELECT + a.`action_id`, a.`action_name`, a.`action_colour`, + ( + SELECT COUNT(c.`action_id`) + FROM `msz_changelog_changes` as c + WHERE c.`action_id` = a.`action_id` + ) as `action_count` + FROM `msz_changelog_actions` as a + ORDER BY a.`action_id` ASC + LIMIT :offset, :take + '); + $getActions->bindValue('take', $actionTake); + $getActions->bindValue('offset', $queryOffset); + $actions = $getActions->execute() ? $getActions->fetchAll(PDO::FETCH_ASSOC) : []; + + echo $tpl->render('@manage.changelog.actions', [ + 'changelog_actions' => $actions, + 'changelog_actions_count' => $actionTake, + 'changelog_take' => $actionTake, + 'changelog_offset' => $queryOffset, + ]); + break; + + case 'action': + $actionId = (int)($_GET['a'] ?? 0); + + if ($_SERVER['REQUEST_METHOD'] === 'POST' && tmp_csrf_verify($_POST['csrf'] ?? '')) { + if (!empty($_POST['action']) && is_array($_POST['action'])) { + if ($actionId > 0) { + $updateAction = $db->prepare(' + UPDATE `msz_changelog_actions` + SET `action_name` = :name, + `action_colour` = :colour, + `action_class` = :class + WHERE `action_id` = :id + '); + $updateAction->bindValue('id', $actionId); + } else { + $updateAction = $db->prepare(' + INSERT INTO `msz_changelog_actions` + (`action_name`, `action_colour`, `action_class`) + VALUES + (:name, :colour, :class) + '); + } + + $actionColour = colour_create(); + + if (!empty($_POST['action']['colour']['inherit'])) { + colour_set_inherit($actionColour); + } else { + colour_set_red($actionColour, $_POST['action']['colour']['red']); + colour_set_green($actionColour, $_POST['action']['colour']['green']); + colour_set_blue($actionColour, $_POST['action']['colour']['blue']); + } + + $updateAction->bindValue('name', $_POST['action']['name']); + $updateAction->bindValue('colour', $actionColour); + $updateAction->bindValue('class', $_POST['action']['class']); + $updateAction->execute(); + + if ($actionId < 1) { + header('Location: ?v=action&a=' . $db->lastInsertId()); + return; + } + } + } + + if ($actionId > 0) { + $getAction = $db->prepare(' + SELECT `action_id`, `action_name`, `action_colour`, `action_class` + FROM `msz_changelog_actions` + WHERE `action_id` = :action_id + '); + $getAction->bindValue('action_id', $actionId); + $action = $getAction->execute() ? $getAction->fetch(PDO::FETCH_ASSOC) : []; + + if ($action) { + $tpl->var('edit_action', $action); + } else { + header('Location: ?v=actions'); + return; + } + } + + echo $tpl->render('@manage.changelog.action_edit'); + break; + + default: + header('Location: ?v=changes'); + break; +} diff --git a/public/manage/index.php b/public/manage/index.php index ec82e6d8..c479764b 100644 --- a/public/manage/index.php +++ b/public/manage/index.php @@ -20,7 +20,7 @@ switch ($_GET['v'] ?? null) { echo 'somewhat soon i guess'; break; - case null: + default: header('Location: ?v=overview'); break; } diff --git a/views/manage/changelog/action_edit.twig b/views/manage/changelog/action_edit.twig new file mode 100644 index 00000000..ab5aad47 --- /dev/null +++ b/views/manage/changelog/action_edit.twig @@ -0,0 +1,63 @@ +{% extends '@manage/changelog/master.twig' %} + +{% block content %} +
+
+

+ {% if edit_action is defined %} + Editing {{ edit_action.action_name }} ({{ edit_action.action_id }}) + {% else %} + Adding a new action + {% endif %} +

+ + + + + +

Colour

+ + + + + + + + + +
+ +
+
+
+{% endblock %} diff --git a/views/manage/changelog/actions.twig b/views/manage/changelog/actions.twig new file mode 100644 index 00000000..b2a06281 --- /dev/null +++ b/views/manage/changelog/actions.twig @@ -0,0 +1,25 @@ +{% extends '@manage/changelog/master.twig' %} +{% from '@manage/macros.twig' import pagination %} + +{% block content %} +
+ Create new action +
+ +
+ {% for action in changelog_actions %} + +
+
+ {{ action.action_name }} ({{ action.action_count }}) +
+
+ + {% endfor %} +
+ +
+ {{ pagination(changelog_actions_count, changelog_take, changelog_offset, '?v=actions') }} +
+{% endblock %} diff --git a/views/manage/changelog/change_edit.twig b/views/manage/changelog/change_edit.twig new file mode 100644 index 00000000..78e24a41 --- /dev/null +++ b/views/manage/changelog/change_edit.twig @@ -0,0 +1,108 @@ +{% extends '@manage/changelog/master.twig' %} + +{% block content %} +
+
+

+ {% if edit_change is defined %} + Editing #{{ edit_change.change_id }} + {% else %} + Adding a new change + {% endif %} +

+ + + + + + + + + + + +
+ +
+
+ + {% if edit_change is defined %} +

+ Tags +

+ + {% if edit_change_assigned_tags|length > 0 %} +
+ + +
+ +
+
+ {% endif %} + + {% if edit_change_available_tags|length > 0 %} +
+ + +
+ +
+
+ {% endif %} + {% endif %} +
+{% endblock %} diff --git a/views/manage/changelog/changes.twig b/views/manage/changelog/changes.twig new file mode 100644 index 00000000..055e2864 --- /dev/null +++ b/views/manage/changelog/changes.twig @@ -0,0 +1,54 @@ +{% extends '@manage/changelog/master.twig' %} +{% from '@manage/macros.twig' import pagination %} + +{% block content %} +
+ Create new change +
+ +
+ {% for change in changelog_changes %} + +
+
+
+ {{ change.change_log }} +
+ + + +
    +
  • + {{ change.action_name }} +
    • + + {% for tag in change.tags %} +
  • {{ tag.tag_name }}
    • + {% endfor %} +
+
+ +
+
+ {{ change.username }} +
+ +
+
+
+
+ + {% endfor %} +
+ +
+ {{ pagination(changelog_changes_count, changelog_take, changelog_offset, '?v=changes') }} +
+{% endblock %} diff --git a/views/manage/changelog/master.twig b/views/manage/changelog/master.twig new file mode 100644 index 00000000..b796b165 --- /dev/null +++ b/views/manage/changelog/master.twig @@ -0,0 +1 @@ +{% extends '@manage/master.twig' %} diff --git a/views/manage/changelog/tag_edit.twig b/views/manage/changelog/tag_edit.twig new file mode 100644 index 00000000..ec620836 --- /dev/null +++ b/views/manage/changelog/tag_edit.twig @@ -0,0 +1,97 @@ +{% extends '@manage/changelog/master.twig' %} + +{% block content %} +
+
+

+ {% if edit_tag is defined %} + Editing {{ edit_tag.tag_name }} ({{ edit_tag.tag_id }}) + {% else %} + Adding a new tag + {% endif %} +

+ + + + + + + + {% if edit_tag is defined %} + + {% endif %} + +
+ +
+
+ + {% if edit_change is defined %} +

+ Tags +

+ + {% if edit_change_assigned_tags|length > 0 %} +
+ + +
+ +
+
+ {% endif %} + + {% if edit_change_available_tags|length > 0 %} +
+ + +
+ +
+
+ {% endif %} + {% endif %} +
+{% endblock %} diff --git a/views/manage/changelog/tags.twig b/views/manage/changelog/tags.twig new file mode 100644 index 00000000..1d55c579 --- /dev/null +++ b/views/manage/changelog/tags.twig @@ -0,0 +1,28 @@ +{% extends '@manage/changelog/master.twig' %} +{% from '@manage/macros.twig' import pagination %} + +{% block content %} +
+ Create new tag +
+ +
+ {% for tag in changelog_tags %} + +
+
+ {{ tag.tag_name }} ({{ tag.tag_count }}) +
+ +
+ {{ tag.tag_description }} +
+
+ + {% endfor %} +
+ +
+ {{ pagination(changelog_tags_count, changelog_take, changelog_offset, '?v=tags') }} +
+{% endblock %} diff --git a/views/manage/macros.twig b/views/manage/macros.twig index f1b8a9bc..454eadea 100644 --- a/views/manage/macros.twig +++ b/views/manage/macros.twig @@ -1,9 +1,3 @@ -{% macro link(url, content, class) %} -{% spaceless %} -{{ content|raw }} -{% endspaceless %} -{% endmacro %} - {% macro pagination_segment(url_window, base_url, currentPage) %} {% for page, url in url_window %}
  • diff --git a/views/manage/master.twig b/views/manage/master.twig index 96ef6577..165f1587 100644 --- a/views/manage/master.twig +++ b/views/manage/master.twig @@ -1,5 +1,3 @@ -{% from '@manage/macros.twig' import link %} - {% set menus = [ { 'name': 'general', @@ -96,6 +94,29 @@ ], ], }, + { + 'name': 'changelog', + 'title': 'Changelog', + 'sections': [ + [ + { + 'name': 'changes', + 'title': 'Changes', + 'url': '/manage/changelog.php?v=changes', + }, + { + 'name': 'tags', + 'title': 'Tags', + 'url': '/manage/changelog.php?v=tags', + }, + { + 'name': 'actions', + 'title': 'Actions', + 'url': '/manage/changelog.php?v=actions', + }, + ], + ], + }, ] %} @@ -160,11 +181,20 @@ {% endblock %} + diff --git a/views/mio/changelog/change.twig b/views/mio/changelog/change.twig index 48e801d0..06e0af72 100644 --- a/views/mio/changelog/change.twig +++ b/views/mio/changelog/change.twig @@ -6,6 +6,8 @@ {% if is_valid %} {% set canonical_url = '/changelog.php?c=' ~ change.change_id %} + {% set manage_link = '/manage/changelog.php?v=change&c=' ~ change.change_id %} + {% set description = change.change_log %} {% endif %} {% block content %} @@ -36,7 +38,7 @@
    -
    +
    {{ change.username }}
    diff --git a/views/mio/changelog/master.twig b/views/mio/changelog/master.twig index 187fe3a8..886b1320 100644 --- a/views/mio/changelog/master.twig +++ b/views/mio/changelog/master.twig @@ -1 +1,5 @@ {% extends '@mio/master.twig' %} + +{% if manage_link is not defined %} + {% set manage_link = '/manage/changelog.php' %} +{% endif %} diff --git a/views/mio/master.twig b/views/mio/master.twig index c3d82b17..492006cf 100644 --- a/views/mio/master.twig +++ b/views/mio/master.twig @@ -75,7 +75,6 @@
    {% autoescape false %} - {{ '#'|html_link('Terms of Service', 'footer__links__link') }} | {{ '#'|html_link('Rules', 'footer__links__link') }} | {{ '#'|html_link('Contact', 'footer__links__link') }} | {{ '#'|html_link('Status', 'footer__links__link') }} |