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

Feat/notif settings #1274

Merged
merged 22 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
58ac27c
Updated send notif page for notif settings design
0xNilesh Sep 26, 2023
d381523
Added changes for user settings flow
0xNilesh Sep 29, 2023
69acfb6
Merge pull request #1259 from ethereum-push-notification-service/refa…
0xNilesh Sep 29, 2023
0cd78b6
css changes
0xNilesh Sep 29, 2023
a8a4339
setting min-width
0xNilesh Sep 29, 2023
aeb4b26
positioning modal in centre in smaller screens
0xNilesh Sep 29, 2023
9c9cb47
Merge main branch
0xNilesh Oct 2, 2023
53479cd
some UI changes
0xNilesh Oct 3, 2023
412a430
Merge branch 'feat/notif-settings' into refactor/user-settings-flow
0xNilesh Oct 3, 2023
b7c4064
Merge pull request #1262 from ethereum-push-notification-service/refa…
0xNilesh Oct 3, 2023
0836fd9
UI changes
0xNilesh Oct 3, 2023
3936616
Notification Settings for channel creator (#1263)
kalashshah Oct 5, 2023
cb6daa1
User settings page (#1264)
kalashshah Oct 5, 2023
437809d
Integrated new api and notif settings backend
0xNilesh Oct 10, 2023
9101023
Refactor/notif settings integration (#1266)
kalashshah Oct 10, 2023
6573420
Merge branch 'feat/notif-settings' into refactor/settings-integration
0xNilesh Oct 10, 2023
23c378e
chore: state management for user and admin settings (#1271)
kalashshah Oct 10, 2023
d5d791e
few styling changes
0xNilesh Oct 10, 2023
829d009
Merge pull request #1270 from ethereum-push-notification-service/refa…
0xNilesh Oct 10, 2023
1d7055d
Merge main
0xNilesh Oct 10, 2023
ce4e229
fix: fixes
0xNilesh Oct 10, 2023
c834d2e
chore: set default val to true in add setting
kalashshah Oct 10, 2023
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
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@mui/lab": "^5.0.0-alpha.72",
"@mui/material": "^5.5.0",
"@pushprotocol/ledgerlive": "latest",
"@pushprotocol/restapi": "1.4.21",
"@pushprotocol/restapi": "0.0.1-alpha.48",
"@pushprotocol/socket": "latest",
"@pushprotocol/uiweb": "1.1.14",
"@pushprotocol/uiweb": "0.0.1-alpha.17",
"@reduxjs/toolkit": "^1.7.1",
"@testing-library/dom": "^9.0.1",
"@testing-library/jest-dom": "^4.2.4",
Expand Down Expand Up @@ -101,9 +101,10 @@
"react-dropzone-uploader": "2.11.0",
"react-easy-crop": "^4.1.4",
"react-ga": "2.7.0",
"react-icons": "^4.7.1",
"react-icons": "^4.11.0",
"react-image-file-resizer": "^0.4.7",
"react-images-upload": "^1.2.8",
"react-input-slider": "^6.0.1",
"react-joyride": "^2.4.0",
"react-loader-spinner": "^5.3.4",
"react-multi-select-component": "^4.2.3",
Expand Down
11 changes: 11 additions & 0 deletions public/svg/manageSettings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/svg/optout.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/svg/setting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading