Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

code: Notifications #3221

Merged
merged 129 commits into from
Jan 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
20eea61
add inbox app
octavioamu Nov 27, 2018
7ab6e9b
Merge branch 'master' into new-notifications
Nov 28, 2018
287b3c4
add initial markup
octavioamu Nov 28, 2018
97b2a72
improve dropdown
octavioamu Nov 29, 2018
e2d315f
dynamic shadow
octavioamu Nov 30, 2018
3e2f9a7
change styles
octavioamu Nov 30, 2018
49594fd
backend init
octavioamu Dec 2, 2018
a6a8f05
small style changes
octavioamu Dec 3, 2018
e28a42d
mockup data
octavioamu Dec 4, 2018
3e6aa8f
fix request logic
octavioamu Dec 5, 2018
3080253
fix login and updates
octavioamu Dec 5, 2018
b4972d7
fix loop
octavioamu Dec 6, 2018
b6be53b
Changes to backend
Dec 5, 2018
be85747
Added username
Dec 6, 2018
fd08458
Get data from db
Dec 6, 2018
7cbb857
Added created time to data returned
Dec 6, 2018
d0b3330
Cleanup
Dec 6, 2018
710efeb
Merge pull request #3083 from usmanmuhd/notifs-backend
octavioamu Dec 6, 2018
dfb235c
fix shadow safari bug
octavioamu Dec 6, 2018
fad9fb9
Changes to notifs backend
Dec 7, 2018
6e958e1
Sort the notifs
Dec 7, 2018
cfd0469
Fix lint error
Dec 7, 2018
195e6ac
more changes
Dec 7, 2018
cfe8504
Added delete notification
Dec 8, 2018
a2c6716
Lint fixes
Dec 8, 2018
c31bd59
Mark read and unread
Dec 8, 2018
73640f4
Lint errors fix
Dec 8, 2018
74b8bd3
Minor fix
Dec 8, 2018
2d50b12
Helper function added
Dec 8, 2018
f33c079
Lint fixes
Dec 8, 2018
81b246b
Lint fixes
Dec 8, 2018
5021197
Lint fixes
Dec 8, 2018
0b3e682
Cleanup migrations
Dec 8, 2018
f01d9b9
add inbox and changes functions names
octavioamu Dec 8, 2018
2475d7f
url versioning and function name changes
Dec 8, 2018
80d93cf
Lint fixes
Dec 8, 2018
f6ef416
Merge branch 'new-notifications' into notif-backend
Dec 8, 2018
b67d6e9
Merge pull request #3119 from usmanmuhd/notif-backend
octavioamu Dec 8, 2018
abdbf37
change url version
octavioamu Dec 8, 2018
403a278
add mark as read
octavioamu Dec 9, 2018
e47ac1d
Handled json execptions
Dec 9, 2018
15064e8
Added pagination for notifications
Dec 9, 2018
476cb70
Merge pull request #3149 from usmanmuhd/notif-pagination
octavioamu Dec 9, 2018
5d25b33
Fix AttributeError in inbox.views
Dec 10, 2018
4def040
Merge pull request #3155 from usmanmuhd/notif-fixes
octavioamu Dec 10, 2018
80acc0e
change add read
octavioamu Dec 10, 2018
1dc59cc
Fix in inbox.views
Dec 10, 2018
a01df33
Merge pull request #3156 from usmanmuhd/new-notifications
octavioamu Dec 10, 2018
62e2f8e
remove setinterval
octavioamu Dec 12, 2018
86b7f57
add placeholder and logic changes
octavioamu Dec 13, 2018
b9dcea5
adding vue
octavioamu Dec 13, 2018
e26d0d9
Merge branch 'master' into vue-notifications
octavioamu Dec 13, 2018
ffd7dab
vue baby
octavioamu Dec 14, 2018
6544212
resolve lint
octavioamu Dec 14, 2018
84fa52a
inbox
octavioamu Dec 17, 2018
e98eb3d
fix manifest
octavioamu Dec 18, 2018
b2596fc
add inbox actions
octavioamu Dec 18, 2018
97f103a
fix loop logic
octavioamu Dec 18, 2018
0332ac7
Merge branch 'master' into vue-notifications
octavioamu Dec 18, 2018
ef7eafa
fix topbar
octavioamu Dec 19, 2018
a5dda51
fix menu cutting
octavioamu Dec 19, 2018
211c1e9
fix responsive menu
octavioamu Dec 19, 2018
a862e68
send tip multiple fixes and clean
octavioamu Dec 19, 2018
bd8f923
removed repeated js
octavioamu Dec 19, 2018
a5bcf77
Backend changes
Dec 20, 2018
38f4306
Lint fixes
Dec 20, 2018
f3e0b8f
Lint fixes
Dec 20, 2018
df4923c
Lint fixes
Dec 20, 2018
fccc548
Changes to models
Dec 20, 2018
a09079d
Recreate migrations
Dec 20, 2018
896b8fa
Docstring in utils.py
Dec 20, 2018
4e9d710
Changes to views.py
Dec 21, 2018
dd1c0f8
Removed profile from models
Dec 21, 2018
5047430
Typo fix
Dec 21, 2018
b35ff5c
changes to inbox/models.py
Dec 21, 2018
6d82423
Added docstring in inbox/models
Dec 21, 2018
c0902cd
Changes to inbox/views.py
Dec 21, 2018
7cdb7af
Paginator changes
Dec 21, 2018
2249f3a
Added options to cta_text
Dec 21, 2018
07e9f77
Changes to urls
Dec 21, 2018
a0aae82
Changes to urls
Dec 21, 2018
25dcde0
Lint fixes
Dec 21, 2018
4b20c14
Changes url in frontend
Dec 22, 2018
2328640
Create notif on new tip
Dec 24, 2018
819b9ae
Merge branch 'master' into notifications-backend
octavioamu Dec 26, 2018
8df9461
Merge branch 'master' into notifications-backend
octavioamu Dec 26, 2018
64f5044
front fixes for backend changes
octavioamu Dec 26, 2018
486793e
merge new backend
octavioamu Dec 26, 2018
62723a9
remove unused imports
octavioamu Dec 26, 2018
46731e3
Merge branch 'master' into vue-notifications
octavioamu Dec 26, 2018
552f713
Merge branch 'master' into vue-notifications
octavioamu Dec 26, 2018
d645b15
remove dead code
octavioamu Dec 27, 2018
7cc6d1c
Merge branch 'vue-notifications' of https://github.com/gitcoinco/web …
octavioamu Dec 27, 2018
b6aa753
Merge branch 'master' into vue-notifications
octavioamu Dec 27, 2018
9d11c32
Resolved code style
Dec 27, 2018
93f911c
Removed params return
Dec 27, 2018
4223a7f
Default paginate for notifications
Dec 28, 2018
e94f763
Merge branch 'master' into vue-notifications
octavioamu Dec 28, 2018
45ba300
Bulk delete notifs
Dec 28, 2018
75812d5
Merge pull request #3332 from usmanmuhd/inbox-notifs
octavioamu Dec 28, 2018
792b3e3
fix review
octavioamu Dec 29, 2018
c8cbfa5
Merge branch 'master' into vue-notifications
octavioamu Dec 29, 2018
5c1900e
review changes
octavioamu Jan 2, 2019
f0c795f
Merge branch 'vue-notifications' of https://github.com/gitcoinco/web …
octavioamu Jan 2, 2019
ba0ed9a
Merge branch 'master' into vue-notifications
octavioamu Jan 2, 2019
0ae7879
missing semicolon
octavioamu Jan 2, 2019
c3ecfdf
Merge branch 'master' into vue-notifications
octavioamu Jan 2, 2019
2a6a432
fix typo and change locale moment
octavioamu Jan 9, 2019
bbeaad0
Changed user in admin to use raw_id
Dec 29, 2018
933fab4
Moved create notif to signals
Dec 31, 2018
f94827b
Lint fixes
Dec 31, 2018
8ae2b8a
Notifs added
Jan 3, 2019
00658db
Added notif generation
Jan 9, 2019
39b49f2
Merge branch 'master' into vue-notifications
octavioamu Jan 9, 2019
fe78c7f
Merge pull request #3349 from usmanmuhd/inbox-backend
octavioamu Jan 9, 2019
13e0daf
Merge branch 'master' into vue-notifications
octavioamu Jan 9, 2019
047fb75
blank space
octavioamu Jan 9, 2019
b8c98c0
Merge branch 'vue-notifications' of https://github.com/gitcoinco/web …
octavioamu Jan 9, 2019
0a84783
sticlker
octavioamu Jan 9, 2019
44cb7b4
fix spaces
octavioamu Jan 9, 2019
c5bf1c4
Merge branch 'master' into vue-notifications
octavioamu Jan 9, 2019
6811ece
Merge branch 'master' into vue-notifications
octavioamu Jan 9, 2019
fe961ba
Merge branch 'master' into vue-notifications
octavioamu Jan 9, 2019
9749abf
Merge branch 'master' into vue-notifications
octavioamu Jan 14, 2019
22c3806
Added new notif generation
Jan 15, 2019
86a45b3
Merge pull request #3537 from usmanmuhd/inbox-backend
octavioamu Jan 15, 2019
94f84c5
Merge branch 'master' into vue-notifications
octavioamu Jan 15, 2019
270218a
Merge branch 'master' into vue-notifications
octavioamu Jan 15, 2019
c2614e2
Merge branch 'master' into vue-notifications
octavioamu Jan 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
'wagtail.core',
'cms',
'revenue',
'inbox',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -155,7 +156,7 @@

TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ['retail/templates/', 'dataviz/templates', 'kudos/templates'],
'DIRS': ['retail/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates'],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down
2 changes: 1 addition & 1 deletion app/app/templates/shared/rain.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
{% endcomment %}
{% for i in "1234567890" %}
<i class="rain {{ class }}"></i>
{% endfor %}
{% endfor %}
3 changes: 3 additions & 0 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
urlpatterns = [
path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),

# inbox
path('inbox/', include('inbox.urls', namespace='inbox')),

# kudos
path('kudos/', kudos.views.about, name='kudos_main'),
path('kudos/about/', kudos.views.about, name='kudos_about'),
Expand Down
222 changes: 4 additions & 218 deletions app/assets/onepager/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
@charset "UTF-8";
/* stylelint-disable no-descending-specificity */

body {
line-height: 1;
-webkit-text-size-adjust: none;
overflow: hidden;
width: 100%;
height: 100%;
color: #000000;
background-color: #0d023b;
background-image: url('/static/onepager/images/overlay.png'), -moz-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url('/static/v2/images/header-bg.png');
background-image: url('/static/onepager/images/overlay.png'), -webkit-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url('/static/v2/images/header-bg.png');
background-image: url('/static/onepager/images/overlay.png'), -ms-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url('/static/v2/images/header-bg.png');
background-image: url('/static/onepager/images/overlay.png'), linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url('/static/v2/images/header-bg.png');
background-repeat: no-repeat;
background-size: 110%;
background-position: center center;
background-attachment: fixed;
}

