diff --git a/src/App.css b/src/App.css
index 74b5e053..ce8e6d52 100644
--- a/src/App.css
+++ b/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;
}
diff --git a/src/fonts/Inter-Regular.otf b/src/fonts/Inter-Regular.otf
new file mode 100644
index 00000000..fdb121dd
Binary files /dev/null and b/src/fonts/Inter-Regular.otf differ
diff --git a/src/fonts/SFUIText-Bold.ttf b/src/fonts/SFUIText-Bold.ttf
new file mode 100644
index 00000000..391724c7
Binary files /dev/null and b/src/fonts/SFUIText-Bold.ttf differ
diff --git a/src/svgs/donut-icon.svg b/src/svgs/donut-icon.svg
new file mode 100644
index 00000000..bb4666aa
--- /dev/null
+++ b/src/svgs/donut-icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/svgs/not-icon-2.svg b/src/svgs/not-icon-2.svg
new file mode 100644
index 00000000..59fd721d
--- /dev/null
+++ b/src/svgs/not-icon-2.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/svgs/not-icon-3.svg b/src/svgs/not-icon-3.svg
new file mode 100644
index 00000000..017d0987
--- /dev/null
+++ b/src/svgs/not-icon-3.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/svgs/profile-icon.svg b/src/svgs/profile-icon.svg
new file mode 100644
index 00000000..1d54b7be
--- /dev/null
+++ b/src/svgs/profile-icon.svg
@@ -0,0 +1,9 @@
+
diff --git a/src/user/dashboard/notifications/notifications.js b/src/user/dashboard/notifications/notifications.js
index 09978668..27700d81 100644
--- a/src/user/dashboard/notifications/notifications.js
+++ b/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 (
+
+
+
+

+
+
+
{notification.heading}
+ {notification.tag ?
:
}
+
{notification.content}
+
+
+
+ )
+ })
+
return (
-
-
-
- | Notifications |
-
-
-
-
- | 1 |
-
-
- | 2 |
-
-
- | 3 |
-
-
-
+
+
Notifications
+
+
+ {notifications}
+
);
}
}
export default Notifications;
+
diff --git a/src/user/dashboard/notifications/notifications.scss b/src/user/dashboard/notifications/notifications.scss
index 4ba13e40..2bb04bf7 100644
--- a/src/user/dashboard/notifications/notifications.scss
+++ b/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;
+}
\ No newline at end of file
diff --git a/src/user/dashboard/portfolio/portfolio.scss b/src/user/dashboard/portfolio/portfolio.scss
index 12e9efa6..4c1e115b 100644
--- a/src/user/dashboard/portfolio/portfolio.scss
+++ b/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;
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/user/dashboard/upcoming-events/upcoming-events.js b/src/user/dashboard/upcoming-events/upcoming-events.js
index f6270c8c..dd360a44 100644
--- a/src/user/dashboard/upcoming-events/upcoming-events.js
+++ b/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 (
+
+
+
+

+
+
+
{event.createdBy}
+ {event.tag ?
:
}
+
{event.description}
+
+
+
+ )
+ })
return (
-
-
-
- | Upcoming Events |
-
-
-
-
- | 1 |
-
-
- | 2 |
-
-
- | 3 |
-
-
-
+
+
Upcoming Events
+
+
+ {upcomingEvents}
+
);
}
diff --git a/src/user/dashboard/upcoming-events/upcoming-events.scss b/src/user/dashboard/upcoming-events/upcoming-events.scss
index a84bb8e5..7d13dfd1 100644
--- a/src/user/dashboard/upcoming-events/upcoming-events.scss
+++ b/src/user/dashboard/upcoming-events/upcoming-events.scss
@@ -1,12 +1,79 @@
.upcoming-events {
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;
+ border-top-left-radius: 2%;
+ border-bottom-left-radius: 2%;
+ box-shadow: 0px 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-events{
+ width:90%;
+ margin: 15px auto;
+ height: 200px;
+ overflow-y: auto;
+
+ .event-container{
+ display: flex;
+ border-bottom: 1px solid #ccc;
+ padding: 10px 0;
+ width:97%;
+ margin-right: 2px;
+ }
+ .event-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
}
}
}
-}
+
+ .img-container > img {
+ width: 30px;
+ border-radius: 100%;
+ background-blend-mode: normal;
+ margin:auto;
+ height: 90%;
+ }
+}
\ No newline at end of file
diff --git a/src/user/organization/org-info/org-info.scss b/src/user/organization/org-info/org-info.scss
index fd9747f9..d1bd9736 100644
--- a/src/user/organization/org-info/org-info.scss
+++ b/src/user/organization/org-info/org-info.scss
@@ -3,8 +3,9 @@
flex-direction: row;
border: solid 1px #dfe9f1;
min-height: 198px;
- height: 198px;
- flex: 0.5;
+ height: auto;
+ flex: 0.5 1;
+ align-items: center;
.org-image {
flex: 0.5;
text-align: center;
diff --git a/src/user/profile/user-info/user-info.scss b/src/user/profile/user-info/user-info.scss
index 9f7b5f54..09e4da0b 100644
--- a/src/user/profile/user-info/user-info.scss
+++ b/src/user/profile/user-info/user-info.scss
@@ -3,7 +3,9 @@
flex-direction: row;
border: solid 1px #dfe9f1;
min-height: 198px;
- height: 198px;
+ height: auto;
+ align-items: center;
+ flex: 0.5;
.user-image {
flex: 1;
text-align: center;