From 20eea61eb58ef193365977a8806fd3e8ae2d3a48 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Tue, 27 Nov 2018 21:10:21 -0200 Subject: [PATCH 01/41] add inbox app --- app/inbox/__init__.py | 0 app/inbox/admin.py | 3 +++ app/inbox/apps.py | 5 +++++ app/inbox/migrations/__init__.py | 0 app/inbox/models.py | 3 +++ app/inbox/tests.py | 3 +++ app/inbox/views.py | 3 +++ 7 files changed, 17 insertions(+) create mode 100644 app/inbox/__init__.py create mode 100644 app/inbox/admin.py create mode 100644 app/inbox/apps.py create mode 100644 app/inbox/migrations/__init__.py create mode 100644 app/inbox/models.py create mode 100644 app/inbox/tests.py create mode 100644 app/inbox/views.py diff --git a/app/inbox/__init__.py b/app/inbox/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/inbox/admin.py b/app/inbox/admin.py new file mode 100644 index 00000000000..8c38f3f3dad --- /dev/null +++ b/app/inbox/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/app/inbox/apps.py b/app/inbox/apps.py new file mode 100644 index 00000000000..9c260e0b160 --- /dev/null +++ b/app/inbox/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class NotificationsConfig(AppConfig): + name = 'notifications' diff --git a/app/inbox/migrations/__init__.py b/app/inbox/migrations/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/inbox/models.py b/app/inbox/models.py new file mode 100644 index 00000000000..71a83623907 --- /dev/null +++ b/app/inbox/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/app/inbox/tests.py b/app/inbox/tests.py new file mode 100644 index 00000000000..7ce503c2dd9 --- /dev/null +++ b/app/inbox/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/inbox/views.py b/app/inbox/views.py new file mode 100644 index 00000000000..91ea44a218f --- /dev/null +++ b/app/inbox/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From 287b3c49e9b3dad0284c3de3ab9b085e6c9800ea Mon Sep 17 00:00:00 2001 From: octavioamu Date: Wed, 28 Nov 2018 19:41:54 -0200 Subject: [PATCH 02/41] add initial markup --- app/app/settings.py | 2 +- app/assets/v2/css/gitcoin.css | 11 +---- app/assets/v2/css/notifications.css | 45 +++++++++++++++++++ app/dashboard/templates/shared/nav_auth.html | 4 +- .../templates/shared/notifications.html | 36 +++++++++++++++ app/inbox/apps.py | 4 +- app/retail/templates/shared/head.html | 1 + app/retail/templates/shared/nav.html | 1 + 8 files changed, 88 insertions(+), 16 deletions(-) create mode 100644 app/assets/v2/css/notifications.css create mode 100644 app/dashboard/templates/shared/notifications.html diff --git a/app/app/settings.py b/app/app/settings.py index 07f5e2259db..3076fad66fe 100644 --- a/app/app/settings.py +++ b/app/app/settings.py @@ -138,7 +138,7 @@ TEMPLATES = [{ 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': ['retail/templates/', 'external_bounties/templates/', 'dataviz/templates', 'kudos/templates'], + 'DIRS': ['retail/templates/', 'external_bounties/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 37f7422293b..f91de4915b7 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -343,7 +343,7 @@ div.button-pink { text-decoration: none; padding-right: 1rem; padding-left: 1rem; - font-size: 0.9rem !important; + font-size: 0.9rem; } .footer .nav-link:hover { @@ -620,12 +620,3 @@ div.button-pink { } } -.notification-dot { - background-color: #ef3427; - width: 0.5rem; - height: 0.5rem; - position: absolute; - top: 6px; - border-radius: 30px; - left: 6px; -} diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css new file mode 100644 index 00000000000..95c1680d9ea --- /dev/null +++ b/app/assets/v2/css/notifications.css @@ -0,0 +1,45 @@ +:root { + --color-notification: 37, 232, 153; + +} + + +.navbar-nav .nav-link.notifications { + position: relative; + font-size: 18px; + color: white; +} + +.dropdown-toggle::after { + content: none; +} + +.notification-dot { + background: rgba(var(--color-notification), 1); + display: block; + width: 9px; + height: 9px; + border-radius: 50%; + box-shadow: 0 0 0 rgba(var(--color-notification), .4); + animation: BadgePulse 1.8s infinite; + position: absolute; + top: 0.5em; + right: 0.9em; +} + +@keyframes BadgePulse{ + 0%{ + -moz-box-shadow:0 0 0 0 rgba(var(--color-notification), .4); + box-shadow:0 0 0 0 rgba(var(--color-notification), .4) + } + + 70%{ + -moz-box-shadow:0 0 0 10px rgba(var(--color-notification), 0); + box-shadow:0 0 0 10px rgba(var(--color-notification), 0) + } + + 100%{ + -moz-box-shadow:0 0 0 20px rgba(var(--color-notification), 0); + box-shadow:0 0 0 20px rgba(var(--color-notification), 0) + } +} diff --git a/app/dashboard/templates/shared/nav_auth.html b/app/dashboard/templates/shared/nav_auth.html index 4bcd8acce9f..e928d96e901 100644 --- a/app/dashboard/templates/shared/nav_auth.html +++ b/app/dashboard/templates/shared/nav_auth.html @@ -21,9 +21,6 @@
@@ -93,6 +90,7 @@
+ {% else %}
+
+ {% trans 'Notifications' %} {% trans 'Mark All as Read' %} +
    +
  • + + You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP… + time +
    • +
+ {% trans 'See all' %} +
+
diff --git a/app/inbox/apps.py b/app/inbox/apps.py index 9c260e0b160..40b3eb9cd0a 100644 --- a/app/inbox/apps.py +++ b/app/inbox/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -class NotificationsConfig(AppConfig): - name = 'notifications' +class NotificationConfig(AppConfig): + name = 'notification' diff --git a/app/retail/templates/shared/head.html b/app/retail/templates/shared/head.html index 34c35afd34c..6493d0dcf09 100644 --- a/app/retail/templates/shared/head.html +++ b/app/retail/templates/shared/head.html @@ -44,6 +44,7 @@ + diff --git a/app/retail/templates/shared/nav.html b/app/retail/templates/shared/nav.html index 4794d3ddaa2..c91f16145a9 100644 --- a/app/retail/templates/shared/nav.html +++ b/app/retail/templates/shared/nav.html @@ -113,6 +113,7 @@ {% endif %}
+ {% include 'shared/notifications.html' %} {% if request.path|matches:"^\/((explorer)|(issue.*)|(.*new.*))$" %} From 97b2a720eb3a8178bf4f9ce4806a9cad089ee913 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Thu, 29 Nov 2018 01:40:20 -0200 Subject: [PATCH 03/41] improve dropdown --- app/assets/v2/css/gitcoin.css | 23 ++++++++- app/assets/v2/css/notifications.css | 48 +++++++++++++++++-- app/assets/v2/js/base.js | 2 +- app/dashboard/templates/shared/nav_auth.html | 2 +- .../templates/shared/notifications.html | 40 +++++++++------- app/retail/templates/shared/nav.html | 4 +- 6 files changed, 93 insertions(+), 26 deletions(-) diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index f91de4915b7..7e4430e1c2c 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -486,8 +486,6 @@ div.button-pink { background-color: #FAFAFA; border-radius: 0px; padding: 0; - right: 0; - left: auto; } .dropdown-menu .dropdown-divider { @@ -620,3 +618,24 @@ div.button-pink { } } +/* dropdown animation */ +.animation { + -webkit-animation-duration: 80ms; + animation-duration: 80ms; + -webkit-animation-fill-mode: forwards; + animation-fill-mode: forwards; +} +.slideDownIn { + -webkit-animation-name: slideDownIn; + animation-name: slideDownIn; +} + +@keyframes slideDownIn { + 0% { + -webkit-transform: translateY(-20px) scale(0.9, 0.7); + } + 50% { + -webkit-transform: translateY(0) scale(1, 1); + } + +} diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index 95c1680d9ea..ec9132db382 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -1,20 +1,22 @@ :root { --color-notification: 37, 232, 153; + --badge-bg: #D6FBEB; + --badge-text: #00A55E; } -.navbar-nav .nav-link.notifications { +.navbar-nav .nav-link.notification__icon { position: relative; font-size: 18px; color: white; } -.dropdown-toggle::after { +.notification__icon.dropdown-toggle::after { content: none; } -.notification-dot { +.notification__dot { background: rgba(var(--color-notification), 1); display: block; width: 9px; @@ -27,6 +29,45 @@ right: 0.9em; } +.badge--greenlight { + background-color: var(--badge-bg); + color: var(--badge-text); +} + +.notifications__box { + width: 430px; + border-radius: 3px; + padding: 1em; + max-width: calc(100vw - 2em); + will-change: transform; +} + +.notifications__header { + display: flex; + justify-content: space-between; +} + +.notifications__list { + max-height: 328px; + overflow-y: auto; + padding: 0; +} + +.notifications__item { + display: flex; + align-items: center; + border-bottom: 1px solid #D8D8D8; +} + +.notifications__item-readed { + background: rgba(var(--color-notification), 1); + display: block; + width: 9px; + height: 9px; + border-radius: 50%; + padding: 0.3em; +} + @keyframes BadgePulse{ 0%{ -moz-box-shadow:0 0 0 0 rgba(var(--color-notification), .4); @@ -43,3 +84,4 @@ box-shadow:0 0 0 20px rgba(var(--color-notification), 0) } } + diff --git a/app/assets/v2/js/base.js b/app/assets/v2/js/base.js index e280402215d..2703ec5e8d6 100644 --- a/app/assets/v2/js/base.js +++ b/app/assets/v2/js/base.js @@ -43,7 +43,7 @@ $(document).ready(function() { var parentSiblings = parent.siblings('.nav-item'); - parent.find('.dropdown-menu').toggle(); + parent.find('.dropdown-menu').toggle().toggleClass('show'); parentSiblings.find('.dropdown-menu').hide(); }); diff --git a/app/dashboard/templates/shared/nav_auth.html b/app/dashboard/templates/shared/nav_auth.html index e928d96e901..7cbe5bce358 100644 --- a/app/dashboard/templates/shared/nav_auth.html +++ b/app/dashboard/templates/shared/nav_auth.html @@ -23,7 +23,7 @@ data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {{ user }} -
+
{% if source == 'authed' %} diff --git a/app/dashboard/templates/shared/notifications.html b/app/dashboard/templates/shared/notifications.html index 0695244a603..2b6ca0d5876 100644 --- a/app/dashboard/templates/shared/notifications.html +++ b/app/dashboard/templates/shared/notifications.html @@ -14,23 +14,29 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . {% endcomment %} -{% load i18n static %} +{% load i18n static humanize %} -
- -
- {% trans 'Notifications' %} {% trans 'Mark All as Read' %} -
    -
  • - - You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP… - time -
    • -
- {% trans 'See all' %} +
+ +
+
+
+ {% trans 'Notifications' %} 8 +
{% trans 'Mark All as Read' %}
+
    +
  • + + You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP… + +
    • +
+ {% trans 'See all' %}
+
diff --git a/app/retail/templates/shared/nav.html b/app/retail/templates/shared/nav.html index c91f16145a9..13c3f614152 100644 --- a/app/retail/templates/shared/nav.html +++ b/app/retail/templates/shared/nav.html @@ -43,7 +43,7 @@ data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> WHY GITCOIN - diff --git a/app/inbox/migrations/0001_initial.py b/app/inbox/migrations/0001_initial.py new file mode 100644 index 00000000000..14a7a87c546 --- /dev/null +++ b/app/inbox/migrations/0001_initial.py @@ -0,0 +1,32 @@ +# Generated by Django 2.1.2 on 2018-12-03 22:38 + +from django.db import migrations, models +import economy.models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Notification', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('modified_on', models.DateTimeField(default=economy.models.get_time)), + ('created_on', models.DateTimeField(auto_now_add=True, null=True)), + ('to_user_id', models.IntegerField()), + ('from_user_id', models.IntegerField()), + ('CTA_URL', models.URLField(max_length=255, null=True)), + ('CTA_Text', models.CharField(max_length=255)), + ('message_html', models.CharField(help_text='Html message', max_length=255, null=True)), + ('is_read', models.BooleanField(default=False)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/app/inbox/models.py b/app/inbox/models.py index 401d5bef019..448ca8f5212 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -1,9 +1,10 @@ from django.db import models from django.utils.translation import gettext_lazy as _ +from economy.models import SuperModel # Create your models here. -class Notification(models.Model): +class Notification(SuperModel): created_on = models.DateTimeField(auto_now_add=True, blank=True, null=True) to_user_id = models.IntegerField() from_user_id = models.IntegerField() diff --git a/app/inbox/views.py b/app/inbox/views.py index bb5d3ddfcc1..a62ac26f604 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,14 +1,59 @@ from django.shortcuts import render +from django.core.paginator import Paginator from inbox.models import Notification + from django.http import Http404, JsonResponse # Create your views here. -def inbox(request, notification): - try: - notification = Notification.get(notification=notification) - return notification - except Exception as e: - print(e) - raise Http404 - return JsonResponse("Hello, world. You're at the polls index.") +# def inbox(request): +# profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + +# try: +# grant = Notification.objects.prefetch_related('subscriptions', 'milestones').get(pk=grant_id, slug=grant_slug) +# notification = Notification.get(notification=notification) +# return notification +# except Exception as e: +# print(e) +# raise Http404 +# return JsonResponse("Hello, world. You're at the polls index.") + + + +def inbox(request): + """Handle grants explorer.""" + profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + limit = request.GET.get('limit', 25) + page = request.GET.get('page', 1) + sort = request.GET.get('sort_option', '-created_on') + + _notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) + + if request.method == 'POST': + sort = request.POST.get('sort_option', '-created_on') + _notifications = Notification.objects.order_by(sort) + + paginator = Paginator(_notifications, limit) + notifications = paginator.get_page(page) + + params = [{ + 'is_read': 'false', + 'created_on': '2018-11-15T19:59:08.081864Z', + 'to_user_id': '7', + 'from_user_id': '1', + 'CTA_URL': 'http://localhost:8000/issue/owocki/pytrader/142/1555', + 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + }, + { + 'is_read': 'false', + 'created_on': '2018-11-15T19:59:08.081864Z', + 'to_user_id': '7', + 'from_user_id': '1', + 'CTA_URL': 'http://localhost:8000/issue/owocki/pytrader/142/1555', + 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + }, + + ] + return JsonResponse(params, status=200, safe=False) diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html index 89d70d32135..9d5c45b2236 100644 --- a/app/retail/templates/shared/footer_scripts.html +++ b/app/retail/templates/shared/footer_scripts.html @@ -41,6 +41,7 @@ + + From 3080253957d71999902155ae3431c06995e11307 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Wed, 5 Dec 2018 20:30:46 -0200 Subject: [PATCH 10/41] fix login and updates --- app/assets/v2/css/notifications.css | 12 ++++ app/assets/v2/js/notifications.js | 66 +++++++++++-------- .../templates/shared/notifications.html | 2 +- app/inbox/views.py | 12 ++++ 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index c035e187d8f..11cc58c9341 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -111,6 +111,8 @@ align-items: center; border-bottom: 1px solid #D8D8D8; padding: 1em 0; + animation: animateElement linear .3s; + animation-iteration-count: 1; } .notifications__item-readed { @@ -161,4 +163,14 @@ } } +@keyframes animateElement{ + 0% { + opacity: 0; + transform: translate(0px,-10px); + } + 100% { + opacity: 1; + transform: translate(0px,0px); + } +} diff --git a/app/assets/v2/js/notifications.js b/app/assets/v2/js/notifications.js index 2d1d8116aee..7edf0b974fa 100644 --- a/app/assets/v2/js/notifications.js +++ b/app/assets/v2/js/notifications.js @@ -1,4 +1,5 @@ var notifications = [] +var newNotifications = [] const isHidden = false const container = $('.notifications__list') @@ -8,39 +9,36 @@ function requestNotifications() { $.when( getNotifications ).then(function(response) { // if (notifications.length) { - // newNotifications = filterNewData(response); + // newNotifications = filterNewData(notifications); + // console.log(newNotifications) // } else { // } // newNotifications = response; - // console.log(newNotifications) - // var flag = compareJson(response, notifications) - // if (flag === false) { console.log('updating') + var loadTmp = true + console.log(response, notifications) + if (response.length !== notifications.length){ + newNotifications = newData(response, notifications) + + newNotifications.forEach(element => { + notifications.push(element) + }); + + console.log(newNotifications) + setDot(true, notifications) + templateSuggestions(newNotifications) + } + + + // notifications = notifications.filter((notification, index, self) => + // index === self.findIndex((t) => ( + // t.id === notification.id + // )) + // ) - response.forEach(element => { - notifications.push(element) - }); - // notifications.push(response); - // notifications = notifications.filter( function( elem, i, array ) { - // console.log( elem, i, array ) - // return array.indexOf( elem ) === i; - // } ); - - // notifications = getDistinctArray(notifications) - - notifications = notifications.filter((notification, index, self) => - index === self.findIndex((t) => ( - t.id === notification.id - )) - ) - console.log(notifications) - setDot(true, notifications) - templateSuggestions(notifications) - // } - // return response }) } @@ -64,7 +62,8 @@ function templateSuggestions(notifications) { ).join(' ')} `; - container.prepend(tmp); + container.prepend(tmp) + $('.notifications__item'); } function checkHidden() { @@ -75,6 +74,15 @@ function checkHidden() { } } +function newData(newObj, oldObj) { + + return newObj.filter(function(obj) { + return !oldObj.some(function(obj2) { + return obj.id == obj2.id; + }); + }); +} + function filterNewData(data) { return notifications.filter( @@ -137,9 +145,9 @@ moment.updateLocale('en', { } }); -function setDot(newData, notifications) { - $('#total-notifications').text(notifications.length) - if (newData) { +function setDot(hasNewData, newNotifications) { + $('#total-notifications').text(newNotifications.length) + if (hasNewData) { $('#notification-dot').addClass('notification__dot-active') } else { $('#notification-dot').removeClass('notification__dot-active') diff --git a/app/dashboard/templates/shared/notifications.html b/app/dashboard/templates/shared/notifications.html index bf142493bb0..f09faf021a1 100644 --- a/app/dashboard/templates/shared/notifications.html +++ b/app/dashboard/templates/shared/notifications.html @@ -25,7 +25,7 @@
- {% trans 'Notifications' %} 8 + {% trans 'Notifications' %} 0
{% trans 'Mark All as Read' %}
    diff --git a/app/inbox/views.py b/app/inbox/views.py index 5142936badb..1566fdc8dd7 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -70,6 +70,18 @@ def inbox(request): 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', 'is_read': False }, + {'id': 4, + 'modified_on': '2018-12-04T11:39:36.662Z', + 'created_on': '2018-12-04T11:39:36.662Z', + 'to_user_id': 1, + 'from_user_id': 3, + 'username': 'octavioamu', + 'CTA_URL': 'http://localhost:8000', + 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', + 'is_read': False + }, + ] return JsonResponse(params, status=200, safe=False) From b4972d7635695ac45d30f7d965d5e8cb28399376 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Thu, 6 Dec 2018 11:40:30 -0200 Subject: [PATCH 11/41] fix loop --- app/assets/v2/css/notifications.css | 15 ++++- app/assets/v2/js/notifications.js | 101 +++++++--------------------- 2 files changed, 38 insertions(+), 78 deletions(-) diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index 11cc58c9341..40ccb8fd6f9 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -29,7 +29,7 @@ right: 0.9em; } -.notification__dot-active { +.notification__dot_active { display: block; animation: BadgePulse 1.8s infinite; } @@ -40,6 +40,11 @@ width: 7px; height: 7px; border-radius: 50%; + opacity: 0; +} + +.notification__dot-small_active { + opacity: 1; } .badge--greenlight { @@ -174,3 +179,11 @@ } } + +.line-clamp { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + text-overflow: ellipsis; + overflow: hidden; +} diff --git a/app/assets/v2/js/notifications.js b/app/assets/v2/js/notifications.js index 7edf0b974fa..afd6512dd0e 100644 --- a/app/assets/v2/js/notifications.js +++ b/app/assets/v2/js/notifications.js @@ -8,36 +8,17 @@ function requestNotifications() { $.when( getNotifications ).then(function(response) { - // if (notifications.length) { - // newNotifications = filterNewData(notifications); - // console.log(newNotifications) - // } else { - // } - // newNotifications = response; - - - - console.log('updating') - var loadTmp = true - console.log(response, notifications) - if (response.length !== notifications.length){ - newNotifications = newData(response, notifications) - - newNotifications.forEach(element => { - notifications.push(element) - }); - - console.log(newNotifications) - setDot(true, notifications) - templateSuggestions(newNotifications) - } - - - // notifications = notifications.filter((notification, index, self) => - // index === self.findIndex((t) => ( - // t.id === notification.id - // )) - // ) + var loadTmp = true + console.log(response, notifications) + if (response.length !== notifications.length) { + newNotifications = newData(response, notifications) + + newNotifications.forEach(element => { + notifications.push(element) + }); + setDot(true, notifications) + templateSuggestions(newNotifications) + } }) } @@ -47,11 +28,11 @@ function templateSuggestions(notifications) { ${notifications.map((notify, index) => `
  • - + -

    +

    ${notify.message_html}

    @@ -83,49 +64,6 @@ function newData(newObj, oldObj) { }); } -function filterNewData(data) { - - return notifications.filter( - function(item) { - - return data.indexOf(item) < 0; - } - ); -} - - - -function getDistinctArray(arr) { - var dups = {}; - return arr.filter(function(el) { - var hash = el.valueOf(); - var isDup = dups[hash]; - dups[hash] = true; - return !isDup; - }); -} - -function compareJson(obj1, obj2) { - var flag = true - if (Object.keys(obj1).length==Object.keys(obj2).length){ - for(key in obj1) { - if(obj1[key] == obj2[key]) { - continue; - } - else { - return flag=false; - break; - } - } - } - else { - return flag=false; - } -} - - - - moment.updateLocale('en', { relativeTime : { future: "in %s", @@ -148,9 +86,18 @@ moment.updateLocale('en', { function setDot(hasNewData, newNotifications) { $('#total-notifications').text(newNotifications.length) if (hasNewData) { - $('#notification-dot').addClass('notification__dot-active') + $('#notification-dot').addClass('notification__dot_active') } else { - $('#notification-dot').removeClass('notification__dot-active') + $('#notification-dot').removeClass('notification__dot_active') + } +} + +function truncateString(str, num) { + + if (str.length > num) { + return str.slice(0, num) + "...";} + else { + return str; } } From b6be53b603cf1350762ddc8d22c4f18a77bf8bdf Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Wed, 5 Dec 2018 17:55:32 +0530 Subject: [PATCH 12/41] Changes to backend --- app/inbox/models.py | 3 ++- app/inbox/views.py | 21 ++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/inbox/models.py b/app/inbox/models.py index 448ca8f5212..09a7e997e6b 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -12,6 +12,7 @@ class Notification(SuperModel): CTA_Text = models.CharField(max_length=255) message_html = models.CharField(max_length=255, null=True, help_text=_("Html message")) is_read = models.BooleanField(default=False) + notification_type = models.CharField(max_length=255) def __str__(self): - return self.notification + return self.notification_type diff --git a/app/inbox/views.py b/app/inbox/views.py index 1566fdc8dd7..28fd5c0a0ea 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -3,23 +3,7 @@ from inbox.models import Notification from django.utils import timezone -from django.http import Http404, JsonResponse - -# Create your views here. - -# def inbox(request): -# profile = request.user.profile if request.user.is_authenticated and request.user.profile else None - -# try: -# grant = Notification.objects.prefetch_related('subscriptions', 'milestones').get(pk=grant_id, slug=grant_slug) -# notification = Notification.get(notification=notification) -# return notification -# except Exception as e: -# print(e) -# raise Http404 -# return JsonResponse("Hello, world. You're at the polls index.") - - +from django.http import Http404, JsonResponse, HttpResponseForbidden def inbox(request): """Handle grants explorer.""" @@ -28,6 +12,9 @@ def inbox(request): page = request.GET.get('page', 1) sort = request.GET.get('sort_option', '-created_on') + if profile == None: + return HttpResponseForbidden('Not Allowed') + _notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) if request.method == 'POST': From be85747cd980ca540e2c69fd769fe1d4fc8b1242 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Thu, 6 Dec 2018 18:44:13 +0530 Subject: [PATCH 13/41] Added username --- app/inbox/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/inbox/models.py b/app/inbox/models.py index 09a7e997e6b..d3db30b8417 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -8,6 +8,7 @@ class Notification(SuperModel): created_on = models.DateTimeField(auto_now_add=True, blank=True, null=True) to_user_id = models.IntegerField() from_user_id = models.IntegerField() + username = models.CharField(max_length=255) CTA_URL = models.URLField(max_length=255, null=True) CTA_Text = models.CharField(max_length=255) message_html = models.CharField(max_length=255, null=True, help_text=_("Html message")) From fd0845854539af63d141d59dc2e952b17db9a142 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Thu, 6 Dec 2018 19:03:39 +0530 Subject: [PATCH 14/41] Get data from db --- .../migrations/0002_notification_username.py | 19 +++++++++++++++ app/inbox/models.py | 3 +-- app/inbox/views.py | 23 ++++++++++++++++--- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 app/inbox/migrations/0002_notification_username.py diff --git a/app/inbox/migrations/0002_notification_username.py b/app/inbox/migrations/0002_notification_username.py new file mode 100644 index 00000000000..bad06529d3b --- /dev/null +++ b/app/inbox/migrations/0002_notification_username.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1.2 on 2018-12-06 13:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inbox', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='username', + field=models.CharField(default='NULL', max_length=255), + preserve_default=False, + ), + ] diff --git a/app/inbox/models.py b/app/inbox/models.py index d3db30b8417..f5d4e631135 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -13,7 +13,6 @@ class Notification(SuperModel): CTA_Text = models.CharField(max_length=255) message_html = models.CharField(max_length=255, null=True, help_text=_("Html message")) is_read = models.BooleanField(default=False) - notification_type = models.CharField(max_length=255) def __str__(self): - return self.notification_type + return str(self.id) diff --git a/app/inbox/views.py b/app/inbox/views.py index 28fd5c0a0ea..5f2129493cd 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -15,7 +15,7 @@ def inbox(request): if profile == None: return HttpResponseForbidden('Not Allowed') - _notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) + '''_notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) if request.method == 'POST': sort = request.POST.get('sort_option', '-created_on') @@ -23,8 +23,25 @@ def inbox(request): paginator = Paginator(_notifications, limit) notifications = paginator.get_page(page) + ''' + all_notifs = Notification.objects.all() + if len(all_notifs) == 0: + a = Notification(created_on=timezone.now(), to_user_id=1, from_user_id=3, username="owocki", + CTA_URL="http://localhost:8000", + CTA_Text="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…", + message_html="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…" ) + a.save() + a = Notification(created_on=timezone.now(), to_user_id=1, from_user_id=3, username="octavioamu", + CTA_URL="http://localhost:8000", + CTA_Text="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…", + message_html="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…" ) + a.save() + params = [] + for i in all_notifs: + params.append(i.to_standard_dict()) - params = [{'id': 1, + + '''params = [{'id': 1, 'modified_on': '2018-12-04T20:32:48.524Z', 'created_on': '2018-12-04T20:32:48.524Z', 'to_user_id': 1, @@ -70,5 +87,5 @@ def inbox(request): }, - ] + ]''' return JsonResponse(params, status=200, safe=False) From 7cbb85730675b1f5e35a3f12c36cb8a69f5c6a20 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Thu, 6 Dec 2018 19:31:15 +0530 Subject: [PATCH 15/41] Added created time to data returned --- app/inbox/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 5f2129493cd..0207cf2b96b 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -38,7 +38,9 @@ def inbox(request): a.save() params = [] for i in all_notifs: - params.append(i.to_standard_dict()) + new_notif = i.to_standard_dict() + new_notif['created_on'] = i.created_on + params.append(new_notif) '''params = [{'id': 1, From d0b33305f2aa56195a513d2e2d87731d33c34cca Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Thu, 6 Dec 2018 19:46:17 +0530 Subject: [PATCH 16/41] Cleanup --- app/inbox/views.py | 63 ++-------------------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 0207cf2b96b..423453b5d4a 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -3,7 +3,7 @@ from inbox.models import Notification from django.utils import timezone -from django.http import Http404, JsonResponse, HttpResponseForbidden +from django.http import JsonResponse, HttpResponseForbidden def inbox(request): """Handle grants explorer.""" @@ -12,7 +12,7 @@ def inbox(request): page = request.GET.get('page', 1) sort = request.GET.get('sort_option', '-created_on') - if profile == None: + if profile is None: return HttpResponseForbidden('Not Allowed') '''_notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) @@ -25,69 +25,10 @@ def inbox(request): notifications = paginator.get_page(page) ''' all_notifs = Notification.objects.all() - if len(all_notifs) == 0: - a = Notification(created_on=timezone.now(), to_user_id=1, from_user_id=3, username="owocki", - CTA_URL="http://localhost:8000", - CTA_Text="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…", - message_html="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…" ) - a.save() - a = Notification(created_on=timezone.now(), to_user_id=1, from_user_id=3, username="octavioamu", - CTA_URL="http://localhost:8000", - CTA_Text="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…", - message_html="You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…" ) - a.save() params = [] for i in all_notifs: new_notif = i.to_standard_dict() new_notif['created_on'] = i.created_on params.append(new_notif) - - '''params = [{'id': 1, - 'modified_on': '2018-12-04T20:32:48.524Z', - 'created_on': '2018-12-04T20:32:48.524Z', - 'to_user_id': 1, - 'from_user_id': 3, - 'username': 'octavioamu', - 'CTA_URL': 'http://localhost:8000', - 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'is_read': False - }, - {'id': 2, - 'modified_on':'2018-12-04T04:39:36.662Z', - 'created_on': '2018-12-04T04:39:36.662Z', - 'to_user_id': 1, - 'from_user_id': 3, - 'username': 'owocki', - 'CTA_URL': 'http://localhost:8000', - 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'is_read': False - }, - {'id': 3, - 'modified_on': '2018-12-04T11:39:36.662Z', - 'created_on': '2018-12-04T11:39:36.662Z', - 'to_user_id': 1, - 'from_user_id': 3, - 'username': 'octavioamu', - 'CTA_URL': 'http://localhost:8000', - 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'is_read': False - }, - {'id': 4, - 'modified_on': '2018-12-04T11:39:36.662Z', - 'created_on': '2018-12-04T11:39:36.662Z', - 'to_user_id': 1, - 'from_user_id': 3, - 'username': 'octavioamu', - 'CTA_URL': 'http://localhost:8000', - 'CTA_Text': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'message_html': 'You haven’t responded to #2186: [Design] Show Remarketed Issues… in 3 days. Please submit a WIP…', - 'is_read': False - }, - - - ]''' return JsonResponse(params, status=200, safe=False) From dfb235ce9aae90963c0e5596dc2ef19acbe51186 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Thu, 6 Dec 2018 16:23:49 -0200 Subject: [PATCH 17/41] fix shadow safari bug --- app/assets/v2/css/notifications.css | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index 40ccb8fd6f9..067b2cc414f 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -152,19 +152,22 @@ } @keyframes BadgePulse{ - 0%{ - -moz-box-shadow:0 0 0 0 rgba(var(--color-notification), .4); - box-shadow:0 0 0 0 rgba(var(--color-notification), .4) + 0% { + -moz-box-shadow:0 0 0 0 rgba(37, 232, 153, .4); + -webkit-box-shadow:0 0 0 0 rgba(37, 232, 153, .4); + box-shadow: 0 0 0 0 rgba(37, 232, 153, .4); } - 70%{ - -moz-box-shadow:0 0 0 10px rgba(var(--color-notification), 0); - box-shadow:0 0 0 10px rgba(var(--color-notification), 0) + 70% { + -moz-box-shadow: 0 0 0 10px rgba(37, 232, 153, 0); + -webkit-box-shadow: 0 0 0 10px rgba(37, 232, 153, 0); + box-shadow: 0 0 0 10px rgba(37, 232, 153, 0); } - 100%{ - -moz-box-shadow:0 0 0 20px rgba(var(--color-notification), 0); - box-shadow:0 0 0 20px rgba(var(--color-notification), 0) + 100% { + -moz-box-shadow: 0 0 0 20px rgba(37, 232, 153, 0); + -webkit-box-shadow: 0 0 0 20px rgba(37, 232, 153, 0); + box-shadow: 0 0 0 20px rgba(37, 232, 153, 0); } } From fad9fb9ab5fdb51ddf029992063333af0bbeaf30 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Fri, 7 Dec 2018 09:52:57 +0530 Subject: [PATCH 18/41] Changes to notifs backend --- app/inbox/admin.py | 4 +++- app/inbox/migrations/0001_initial.py | 12 ++++++++---- .../migrations/0002_notification_username.py | 19 ------------------- .../0002_remove_notification_username.py | 17 +++++++++++++++++ app/inbox/models.py | 18 ++++++++++++------ app/inbox/views.py | 18 ++++-------------- 6 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 app/inbox/migrations/0002_notification_username.py create mode 100644 app/inbox/migrations/0002_remove_notification_username.py diff --git a/app/inbox/admin.py b/app/inbox/admin.py index 8c38f3f3dad..c966af731a3 100644 --- a/app/inbox/admin.py +++ b/app/inbox/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin -# Register your models here. +from .models import Notification + +admin.site.register(Notification) diff --git a/app/inbox/migrations/0001_initial.py b/app/inbox/migrations/0001_initial.py index 14a7a87c546..762d66c5d38 100644 --- a/app/inbox/migrations/0001_initial.py +++ b/app/inbox/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 2.1.2 on 2018-12-03 22:38 +# Generated by Django 2.1.2 on 2018-12-07 04:02 +from django.conf import settings from django.db import migrations, models +import django.db.models.deletion import economy.models @@ -9,6 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -17,13 +20,14 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('modified_on', models.DateTimeField(default=economy.models.get_time)), - ('created_on', models.DateTimeField(auto_now_add=True, null=True)), - ('to_user_id', models.IntegerField()), - ('from_user_id', models.IntegerField()), + ('created_on', models.DateTimeField(auto_now_add=True)), + ('username', models.CharField(max_length=255)), ('CTA_URL', models.URLField(max_length=255, null=True)), ('CTA_Text', models.CharField(max_length=255)), ('message_html', models.CharField(help_text='Html message', max_length=255, null=True)), ('is_read', models.BooleanField(default=False)), + ('from_user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='from_user', to=settings.AUTH_USER_MODEL)), + ('to_user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='to_user', to=settings.AUTH_USER_MODEL)), ], options={ 'abstract': False, diff --git a/app/inbox/migrations/0002_notification_username.py b/app/inbox/migrations/0002_notification_username.py deleted file mode 100644 index bad06529d3b..00000000000 --- a/app/inbox/migrations/0002_notification_username.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-06 13:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inbox', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='username', - field=models.CharField(default='NULL', max_length=255), - preserve_default=False, - ), - ] diff --git a/app/inbox/migrations/0002_remove_notification_username.py b/app/inbox/migrations/0002_remove_notification_username.py new file mode 100644 index 00000000000..641fbfc2b2e --- /dev/null +++ b/app/inbox/migrations/0002_remove_notification_username.py @@ -0,0 +1,17 @@ +# Generated by Django 2.1.2 on 2018-12-07 04:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('inbox', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='notification', + name='username', + ), + ] diff --git a/app/inbox/models.py b/app/inbox/models.py index f5d4e631135..0534e11446a 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -1,18 +1,24 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from economy.models import SuperModel - -# Create your models here. +from django.contrib.auth import get_user_model class Notification(SuperModel): - created_on = models.DateTimeField(auto_now_add=True, blank=True, null=True) - to_user_id = models.IntegerField() - from_user_id = models.IntegerField() - username = models.CharField(max_length=255) + created_on = models.DateTimeField(auto_now_add=True, editable=False) CTA_URL = models.URLField(max_length=255, null=True) CTA_Text = models.CharField(max_length=255) message_html = models.CharField(max_length=255, null=True, help_text=_("Html message")) is_read = models.BooleanField(default=False) + to_user_id = models.ForeignKey( + get_user_model(), + on_delete=models.CASCADE, + related_name='to_user' + ) + from_user_id = models.ForeignKey( + get_user_model(), + on_delete=models.CASCADE, + related_name='from_user' + ) def __str__(self): return str(self.id) diff --git a/app/inbox/views.py b/app/inbox/views.py index 423453b5d4a..c9237bdada3 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -2,33 +2,23 @@ from django.core.paginator import Paginator from inbox.models import Notification from django.utils import timezone +from django.contrib.auth import get_user_model from django.http import JsonResponse, HttpResponseForbidden def inbox(request): """Handle grants explorer.""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None - limit = request.GET.get('limit', 25) - page = request.GET.get('page', 1) - sort = request.GET.get('sort_option', '-created_on') - if profile is None: return HttpResponseForbidden('Not Allowed') - '''_notifications = Notification.objects.filter(to_user_id=profile.id).order_by(sort) - - if request.method == 'POST': - sort = request.POST.get('sort_option', '-created_on') - _notifications = Notification.objects.order_by(sort) - - paginator = Paginator(_notifications, limit) - notifications = paginator.get_page(page) - ''' - all_notifs = Notification.objects.all() + all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id) params = [] for i in all_notifs: new_notif = i.to_standard_dict() new_notif['created_on'] = i.created_on + new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username + params.append(new_notif) return JsonResponse(params, status=200, safe=False) From 6e958e14c69cc0936760e65d99a99a097d1e79be Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Fri, 7 Dec 2018 15:38:59 +0530 Subject: [PATCH 19/41] Sort the notifs --- app/inbox/apps.py | 1 - app/inbox/views.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/inbox/apps.py b/app/inbox/apps.py index 40b3eb9cd0a..0b0b0fc7996 100644 --- a/app/inbox/apps.py +++ b/app/inbox/apps.py @@ -1,5 +1,4 @@ from django.apps import AppConfig - class NotificationConfig(AppConfig): name = 'notification' diff --git a/app/inbox/views.py b/app/inbox/views.py index c9237bdada3..1e10ab0a1f5 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -12,7 +12,7 @@ def inbox(request): if profile is None: return HttpResponseForbidden('Not Allowed') - all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id) + all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id).order_by('id')[::-1] params = [] for i in all_notifs: new_notif = i.to_standard_dict() From cfd04696c9b142a54049c6c7f285727cad132167 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Fri, 7 Dec 2018 15:42:29 +0530 Subject: [PATCH 20/41] Fix lint error --- app/inbox/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 1e10ab0a1f5..807cf60c7b3 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -12,7 +12,8 @@ def inbox(request): if profile is None: return HttpResponseForbidden('Not Allowed') - all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id).order_by('id')[::-1] + all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id).\ + order_by('id')[::-1] params = [] for i in all_notifs: new_notif = i.to_standard_dict() From 195e6ac0b3249bf29eead2c138fe21591938fc4a Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Fri, 7 Dec 2018 16:18:59 +0530 Subject: [PATCH 21/41] more changes --- app/inbox/views.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 807cf60c7b3..dbc0a42e353 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,19 +1,15 @@ -from django.shortcuts import render -from django.core.paginator import Paginator from inbox.models import Notification -from django.utils import timezone from django.contrib.auth import get_user_model from django.http import JsonResponse, HttpResponseForbidden def inbox(request): - """Handle grants explorer.""" + """Handle all notifications.""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if profile is None: return HttpResponseForbidden('Not Allowed') - all_notifs = Notification.objects.filter(to_user_id=get_user_model().objects.get(username=profile).id).\ - order_by('id')[::-1] + all_notifs = Notification.objects.filter(to_user_id=request.user.id).order_by('id')[::-1] params = [] for i in all_notifs: new_notif = i.to_standard_dict() @@ -22,4 +18,4 @@ def inbox(request): params.append(new_notif) - return JsonResponse(params, status=200, safe=False) + return JsonResponse(params, status=200) From cfe850464716dc2db90d1dbb4331a991e8c769b0 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 09:01:23 +0530 Subject: [PATCH 22/41] Added delete notification --- app/app/urls.py | 3 +++ app/inbox/views.py | 47 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/app/app/urls.py b/app/app/urls.py index 984b7ad27f7..5f464d5fc0e 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -58,7 +58,10 @@ urlpatterns = [ path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'), + # inbox path('notification/', inbox.views.inbox, name='inbox'), + path('notification/delete/', inbox.views.delete_notification, name='inbox'), + # kudos path('kudos/', kudos.views.about, name='kudos_main'), path('kudos/about/', kudos.views.about, name='kudos_about'), diff --git a/app/inbox/views.py b/app/inbox/views.py index dbc0a42e353..0fbd9582dc5 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,21 +1,44 @@ from inbox.models import Notification from django.contrib.auth import get_user_model - +from django.views.decorators.csrf import csrf_exempt +import json from django.http import JsonResponse, HttpResponseForbidden def inbox(request): """Handle all notifications.""" - profile = request.user.profile if request.user.is_authenticated and request.user.profile else None - if profile is None: - return HttpResponseForbidden('Not Allowed') + if request.method == 'GET': + profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + if profile is None: + return HttpResponseForbidden('Not Allowed') - all_notifs = Notification.objects.filter(to_user_id=request.user.id).order_by('id')[::-1] - params = [] - for i in all_notifs: - new_notif = i.to_standard_dict() - new_notif['created_on'] = i.created_on - new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username + all_notifs = Notification.objects.filter(to_user_id=request.user.id).order_by('id')[::-1] + params = [] + for i in all_notifs: + new_notif = i.to_standard_dict() + new_notif['created_on'] = i.created_on + new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username - params.append(new_notif) + params.append(new_notif) - return JsonResponse(params, status=200) + return JsonResponse(params, status=200, safe=False) + + else: + return HttpResponseForbidden('Not Allowed') + +def delete_notification(request): + """For deleting a notification""" + profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + if request.method == 'DELETE' and profile is not None: + params = dict() + params['success'] = [] + for i in json.loads(request.body.decode('utf-8'))['delete']: + entry = Notification.objects.filter(id=i) + if entry.to_user_id == request.user.id and len(entry) != 0: + entry.delete() + params['success'].append(True) + else: + params['success'].append(False) + return JsonResponse(params, status=200) + + else: + return HttpResponseForbidden('Not Allowed') From a2c6716cf9bfbbc230c9a8adece16090e4ab5085 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 09:03:44 +0530 Subject: [PATCH 23/41] Lint fixes --- app/inbox/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 0fbd9582dc5..a9ca21565e6 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,6 +1,5 @@ from inbox.models import Notification from django.contrib.auth import get_user_model -from django.views.decorators.csrf import csrf_exempt import json from django.http import JsonResponse, HttpResponseForbidden @@ -25,6 +24,7 @@ def inbox(request): else: return HttpResponseForbidden('Not Allowed') + def delete_notification(request): """For deleting a notification""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None From c31bd59ca12afe601dfc9012590e95d23d6dba2b Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 12:47:48 +0530 Subject: [PATCH 24/41] Mark read and unread --- app/app/urls.py | 4 +- .../migrations/0003_auto_20181208_0646.py | 18 ++++++ app/inbox/models.py | 9 ++- app/inbox/views.py | 63 ++++++++++++++++--- 4 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 app/inbox/migrations/0003_auto_20181208_0646.py diff --git a/app/app/urls.py b/app/app/urls.py index 5f464d5fc0e..8676e6392d2 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -60,7 +60,9 @@ # inbox path('notification/', inbox.views.inbox, name='inbox'), - path('notification/delete/', inbox.views.delete_notification, name='inbox'), + path('notification/delete/', inbox.views.delete_notification, name='delete_notif'), + path('notification/unread/', inbox.views.unread_notification, name='unread_notif'), + path('notification/read/', inbox.views.read_notification, name='read_notif'), # kudos path('kudos/', kudos.views.about, name='kudos_main'), diff --git a/app/inbox/migrations/0003_auto_20181208_0646.py b/app/inbox/migrations/0003_auto_20181208_0646.py new file mode 100644 index 00000000000..217f2f04000 --- /dev/null +++ b/app/inbox/migrations/0003_auto_20181208_0646.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.2 on 2018-12-08 06:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inbox', '0002_remove_notification_username'), + ] + + operations = [ + migrations.AlterField( + model_name='notification', + name='modified_on', + field=models.DateTimeField(auto_now=True), + ), + ] diff --git a/app/inbox/models.py b/app/inbox/models.py index 0534e11446a..6c7fb2bb8c5 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -1,10 +1,11 @@ from django.db import models from django.utils.translation import gettext_lazy as _ -from economy.models import SuperModel from django.contrib.auth import get_user_model +from django.forms.models import model_to_dict -class Notification(SuperModel): +class Notification(models.Model): created_on = models.DateTimeField(auto_now_add=True, editable=False) + modified_on = models.DateTimeField(auto_now=True) CTA_URL = models.URLField(max_length=255, null=True) CTA_Text = models.CharField(max_length=255) message_html = models.CharField(max_length=255, null=True, help_text=_("Html message")) @@ -20,5 +21,9 @@ class Notification(SuperModel): related_name='from_user' ) + def to_standard_dict(self): + kwargs = {} + return model_to_dict(self, **kwargs) + def __str__(self): return str(self.id) diff --git a/app/inbox/views.py b/app/inbox/views.py index a9ca21565e6..2ac8c6e3153 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -15,6 +15,7 @@ def inbox(request): for i in all_notifs: new_notif = i.to_standard_dict() new_notif['created_on'] = i.created_on + new_notif['modified_on'] = i.modified_on new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username params.append(new_notif) @@ -31,13 +32,61 @@ def delete_notification(request): if request.method == 'DELETE' and profile is not None: params = dict() params['success'] = [] - for i in json.loads(request.body.decode('utf-8'))['delete']: - entry = Notification.objects.filter(id=i) - if entry.to_user_id == request.user.id and len(entry) != 0: - entry.delete() - params['success'].append(True) - else: - params['success'].append(False) + req_body = json.loads(request.body.decode('utf-8')) + if 'delete' in req_body: + for i in req_body['delete']: + entry = Notification.objects.filter(id=i) + if entry.to_user_id == request.user.id and len(entry) != 0: + entry.delete() + params['success'].append(True) + else: + params['success'].append(False) + return JsonResponse(params, status=200) + + else: + return HttpResponseForbidden('Not Allowed') + + +def unread_notification(request): + """Mark a notification as unread""" + profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + if request.method == 'PUT' and profile is not None: + params = dict() + params['success'] = [] + req_body = json.loads(request.body.decode('utf-8')) + if 'unread' in req_body: + for i in req_body['unread']: + entry = Notification.objects.filter(id=i) + if entry.to_user_id == request.user.id and len(entry) != 0: + obj = entry[0] + obj.is_read = False + obj.save() + params['success'].append(True) + else: + params['success'].append(False) + return JsonResponse(params, status=200) + + else: + return HttpResponseForbidden('Not Allowed') + + +def read_notification(request): + """Mark a notification as unread""" + profile = request.user.profile if request.user.is_authenticated and request.user.profile else None + if request.method == 'PUT' and profile is not None: + params = dict() + params['success'] = [] + req_body = json.loads(request.body.decode('utf-8')) + if 'read' in req_body: + for i in req_body['unread']: + entry = Notification.objects.filter(id=i) + if entry.to_user_id == request.user.id and len(entry) != 0: + obj = entry[0] + obj.is_read = True + obj.save() + params['success'].append(True) + else: + params['success'].append(False) return JsonResponse(params, status=200) else: From 73640f423e0672880d818868523e69b4eb7483ce Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 12:49:04 +0530 Subject: [PATCH 25/41] Lint errors fix --- app/inbox/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/inbox/models.py b/app/inbox/models.py index 6c7fb2bb8c5..969fda68dc8 100644 --- a/app/inbox/models.py +++ b/app/inbox/models.py @@ -3,6 +3,7 @@ from django.contrib.auth import get_user_model from django.forms.models import model_to_dict + class Notification(models.Model): created_on = models.DateTimeField(auto_now_add=True, editable=False) modified_on = models.DateTimeField(auto_now=True) From 74b8bd3ca8bf7d29d18b1a90ee71c2afb3b72fd0 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 12:54:05 +0530 Subject: [PATCH 26/41] Minor fix --- app/inbox/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 2ac8c6e3153..5e2c08c2295 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -78,7 +78,7 @@ def read_notification(request): params['success'] = [] req_body = json.loads(request.body.decode('utf-8')) if 'read' in req_body: - for i in req_body['unread']: + for i in req_body['read']: entry = Notification.objects.filter(id=i) if entry.to_user_id == request.user.id and len(entry) != 0: obj = entry[0] From 2d50b12020c0b71d4e4d32e1e3aed2606b6e0679 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 13:04:35 +0530 Subject: [PATCH 27/41] Helper function added --- app/inbox/utils.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/inbox/utils.py diff --git a/app/inbox/utils.py b/app/inbox/utils.py new file mode 100644 index 00000000000..f68d7ba5f49 --- /dev/null +++ b/app/inbox/utils.py @@ -0,0 +1,12 @@ +from inbox.models import Notification +from django.contrib.auth import get_user_model + +def send_notification_to_user(from_user, to_user, cta_url, cta_text, msg_html): + new_notif = Notification( + CTA_URL = cta_url, + CTA_Text = cta_text, + message_html = msg_html, + from_user_id = get_user_model().objects.get(id=from_user), + to_user_id = get_user_model().objects.get(id=to_user) + ) + new_notif.save() From f33c079735a6f10cddf72b8036a8e613d8d2a164 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 13:05:40 +0530 Subject: [PATCH 28/41] Lint fixes --- app/inbox/utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/inbox/utils.py b/app/inbox/utils.py index f68d7ba5f49..6961694c99b 100644 --- a/app/inbox/utils.py +++ b/app/inbox/utils.py @@ -2,11 +2,11 @@ from django.contrib.auth import get_user_model def send_notification_to_user(from_user, to_user, cta_url, cta_text, msg_html): - new_notif = Notification( - CTA_URL = cta_url, - CTA_Text = cta_text, - message_html = msg_html, - from_user_id = get_user_model().objects.get(id=from_user), - to_user_id = get_user_model().objects.get(id=to_user) - ) - new_notif.save() + new_notif = Notification( + CTA_URL = cta_url, + CTA_Text = cta_text, + message_html = msg_html, + from_user_id = get_user_model().objects.get(id=from_user), + to_user_id = get_user_model().objects.get(id=to_user) + ) + new_notif.save() From 81b246bfe75bebaa482bb399c20dc10d535f906a Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 13:07:08 +0530 Subject: [PATCH 29/41] Lint fixes --- app/inbox/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/inbox/utils.py b/app/inbox/utils.py index 6961694c99b..3289bd5ce15 100644 --- a/app/inbox/utils.py +++ b/app/inbox/utils.py @@ -3,10 +3,10 @@ def send_notification_to_user(from_user, to_user, cta_url, cta_text, msg_html): new_notif = Notification( - CTA_URL = cta_url, - CTA_Text = cta_text, - message_html = msg_html, - from_user_id = get_user_model().objects.get(id=from_user), - to_user_id = get_user_model().objects.get(id=to_user) + CTA_URL=cta_url, + CTA_Text=cta_text, + message_html=msg_html, + from_user_id=get_user_model().objects.get(id=from_user), + to_user_id=get_user_model().objects.get(id=to_user) ) new_notif.save() From 5021197551a8f7c68a85986cabf5dd2f1a9c435e Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 13:08:24 +0530 Subject: [PATCH 30/41] Lint fixes --- app/inbox/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/inbox/utils.py b/app/inbox/utils.py index 3289bd5ce15..8209216ef3b 100644 --- a/app/inbox/utils.py +++ b/app/inbox/utils.py @@ -1,6 +1,7 @@ from inbox.models import Notification from django.contrib.auth import get_user_model + def send_notification_to_user(from_user, to_user, cta_url, cta_text, msg_html): new_notif = Notification( CTA_URL=cta_url, From 0b3e682d60c2559241caa5333ce427c69b7f96f7 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 18:26:07 +0530 Subject: [PATCH 31/41] Cleanup migrations --- app/inbox/migrations/0001_initial.py | 9 ++------- .../0002_remove_notification_username.py | 17 ----------------- .../migrations/0003_auto_20181208_0646.py | 18 ------------------ app/inbox/views.py | 2 +- 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 app/inbox/migrations/0002_remove_notification_username.py delete mode 100644 app/inbox/migrations/0003_auto_20181208_0646.py diff --git a/app/inbox/migrations/0001_initial.py b/app/inbox/migrations/0001_initial.py index 762d66c5d38..f84ad578bb5 100644 --- a/app/inbox/migrations/0001_initial.py +++ b/app/inbox/migrations/0001_initial.py @@ -1,9 +1,8 @@ -# Generated by Django 2.1.2 on 2018-12-07 04:02 +# Generated by Django 2.1.2 on 2018-12-08 12:52 from django.conf import settings from django.db import migrations, models import django.db.models.deletion -import economy.models class Migration(migrations.Migration): @@ -19,9 +18,8 @@ class Migration(migrations.Migration): name='Notification', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('modified_on', models.DateTimeField(default=economy.models.get_time)), ('created_on', models.DateTimeField(auto_now_add=True)), - ('username', models.CharField(max_length=255)), + ('modified_on', models.DateTimeField(auto_now=True)), ('CTA_URL', models.URLField(max_length=255, null=True)), ('CTA_Text', models.CharField(max_length=255)), ('message_html', models.CharField(help_text='Html message', max_length=255, null=True)), @@ -29,8 +27,5 @@ class Migration(migrations.Migration): ('from_user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='from_user', to=settings.AUTH_USER_MODEL)), ('to_user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='to_user', to=settings.AUTH_USER_MODEL)), ], - options={ - 'abstract': False, - }, ), ] diff --git a/app/inbox/migrations/0002_remove_notification_username.py b/app/inbox/migrations/0002_remove_notification_username.py deleted file mode 100644 index 641fbfc2b2e..00000000000 --- a/app/inbox/migrations/0002_remove_notification_username.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-07 04:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('inbox', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='notification', - name='username', - ), - ] diff --git a/app/inbox/migrations/0003_auto_20181208_0646.py b/app/inbox/migrations/0003_auto_20181208_0646.py deleted file mode 100644 index 217f2f04000..00000000000 --- a/app/inbox/migrations/0003_auto_20181208_0646.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-08 06:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inbox', '0002_remove_notification_username'), - ] - - operations = [ - migrations.AlterField( - model_name='notification', - name='modified_on', - field=models.DateTimeField(auto_now=True), - ), - ] diff --git a/app/inbox/views.py b/app/inbox/views.py index 5e2c08c2295..262b1cec597 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -71,7 +71,7 @@ def unread_notification(request): def read_notification(request): - """Mark a notification as unread""" + """Mark a notification as read""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if request.method == 'PUT' and profile is not None: params = dict() From f01d9b99fef77d8edfd351df7fa4b455bd094625 Mon Sep 17 00:00:00 2001 From: octavioamu Date: Sat, 8 Dec 2018 11:50:20 -0200 Subject: [PATCH 32/41] add inbox and changes functions names --- app/app/urls.py | 3 +- .../v2/css/external_bounties/checkboxes.css | 73 ++++++++++++ app/assets/v2/css/gitcoin.css | 6 + app/assets/v2/css/notifications.css | 17 ++- app/assets/v2/js/notifications.js | 95 +++++++-------- .../templates/shared/notifications.html | 4 +- app/inbox/templates/inbox.html | 109 ++++++++++++++++++ app/inbox/views.py | 21 +++- 8 files changed, 269 insertions(+), 59 deletions(-) create mode 100644 app/inbox/templates/inbox.html diff --git a/app/app/urls.py b/app/app/urls.py index 984b7ad27f7..ff80c621b04 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -58,7 +58,8 @@ urlpatterns = [ path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'), - path('notification/', inbox.views.inbox, name='inbox'), + path('api/v0.1/notifications/', inbox.views.notifications, name='notifications'), + path('inbox/', inbox.views.inbox, name='inbox'), # kudos path('kudos/', kudos.views.about, name='kudos_main'), path('kudos/about/', kudos.views.about, name='kudos_about'), diff --git a/app/assets/v2/css/external_bounties/checkboxes.css b/app/assets/v2/css/external_bounties/checkboxes.css index 24f419a8ff2..9dadfa5a039 100644 --- a/app/assets/v2/css/external_bounties/checkboxes.css +++ b/app/assets/v2/css/external_bounties/checkboxes.css @@ -91,3 +91,76 @@ background-color: #26cd7f; border: 3px solid #36E69B; } + +/* border checkbox */ + +.gc-checkbox input[type="checkbox"] { + -moz-appearance: none; + -webkit-appearance: none; + appearance: none; + margin-top: .75em; + opacity: .00001; + position: relative; + vertical-align: top; + z-index: 2; +} + +.gc-checkbox label { + position: relative; + display: inline-block; + + /*16px width of fake checkbox + 6px distance between fake checkbox and text*/ + padding-left: 22px; + min-height: 16px; + vertical-align: middle; +} + +.gc-checkbox label::before, +.gc-checkbox label::after { + position: absolute; + content: ""; + + /*Needed for the line-height to take effect*/ + display: inline-block; +} + +/*Outer box of the fake checkbox*/ +.gc-checkbox label::before{ + height: 18px; + width: 18px; + border: 2px solid #9F9F9F; + border-radius: 3px; + left: 0px; + + /*(24px line-height - 16px height of fake checkbox) / 2 - 1px for the border + *to vertically center it. + */ + top: 3px; +} + +/*Checkmark of the fake checkbox*/ +.gc-checkbox label::after { + height: 6px; + width: 10px; + border-left: 2px solid; + border-bottom: 2px solid; + transform: rotate(-45deg); + left: 4px; + top: 8px; +} + +/*Hide the checkmark by default*/ +.gc-checkbox input[type="checkbox"] + label::after { + content: none; +} + +/*Unhide on the checked state*/ +.gc-checkbox input[type="checkbox"]:checked + label::after { + content: ""; +} + +/*Adding focus styles on the outer-box of the fake checkbox*/ +.gc-checkbox input[type="checkbox"]:focus + label::before { + outline: rgb(59, 153, 252) auto 5px; +} + diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 40f61c30fc9..1cd53efaaf2 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -69,10 +69,12 @@ h4, position: fixed; top: 0; left: 0; + right: 0; z-index: -1; will-change: transform; overflow-y: hidden; overflow-x: hidden; + min-height: 112px; } .text-white { @@ -201,6 +203,10 @@ div.button-pink { background-repeat: no-repeat; } +.bg-lightblue { + background-color: #EFF3F6; +} + .white-light-bg { background-color: white; background-image: url('/static/v2/images/light-bg.png'); diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index 067b2cc414f..97ab15b4778 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -59,7 +59,7 @@ max-width: calc(100vw - 2em); } -.notifications__box a { +.notifications__link { color: var(--link-color); font-size: 0.75rem; } @@ -130,10 +130,16 @@ } .notifications_content { + color: #212529; display: flex; align-items: center; } +.notifications_content:hover { + color: #5d666f; + text-decoration: none; +} + .notifications_content p { margin-bottom: 0; } @@ -190,3 +196,12 @@ text-overflow: ellipsis; overflow: hidden; } + +.inbox-list { + background: white; + padding: 6em; + margin-top: -3em; + z-index: 0; + position: relative; + border-radius: 4px; +} diff --git a/app/assets/v2/js/notifications.js b/app/assets/v2/js/notifications.js index afd6512dd0e..84bb3a2cd3e 100644 --- a/app/assets/v2/js/notifications.js +++ b/app/assets/v2/js/notifications.js @@ -1,26 +1,25 @@ -var notifications = [] -var newNotifications = [] -const isHidden = false -const container = $('.notifications__list') +var notifications = []; +var newNotifications = []; +var isHidden = false; +const container = $('.notifications__list'); function requestNotifications() { - var getNotifications = fetchData ('/notification/','GET') + var getNotifications = fetchData ('/api/v0.1/notifications/', 'GET'); - $.when( getNotifications ).then(function(response) { + $.when(getNotifications).then(function(response) { + var loadTmp = true; - var loadTmp = true - console.log(response, notifications) if (response.length !== notifications.length) { - newNotifications = newData(response, notifications) + newNotifications = newData(response, notifications); newNotifications.forEach(element => { - notifications.push(element) + notifications.push(element); }); - setDot(true, notifications) - templateSuggestions(newNotifications) + setDot(true, notifications); + templateSuggestions(newNotifications); } - }) + }); } function templateSuggestions(notifications) { @@ -28,10 +27,10 @@ function templateSuggestions(notifications) { ${notifications.map((notify, index) => `
  • - + - - + +

    ${notify.message_html}

    @@ -39,68 +38,60 @@ function templateSuggestions(notifications) { -
    • ` - ).join(' ')} - `; + `).join(' ')}`; - container.prepend(tmp) + container.prepend(tmp); $('.notifications__item'); } function checkHidden() { - if (typeof document.hidden !== "undefined") { - return isHidden = document.hidden + if (typeof document.hidden !== 'undefined') { + isHidden = document.hidden; + } else { - return isHidden = false + isHidden = false; } + return isHidden; } function newData(newObj, oldObj) { return newObj.filter(function(obj) { return !oldObj.some(function(obj2) { - return obj.id == obj2.id; + return obj.id == obj2.id; }); }); } moment.updateLocale('en', { - relativeTime : { - future: "in %s", - past: "%s ", - s : 'now', - ss : '%ds', - m: "1m", - mm: "%d m", - h: "1h", - hh: "%dh", - d: "1 day", - dd: "%d days", - M: "1 month", - MM: "%d months", - y: "1 year", - yy: "%d years" + relativeTime: { + future: 'in %s', + past: '%s ', + s: 'now', + ss: '%ds', + m: '1m', + mm: '%d m', + h: '1h', + hh: '%dh', + d: '1 day', + dd: '%d days', + M: '1 month', + MM: '%d months', + y: '1 year', + yy: '%d years' } }); function setDot(hasNewData, newNotifications) { - $('#total-notifications').text(newNotifications.length) + $('#total-notifications').text(newNotifications.length); + if (hasNewData) { - $('#notification-dot').addClass('notification__dot_active') + $('#notification-dot').addClass('notification__dot_active'); } else { - $('#notification-dot').removeClass('notification__dot_active') - } -} - -function truncateString(str, num) { - - if (str.length > num) { - return str.slice(0, num) + "...";} - else { - return str; + $('#notification-dot').removeClass('notification__dot_active'); } } -requestNotifications() +requestNotifications(); var intervalNotifications = window.setInterval(requestNotifications, 5000); diff --git a/app/dashboard/templates/shared/notifications.html b/app/dashboard/templates/shared/notifications.html index f09faf021a1..414d56ab49e 100644 --- a/app/dashboard/templates/shared/notifications.html +++ b/app/dashboard/templates/shared/notifications.html @@ -26,7 +26,7 @@
    {% trans 'Notifications' %} 0 -
    {% trans 'Mark All as Read' %} +
    {% trans 'Mark All as Read' %}
- {% trans 'See all' %} + {% trans 'See all' %}
diff --git a/app/inbox/templates/inbox.html b/app/inbox/templates/inbox.html new file mode 100644 index 00000000000..27b55d25817 --- /dev/null +++ b/app/inbox/templates/inbox.html @@ -0,0 +1,109 @@ +{% comment %} + Copyright (C) 2017 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not,see + . +{% endcomment %} +{% load i18n static %} + + + + + {% include 'shared/head.html' %} + {% include 'shared/cards.html' %} + + + + + {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'shared/nav.html' %} +
+ {% include 'shared/minihero.html' with h1='Notifications' suppress_logo=1 %} +
+
+ +
+
+
+ + +
+ +
+ All + None + Read + Unread +
+
+ + + + + +
+ Today + + +
+ {% include 'shared/footer.html' %} + {% include 'shared/analytics.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + + + + + diff --git a/app/inbox/views.py b/app/inbox/views.py index 423453b5d4a..246607191c3 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,11 +1,14 @@ -from django.shortcuts import render +from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.paginator import Paginator -from inbox.models import Notification +from django.shortcuts import render +from django.template.response import TemplateResponse from django.utils import timezone +from django.utils.translation import gettext_lazy as _ +from inbox.models import Notification from django.http import JsonResponse, HttpResponseForbidden -def inbox(request): +def notifications(request): """Handle grants explorer.""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None limit = request.GET.get('limit', 25) @@ -32,3 +35,15 @@ def inbox(request): params.append(new_notif) return JsonResponse(params, status=200, safe=False) + +def inbox(request): + + context = { + 'is_outside': True, + 'active': 'inbox', + 'title': 'inbox', + 'card_title': _('Each Kudos is a unique work of art.'), + 'card_desc': _('It can be sent to highlight, recognize, and show appreciation.'), + 'avatar_url': static('v2/images/kudos/assets/kudos-image.png'), + } + return TemplateResponse(request, 'inbox.html', context) From 2475d7fdef4b15e28676404ece8e0af235eec114 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 19:52:10 +0530 Subject: [PATCH 33/41] url versioning and function name changes --- app/app/urls.py | 8 ++++---- app/inbox/views.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/app/urls.py b/app/app/urls.py index 8676e6392d2..a0ac77c4a13 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -59,10 +59,10 @@ path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'), # inbox - path('notification/', inbox.views.inbox, name='inbox'), - path('notification/delete/', inbox.views.delete_notification, name='delete_notif'), - path('notification/unread/', inbox.views.unread_notification, name='unread_notif'), - path('notification/read/', inbox.views.read_notification, name='read_notif'), + path('api/v1.0/notifications/', inbox.views.notifications, name='notifications'), + path('api/v1.0/notifications/delete/', inbox.views.delete_notifications, name='delete_notif'), + path('api/v1.0/notifications/unread/', inbox.views.unread_notifications, name='unread_notif'), + path('api/v1.0/notifications/read/', inbox.views.read_notifications, name='read_notif'), # kudos path('kudos/', kudos.views.about, name='kudos_main'), diff --git a/app/inbox/views.py b/app/inbox/views.py index 262b1cec597..381f6955a87 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -3,7 +3,7 @@ import json from django.http import JsonResponse, HttpResponseForbidden -def inbox(request): +def notifications(request): """Handle all notifications.""" if request.method == 'GET': profile = request.user.profile if request.user.is_authenticated and request.user.profile else None @@ -26,7 +26,7 @@ def inbox(request): return HttpResponseForbidden('Not Allowed') -def delete_notification(request): +def delete_notifications(request): """For deleting a notification""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if request.method == 'DELETE' and profile is not None: @@ -47,7 +47,7 @@ def delete_notification(request): return HttpResponseForbidden('Not Allowed') -def unread_notification(request): +def unread_notifications(request): """Mark a notification as unread""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if request.method == 'PUT' and profile is not None: @@ -70,7 +70,7 @@ def unread_notification(request): return HttpResponseForbidden('Not Allowed') -def read_notification(request): +def read_notifications(request): """Mark a notification as read""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if request.method == 'PUT' and profile is not None: From 80d93cfddd9c1f26b03d3c1e209b90fb5a1b6945 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sat, 8 Dec 2018 19:53:45 +0530 Subject: [PATCH 34/41] Lint fixes --- app/inbox/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/inbox/views.py b/app/inbox/views.py index 381f6955a87..0ad96da14be 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -3,6 +3,7 @@ import json from django.http import JsonResponse, HttpResponseForbidden + def notifications(request): """Handle all notifications.""" if request.method == 'GET': From abdbf3706ee3228f280c3ebc6c1748f5c503d13e Mon Sep 17 00:00:00 2001 From: octavioamu Date: Sat, 8 Dec 2018 13:00:13 -0200 Subject: [PATCH 35/41] change url version --- app/app/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app/urls.py b/app/app/urls.py index ad24470216b..73455242359 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -59,10 +59,10 @@ path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'), # inbox - path('api/v1.0/notifications/', inbox.views.notifications, name='notifications'), - path('api/v1.0/notifications/delete/', inbox.views.delete_notifications, name='delete_notif'), - path('api/v1.0/notifications/unread/', inbox.views.unread_notifications, name='unread_notif'), - path('api/v1.0/notifications/read/', inbox.views.read_notifications, name='read_notif'), + path('api/v0.1/notifications/', inbox.views.notifications, name='notifications'), + path('api/v0.1/notifications/delete/', inbox.views.delete_notifications, name='delete_notif'), + path('api/v0.1/notifications/unread/', inbox.views.unread_notifications, name='unread_notif'), + path('api/v0.1/notifications/read/', inbox.views.read_notifications, name='read_notif'), path('inbox/', inbox.views.inbox, name='inbox'), # kudos From 403a278d3ac4394e46818518958a0b499b6c8c8d Mon Sep 17 00:00:00 2001 From: octavioamu Date: Sun, 9 Dec 2018 04:47:49 -0200 Subject: [PATCH 36/41] add mark as read --- app/assets/v2/css/mission.css | 4 +-- app/assets/v2/js/notifications.js | 29 +++++++++++++++++++ .../templates/shared/notifications.html | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/css/mission.css b/app/assets/v2/css/mission.css index 41bd21103b9..8fd58ee86a4 100644 --- a/app/assets/v2/css/mission.css +++ b/app/assets/v2/css/mission.css @@ -1,4 +1,4 @@ -.mission p { +.mission .animatedParent p { font-size: 20px; font-weight: 500; color: #666666; @@ -98,4 +98,4 @@ #we_interact, #we_believe { padding: 0 10vw; -} \ No newline at end of file +} diff --git a/app/assets/v2/js/notifications.js b/app/assets/v2/js/notifications.js index 84bb3a2cd3e..de83d48470d 100644 --- a/app/assets/v2/js/notifications.js +++ b/app/assets/v2/js/notifications.js @@ -15,6 +15,9 @@ function requestNotifications() { newNotifications.forEach(element => { notifications.push(element); }); + + markAsRead(newNotifications) + setDot(true, notifications); templateSuggestions(newNotifications); } @@ -92,6 +95,32 @@ function setDot(hasNewData, newNotifications) { } } +function markAsRead(notificationsA) { + console.log(notificationsA) + var notificationRead = parseInt(sessionStorage.getItem('notificationRead')) + + if (notificationRead) { + console.log('ping') + sessionStorage.removeItem('notificationRead'); + console.log('api request readed', notificationRead); + // notificationRead = parseInt(notificationRead) + + const resulta = notificationsA.findIndex(item => { + return item.id === notificationRead + }) + notificationsA[resulta].is_read = true; + } +} + requestNotifications(); var intervalNotifications = window.setInterval(requestNotifications, 5000); + +$(document).ready(function() { + + $('.notifications__box').on('click', '[data-notification]', function(e){ + window.sessionStorage.setItem('notificationRead', e.currentTarget.dataset.notification); + }) + +}) + diff --git a/app/dashboard/templates/shared/notifications.html b/app/dashboard/templates/shared/notifications.html index 414d56ab49e..255f287212d 100644 --- a/app/dashboard/templates/shared/notifications.html +++ b/app/dashboard/templates/shared/notifications.html @@ -99,6 +99,6 @@ --> - {% trans 'See all' %} + {% trans 'See all' %}
From e47ac1da68ca982b5a9077579505075f64cc8ea1 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sun, 9 Dec 2018 17:10:56 +0530 Subject: [PATCH 37/41] Handled json execptions --- app/inbox/views.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index d488d7f6fd0..64bb20ae5b0 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -38,7 +38,10 @@ def delete_notifications(request): if request.method == 'DELETE' and profile is not None: params = dict() params['success'] = [] - req_body = json.loads(request.body.decode('utf-8')) + try: + req_body = json.loads(request.body.decode('utf-8')) + except: + pass if 'delete' in req_body: for i in req_body['delete']: entry = Notification.objects.filter(id=i) @@ -59,7 +62,10 @@ def unread_notifications(request): if request.method == 'PUT' and profile is not None: params = dict() params['success'] = [] - req_body = json.loads(request.body.decode('utf-8')) + try: + req_body = json.loads(request.body.decode('utf-8')) + except: + pass if 'unread' in req_body: for i in req_body['unread']: entry = Notification.objects.filter(id=i) @@ -82,7 +88,10 @@ def read_notifications(request): if request.method == 'PUT' and profile is not None: params = dict() params['success'] = [] - req_body = json.loads(request.body.decode('utf-8')) + try: + req_body = json.loads(request.body.decode('utf-8')) + except: + pass if 'read' in req_body: for i in req_body['read']: entry = Notification.objects.filter(id=i) From 15064e802b2ec26c5dafd519b225b76388f39c03 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Sun, 9 Dec 2018 17:33:34 +0530 Subject: [PATCH 38/41] Added pagination for notifications --- app/inbox/views.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 64bb20ae5b0..9a2df0acc21 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -1,12 +1,13 @@ +import json +from inbox.models import Notification from django.contrib.staticfiles.templatetags.staticfiles import static from django.shortcuts import render from django.template.response import TemplateResponse from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from inbox.models import Notification from django.contrib.auth import get_user_model -import json from django.http import JsonResponse, HttpResponseForbidden +from django.core.paginator import Paginator def notifications(request): @@ -15,17 +16,29 @@ def notifications(request): profile = request.user.profile if request.user.is_authenticated and request.user.profile else None if profile is None: return HttpResponseForbidden('Not Allowed') - + limit = 10 + page = 1 + if 'limit' in request.GET: + limit = int(request.GET['limit']) + if 'page' in request.GET: + page = int(request.GET['page']) + print(limit, page) all_notifs = Notification.objects.filter(to_user_id=request.user.id).order_by('id')[::-1] - params = [] - for i in all_notifs: - new_notif = i.to_standard_dict() - new_notif['created_on'] = i.created_on - new_notif['modified_on'] = i.modified_on - new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username - - params.append(new_notif) - + params = dict() + all_pages = Paginator(all_notifs, limit) + if page > 0 and page <= all_pages.num_pages: + all_notifications = [] + for i in all_pages.page(page): + new_notif = i.to_standard_dict() + new_notif['created_on'] = i.created_on + new_notif['modified_on'] = i.modified_on + new_notif['username'] = get_user_model().objects.get(id=new_notif['from_user_id']).username + + all_notifications.append(new_notif) + params['data'] = all_notifications + params['has_next'] = all_pages.page(page).has_next() + else: + params['total_pages'] = all_pages.num_pages return JsonResponse(params, status=200, safe=False) else: From 5d25b337b3e4a1e9a7dea21b94e7df8c73e973d0 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Mon, 10 Dec 2018 07:35:10 +0530 Subject: [PATCH 39/41] Fix AttributeError in inbox.views --- app/inbox/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 9a2df0acc21..26eb826fbd9 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -58,7 +58,7 @@ def delete_notifications(request): if 'delete' in req_body: for i in req_body['delete']: entry = Notification.objects.filter(id=i) - if entry.to_user_id == request.user.id and len(entry) != 0: + if entry.to_user_id.id == request.user.id and len(entry) != 0: entry.delete() params['success'].append(True) else: @@ -82,7 +82,7 @@ def unread_notifications(request): if 'unread' in req_body: for i in req_body['unread']: entry = Notification.objects.filter(id=i) - if entry.to_user_id == request.user.id and len(entry) != 0: + if entry.to_user_id.id == request.user.id and len(entry) != 0: obj = entry[0] obj.is_read = False obj.save() @@ -108,7 +108,7 @@ def read_notifications(request): if 'read' in req_body: for i in req_body['read']: entry = Notification.objects.filter(id=i) - if entry.to_user_id == request.user.id and len(entry) != 0: + if entry.to_user_id.id == request.user.id and len(entry) != 0: obj = entry[0] obj.is_read = True obj.save() From 80acc0ee213c205dbd01c8257094da86b569e56c Mon Sep 17 00:00:00 2001 From: octavioamu Date: Mon, 10 Dec 2018 00:31:34 -0200 Subject: [PATCH 40/41] change add read --- app/assets/v2/js/notifications.js | 57 +++++++++++++++++++++++----- app/inbox/migrations/0001_initial.py | 2 +- app/inbox/views.py | 4 ++ 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/app/assets/v2/js/notifications.js b/app/assets/v2/js/notifications.js index de83d48470d..96d84d4e68f 100644 --- a/app/assets/v2/js/notifications.js +++ b/app/assets/v2/js/notifications.js @@ -1,16 +1,23 @@ var notifications = []; var newNotifications = []; var isHidden = false; +var page = 1; const container = $('.notifications__list'); function requestNotifications() { - var getNotifications = fetchData ('/api/v0.1/notifications/', 'GET'); + console.log(page) + var getNotifications = fetchData (`/api/v0.1/notifications/?page=${page}`, 'GET'); $.when(getNotifications).then(function(response) { - var loadTmp = true; + // var loadTmp = response.data.length && response.data[0].id !== notifications[0].id; + var loadTmp = response.data.length !== notifications.length + // console.log(response.data[0].id) + // if (response.data.length !== notifications.length) { + if (loadTmp) { + newNotifications = newData(response.data, notifications); - if (response.length !== notifications.length) { - newNotifications = newData(response, notifications); + page = response.has_next ? page+1 : page = 1 + console.log(page) newNotifications.forEach(element => { notifications.push(element); @@ -43,7 +50,11 @@ function templateSuggestions(notifications) { `).join(' ')}`; - container.prepend(tmp); + // if (newItems) { + container.prepend(tmp); + // } else { + // container.append(tmp); + // } $('.notifications__item'); } @@ -95,26 +106,32 @@ function setDot(hasNewData, newNotifications) { } } -function markAsRead(notificationsA) { - console.log(notificationsA) +function markAsRead(notificationToRead) { + console.log(notificationToRead) var notificationRead = parseInt(sessionStorage.getItem('notificationRead')) if (notificationRead) { console.log('ping') sessionStorage.removeItem('notificationRead'); console.log('api request readed', notificationRead); + let data = JSON.stringify({'read':[notificationRead]}); + var putRead = fetchData (`api/v0.1/notifications/read/`, 'PUT', data); + $.when(putRead).then(function(response) { + console.log(response) + }) + // notificationRead = parseInt(notificationRead) - const resulta = notificationsA.findIndex(item => { + const index = notificationToRead.findIndex(item => { return item.id === notificationRead }) - notificationsA[resulta].is_read = true; + notificationToRead[index].is_read = true; } } requestNotifications(); -var intervalNotifications = window.setInterval(requestNotifications, 5000); +var intervalNotifications = window.setInterval(requestNotifications, 10000); $(document).ready(function() { @@ -124,3 +141,23 @@ $(document).ready(function() { }) +$('.notifications__list').scroll( function() { + console.log($(this)[0]) + const scrollContainer = $(this)[0] + if (scrollContainer.scrollTop + scrollContainer.clientHeight >= scrollContainer.scrollHeight) { + requestNotifications(page); + } +}); + + + +var array = []; +var observedArray = new Proxy(notifications, { + set: function (target, propertyKey, value, receiver) { + console.log(propertyKey+'='+value); + console.log(target,propertyKey, value ) + target[propertyKey] = value; + return true + } +}); + diff --git a/app/inbox/migrations/0001_initial.py b/app/inbox/migrations/0001_initial.py index f84ad578bb5..0c88b39331a 100644 --- a/app/inbox/migrations/0001_initial.py +++ b/app/inbox/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.2 on 2018-12-08 12:52 +# Generated by Django 2.1.2 on 2018-12-10 02:25 from django.conf import settings from django.db import migrations, models diff --git a/app/inbox/views.py b/app/inbox/views.py index 26eb826fbd9..8e0b327c9e0 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -8,6 +8,7 @@ from django.contrib.auth import get_user_model from django.http import JsonResponse, HttpResponseForbidden from django.core.paginator import Paginator +from django.views.decorators.csrf import csrf_exempt def notifications(request): @@ -45,6 +46,7 @@ def notifications(request): return HttpResponseForbidden('Not Allowed') +@csrf_exempt def delete_notifications(request): """For deleting a notification""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None @@ -69,6 +71,7 @@ def delete_notifications(request): return HttpResponseForbidden('Not Allowed') +@csrf_exempt def unread_notifications(request): """Mark a notification as unread""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None @@ -95,6 +98,7 @@ def unread_notifications(request): return HttpResponseForbidden('Not Allowed') +@csrf_exempt def read_notifications(request): """Mark a notification as read""" profile = request.user.profile if request.user.is_authenticated and request.user.profile else None From 1dc59cc9093cd09adbf9131edd797e03ac55efa7 Mon Sep 17 00:00:00 2001 From: Muhammad Usman Date: Mon, 10 Dec 2018 08:16:00 +0530 Subject: [PATCH 41/41] Fix in inbox.views --- app/inbox/views.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/app/inbox/views.py b/app/inbox/views.py index 8e0b327c9e0..2acd66cae79 100644 --- a/app/inbox/views.py +++ b/app/inbox/views.py @@ -60,9 +60,13 @@ def delete_notifications(request): if 'delete' in req_body: for i in req_body['delete']: entry = Notification.objects.filter(id=i) - if entry.to_user_id.id == request.user.id and len(entry) != 0: - entry.delete() - params['success'].append(True) + if len(entry) != 0: + obj = entry[0] + if obj.to_user_id.id == request.user.id: + obj.delete() + params['success'].append(True) + else: + params['success'].append(False) else: params['success'].append(False) return JsonResponse(params, status=200) @@ -85,11 +89,14 @@ def unread_notifications(request): if 'unread' in req_body: for i in req_body['unread']: entry = Notification.objects.filter(id=i) - if entry.to_user_id.id == request.user.id and len(entry) != 0: + if len(entry) != 0: obj = entry[0] - obj.is_read = False - obj.save() - params['success'].append(True) + if obj.to_user_id.id == request.user.id: + obj.is_read = False + obj.save() + params['success'].append(True) + else: + params['success'].append(False) else: params['success'].append(False) return JsonResponse(params, status=200) @@ -112,11 +119,15 @@ def read_notifications(request): if 'read' in req_body: for i in req_body['read']: entry = Notification.objects.filter(id=i) - if entry.to_user_id.id == request.user.id and len(entry) != 0: + #if entry.to_user_id.id == request.user.id and len(entry) != 0: + if len(entry) != 0: obj = entry[0] - obj.is_read = True - obj.save() - params['success'].append(True) + if obj.to_user_id.id == request.user.id: + obj.is_read = True + obj.save() + params['success'].append(True) + else: + params['success'].append(False) else: params['success'].append(False) return JsonResponse(params, status=200)