From 8943ef60c6b8afff710564687ca0c078f449235a Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Tue, 7 Jul 2020 20:15:51 +0530
Subject: [PATCH 1/6] dashboard page buttons changed

---
 src/common/Button.js                          | 27 +++++++++++++++++++
 src/css/components/_modals.scss               | 12 +++------
 src/user/dashboard/news-feed/news-feed.js     | 14 +++++-----
 src/user/dashboard/news-feed/news-feed.scss   | 15 +----------
 .../dashboard/notifications/notifications.js  |  3 ++-
 .../notifications/notifications.scss          |  6 -----
 6 files changed, 42 insertions(+), 35 deletions(-)
 create mode 100644 src/common/Button.js

diff --git a/src/common/Button.js b/src/common/Button.js
new file mode 100644
index 00000000..92074064
--- /dev/null
+++ b/src/common/Button.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Button } from 'react-bootstrap';
+
+const Btn = (props) => {
+    let styles = {
+        fontFamily: 'Inter',
+        boxShadow: 'none',
+        borderRadius: '0.25rem',
+        fontStyle: 'normal'
+    };
+    if (props.buttonType === 'outline'){
+        styles.backgroundColor = '#ffffff';
+        styles.color = '#1A73E8';
+    } else {
+        styles.backgroundColor = '#1A73E8';
+        styles.color = '#ffffff';
+    }
+    const Props = {...props};
+    Props.style = styles;
+    return(
+        <Button {...Props}>
+            {props.children}
+        </Button>
+    )
+}
+
+export default Btn;
diff --git a/src/css/components/_modals.scss b/src/css/components/_modals.scss
index 47702b99..984faba8 100644
--- a/src/css/components/_modals.scss
+++ b/src/css/components/_modals.scss
@@ -34,7 +34,7 @@
         width: 6vw;
         height: 5vh;
         background: rgb(250, 251, 252);
-        border-radius: 100px;
+        font-family: Inter;
         color: #1A73E8;
         padding: 0.3em;
         margin-left: 1em;
