diff --git a/frontend/src/components/Header/HeaderTitle/HeaderTitle.js b/frontend/src/components/Header/HeaderTitle/HeaderTitle.js
index 693a58b..3e2fb3a 100644
--- a/frontend/src/components/Header/HeaderTitle/HeaderTitle.js
+++ b/frontend/src/components/Header/HeaderTitle/HeaderTitle.js
@@ -1,11 +1,11 @@
-import React, { Component } from 'react';
+import React from 'react';
import logo from './careandshare.png';
import ('../style.css');
const Title = ({ title }) => {
return(
-
+
{title?{title}
:}
);
diff --git a/frontend/src/components/Header/Notifications/Notification/Notification.js b/frontend/src/components/Header/Notifications/Notification/Notification.js
index 0aa5fe2..fa1f38a 100644
--- a/frontend/src/components/Header/Notifications/Notification/Notification.js
+++ b/frontend/src/components/Header/Notifications/Notification/Notification.js
@@ -1,4 +1,4 @@
-import React , { Component } from 'react';
+import React from 'react';
import './style.css';
diff --git a/frontend/src/components/Header/Notifications/index.js b/frontend/src/components/Header/Notifications/index.js
index 478a554..e30cb96 100644
--- a/frontend/src/components/Header/Notifications/index.js
+++ b/frontend/src/components/Header/Notifications/index.js
@@ -8,6 +8,16 @@ import './style.css';
class Notifications extends Component {
state = {
show: false,
+ connectReq: [ //should be fetched from db
+ { name: 'ahmed', id:1 },
+ { name: 'mohammed', id:2 },
+ { name: 'abdSamad', id:3 },
+ { name: 'Frah', id:4 },
+ { name: 'Ramy', id:5 },
+ { name: 'Inass', id:6 },
+ { name: 'Isaac', id:7 },
+ { name: 'Marwa', id:8 },
+ ]
}
toggleNotification = (e) => {
@@ -17,8 +27,7 @@ class Notifications extends Component {
}
render () {
- const { connectReq } = this.props;
- const { show } = this.state;
+ const { show, connectReq } = this.state;
const notifications = connectReq.length? connectReq.map(element => {
return
diff --git a/frontend/src/components/Header/Notifications/style.css b/frontend/src/components/Header/Notifications/style.css
index fe808f5..d52b9c9 100644
--- a/frontend/src/components/Header/Notifications/style.css
+++ b/frontend/src/components/Header/Notifications/style.css
@@ -6,7 +6,9 @@
background-color: #FC2E2E;
color: #fff;
text-align: center;
- font-size: 19px;
+ padding: auto;
+ line-height: 20px;
+ font-size: 14px;
position: absolute;
right: 10px;
top: 8px;
diff --git a/frontend/src/components/Header/index.js b/frontend/src/components/Header/index.js
index 19e7529..79c483f 100644
--- a/frontend/src/components/Header/index.js
+++ b/frontend/src/components/Header/index.js
@@ -8,10 +8,12 @@ import './style.css';
class Header extends Component {
+ // the title should come from the selected nav
+
render(){
return(