Improvement/subscription date in profile #733

kedMertens · 2021-10-12T18:44:57Z

#504, #723
Время членства выводится по нарастающей в зависимости от количества дней в клубе. Мне кажется, так чище чем выводить все сразу дни/недели/месяцы/годы.

Add friends page vas3k#723

kedMertens · 2021-10-12T18:49:51Z

пока делал заметил, что profile-respect тэг не описан в css. Можно убрать или открыть отдельный issue?

vas3k.club/frontend/html/users/profile.html

Line 44 in aab398f

frontend/static/js/components/FriendButton.vue

vas3k · 2021-10-15T14:13:31Z

users/models/user.py

+        return round(self.membership_created_days() / 30)
+
+    def gmembership_created_years(self):
+        return round(self.membership_created_days() / 365)


Эти новые функции прям так необходимы? Кажется, что если мы стали лепить их на каждый чих, мы далем что-то не так

Думал сделать подобно membership_days_left.
Наверное, ты прав, скорее всего эти функции будут использоваться только в одном месте.
Можно сделать одну membership_created_days и от нее расчитывать остальное.

vas3k · 2021-10-15T14:14:24Z

users/views/friends.py

+
+@auth_required
+def friends(request, user_slug):
+    # TODO: what to do if user tries to see someones friends


Не показывать эту страницу значит

Замерджу с #723, @ollkostin сделал страницу 403 для этого кейса

vas3k

Покажи плиз скриншотов еще как это выглядит. Особенно интересует новая плашка в профиле

kedMertens · 2021-10-15T14:20:15Z

users/models/user.py

+    def membership_created_months(self):
+        return round(self.membership_created_days() / 30)
+
+    def gmembership_created_years(self):


опечатка gmembership_created_years -> membership_created_years

kedMertens · 2021-10-15T15:13:11Z

Покажи плиз скриншотов еще как это выглядит. Особенно интересует новая плашка в профиле

vas3k · 2021-10-15T15:14:59Z

Хах, а почему их две-то? В своём профиле будет своя, в чужом чужая, но две никогда не может быть, это же даже выглядит смешно :D

kedMertens · 2021-10-15T15:22:23Z

вот так в чужом

тогда в своем все в одну полоску?

vas3k · 2021-10-15T15:26:52Z

Идея была оставить и там и там по 4 пункта вроде бы. Если заметки не хочется сразу делать, можно три, кто-то потом доделает

kedMertens · 2021-10-16T12:20:06Z

Идея была оставить и там и там по 4 пункта вроде бы. Если заметки не хочется сразу делать, можно три, кто-то потом доделает

Получается, в своем и чужом будет 4 пункта: плюсы, количество времени в кубе, мои чуваки и заметки? А куда еженедельный журнал, бот и подписка уйдут?

vas3k · 2021-10-16T12:47:25Z

В своём: плюсики, остаток членства, журнал, бот

В чужом: плюсики, возраст членства, чуваки и заметки

Adds 403 page

kedMertens · 2021-10-21T17:39:03Z

Поправил, заметки тоже хочу сделать, открыть новый PR или можно тут?

vas3k · 2021-10-21T18:00:50Z

Давай в отдельном, чтобы этот быстрее замержить. Посмотрю на днях

vas3k

Добавил от себя последних фиксов, будем мержить, заметки давай делать уже поверх, там как раз место под четвертую кнопку осталось

Для ссылки "Мои чуваки" в своем профиле надо будет смержить экраны нотификаций и дайджеста, чтобы "Бот активен" превратилось в одну кнопку "Бот и журнал активен", а слева от нее появилась новая

kedMertens · 2021-10-23T10:41:06Z

А что с #723, его тоже бы закрыть? Перед мерджем хотел гит историю поправить, а то Fixes typo and suggestions for PR не очень

vas3k · 2021-10-23T10:43:28Z

Гит-историю нет смысла править, у нас Squash and merge. Тот issue пока не закрываем, фичу-то не сделали, только блок отрефакторили

* Add friends page vas3k#723 * Adds subscription status to profile * send 403 if user tries to look someones friends vas3k#723 * bring back old name for add to friends button vas3k#723 * Fixes typo, covers PR suggestions * Visual improvements Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: vas3k <me@vas3k.ru>

