diff --git a/src/components/Dashboard/MeetingList.js b/src/components/Dashboard/MeetingList.js
index 740daa8..8b47b51 100644
--- a/src/components/Dashboard/MeetingList.js
+++ b/src/components/Dashboard/MeetingList.js
@@ -72,7 +72,7 @@ const alignRight = {
justifyContent: 'center',
alignItems: 'center',
height: '60px',
- alignSelf: 'right'
+ marginLeft: 'auto'
};
const slimText = {
diff --git a/src/screens/Dashboard.js b/src/screens/Dashboard.js
index 3624ac8..df07a84 100644
--- a/src/screens/Dashboard.js
+++ b/src/screens/Dashboard.js
@@ -1,15 +1,18 @@
import React, { useEffect, useState } from 'react';
-import { Panel, Divider, List, Icon, FlexboxGrid } from 'rsuite';
+import { Panel, Placeholder, Loader } from 'rsuite';
import { NavBar, MeetingList } from '../components';
import './styles/layout.less';
import { backend } from '../helpers/http-common';
+const { Paragraph } = Placeholder;
+
export default function Dashboard({ currentUser }) {
const [meetings, setMeetings] = useState([]);
const [confirmed, setConfirmed] = useState();
const [unconfirmed, setUnconfirmed] = useState();
+ const [loading, setLoading] = useState(true);
useEffect(() => {
backend
@@ -27,6 +30,7 @@ export default function Dashboard({ currentUser }) {
setConfirmed(confirmed);
setUnconfirmed(unconfirmed);
setMeetings(allMeetings);
+ setLoading(false);
})
.catch((error) => console.log(error));
}, []);
@@ -34,16 +38,36 @@ export default function Dashboard({ currentUser }) {
return (
<>
-
- Invitations
- {meetings.length === 0 && You have no meetings.
}
- {confirmed && (
-
- )}
- {unconfirmed && (
-
- )}
-
+ {loading ? (
+
+ Invitations
+ Confirmed
+
+
+
+ To confirm
+
+
+
+
+ ) : (
+
+ Invitations
+ {confirmed && (
+
+ )}
+ {unconfirmed && (
+
+ )}
+ {meetings.length === 0 && You have no meetings.
}
+
+ )}
>
);
}