Merge branch 'development' of https://github.com/codeuino/social-platform-donut-frontend into user_activity

Author: Rupeshiya

package-lock.json

@@ -43,6 +43,7 @@
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.4.0",
     "react-shapes": "^0.1.0",
+    "react-share": "^4.2.1",
     "react-spinners": "^0.8.3",
     "react-switch": "^5.0.1",
     "react-toastify": "^6.0.5",

package.json

@@ -81,7 +81,7 @@ export const updatePost = (postId, updatedInfo) => async (dispatch) => {
     console.log("updatedPostInfo ", updatedInfo);
     const res = await axios.patch(`${BASE_URL}/post/${postId}`, updatedInfo);
     if (res.status === 200) {
-      dispatch(getPostById(postId));
+      dispatch(getAllPosts());
     }
   } catch (error) {
     dispatch(errorHandler(error));
@@ -103,7 +103,10 @@ export const deletePost = (postId) => async (dispatch) => {
 // REMOVE REACTION
 export const removeReaction = (postId, type) => async (dispatch) => {
   try {
-    const res = await axios.patch(`${BASE_URL}/post/removereaction/${postId}`, type);
+    const res = await axios.patch(
+      `${BASE_URL}/post/removereaction/${postId}`,
+      type
+    );
     if (res.status === 200) {
       dispatch(getAllPosts());
     }

src/actions/postAction.js

@@ -0,0 +1,103 @@
+import Drive from "../integrations/Drive.png";
+import Calendar from "../integrations/Calendar.png";
+import Github from "../integrations/Github.png";
+import Jitsi from "../integrations/Jitsi.png";
+import Trello from "../integrations/Trello.png";
+import SimplePoll from "../integrations/SimplePoll.png";
+
+const integrationsList = [
+  {
+    id: "1",
+    integrationName: "Google Drive",
+    image: Drive,
+    tag: "File Management",
+    description: `Use Google Drive within Donut to:
+    • Create new Google Docs, Slides, and Sheets files
+    • Import an existing file from Google Drive into a channel or direct message
+    • Search directly within Google Drive files shared within Donut
+    • Automatically grant access to the files you share with the right audience
+    • Get updates in Donut on changes in Drive, like comments, access requests, and new files shared with you
+    • Reply directly to comment notifications from within Donut and have them posted to the file
+    `,
+  },
+  {
+    id: "2",
+    integrationName: "Google Calendar",
+    image: Calendar,
+    tag: "Productivity",
+    description: `From viewing your daily schedule or receiving up-to-the-minute reminders, keep your calendar top of mind without leaving Donut. Use Google Calendar in Donut to:
+    • Create an event right from Donut using the shortcuts button.
+    • Automatically sync your calendar to your Donut status to let your team know when you are in a meeting.
+    • See a holistic view of your daily schedule from Donut.
+    • Get notified when an event is starting soon, and join a Hangout, Zoom, Webex, or Microsoft Teams meeting directly from the calendar reminder in Donut.
+    • Respond directly to event invitations.
+    • Get updated when an event’s details change, and change your response as needed.
+    `,
+  },
+  {
+    id: "3",
+    integrationName: "Github",
+    image: Github,
+    tag: "Developer Tools",
+    description: `Bring your code to the conversations you care about with the GitHub and Donut app. With two of your most important workspaces connected, you’ll get updates about what’s happening on GitHub—without leaving Donut.
+    Subscribe to repositories
+    Use /github subscribe [owner/repo] in Donut to start receiving updates about that project.
+    Stay up to date
+    Get updates about what’s happening with your repositories in Donut discussions for activities like:
+    • New commits
+    • New pull requests
+    • New issues
+    • Code reviews
+    • Deployment statuses
+    See the details
+    Give your team more information in Donut when you share links to GitHub activities and properties like:
+    • Pull requests
+    • Issues
+    • Linked comments
+    • Code snippets
+    • Developer profiles
+    Take actions with slash commands
+    Donut conversations often lead to decisions and actionable takeaways. Now it’s easier to start on next steps from Donut with slash commands for common GitHub actions, using  /github [action] [resource]. For example, these commands let you:
+    • Close an issue or pull request
+    • Reopen an issue or pull request
+    • Open a new issue using a Donut dialog
+    Using an older version of GitHub and Donut? Installing the new integration will allow you to migrate subscriptions from legacy versions. GitHub Enterprise and Donut Enterprise Grid are not yet supported.
+    `,
+  },
+  {
+    id: "4",
+    integrationName: "Jitsi Meet",
+    image: Jitsi,
+    tag: "Communication",
+    description: `Jitsi Meet is an OpenSource (Apache License)  application that provides large scale video conferences for your browser or your mobile. No accounts or pin-codes are necessary. Just click the link and you are in!
+    This integration adds the /jitsi slash command for your team so that you can start a video conference in your channel, making it easy for everyone to just jump on the call. Just type /jitsi into your channel and a conference link will be provided in the channel. Additionally, you can send direct messages to users by mentioning their username in the command.
+    In addition to simple video calls Jitsi Meet also lets you join over the phone, stream to YouTube and collaboratively edit documents.
+    `,
+  },
+  {
+    id: "5",
+    integrationName: "Trello",
+    image: Trello,
+    tag: "Prodictivity",
+    description: `Trusted by millions, Trello is the visual collaboration tool that creates a shared perspective on any project.
+    Link your Trello and Donut teams to harness the power of productivity with the Trello app for Donut, and create a seamless and collaborative workflow between your favorite apps.
+    With Trello for Donut, you can:
+    • Add new Trello cards to boards directly from Donut with /trello add
+    • Join Trello cards (and boards!), change due dates, attach conversations and a lot more.
+    • Invite @trello to a channel for automated card & board previews including members, descriptions, comments and more.
+    • Allow Donut team members to join your Trello team & boards in one click.
+    `,
+  },
+  {
+    id: "6",
+    integrationName: "Simple Poll",
+    image: SimplePoll,
+    tag: "Productivity",
+    description: `With Simple Poll, you can create native and simple polls, right within Slack.
+    Get your colleagues’ thoughts in minutes; not in the next meeting.
+    Need to decide on whether to proceed with a candidate? The next step with a customer? A favourite product design? Or even where to go to lunch on Thursday? Simple Poll provides an effortless and collaborative way to make these decisions.
+    `,
+  },
+];
+
+export default integrationsList;

src/assets/jsonData/integrations.js

@@ -124,6 +124,9 @@
         }
       }
     }
+    .modal__body-sharebutton {
+      margin-right: 8px;
+    }
     .modal__mini-title {
       font-family: $font-family-Inter;
       font-style: normal;
@@ -479,26 +482,26 @@
 }
 
 .modal__body {
-   .modal__setting__btn__container {
-     .modal__save {
-       background: $color-modal-button-active;
-       box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
-       // border-radius: 34px;
-       width: 80px;
-       height: 38.5px;
-       margin-right: 20px;
-       margin-bottom: 10px;
+  .modal__setting__btn__container {
+    .modal__save {
+      background: $color-modal-button-active;
+      box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
+      // border-radius: 34px;
+      width: 80px;
+      height: 38.5px;
+      margin-right: 20px;
+      margin-bottom: 10px;
 
-       .modal__buttontext {
-         font-family: $font-family-Inter;
-         font-style: normal;
-         font-weight: bold;
-         font-size: 14px;
-         line-height: 22px;
-         /* identical to box height */
+      .modal__buttontext {
+        font-family: $font-family-Inter;
+        font-style: normal;
+        font-weight: bold;
+        font-size: 14px;
+        line-height: 22px;
+        /* identical to box height */
 
-         color: #ffffff;
-       }
-     }
-   }
+        color: #ffffff;
+      }
+    }
+  }
 }

src/css/components/_modals.scss

@@ -20,8 +20,9 @@ import Setup from "./user/setup/Setup";
 import CommunitySetting from "./user/dashboard/Community/CommunitySetting";
 import Insight from "./user/dashboard/insights/Insight";
 import AdminRoute from "./common/AdminRoute";
-import Activity from './user/Activity/Activity';
-import IntegrationsPage from './user/integrations/IntegrationsPage/IntegrationsPage'
+import Activity from "./user/Activity/Activity";
+import IntegrationsPage from "./user/integrations/IntegrationsPage/IntegrationsPage";
+import UserIntegrations from "./user/integrations/UserIntegrations/UserIntegrations";
 
 const Router = () => (
   <BrowserRouter>
@@ -45,15 +46,16 @@ const Router = () => (
       />
       <PrivateRoute exact path="/proposaleditor" component={ProposalEditor} />
       <PrivateRoute exact path="/setup" component={Setup} />
-      <AdminRoute
-        exact 
-        path="/org-settings" 
-        component={CommunitySetting} 
-      />
+      <AdminRoute exact path="/org-settings" component={CommunitySetting} />
       <AdminRoute exact path="/activity/:userId" component={Activity} />
       <PrivateRoute exact path="/insight" component={Insight} />
       <PrivateRoute exact path="/admin" component={Admin} />
       <PrivateRoute exact path="/integrations" component={IntegrationsPage} />
+      <PrivateRoute
+        exact
+        path="/userintegrations"
+        component={UserIntegrations}
+      />
       <Route component={NotFound} />
     </Switch>
   </BrowserRouter>