Improved upcoming events and notifications section

src/App.css

@@ -1,3 +1,13 @@
+@font-face {
+  font-family: 'SF UI Text';
+  src: local('SF UI Text'), url(./fonts/SFUIText-Bold.ttf) format('truetype');
+}
+
+@font-face {
+  font-family: 'Inter';
+  src: local('Inter'), url(./fonts/Inter-Regular.otf) format('opentype');
+}
+
 .App {
   text-align: center;
 }

src/user/dashboard/notifications/notifications.js

@@ -1,32 +1,71 @@
 import React, { Component } from "react";
-import { Table } from "react-bootstrap";
+import donutIcon from '../../../svgs/donut-icon.svg'
+import icon2 from '../../../svgs/not-icon-2.svg'
+import icon3 from '../../../svgs/not-icon-3.svg'
 import "./notifications.scss";
 
+const customNotifications = [
+  {
+    _id: 1,
+    imgSrc: donutIcon,
+    heading: 'Cody Nguyen',
+    content: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: '+1 RSVP'
+  },
+  {
+    _id: 2,
+    imgSrc: icon2,
+    heading: 'Arlene Mccoy',
+    content: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  },
+  {
+    _id: 3,
+    imgSrc: icon3,
+    heading: 'Julian Richards',
+    content: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: 'View'
+  },
+  {
+    _id: 4,
+    imgSrc: donutIcon,
+    heading: 'Julian Richards',
+    content: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  },
+]
+
 class Notifications extends Component {
   render() {
+    let notifications = customNotifications.map((notification,i) => {
+      return (
+        <div key={i}>
+          <div className="notification-container"> 
+            <div className="notification-img-container">
+              <img alt="notification-icon" src={notification.imgSrc}></img>
+            </div>
+            <div className="notification-description">
+              <h6>{notification.heading}</h6>
+              {notification.tag ? <button type="button" className="tag">{notification.tag}</button> : <div></div>}
+              <p>{notification.content}</p>
+            </div>
+          </div>
+        </div>
+      )
+    })
+
     return (
       <div className="notifications">
-        <Table bordered hover>
-          <thead>
-            <tr>
-              <th>Notifications</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>1</td>
-            </tr>
-            <tr>
-              <td>2</td>
-            </tr>
-            <tr>
-              <td>3</td>
-            </tr>
-          </tbody>
-        </Table>
+        <div className="text-center heading-container">
+          <h5>Notifications</h5>
+        </div>
+        <div className="all-notifications">
+          {notifications}
+        </div>
       </div>
     );
   }
 }
 
 export default Notifications;
+

src/user/dashboard/notifications/notifications.scss

