From a0640ebf9ae535f3bab1f3fb0ce09f2e57fb7d42 Mon Sep 17 00:00:00 2001 From: daichimarukana Date: Tue, 22 Aug 2023 23:07:46 +0900 Subject: [PATCH] uwuzu version 1.2.9 --- css/home.css | 181 +++++++++++++++++------- img/sysimage/menuicon/addemoji.svg | 5 + img/sysimage/menuicon/addnotice.svg | 5 + img/sysimage/menuicon/emoji.svg | 5 + img/sysimage/menuicon/home.svg | 6 + img/sysimage/menuicon/logout.svg | 5 + img/sysimage/menuicon/notification.svg | 7 + img/sysimage/menuicon/notification2.svg | 10 ++ img/sysimage/menuicon/others.svg | 5 + img/sysimage/menuicon/profile.svg | 5 + img/sysimage/menuicon/search.svg | 5 + img/sysimage/menuicon/settings.svg | 6 + nextpage/nextpage.php | 1 + nextpage/notification.php | 2 +- nextpage/searchpage.php | 1 + nextpage/ueusepage.php | 1 + nextpage/userpage.php | 1 + nextpage/view.php | 7 + require/botbox.php | 10 +- require/leftbox.php | 20 +-- server/uwuzuabout.txt | 2 +- server/uwuzuinfo.txt | 4 +- server/uwuzurelease.txt | 6 + user/index.php | 2 +- 24 files changed, 230 insertions(+), 72 deletions(-) create mode 100644 img/sysimage/menuicon/addemoji.svg create mode 100644 img/sysimage/menuicon/addnotice.svg create mode 100644 img/sysimage/menuicon/emoji.svg create mode 100644 img/sysimage/menuicon/home.svg create mode 100644 img/sysimage/menuicon/logout.svg create mode 100644 img/sysimage/menuicon/notification.svg create mode 100644 img/sysimage/menuicon/notification2.svg create mode 100644 img/sysimage/menuicon/others.svg create mode 100644 img/sysimage/menuicon/profile.svg create mode 100644 img/sysimage/menuicon/search.svg create mode 100644 img/sysimage/menuicon/settings.svg diff --git a/css/home.css b/css/home.css index 60f5562..5a0d7f0 100644 --- a/css/home.css +++ b/css/home.css @@ -313,7 +313,7 @@ body{ cursor: pointer; border: none; display: block; - width:70%; + width:80%; margin: 16px; padding: 8px auto; margin-left: auto; @@ -341,11 +341,11 @@ body{ background-color: #FFC832; color: #FFFAE6; box-shadow:0 0px 48px 0 rgba(0, 0, 0, .2); - width:75%; + width:85%; } .leftbutton_on:active{ box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); - width:65%; + width:75%; } .leftbutton{ @@ -353,13 +353,13 @@ body{ cursor: pointer; border: none; display: flex; - width:70%; + width:80%; margin: 16px; padding: 8px auto; margin-left: auto; margin-right: auto; - padding-left: 16px; + padding-left: 12px; padding-top: 8px; padding-bottom: 8px; @@ -381,11 +381,11 @@ body{ background-color: #FFC832; color: #FFFAE6; box-shadow:0 0px 48px 0 rgba(0, 0, 0, .2); - width:75%; + width:85%; } .leftbutton:active{ box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); - width:65%; + width:75%; } .leftbutton .notipod{ @@ -421,6 +421,32 @@ body{ color:#FF4444; } +.leftbutton img{ + width: 32px; + height: 32px; + margin-left: 0px; + margin-right: 0px; + margin-top: auto; + margin-bottom: auto; + vertical-align: middle; + background-color: #ffbc0d; +} +.leftbutton:hover img{ + background-color: #FFF; +} + +svg { + width: 32px; + height: 32px; + margin-left: 0px; + margin-right: 6px; + margin-top: auto; + margin-bottom: auto; + vertical-align: middle; + fill: currentColor; +} + + main{ height: 95dvh; overflow: auto; @@ -461,6 +487,7 @@ main h1{ .userheader .icon{ margin-left: 24px; + margin-right: 24px; display: flex; width: auto; } @@ -476,9 +503,10 @@ main h1{ } .userheader h2{ + word-wrap: break-word; margin-left: 12px; margin-top: auto; - margin-bottom: auto; + margin-bottom: 12px; color:#252525; font-size: 32px; font-family: 'BIZ UDPGothic', sans-serif; @@ -486,6 +514,7 @@ main h1{ } .userheader p{ + word-wrap: break-word; margin-left: 12px; margin-right: auto; margin-top: auto; @@ -509,6 +538,24 @@ main h1{ font-family: 'BIZ UDPGothic', sans-serif; font-weight: bold; } +.userheader .profile p img{ + vertical-align: middle; + margin-top: auto; + margin-bottom: auto; + margin-left: 4px; + margin-right: 4px; + height: 28px; +} +.userheader .profile p a{ + margin-top: auto; + margin-bottom: auto; + margin-left: auto; + font-size: 16px; + color:#4e4428; + text-decoration: none; + font-family: 'BIZ UDPGothic', sans-serif; + font-weight: bold; +} .userheader .roleboxes{ margin-left: 180px; @@ -2517,7 +2564,6 @@ label>input { font-family: 'BIZ UDPGothic', sans-serif; font-weight: bold; } - hr{ height: 0; margin-top: 12px; @@ -2570,6 +2616,33 @@ hr{ display: none; } +.checkicon { + display: block; + text-align: center; + width: 25px; + height: 25px; + margin-left: 8px; + margin-right: 8px; + margin-top: auto; + margin-bottom: auto; + background-color: #FFC832; + border-radius: 50%; + transition: all 250ms ease-out; +} + +.check { + display: inline-block; + margin-right: 2px; + margin-bottom: 2px; + margin-left: 1px; + content: ''; + width: 10px; + height: 5px; + border-left: 3px solid #ffffff; + border-bottom: 3px solid #ffffff; + transform: rotate(-45deg); +} + /*------------------------------------------------------------------------------------------------------------*/ /*--------------------------------------------------スマホ向け--------------------------------------------------*/ /*--------------------------------------------------ここから--------------------------------------------------*/ @@ -2604,8 +2677,28 @@ hr{ flex-wrap : wrap; } + .userheader .icon{ + margin-right: 24px; + } + .userheader .icon h2{ + word-wrap: break-word; + margin-left:0px; + display: flex; + padding: 0px; + flex-wrap : wrap; + } + + .userheader .icon p{ + word-wrap: break-word; + margin-top: 12px; + margin-left:0px; + display: flex; + padding: 0px; + flex-wrap : wrap; + } + main{ - height: 88dvh; + height: 90dvh; overflow: auto; border-radius: 0px; margin-top: 0px; @@ -2700,13 +2793,17 @@ hr{ .botbox{ display: block; + margin-bottom: 0px; + margin-top: 0px; } .botbox .lbtnzone{ display: flex; - width: 90%; + width: 100%; + margin-top: 0px; margin-left: auto; margin-right: auto; + margin-bottom: 0px; } @@ -2714,18 +2811,19 @@ hr{ cursor: pointer; border: none; display: block; - width:28%; + width:25%; margin: 16px; padding: 8px auto; height: auto; - margin-left: 12px; - margin-right: 12px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + background-color: none; + padding-top: 1.9dvh; + padding-bottom: 1.9dvh; - padding-top: 14px; - padding-bottom: 14px; - background-color: #FFFFFF; - - border-radius: 50px; + border-radius: 0px; color:#FFC832; font-size: 16px; font-family: 'Zen Maru Gothic', sans-serif; @@ -2735,46 +2833,25 @@ hr{ transition: box-shadow 250ms ease-in-out; transition: width 250ms ease-out; transition: all 250ms ease-out; - box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); - border: 1px solid #FFC832; + box-shadow:none; + border: none; } .btmbutton:hover{ background-color: #FFC832; color: #FFFAE6; - box-shadow:0 0px 48px 0 rgba(0, 0, 0, .2); - width:29%; + box-shadow:none; } .btmbutton:active{ - box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); - width:27%; + box-shadow:none; } - - .btmbutton_on{ - cursor: pointer; - border: none; - display: block; - width:28%; - margin: 16px; - padding: 8px auto; - height: auto; - margin-left: 12px; - margin-right: 12px; - - padding-top: 14px; - padding-bottom: 14px; - background-color: #FFFFFF; - border-radius: 50px; - color:#FF4444; - font-size: 16px; - font-family: 'Zen Maru Gothic', sans-serif; - font-weight: normal; - text-decoration:none; - text-align: center; - transition: box-shadow 250ms ease-in-out; - transition: width 250ms ease-out; - transition: all 250ms ease-out; - box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); - border: 1px solid #FFC832; + svg { + width: 6dvh; + height: 6dvh; + margin-left: auto; + margin-right: auto; + margin-top: auto; + margin-bottom: auto; + fill: currentColor; } diff --git a/img/sysimage/menuicon/addemoji.svg b/img/sysimage/menuicon/addemoji.svg new file mode 100644 index 0000000..3632427 --- /dev/null +++ b/img/sysimage/menuicon/addemoji.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/addnotice.svg b/img/sysimage/menuicon/addnotice.svg new file mode 100644 index 0000000..5cecec4 --- /dev/null +++ b/img/sysimage/menuicon/addnotice.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/emoji.svg b/img/sysimage/menuicon/emoji.svg new file mode 100644 index 0000000..b0a92c9 --- /dev/null +++ b/img/sysimage/menuicon/emoji.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/home.svg b/img/sysimage/menuicon/home.svg new file mode 100644 index 0000000..d39832e --- /dev/null +++ b/img/sysimage/menuicon/home.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/img/sysimage/menuicon/logout.svg b/img/sysimage/menuicon/logout.svg new file mode 100644 index 0000000..619ddec --- /dev/null +++ b/img/sysimage/menuicon/logout.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/notification.svg b/img/sysimage/menuicon/notification.svg new file mode 100644 index 0000000..8c72b8f --- /dev/null +++ b/img/sysimage/menuicon/notification.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/img/sysimage/menuicon/notification2.svg b/img/sysimage/menuicon/notification2.svg new file mode 100644 index 0000000..1a234dd --- /dev/null +++ b/img/sysimage/menuicon/notification2.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/img/sysimage/menuicon/others.svg b/img/sysimage/menuicon/others.svg new file mode 100644 index 0000000..31f7ca2 --- /dev/null +++ b/img/sysimage/menuicon/others.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/profile.svg b/img/sysimage/menuicon/profile.svg new file mode 100644 index 0000000..1164a12 --- /dev/null +++ b/img/sysimage/menuicon/profile.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/search.svg b/img/sysimage/menuicon/search.svg new file mode 100644 index 0000000..6a0b76e --- /dev/null +++ b/img/sysimage/menuicon/search.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/sysimage/menuicon/settings.svg b/img/sysimage/menuicon/settings.svg new file mode 100644 index 0000000..bd62ce3 --- /dev/null +++ b/img/sysimage/menuicon/settings.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/nextpage/nextpage.php b/nextpage/nextpage.php index bdab2c8..d139b0b 100644 --- a/nextpage/nextpage.php +++ b/nextpage/nextpage.php @@ -86,6 +86,7 @@ if (!empty($pdo)) { if ($userData) { $message['username'] = $userData['username']; + $message['role'] = $userData['role']; } } diff --git a/nextpage/notification.php b/nextpage/notification.php index 17da682..aa62e22 100644 --- a/nextpage/notification.php +++ b/nextpage/notification.php @@ -27,7 +27,7 @@ try { $userid = htmlentities($_GET['userid']); -$itemsPerPage = 30; // 1ページあたりの投稿数 +$itemsPerPage = 15; // 1ページあたりの投稿数 $pageNumber = htmlentities(isset($_GET['page'])) ? htmlentities(intval($_GET['page'])) : 1; $offset = ($pageNumber - 1) * $itemsPerPage; diff --git a/nextpage/searchpage.php b/nextpage/searchpage.php index 2aab512..57a9184 100644 --- a/nextpage/searchpage.php +++ b/nextpage/searchpage.php @@ -92,6 +92,7 @@ if (!empty($pdo)) { if ($userData) { $message['username'] = $userData['username']; + $message['role'] = $userData['role']; } } diff --git a/nextpage/ueusepage.php b/nextpage/ueusepage.php index 4dd2574..550d186 100644 --- a/nextpage/ueusepage.php +++ b/nextpage/ueusepage.php @@ -100,6 +100,7 @@ if (!empty($pdo)) { if ($userData) { $message['username'] = $userData['username']; + $message['role'] = $userData['role']; } } diff --git a/nextpage/userpage.php b/nextpage/userpage.php index 17bc0da..59f1e7a 100644 --- a/nextpage/userpage.php +++ b/nextpage/userpage.php @@ -99,6 +99,7 @@ if (!empty($pdo)) { if ($userData) { $message['username'] = $userData['username']; + $message['role'] = $userData['role']; } } diff --git a/nextpage/view.php b/nextpage/view.php index 4018c75..b1fbe16 100644 --- a/nextpage/view.php +++ b/nextpage/view.php @@ -24,6 +24,13 @@ class MessageDisplay { echo '
'; echo ' @' . htmlentities($this->value['account']) . ''; echo '
'; + if (false !== strpos($this->value['role'], 'official')) { + echo '
'; + echo '
'; + echo '
'; + echo '
'; + } + echo '
'; $day = date("Ymd", strtotime(htmlentities($this->value['datetime']))); if ($day == date("Ymd")) { diff --git a/require/botbox.php b/require/botbox.php index e38759a..f943495 100644 --- a/require/botbox.php +++ b/require/botbox.php @@ -1,14 +1,14 @@
- ホーム + 0){?> - 通知 + - 通知 + - 検索 - 設定 + +
\ No newline at end of file diff --git a/require/leftbox.php b/require/leftbox.php index 2819288..41de539 100644 --- a/require/leftbox.php +++ b/require/leftbox.php @@ -5,21 +5,21 @@
- 🏠ホーム - 検索 + ホーム + 検索 0){?> - 通知

 + 通知

 - 通知 + 通知 - 絵文字 - プロフィール - 設定 - その他 + 絵文字 + プロフィール + 設定 + その他
- 絵文字登録 - お知らせ配信 + 絵文字登録 + お知らせ配信
diff --git a/server/uwuzuabout.txt b/server/uwuzuabout.txt index 9f944f7..8ee62bd 100644 --- a/server/uwuzuabout.txt +++ b/server/uwuzuabout.txt @@ -110,7 +110,7 @@ uwuzuはPHPとJS、HTML(プログラミング言語じゃないか)、CSSで作 - datetime(datetime) 招待コード仕様日時更新用 すべて作成完了したらGithubよりuwuzuのファイルをDLし、解凍し、それをサーバーの動作ディレクトリに置き、Apacheのhttpd.confからその動作ディレクトリを指定し、あとはApacheとphpとMy SQLを起動するだけ！ -起動したらまずDBのroleにphpmyadminから「user」ロールを追加権限は「user」でOK。ロール名はとりあえず「一般ユーザー」ロールの色はHEXコード(#を除く)で000000のように指定。 +起動したらまずDBのroleにphpmyadminから「user」ロールと「official」ロールを追加、権限は「user」と「official」でOK。ロール名はとりあえず「一般ユーザー」ロールの色はHEXコード(#を除く)で000000のように指定。(この２つのロールがないとエラーが発生します。) そしたら普通にuwuzuにアクセスして自分のアカウントを登録。 それが終わったら一度サーバーを止め、uwuzuの動作ディレクトリ内のserverフォルダ内のファイルを各自設定 ファイルの機能は以下の通り！ diff --git a/server/uwuzuinfo.txt b/server/uwuzuinfo.txt index b085501..6579dae 100644 --- a/server/uwuzuinfo.txt +++ b/server/uwuzuinfo.txt @@ -1,4 +1,4 @@ uwuzu -1.2.8 -2023/08/21 +1.2.9 +2023/08/22 daichimarukana,putonfps \ No newline at end of file diff --git a/server/uwuzurelease.txt b/server/uwuzurelease.txt index 6ffcb1f..8a7dd4e 100644 --- a/server/uwuzurelease.txt +++ b/server/uwuzurelease.txt @@ -1,6 +1,12 @@ ## リリースノートだぜぇぇぇぇぇぇい！！！！！！！ ここにはuwuzuの更新情報を載せてくぜぇ～！(いやまてテンションおかしいだろ...) +## Version 1.2.9 +リリース日:2023/08/21 +メニュー画面に各機能のアイコンを表示するようにしました。 +公式ロールがあるアカウントの投稿がタイムラインに流れると公式バッジがアカウントidの横に表示されるようにしました。 +プロフィールにカスタム絵文字を使用できるようにしました。 + ## Version 1.2.8 リリース日:2023/08/21 ログイン時にリダイレクトを繰り返してしまうバグを修正しました。 diff --git a/user/index.php b/user/index.php index 075e9ab..b81ef13 100644 --- a/user/index.php +++ b/user/index.php @@ -350,7 +350,7 @@ $pdo = null;
-

+