* cleanup: remove "pain" post type (#742) * Убран тип поста Боль * Фикс миграции Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> * Increase "ban_reason" length * Disable comments auto-subscription * feat: Badges (#704) * Badges draft * Badges CSS for comments, posts, profiles * Almost done, needs data and icons * CSS fixes + frontend bugs * More logical fixes * Fixing bugs, rename things * Add icons and initial data * fix: badge notifications + typos * feat: show subscription duration in profile (#733) * Add friends page #723 * Adds subscription status to profile * send 403 if user tries to look someones friends #723 * bring back old name for add to friends button #723 * Fixes typo, covers PR suggestions * Visual improvements Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: vas3k <me@vas3k.ru> * feat: Remove sending limits for friend's comments * Threads now public * Fix #753. Add badges to /stats/ page * fix: Increase latest_badges on stats to 20 * Add "align-items: center;" to stats/badges * feat: exclude replies from friends notifications * fix: bad gradient of badges block (#760) Signed-off-by: Vitalii Dmitriev <dmitvitalii@gmail.com> * Add highlight to badged comments, improve CSS * Cooking achievements (#755) * Draft for cooking achievements * Fixing bg color and using proper URLs * Fixing pictures order * Fixing pastry_cook_2 * feat: add socialism and anarchism to list of tags (#637) А то сейчас доступны три правые системы взглядов и ни одной левой 🤔 * feat: remove "libertarianism" and "anarchism" tags * fix: mobile CSS bugs * feat: remove expertise from profile, move achievements * fix #764: "show all posts" link in profile is wrong * feat: remove NLTK dependency + add test docker build step * fix #714: add login button to public pages (#763) * add login button * fix css * fix url * fix css justify * Refactor daily and weekly digest renderers * Remove old supervisor config * fix: use sum of prices for top badges page * Add data archives cleanup to crontab * fix #765: css padding for upvote button * Upstream * Makefile * Docker deploy * Фикс CI * Сборка из указанного тега * Права на крон * Prepare for test deployment Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> Co-authored-by: vas3k <me@vas3k.ru> Co-authored-by: kedMertens <39831696+kedMertens@users.noreply.github.com> Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: Vitalii Dmitriev <dmitvitalii@gmail.com> Co-authored-by: Dmitry Kochkin <cooch@mail.ru> Co-authored-by: Ivan Mir <ivmirx@users.noreply.github.com> Co-authored-by: Kamil <babaevkamil@gmail.com> Co-authored-by: Vasily Zubarev <vasily@parity.io>

* cleanup: remove "pain" post type (#742) * Убран тип поста Боль * Фикс миграции Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> * Increase "ban_reason" length * Disable comments auto-subscription * feat: Badges (#704) * Badges draft * Badges CSS for comments, posts, profiles * Almost done, needs data and icons * CSS fixes + frontend bugs * More logical fixes * Fixing bugs, rename things * Add icons and initial data * fix: badge notifications + typos * feat: show subscription duration in profile (#733) * Add friends page #723 * Adds subscription status to profile * send 403 if user tries to look someones friends #723 * bring back old name for add to friends button #723 * Fixes typo, covers PR suggestions * Visual improvements Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: vas3k <me@vas3k.ru> * feat: Remove sending limits for friend's comments * Threads now public * Fix #753. Add badges to /stats/ page * fix: Increase latest_badges on stats to 20 * Add "align-items: center;" to stats/badges * feat: exclude replies from friends notifications * fix: bad gradient of badges block (#760) Signed-off-by: Vitalii Dmitriev <dmitvitalii@gmail.com> * Add highlight to badged comments, improve CSS * Cooking achievements (#755) * Draft for cooking achievements * Fixing bg color and using proper URLs * Fixing pictures order * Fixing pastry_cook_2 * feat: add socialism and anarchism to list of tags (#637) А то сейчас доступны три правые системы взглядов и ни одной левой 🤔 * feat: remove "libertarianism" and "anarchism" tags * fix: mobile CSS bugs * feat: remove expertise from profile, move achievements * fix #764: "show all posts" link in profile is wrong * feat: remove NLTK dependency + add test docker build step * fix #714: add login button to public pages (#763) * add login button * fix css * fix url * fix css justify * Refactor daily and weekly digest renderers * Remove old supervisor config * fix: use sum of prices for top badges page * Add data archives cleanup to crontab * fix #765: css padding for upvote button * Upstream * Обновление интро подтвержденного юзера Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> Co-authored-by: vas3k <me@vas3k.ru> Co-authored-by: kedMertens <39831696+kedMertens@users.noreply.github.com> Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: Vitalii Dmitriev <dmitvitalii@gmail.com> Co-authored-by: Dmitry Kochkin <cooch@mail.ru> Co-authored-by: Ivan Mir <ivmirx@users.noreply.github.com> Co-authored-by: Kamil <babaevkamil@gmail.com>

* cleanup: remove "pain" post type (#742) * Убран тип поста Боль * Фикс миграции Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> * Increase "ban_reason" length * Disable comments auto-subscription * feat: Badges (#704) * Badges draft * Badges CSS for comments, posts, profiles * Almost done, needs data and icons * CSS fixes + frontend bugs * More logical fixes * Fixing bugs, rename things * Add icons and initial data * fix: badge notifications + typos * feat: show subscription duration in profile (#733) * Add friends page #723 * Adds subscription status to profile * send 403 if user tries to look someones friends #723 * bring back old name for add to friends button #723 * Fixes typo, covers PR suggestions * Visual improvements Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: vas3k <me@vas3k.ru> * feat: Remove sending limits for friend's comments * Threads now public * Fix #753. Add badges to /stats/ page * fix: Increase latest_badges on stats to 20 * Add "align-items: center;" to stats/badges * feat: exclude replies from friends notifications * fix: bad gradient of badges block (#760) Signed-off-by: Vitalii Dmitriev <dmitvitalii@gmail.com> * Add highlight to badged comments, improve CSS * Cooking achievements (#755) * Draft for cooking achievements * Fixing bg color and using proper URLs * Fixing pictures order * Fixing pastry_cook_2 * feat: add socialism and anarchism to list of tags (#637) А то сейчас доступны три правые системы взглядов и ни одной левой 🤔 * feat: remove "libertarianism" and "anarchism" tags * fix: mobile CSS bugs * feat: remove expertise from profile, move achievements * fix #764: "show all posts" link in profile is wrong * feat: remove NLTK dependency + add test docker build step * fix #714: add login button to public pages (#763) * add login button * fix css * fix url * fix css justify * Refactor daily and weekly digest renderers * Remove old supervisor config * fix: use sum of prices for top badges page * Add data archives cleanup to crontab * fix #765: css padding for upvote button * Upstream * Логин под именем указанного пользователя Co-authored-by: Mikhail Polykovskij <mikhail.polykovskiy@x5.ru> Co-authored-by: vas3k <me@vas3k.ru> Co-authored-by: kedMertens <39831696+kedMertens@users.noreply.github.com> Co-authored-by: ollkostin <ollkostin@gmail.com> Co-authored-by: kedMertens <kedmail@pm.me> Co-authored-by: Vitalii Dmitriev <dmitvitalii@gmail.com> Co-authored-by: Dmitry Kochkin <cooch@mail.ru> Co-authored-by: Ivan Mir <ivmirx@users.noreply.github.com> Co-authored-by: Kamil <babaevkamil@gmail.com>

ollkostin and others added 3 commits October 11, 2021 22:40

Add friends page vas3k#723

dad8092

Merge pull request #1 from ollkostin/feature/friends_page

c5b1e8c

Add friends page vas3k#723

Adds subscription status to profile

73346fc

kedMertens marked this pull request as ready for review October 12, 2021 18:45

kedMertens requested a review from vas3k as a code owner October 12, 2021 18:45

send 403 if user tries to look someones friends vas3k#723

1f201e6

vas3k reviewed Oct 15, 2021

View reviewed changes

frontend/static/js/components/FriendButton.vue Outdated Show resolved Hide resolved

vas3k reviewed Oct 15, 2021

View reviewed changes

vas3k requested changes Oct 15, 2021

View reviewed changes

kedMertens commented Oct 15, 2021

View reviewed changes

bring back old name for add to friends button vas3k#723

2846d7a

kedMertens and others added 2 commits October 21, 2021 20:33

Fixes typo, covers PR suggestions

d69284a

Merge pull request #2 from ollkostin/feature/friends_page

578a001

Adds 403 page

kedMertens and others added 2 commits October 23, 2021 13:24

Merge branch 'master' into improvement/subscribtion_date_in_profile

7fd6a2c

Visual improvements

255b951

vas3k approved these changes Oct 23, 2021

View reviewed changes

vas3k merged commit f9673af into vas3k:master Oct 23, 2021

kedMertens deleted the improvement/subscribtion_date_in_profile branch October 23, 2021 10:44

kedMertens mentioned this pull request Oct 23, 2021

Feature/notes in profile #751

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement/subscription date in profile #733

Improvement/subscription date in profile #733

kedMertens commented Oct 12, 2021

kedMertens commented Oct 12, 2021 •

edited

Loading

vas3k Oct 15, 2021

kedMertens Oct 15, 2021

vas3k Oct 15, 2021

kedMertens Oct 15, 2021

vas3k left a comment

kedMertens Oct 15, 2021

kedMertens commented Oct 15, 2021

vas3k commented Oct 15, 2021

kedMertens commented Oct 15, 2021

vas3k commented Oct 15, 2021

kedMertens commented Oct 16, 2021

vas3k commented Oct 16, 2021

kedMertens commented Oct 21, 2021

vas3k commented Oct 21, 2021

vas3k left a comment

kedMertens commented Oct 23, 2021

vas3k commented Oct 23, 2021

Improvement/subscription date in profile #733

Improvement/subscription date in profile #733

Conversation

kedMertens commented Oct 12, 2021

kedMertens commented Oct 12, 2021 • edited Loading

vas3k Oct 15, 2021

Choose a reason for hiding this comment

kedMertens Oct 15, 2021

Choose a reason for hiding this comment

vas3k Oct 15, 2021

Choose a reason for hiding this comment

kedMertens Oct 15, 2021

Choose a reason for hiding this comment

vas3k left a comment

Choose a reason for hiding this comment

kedMertens Oct 15, 2021

Choose a reason for hiding this comment

kedMertens commented Oct 15, 2021

vas3k commented Oct 15, 2021

kedMertens commented Oct 15, 2021

vas3k commented Oct 15, 2021

kedMertens commented Oct 16, 2021

vas3k commented Oct 16, 2021

kedMertens commented Oct 21, 2021

vas3k commented Oct 21, 2021

vas3k left a comment

Choose a reason for hiding this comment

kedMertens commented Oct 23, 2021

vas3k commented Oct 23, 2021

kedMertens commented Oct 12, 2021 •

edited

Loading