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.

Sign up for GitHub

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

#167730641 Notifying New Travel Request #20

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open

#167730641 Notifying New Travel Request #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
50645bb
updated travis and test
ChidiChuks Aug 29, 2019
5d29574
feature(notify-request): notify manager of travel request
ChidiChuks Sep 4, 2019
a398362
pop-up of stashed commits
ChidiChuks Sep 4, 2019
e16b72e
declaring server as a function in the entry point
ChidiChuks Sep 4, 2019
7b1af3a
setting up the project
ChidiChuks Sep 4, 2019
ce3ea15
updating the controller and test files with line-spacing
ChidiChuks Sep 5, 2019
5e8e023
updating the .env file to hold values for sendGrid
ChidiChuks Sep 5, 2019
1e22bad
created service and routes files
ChidiChuks Sep 5, 2019
46c79b7
installing @sendgrid/mail package from npm
ChidiChuks Sep 5, 2019
ebbf9d9
Checking out the socket.io client and server side
ChidiChuks Sep 8, 2019
82d0ddc
refactoring codes
ChidiChuks Sep 10, 2019
4ebc6b7
edited the entry point and routes to test with postman
ChidiChuks Sep 10, 2019
d412bd2
updating the database models, migrations and seeders files
ChidiChuks Sep 11, 2019
2bba6ea
reconfigured local project to be in sync with develop
ChidiChuks Sep 12, 2019
250f35d
updating the database
ChidiChuks Sep 13, 2019
41bb90f
changing folder structure
ChidiChuks Sep 13, 2019
3fae104
feature(approve-travel-request):enable manager to approve travel request
chuksjoe Sep 12, 2019
6f9953b
brute force of merged PR
ChidiChuks Sep 13, 2019
a6a3cfc
implementation of notification features
ChidiChuks Sep 13, 2019
b7a3902
Merge branch 'develop' into ft-notify-new-travel-167730641
ChidiChuks Sep 13, 2019
d8ecdcf
feature(notify-new-request): new travel requests
ChidiChuks Sep 13, 2019
db6cfba
feature(notify-new-request): new travel requests
ChidiChuks Sep 13, 2019
a64e64c
feature(notify-new-request): new travel requests
ChidiChuks Sep 13, 2019
63b4184
feature(notify-new-request): new travel requests
ChidiChuks Sep 13, 2019
07d0a3d
resolved conflicts
ChidiChuks Sep 14, 2019
eeda180
resolved conflicts
ChidiChuks Sep 14, 2019
ae666f1
resolving merge conflicts
ChidiChuks Sep 17, 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
5 changes: 5 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.formatOnSaveTimeout": 0,
"editor.tabSize": 2,
"editor.wordWrap": "on"
}
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<h1>Testing Approved Travel Request Notification</h1>
<h3>Updated some info...</h3>
<script>
const pusher = new Pusher('a8d96c1afa4c3634189f', { cluster: 'mt1' });
const pusher = new Pusher('89356d2fe3911f22e19f', { cluster: 'eu' });

pusher.connection.bind('connected', () => {
axios.defaults.headers.common['X-Socket-Id'] =
Expand All @@ -19,7 +19,7 @@ <h3>Updated some info...</h3>
Notification.requestPermission();
pusher
.subscribe('notifications')
.bind('approved-travel-1215739', (notify) => {
.bind('new-travel-6749460', (notify) => {
const notification = new Notification(notify.title);
notification.onclick = function(event) {
window.location.href = `http://localhost:3000/api/v1/notification/${notify.id}`;
Expand Down
Loading