body.is-loading:after {
opacity: 1;
}
Expand All @@ -44,148 +26,6 @@ body.is-loading:after {
margin: 2px;
}

#yge.receive,
#yge.send {
overflow-y: hidden;
}

/* Reset */

html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font: inherit;
vertical-align: baseline;
}

article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}

ol,
ul {
list-style: none;
}

blockquote,
q {
quotes: none;
}

blockquote:before,
blockquote:after,
q:before,
q:after {
content: '';
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}

/* Box Model */

*,
*:before,
*:after {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

/* Basic */

@media screen and (max-width: 480px) {
Expand Down Expand Up @@ -480,7 +320,6 @@ input[type='radio'] + label::before {
line-height: 1.58125em;
position: absolute;
text-align: center;
top: 0.15em;
width: 1.65em;
}

Expand Down Expand Up @@ -674,72 +513,19 @@ dl dd {
position: absolute;
}

#footer {
-moz-align-self: -moz-flex-end;
-webkit-align-self: -webkit-flex-end;
-ms-align-self: -ms-flex-end;
align-self: flex-end;
width: 100%;
padding: 1.5em 0 0 0;
color: rgba(255, 255, 255, 0.75);
cursor: default;
text-align: center;
z-index: 2;
}

#footer .copyright {
margin: 0;
padding: 0;
font-size: 0.9em;
list-style: none;
}

#footer .copyright li {
display: inline-block;
margin: 0 0 0 0.45em;
padding: 0 0 0 0.85em;
border-left: solid 1px rgba(255, 255, 255, 0.5);
.copyright a {
padding: 0 0.85em;
line-height: 1;
}

#footer .copyright li:first-child {
border-left: 0;
.copyright a:first-child {
border-right: solid 1px rgba(255, 255, 255, 0.5);
}

.pull-request-link:hover {
color: #FFFFFF;
}

/* Wrapper */

#wrapper {
display: -moz-flex;
display: -webkit-flex;
display: -ms-flex;
display: flex;
-moz-align-items: center;
-webkit-align-items: center;
-ms-align-items: center;
align-items: center;
-moz-justify-content: space-between;
-webkit-justify-content: space-between;
-ms-justify-content: space-between;
justify-content: space-between;
-moz-flex-direction: column;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-moz-perspective: 1000px;
-webkit-perspective: 1000px;
-ms-perspective: 1000px;
perspective: 1000px;
position: relative;
height: 100%;
overflow-y: scroll;
padding: 1.5em;
z-index: 2;
}

@media screen and (max-width: 360px) {
#wrapper {
padding: 0.75em;
Expand Down
9 changes: 4 additions & 5 deletions app/assets/v2/css/box_redeem.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

#main {
max-width: 100%;
min-width: 27em;
max-width: 440px;
padding: 4.5em 3em 3em 3em;
background: #ffffff;
border-radius: 4px;
Expand All @@ -20,9 +19,9 @@
-webkit-transition: opacity 1s ease, -webkit-transform 1s ease;
-ms-transition: opacity 1s ease, -ms-transform 1s ease;
transition: opacity 1s ease, transform 1s ease;
z-index: 9999;
z-index: 1;
position: relative;
margin-top: 2rem;
margin: 2rem auto;
}

#main #ens_subdomain h1 {
Expand Down Expand Up @@ -96,4 +95,4 @@ body.is-loading #main {
-webkit-transform: rotateX(15deg);
-ms-transform: rotateX(15deg);
transform: rotateX(15deg);
}
}
2 changes: 0 additions & 2 deletions app/assets/v2/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ button {

button:hover,
button:focus {
border-color: var(--hover);
color: #fff;
outline: none;
}

Expand Down
65 changes: 65 additions & 0 deletions app/assets/v2/css/external_bounties/checkboxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,68 @@
background-color: #26cd7f;
border: 3px solid #36E69B;
}

/* border checkbox */

.gc-checkbox {
display: flex;
align-items: center;
}

.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;
octavioamu marked this conversation as resolved.
Show resolved Hide resolved
}

.gc-checkbox label {
position: relative;
display: inline-block;
padding-left: 22px;
min-height: 16px;
vertical-align: middle;
}

.gc-checkbox label::before,
.gc-checkbox label::after {
position: absolute;
content: "";
display: inline-block;
}

.gc-checkbox label::before{
height: 18px;
width: 18px;
border: 2px solid #9F9F9F;
border-radius: 3px;
left: 0px;
top: 3px;
}

.gc-checkbox label::after {
height: 6px;
width: 10px;
border-left: 2px solid;
border-bottom: 2px solid;
transform: rotate(-45deg);
left: 4px;
top: 8px;
}

.gc-checkbox input[type="checkbox"] + label::after {
content: none;
}

.gc-checkbox input[type="checkbox"]:checked + label::after {
content: "";
}

.gc-checkbox input[type="checkbox"]:focus + label::before {
outline: rgb(59, 153, 252) auto 5px;
}

Loading