From 01b3295a2dfd804b121104bb7d1e0657fb16bcc9 Mon Sep 17 00:00:00 2001 From: Meraj Sharifi <57524057+MerajSharifi@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:46:32 +0200 Subject: [PATCH 1/4] nothing --- packages/client/src/App.js | 5 ++--- packages/client/src/containers/Dashboard/Dashboard.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/client/src/App.js b/packages/client/src/App.js index af142c4..b983f3d 100644 --- a/packages/client/src/App.js +++ b/packages/client/src/App.js @@ -3,10 +3,9 @@ import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import Dashboard from './containers/Dashboard/Dashboard'; // TODO: put back comment after the login flow is down // import { LandingPageContainer } from './containers/LandingPage/LandingPage'; -import { PageNotFound } from './containers/PageNotFound/PageNotFound.Container'; +// import { PageNotFound } from './containers/PageNotFound/PageNotFound.Container'; import { CheckinQuestions } from './containers/LandingPage/CheckinQuestionsPage/CheckinQuestions'; import { TeamIdContextProvider } from './hooks/contextHook'; - function App() { return (
@@ -17,7 +16,7 @@ function App() { {/* } /> */} } /> } /> - } /> + {/* } /> */} diff --git a/packages/client/src/containers/Dashboard/Dashboard.js b/packages/client/src/containers/Dashboard/Dashboard.js index 82d9c89..ee53745 100644 --- a/packages/client/src/containers/Dashboard/Dashboard.js +++ b/packages/client/src/containers/Dashboard/Dashboard.js @@ -4,7 +4,7 @@ import NavigationBar from '../../components/Dashboard/NavigationBar'; import placeholder from './placeholder.png'; import './Dashboard.css'; import { TeamMembers } from '../../components/Dashboard/TeamMembers'; -import logo from './logo-dark.svg'; +import logo from '../../components/Dashboard/logo-dark.svg'; const Dashboard = () => { return ( From c1b37675cce91e1d55d484e1bafaf5f94a5a1e8e Mon Sep 17 00:00:00 2001 From: Meraj Sharifi <57524057+MerajSharifi@users.noreply.github.com> Date: Sun, 21 Apr 2024 15:44:28 +0200 Subject: [PATCH 2/4] edits 2 - fixed the landing page and comments --- packages/client/src/App.js | 4 +- .../Dashboard/TeamMemberListItem.jsx | 5 +- .../src/components/Dashboard/TeamMembers.jsx | 55 +++++++++++-------- .../src/containers/Dashboard/Dashboard.css | 11 +++- .../src/containers/Dashboard/Dashboard.js | 1 - .../containers/LandingPage/LandingPage.css | 10 +--- .../containers/LandingPage/Teams.Container.js | 26 --------- 7 files changed, 50 insertions(+), 62 deletions(-) delete mode 100644 packages/client/src/containers/LandingPage/Teams.Container.js diff --git a/packages/client/src/App.js b/packages/client/src/App.js index b983f3d..67509f2 100644 --- a/packages/client/src/App.js +++ b/packages/client/src/App.js @@ -2,7 +2,7 @@ import React from 'react'; import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import Dashboard from './containers/Dashboard/Dashboard'; // TODO: put back comment after the login flow is down -// import { LandingPageContainer } from './containers/LandingPage/LandingPage'; +import { LandingPageContainer } from './containers/LandingPage/LandingPage'; // import { PageNotFound } from './containers/PageNotFound/PageNotFound.Container'; import { CheckinQuestions } from './containers/LandingPage/CheckinQuestionsPage/CheckinQuestions'; import { TeamIdContextProvider } from './hooks/contextHook'; @@ -13,7 +13,7 @@ function App() { {/* TODO: put back comment after the login flow is down */} - {/* } /> */} + } /> } /> } /> {/* } /> */} diff --git a/packages/client/src/components/Dashboard/TeamMemberListItem.jsx b/packages/client/src/components/Dashboard/TeamMemberListItem.jsx index a26d77b..2ff71ff 100644 --- a/packages/client/src/components/Dashboard/TeamMemberListItem.jsx +++ b/packages/client/src/components/Dashboard/TeamMemberListItem.jsx @@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; import { IconButton } from '@mui/material'; import EditIcon from '@mui/icons-material/Edit'; import DeleteIcon from '@mui/icons-material/Delete'; +import Dashboard from '../../containers/Dashboard/Dashboard'; const TeamMemberListItem = ({ member, @@ -11,8 +12,8 @@ const TeamMemberListItem = ({ }) => { return (
  • -
    -
    +
    +
    {member.first_name} {member.last_name}
    diff --git a/packages/client/src/components/Dashboard/TeamMembers.jsx b/packages/client/src/components/Dashboard/TeamMembers.jsx index 58cf03e..56cfde2 100644 --- a/packages/client/src/components/Dashboard/TeamMembers.jsx +++ b/packages/client/src/components/Dashboard/TeamMembers.jsx @@ -4,8 +4,10 @@ import { AddTeamMemberModal } from '../../containers/LandingPage/AddTeamMemberMo import { Typography, Button } from '@mui/material'; import TeamMemberListItem from './TeamMemberListItem'; import EditingMember from './EditingMember'; // Import the newly created component +import { useTeamIdContext } from '../../hooks/contextHook'; const TeamMembers = () => { + const { teamId } = useTeamIdContext(); const [teamMembers, setTeamMembers] = useState([]); const [editMemberId, setEditMemberId] = useState(null); const [editMemberFirstName, setEditMemberFirstName] = useState(''); @@ -20,7 +22,7 @@ const TeamMembers = () => { const fetchTeamMembers = async () => { try { - const response = await fetch(`${apiURL()}/teamMembers`); + const response = await fetch(`${apiURL()}/teamMembers/${teamId}/members`); if (!response.ok) { throw new Error('Failed to fetch team members'); } @@ -44,9 +46,12 @@ const TeamMembers = () => { ); if (confirmDelete) { try { - const response = await fetch(`${apiURL()}/teamMembers/${id}`, { - method: 'DELETE', - }); + const response = await fetch( + `${apiURL()}/teamMembers/${teamId}/members/${id}`, + { + method: 'DELETE', + }, + ); if (!response.ok) { throw new Error('Failed to delete team member'); } @@ -65,16 +70,19 @@ const TeamMembers = () => { return; } try { - const response = await fetch(`${apiURL()}/teamMembers/addMember`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', + const response = await fetch( + `${apiURL()}/teamMembers/${teamId}/members`, + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + first_name: newMemberFirstName, + last_name: newMemberLastName, + }), }, - body: JSON.stringify({ - first_name: newMemberFirstName, - last_name: newMemberLastName, - }), - }); + ); if (!response.ok) { throw new Error('Failed to add team member'); } @@ -89,16 +97,19 @@ const TeamMembers = () => { const handleEditSave = async () => { try { - const response = await fetch(`${apiURL()}/teamMembers/${editMemberId}`, { - method: 'PATCH', - headers: { - 'Content-Type': 'application/json', + const response = await fetch( + `${apiURL()}/teamMembers/${teamId}/members/${editMemberId}`, + { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + first_name: editMemberFirstName, + last_name: editMemberLastName, + }), }, - body: JSON.stringify({ - first_name: editMemberFirstName, - last_name: editMemberLastName, - }), - }); + ); if (!response.ok) { throw new Error('Failed to edit team member'); } diff --git a/packages/client/src/containers/Dashboard/Dashboard.css b/packages/client/src/containers/Dashboard/Dashboard.css index 4813d98..6e76434 100644 --- a/packages/client/src/containers/Dashboard/Dashboard.css +++ b/packages/client/src/containers/Dashboard/Dashboard.css @@ -16,7 +16,7 @@ body { height: 100vh; - background-color: var(--background-color); + background-color: #f7f7f7; } .dashboard-container { @@ -234,3 +234,12 @@ body { display: flex; justify-content: flex-end; } + +.member-info-container { + display: flex; + align-items: center; +} +.member-info { + flex-grow: 1; + border: none; +} diff --git a/packages/client/src/containers/Dashboard/Dashboard.js b/packages/client/src/containers/Dashboard/Dashboard.js index ee53745..9c73267 100644 --- a/packages/client/src/containers/Dashboard/Dashboard.js +++ b/packages/client/src/containers/Dashboard/Dashboard.js @@ -4,7 +4,6 @@ import NavigationBar from '../../components/Dashboard/NavigationBar'; import placeholder from './placeholder.png'; import './Dashboard.css'; import { TeamMembers } from '../../components/Dashboard/TeamMembers'; -import logo from '../../components/Dashboard/logo-dark.svg'; const Dashboard = () => { return ( diff --git a/packages/client/src/containers/LandingPage/LandingPage.css b/packages/client/src/containers/LandingPage/LandingPage.css index 5015f8d..330ba4d 100644 --- a/packages/client/src/containers/LandingPage/LandingPage.css +++ b/packages/client/src/containers/LandingPage/LandingPage.css @@ -5,19 +5,13 @@ --text-color: #fffff; } -* { - padding: 0; - margin: 0; - box-sizing: border-box; -} - -body { +.landing-page { margin: 0; display: flex; justify-content: center; /* Horizontally center content */ align-items: center; /* Vertically center content */ height: 100vh; /* Set body height to full viewport height */ - background: var(--background-color); + background: #1d4ed8; } .landing-page { diff --git a/packages/client/src/containers/LandingPage/Teams.Container.js b/packages/client/src/containers/LandingPage/Teams.Container.js deleted file mode 100644 index 77563d2..0000000 --- a/packages/client/src/containers/LandingPage/Teams.Container.js +++ /dev/null @@ -1,26 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { apiURL } from '../../apiURL'; -import './LandingPage.Style.css'; - -export const LandingPage = () => { - const [teams, setteams] = useState([]); - useEffect(() => { - async function fetchteams() { - const response = await fetch(`${apiURL()}/Teams`); - const examples = await response.json(); - setteams(examples); - } - - fetchteams(); - }, []); - - return ( -
    - Home Page -

    Login

    - {teams.map((example) => ( -
    {example.title}
    - ))} -
    - ); -}; From f8563e1a227fab1f66bea52a27d656c930fb2683 Mon Sep 17 00:00:00 2001 From: Meraj Sharifi <57524057+MerajSharifi@users.noreply.github.com> Date: Sun, 21 Apr 2024 16:14:07 +0200 Subject: [PATCH 3/4] edit --- .../client/src/containers/Dashboard/Dashboard.css | 4 ++-- .../containers/LandingPage/AddTeamMemberModal.css | 9 +++++++++ .../containers/LandingPage/AddTeamMemberModal.jsx | 14 +------------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/packages/client/src/containers/Dashboard/Dashboard.css b/packages/client/src/containers/Dashboard/Dashboard.css index 6e76434..9b02485 100644 --- a/packages/client/src/containers/Dashboard/Dashboard.css +++ b/packages/client/src/containers/Dashboard/Dashboard.css @@ -158,7 +158,7 @@ body { list-style-type: none; /* Remove default list styles */ padding: 0; /* Remove default padding */ background: var(--primary-background-color); - padding: 20px 20px 20px 20px; + padding: 20px; } .team-members-container ul li { @@ -195,7 +195,7 @@ body { flex-direction: column; margin-top: 20px; background-color: #fff; - padding: 20px 20px; + padding: 20px; border: #8a8a8a 1px solid; } diff --git a/packages/client/src/containers/LandingPage/AddTeamMemberModal.css b/packages/client/src/containers/LandingPage/AddTeamMemberModal.css index 83f1ade..281b3c4 100644 --- a/packages/client/src/containers/LandingPage/AddTeamMemberModal.css +++ b/packages/client/src/containers/LandingPage/AddTeamMemberModal.css @@ -4,6 +4,15 @@ display: flex; flex-direction: column; align-items: center; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 350; + background-color: background-paper; + border: none; + box-shadow: 24; + padding: 4; } .add-member { diff --git a/packages/client/src/containers/LandingPage/AddTeamMemberModal.jsx b/packages/client/src/containers/LandingPage/AddTeamMemberModal.jsx index 6f92485..76eac78 100644 --- a/packages/client/src/containers/LandingPage/AddTeamMemberModal.jsx +++ b/packages/client/src/containers/LandingPage/AddTeamMemberModal.jsx @@ -16,18 +16,6 @@ export const AddTeamMemberModal = ({ return null; } - const style = { - position: 'absolute', - top: '50%', - left: '50%', - transform: 'translate(-50%, -50%)', - width: 350, - bgcolor: 'background.paper', - border: `none`, - boxShadow: 24, - p: 4, - }; - return ( - + {' '} Add Team Member From 60dc1f5526377ec470b2fa20c2810eefa211ae36 Mon Sep 17 00:00:00 2001 From: Meraj Sharifi <57524057+MerajSharifi@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:26:28 +0200 Subject: [PATCH 4/4] modal container fixed --- .../src/containers/LandingPage/AddTeamMemberModal.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/containers/LandingPage/AddTeamMemberModal.css b/packages/client/src/containers/LandingPage/AddTeamMemberModal.css index 281b3c4..1c7112a 100644 --- a/packages/client/src/containers/LandingPage/AddTeamMemberModal.css +++ b/packages/client/src/containers/LandingPage/AddTeamMemberModal.css @@ -8,11 +8,11 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - width: 350; - background-color: background-paper; + width: 300px; + background-color: white; border: none; box-shadow: 24; - padding: 4; + padding: 20px; } .add-member {