@@ -1,12 +1,90 @@
 .notifications {
   flex: 1;
-  height: 250px;
   overflow: auto;
-  .table {
-    thead {
-      th {
-        text-align: center;
+  border-top: 1px solid #dfe9f1;
+  border-left: 1px solid #dfe9f1;
+  border-bottom: 1px solid #dfe9f1;
+  box-shadow: -1px 2px 2px -1px rgba(0, 0, 0, 0.1);
+  .heading-container{
+    border-bottom: 1px solid #dfe9f1;
+    h5{
+      padding-top: 10px;
+      margin-bottom: 5px;
+      font-family: Inter;
+      font-style: normal;
+      font-weight: 600;
+      font-size: 18px;
+      line-height: 22px;
+    }
+  }
+  .all-notifications{
+    width:90%;
+    margin: 15px auto;
+    height: 200px;
+    overflow-y: auto;
+
+    .notification-container{
+      display: flex;
+      border-bottom: 1px solid #ccc;
+      padding: 10px 0;
+      width:97%;
+      margin-right: 2px;
+    }
+    .notification-description{
+      padding: 0px 20px;
+      p{
+        color: rgba(29, 33, 41, 0.5);
+        font-family: Inter;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 12px;
+        line-height: 15px;
+        margin-bottom: 2px;
+      }
+      h6{
+        font-family: Inter;
+        font-style: normal;
+        font-weight: 600;
+        font-size: 14px;
+        line-height: 21px;
+        display: inline
+      }
+      .tag{
+        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
+        border-radius: 100px;
+        border: 1px solid #007bff;
+        background-color: #1A73E8;
+        color: #fff;
+        font-family: Inter;
+        font-style: normal;
+        font-weight: 600;
+        font-size: 10px;
+        line-height: 18px;
+        margin-left: 15px;
+        position: relative;
+        bottom: 5px
       }
     }
   }
+
+  .notification-img-container > img {
+    width: 30px;
+    background-blend-mode: normal;
+    margin:auto;
+    height: 90%;
+  }
+}
+
+::-webkit-scrollbar, tbody::-webkit-scrollbar {
+  width: 4.3px;
+}
+
+::-webkit-scrollbar-track {
+  background: #ccc;
+  border-radius: 40px; 
 }
+
+::-webkit-scrollbar-thumb, tbody::-webkit-scrollbar-thumb {
+  background: #90949c; 
+  border-radius: 40px;
+}

src/user/dashboard/portfolio/portfolio.scss

@@ -1,20 +1,32 @@
 .portfolio {
+  box-shadow: -1px 2px 2px -1px rgba(0, 0, 0, 0.1);
   display: flex;
   text-align: center;
-  min-height: 198px;
-  height: 198px;
+  border-top-right-radius: 2%;
+  border-bottom-right-radius: 2%;
+  flex:0.5;
+  height: 269px;
   .items-list {
     flex: 0.8;
+    padding: 40px 0px;
     border: solid 1px #dfe9f1;
     .item {
       padding: 12px;
       h1 {
-        font-size: 26px;
+        font-size: 36px;
+        font-family: SF UI Text;
+        font-style: normal;
+        font-weight: bold;
+        text-align: center;
+        margin-bottom: 0px;
       }
       h3 {
         font-size: 15px;
         color: #4457a5;
+        font-family: Inter;
+        font-style: normal;
+        font-weight: 600;
       }
     }
   }
-}
+}

src/user/dashboard/upcoming-events/upcoming-events.js

@@ -1,29 +1,78 @@
 import React, { Component } from "react";
-import { Table } from "react-bootstrap";
 import "./upcoming-events.scss";
+import profileImg from '../../../svgs/profile-icon.svg';
+
+const events = [
+  {
+    _id: 1,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: '+1 RSVP'
+  },
+  {
+    _id: 2,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  },
+  {
+    _id: 3,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: '+1 RSVP'
+  },
+  {
+    _id: 4,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  },
+  {
+    _id: 5,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  },
+  {
+    _id: 6,
+    imgSrc: profileImg,
+    createdBy: 'Julian Richards',
+    description: 'Lorem ipsum dolor sit amet, duo esse augue torgatos te, ius an nisi deterruisset.',
+    tag: ''
+  }
+]
 
 class UpcomingEvents extends Component {
   render() {
+    let upcomingEvents = events.map((event,i)=>{
+      return (
+        <div key={i}>
+          <div className="event-container"> 
+            <div className="img-container">
+              <img alt="event-icon" src={event.imgSrc}></img>
+            </div>
+            <div className="event-description">
+              <h6>{event.createdBy}</h6>
+              {event.tag ? <button type="button" className="tag">{event.tag}</button> : <div></div>}
+              <p>{event.description}</p>
+            </div>
+          </div>
+        </div>
+      )
+    })
     return (
       <div className="upcoming-events">
-        <Table bordered hover>
-          <thead>
-            <tr>
-              <th>Upcoming Events</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>1</td>
-            </tr>
-            <tr>
-              <td>2</td>
-            </tr>
-            <tr>
-              <td>3</td>
-            </tr>
-          </tbody>
-        </Table>
+        <div className="text-center heading-container">
+          <h5>Upcoming Events</h5>
+        </div>
+        <div className="all-events">
+          {upcomingEvents}
+        </div>
       </div>
     );
   }