@@ -257,8 +257,6 @@
       .modal__remove__followButton {
         border: 1px solid #eb5757;
         box-sizing: border-box;
-        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
-        border-radius: 34px;
         background: transparent;
         width: 83px;
         height: 4.5vh;
@@ -309,9 +307,8 @@
           display: flex;
           .invite__btn {
             margin-left: 3px;
+            font-family: Inter;
             background: #1a73e8;
-            box-shadow: 1.26667px 2.53333px 6.33333px rgba(0, 0, 0, 0.1);
-            border-radius: 43.0667px;
             width: 83px;
             height: 4.5vh;
             padding: 0px;
@@ -322,9 +319,8 @@
           flex-wrap: wrap;
           .invite__btn {
             margin-right: 10px;
+            font-family: Inter;
             background: #1a73e8;
-            box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
-            border-radius: 20px;
             width: 83px;
             height: 4.5vh;
             padding: 0px;
@@ -385,4 +381,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/user/dashboard/news-feed/news-feed.js b/src/user/dashboard/news-feed/news-feed.js
index 62bde94b..97f5890b 100644
--- a/src/user/dashboard/news-feed/news-feed.js
+++ b/src/user/dashboard/news-feed/news-feed.js
@@ -15,6 +15,7 @@ import {
 } from "@material-ui/core";
 import { makeStyles } from "@material-ui/core/styles";
 import { Button } from "react-bootstrap";
+import Btn from "../../../common/Button";
 import AddEventModal from "./popups/AddEventModal";
 import AddProjectModal from "./popups/AddProjectModal";
 import ArrowDropUpIcon from "@material-ui/icons/ArrowDropUp";
@@ -219,7 +220,7 @@ function NewsFeed(props) {
                                 <h3>{project?.projectName}</h3>
                                 <p>By {project?.projectOwner || "CODEUINO"}</p>
                                 <div className="view-project">
-                                    <Button className="view-project-btn">View Project</Button>
+                                    <Btn className="view-project-btn">View Project</Btn>
                                 </div>
                             </div>
                         </Paper>
@@ -301,7 +302,7 @@ function NewsFeed(props) {
                                     </div>
                                 </div>
                                 <div className="tag-container">
-                                    <Button className="tag-btn">+1 RSVP</Button>
+                                    <Btn className="tag-btn">+1 RSVP</Btn>
                                 </div>
                             </div>
                         </Paper>
@@ -393,7 +394,8 @@ function NewsFeed(props) {
                 color="primary"
                 aria-label="contained primary button group"
               >
-                <Button
+                <Btn
+                  style={{backgroundColor: "purple"}}
                   variant="primary"
                   onClick={() => {
                     handleShow("event");
@@ -413,8 +415,8 @@ function NewsFeed(props) {
                     />
                   </svg>
                   <span className="optionbtn-text">Event</span>
-                </Button>
-                <Button
+                </Btn>
+                <Btn
                   variant="primary"
                   className="optionbtn"
                   onClick={() => {
@@ -434,7 +436,7 @@ function NewsFeed(props) {
                     />
                   </svg>
                   <span className="optionbtn-text">Project</span>
-                </Button>
+                </Btn>
               </ButtonGroup>
             </div>
           </div>
diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
index a25a98bf..93c287e3 100644
--- a/src/user/dashboard/news-feed/news-feed.scss
+++ b/src/user/dashboard/news-feed/news-feed.scss
@@ -198,10 +198,6 @@
                 margin-right: 15px;
                 margin-bottom: 15px;
                 .tag-btn {
-                  background: #1a73e8;
-                  border-radius: 15px;
-                  font-family: Inter;
-                  font-style: normal;
                   font-weight: 600;
                   font-size: 10px;
                   line-height: 12px;
@@ -253,16 +249,11 @@
                 display: flex;
                 justify-content: center;
                 .view-project-btn {
-                  background: #1a73e8;
-                  border-radius: 20px;
                   padding-left: 25px;
                   padding-right: 25px;
-                  font-family: Qanelas;
-                  font-style: normal;
                   font-weight: 600;
                   font-size: 10px;
                   line-height: 12px;
-                  color: #ffffff;
                 }
               }
             }
@@ -392,16 +383,11 @@
         }
 
         .optionbtn {
-          background: #1a73e8;
-          border-radius: 100px;
           .optionbtn-text {
-            font-family: Inter;
             font-style: normal;
             font-weight: 600;
             font-size: 16px;
             line-height: 19px;
-
-            color: #ffffff;
           }
         }
       }
@@ -413,6 +399,7 @@
    width: 140%;
   .category {
     .category-btn {
+      border-radius: .25rem;
       background-color: white;
       font-family: Inter;
       font-style: normal;
diff --git a/src/user/dashboard/notifications/notifications.js b/src/user/dashboard/notifications/notifications.js
index 29fd7b62..7fd41a97 100644
--- a/src/user/dashboard/notifications/notifications.js
+++ b/src/user/dashboard/notifications/notifications.js
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import "./notifications.scss";
+import Btn from "../../../common/Button";
 import { ToastContainer, toast } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
 import donutIcon from '../../../svgs/donut-icon.svg'
@@ -81,7 +82,7 @@ class Notifications extends Component {
             </div>
             <div className="notification-description">
               <h6>{notification.heading}</h6>
-              {notification.tag ? <button type="button" className="tag">{notification.tag}</button> : <div></div>}
+              {notification.tag ? <Btn type="button" className="tag">{notification.tag}</Btn> : <div></div>}
               <p>{notification.content}</p>
             </div>
           </div>
diff --git a/src/user/dashboard/notifications/notifications.scss b/src/user/dashboard/notifications/notifications.scss
index c9d4c979..cbb01020 100644
--- a/src/user/dashboard/notifications/notifications.scss
+++ b/src/user/dashboard/notifications/notifications.scss
@@ -50,14 +50,8 @@
         display: inline;
       }
       .tag {
-        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
-        border-radius: 31px;
         padding: 2px;
         border: 1px solid #007bff;
-        background-color: #1a73e8;
-        color: #fff;
-        font-family: Inter;
-        font-style: normal;
         font-weight: 600;
         font-size: 10px;
         line-height: 12px;

From 8e2a9dde657dfe972d9a11d6e5776e86b5ef81f5 Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Tue, 7 Jul 2020 20:42:05 +0530
Subject: [PATCH 2/6] netlify failing build solution

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 92342149..b9bd23ed 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "proxy": "http://localhost:5000",
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build && ./build.sh",
+    "build": "CI=false && react-scripts build && ./build.sh",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

From e4ced8be2fa36a98237e2b78038c53bb04261b0d Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Thu, 9 Jul 2020 03:35:39 +0530
Subject: [PATCH 3/6] restored notification buttons to round

---
 src/user/dashboard/news-feed/news-feed.scss         | 4 ++++
 src/user/dashboard/notifications/notifications.js   | 3 +--
 src/user/dashboard/notifications/notifications.scss | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
index 93c287e3..031d61a9 100644
--- a/src/user/dashboard/news-feed/news-feed.scss
+++ b/src/user/dashboard/news-feed/news-feed.scss
@@ -198,6 +198,10 @@
                 margin-right: 15px;
                 margin-bottom: 15px;
                 .tag-btn {
+                  background: #1a73e8;
+                  border-radius: 15px;
+                  font-family: Inter;
+                  font-style: normal;
                   font-weight: 600;
                   font-size: 10px;
                   line-height: 12px;
diff --git a/src/user/dashboard/notifications/notifications.js b/src/user/dashboard/notifications/notifications.js
index 7fd41a97..29fd7b62 100644
--- a/src/user/dashboard/notifications/notifications.js
+++ b/src/user/dashboard/notifications/notifications.js
@@ -1,6 +1,5 @@
 import React, { Component } from "react";
 import "./notifications.scss";
-import Btn from "../../../common/Button";
 import { ToastContainer, toast } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
 import donutIcon from '../../../svgs/donut-icon.svg'
@@ -82,7 +81,7 @@ class Notifications extends Component {
             </div>
             <div className="notification-description">
               <h6>{notification.heading}</h6>
-              {notification.tag ? <Btn type="button" className="tag">{notification.tag}</Btn> : <div></div>}
+              {notification.tag ? <button type="button" className="tag">{notification.tag}</button> : <div></div>}
               <p>{notification.content}</p>
             </div>
           </div>
diff --git a/src/user/dashboard/notifications/notifications.scss b/src/user/dashboard/notifications/notifications.scss
index cbb01020..49758ee4 100644
--- a/src/user/dashboard/notifications/notifications.scss
+++ b/src/user/dashboard/notifications/notifications.scss
@@ -50,8 +50,13 @@
         display: inline;
       }
       .tag {
+        border-radius: 31px;
         padding: 2px;
         border: 1px solid #007bff;
+        background-color: #1a73e8;
+        color: #fff;
+        font-family: Inter;
+        font-style: normal;
         font-weight: 600;
         font-size: 10px;
         line-height: 12px;

From dc51c6e7c5e8a5ac61d21376a8f43ee2d423a098 Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Thu, 9 Jul 2020 03:53:04 +0530
Subject: [PATCH 4/6] restored all tags to round

---
 src/user/dashboard/news-feed/news-feed.js   | 4 ++--
 src/user/dashboard/news-feed/news-feed.scss | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/user/dashboard/news-feed/news-feed.js b/src/user/dashboard/news-feed/news-feed.js
index 97f5890b..b9780367 100644
--- a/src/user/dashboard/news-feed/news-feed.js
+++ b/src/user/dashboard/news-feed/news-feed.js
@@ -220,7 +220,7 @@ function NewsFeed(props) {
                                 <h3>{project?.projectName}</h3>
                                 <p>By {project?.projectOwner || "CODEUINO"}</p>
                                 <div className="view-project">
-                                    <Btn className="view-project-btn">View Project</Btn>
+                                    <Button className="view-project-btn">View Project</Button>
                                 </div>
                             </div>
                         </Paper>
@@ -302,7 +302,7 @@ function NewsFeed(props) {
                                     </div>
                                 </div>
                                 <div className="tag-container">
-                                    <Btn className="tag-btn">+1 RSVP</Btn>
+                                    <Button className="tag-btn">+1 RSVP</Button>
                                 </div>
                             </div>
                         </Paper>
diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
index 031d61a9..cef6f020 100644
--- a/src/user/dashboard/news-feed/news-feed.scss
+++ b/src/user/dashboard/news-feed/news-feed.scss
@@ -253,11 +253,16 @@
                 display: flex;
                 justify-content: center;
                 .view-project-btn {
+                  background: #1a73e8;
+                  border-radius: 20px;
                   padding-left: 25px;
                   padding-right: 25px;
+                  font-family: Qanelas;
+                  font-style: normal;
                   font-weight: 600;
                   font-size: 10px;
                   line-height: 12px;
+                  color: #ffffff;
                 }
               }
             }

From d4bc4e03c5816bc798f5f90bea6971ee069a2c7e Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Thu, 9 Jul 2020 04:03:24 +0530
Subject: [PATCH 5/6] restored changed to category button

---
 src/user/dashboard/news-feed/news-feed.js   | 1 -
 src/user/dashboard/news-feed/news-feed.scss | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/user/dashboard/news-feed/news-feed.js b/src/user/dashboard/news-feed/news-feed.js
index b9780367..0ef3b02e 100644
--- a/src/user/dashboard/news-feed/news-feed.js
+++ b/src/user/dashboard/news-feed/news-feed.js
@@ -395,7 +395,6 @@ function NewsFeed(props) {
                 aria-label="contained primary button group"
               >
                 <Btn
-                  style={{backgroundColor: "purple"}}
                   variant="primary"
                   onClick={() => {
                     handleShow("event");
diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
index cef6f020..aba7ac70 100644
--- a/src/user/dashboard/news-feed/news-feed.scss
+++ b/src/user/dashboard/news-feed/news-feed.scss
@@ -408,7 +408,6 @@
    width: 140%;
   .category {
     .category-btn {
-      border-radius: .25rem;
       background-color: white;
       font-family: Inter;
       font-style: normal;

From e0542fc2f9d670893872e8f5ea7dd72da3219c31 Mon Sep 17 00:00:00 2001
From: ksraj123 <kumarsaurabhraj.sr@gmail.com>
Date: Thu, 9 Jul 2020 04:31:00 +0530
Subject: [PATCH 6/6] fixes some alignment issues

---
 src/css/components/_modals.scss             |  4 +++
 src/user/dashboard/news-feed/news-feed.scss |  1 +
 src/user/organization/popups/Admins.js      | 24 ++++++++-------
 src/user/organization/popups/Members.js     | 34 +++++++++++----------
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/css/components/_modals.scss b/src/css/components/_modals.scss
index 984faba8..fe2a72ab 100644
--- a/src/css/components/_modals.scss
+++ b/src/css/components/_modals.scss
@@ -381,4 +381,8 @@
       }
     }
   }
+  .vertical-align-row {
+    display: flex;
+    align-items: center;
+  }
 }
\ No newline at end of file
diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
index aba7ac70..074df5cb 100644
--- a/src/user/dashboard/news-feed/news-feed.scss
+++ b/src/user/dashboard/news-feed/news-feed.scss
@@ -4,6 +4,7 @@
     height: 50px;
     .article {
       display: flex;
+      align-items: center;
       form {
         flex: 1;
         border: none;
diff --git a/src/user/organization/popups/Admins.js b/src/user/organization/popups/Admins.js
index 103a022a..54d8ddf3 100644
--- a/src/user/organization/popups/Admins.js
+++ b/src/user/organization/popups/Admins.js
@@ -105,17 +105,19 @@ class Admins extends Component {
         <Modal.Header closeButton className="modal__header">
           <Modal.Title className="modal__title">
             <div className="modal__main-title">Administrators</div>
-            <input
-              type="text"
-              placeholder="Search"
-              className="modal__search"
-              value={this.state.query}
-              onChange={this.onChange}
-              onKeyPress={this.onKeyPress}
-            />
-            <Button className="search_btn" onClick={this.onSearchClick}>
-              Search
-            </Button>
+            <div className="vertical-align-row">
+              <input
+                type="text"
+                placeholder="Search"
+                className="modal__search"
+                value={this.state.query}
+                onChange={this.onChange}
+                onKeyPress={this.onKeyPress}
+              />
+              <Button className="search_btn" onClick={this.onSearchClick}>
+                Search
+              </Button>
+            </div>
           </Modal.Title>
         </Modal.Header>
         <Modal.Body className="modal__body">
diff --git a/src/user/organization/popups/Members.js b/src/user/organization/popups/Members.js
index e4911ce1..d05e428e 100644
--- a/src/user/organization/popups/Members.js
+++ b/src/user/organization/popups/Members.js
@@ -137,21 +137,23 @@ class Members extends Component {
         <Modal.Header closeButton className="modal__header">
           <Modal.Title className="modal__title">
             <div className="modal__main-title">Members</div>
-            <input 
-              type="text"
-              placeholder="Search"
-              className="modal__search"
-              name="query"
-              value={this.state.query}
-              onChange={this.onChange}
-              onKeyPress={this.onKeyPress}
-            />
-            <Button
-              className="search_btn"
-              onClick={this.onSearchClick}
-            >
-              Search
-            </Button>
+            <div className="vertical-align-row">
+              <input 
+                type="text"
+                placeholder="Search"
+                className="modal__search"
+                name="query"
+                value={this.state.query}
+                onChange={this.onChange}
+                onKeyPress={this.onKeyPress}
+              />
+              <Button
+                className="search_btn"
+                onClick={this.onSearchClick}
+              >
+                Search
+              </Button>
+            </div>
           </Modal.Title>
         </Modal.Header>
         <Modal.Body className="modal__body">
@@ -163,7 +165,7 @@ class Members extends Component {
               <Form.Label htmlFor="email" className="email__header">
                 Get invite link
               </Form.Label>
-              <div className="add__member__input__container">
+              <div className="add__member__input__container vertical-align-row">
                 <Form.Control
                   as="input"
                   placeholder="Copy invite link to share"