Merge pull request #114 from sdslabs/development

merge development

package.json

@@ -19,13 +19,13 @@
     "node-sass": "^4.13.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "react-google-docs-viewer": "^1.0.1",
     "react-lottie": "^1.2.3",
     "react-redux": "^7.1.1",
     "react-router-dom": "^5.0.0",
     "react-scripts": "3.0.1",
     "react-select": "^4.2.1",
     "react-swipeable-views": "^0.13.9",
+    "react-toastify": "^7.0.3",
     "redux": "^4.0.4",
     "websocket": "^1.0.31"
   },

src/actions/adminPanelActions.js

@@ -4,6 +4,7 @@ import {
   SWITCH_TAB,
   SET_TABLE_DATA,
   RESET_ADMIN_MENU,
+  TOGGLE_ADMIN_LOADER,
 } from 'constants/action-types';
 
 export const SwitchMainMenu = (data) => ({
@@ -29,3 +30,8 @@ export const SetTableData = (data) => ({
 export const ResetAdminMenu = () => ({
   type: RESET_ADMIN_MENU,
 });
+
+export const ToggleAdminLoader = (data) => ({
+  type: TOGGLE_ADMIN_LOADER,
+  payload: data,
+});

src/api/notificationApi.js

@@ -30,7 +30,18 @@ function getNewNotification(token) {
 }
 function deleteNotification(notification) {
   return axiosInstance
-    .delete('/notifications', { params: { notification } })
+    .delete('/notifications', { params: { notification: notification, userid: 'null' } })
+    .then((response) => {
+      const res = JSON.parse(response.request.response);
+      return res;
+    })
+    .catch((error) => {
+      return Promise.reject(error);
+    });
+}
+function deleteAllNotifications(userid) {
+  return axiosInstance
+    .delete('/notifications', { params: { notification: 'null', userid: userid } })
     .then((response) => {
       const res = JSON.parse(response.request.response);
       return res;
@@ -40,4 +51,4 @@ function deleteNotification(notification) {
     });
 }
 
-export { getNewNotification, getAllNotifications, deleteNotification };
+export { getNewNotification, getAllNotifications, deleteNotification, deleteAllNotifications };

src/api/searchApi.js

@@ -12,4 +12,16 @@ function getSearchResults(query) {
     });
 }
 
-export { getSearchResults };
+function getSearchCourseResults(query, dept, user) {
+  return axiosInstance
+    .get(`/filtercourse`, { params: { q: query, format: 'json', dept: dept, user: user } })
+    .then((response) => {
+      const res = JSON.parse(response.request.response);
+      return res;
+    })
+    .catch((error) => {
+      return Promise.reject(error);
+    });
+}
+
+export { getSearchResults, getSearchCourseResults };