c4patino/know-it-all
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reworked client models to work with new backend

Browse source
This commit is contained in:
Ceferino Patino 2022-04-03 12:01:11 -05:00
commit be2566dba0
9 changed files with 27 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/App.jsx
View file

@ -17,7 +17,7 @@ import OrgDashboard from './components/orgs/OrgDashboard';
import UpdateOrganization from './components/forms/UpdateOrganization';
function App() {
const [token, setToken] = useState(false);
const [token, setToken] = useState(true);
return (
<React.Fragment>

22
client/src/components/MainPage.jsx
View file

@ -76,16 +76,7 @@ function MainPage() {
)}`
)
.then((response) => {
setOwnedOrgs(() =>
response.data.map((org) => {
return {
orgID: org.orgID,
orgName: org.orgName,
memberCount: org.memberCount,
createdAt: org.createdAt,
};
})
);
setOwnedOrgs(() => response.data);
})
.catch((e) => {
console.log(e);
@ -100,16 +91,7 @@ function MainPage() {
}/auth/orgs?token=${Cookies.get('token')}`
)
.then((response) => {
setOrgs(() =>
response.data.map((org) => {
return {
orgID: org.orgID,
orgName: org.orgName,
memberCount: org.memberCount,
createdAt: org.createdAt,
};
})
);
setOrgs(() => response.data);
});
}

5
client/src/components/forms/Login.jsx
View file

@ -40,7 +40,10 @@ function Login({ setToken }) {
setToken(() => false);
}
logout();
if (Cookies.get('token')) {
logout();
}
}, [setToken]);
function handleChange(e) {

11
client/src/components/orgs/MemberOrgs.jsx
View file

@ -14,16 +14,7 @@ function JoinedOrgs() {
}/auth/orgs?token=${Cookies.get('token')}`
)
.then((response) => {
setOrgs(() =>
response.data.map((org) => {
return {
orgID: org.orgID,
orgName: org.orgName,
memberCount: org.memberCount,
createdAt: org.createdAt,
};
})
);
setOrgs(() => response.data);
});
}

46
client/src/components/orgs/OrgDashboard.jsx
View file

@ -34,14 +34,14 @@ function OrgDashboard() {
const navigate = useNavigate();
const [org, setOrg] = useState({
orgID: orgID,
orgName: '',
orgOwner: {
id: orgID,
name: '',
owner: {
firstName: '',
lastName: '',
email: '',
},
orgMembers: [],
member: [],
createdAt: '',
memberCount: 0,
});
@ -65,32 +65,12 @@ function OrgDashboard() {
)
.then((response) => {
const res = response.data;
console.log(res);
setOrg(() => {
return {
orgID: res.org.orgID,
orgName: res.org.orgName,
orgOwner: {
firstName: res.org.orgOwner.firstName,
lastName: res.org.orgOwner.lastName,
email: res.org.orgOwner.email,
},
orgMembers: res.org.orgMember,
createdAt: res.org.createdAt,
memberCount: res.memberCount,
};
return { ...res.org, memberCount: res.memberCount };
});
const orgMembers = res.org.orgMember.map((member) => {
return {
id: member.userID,
...member,
};
});
setRows(() => orgMembers);
setRows(() => res.org.member);
setStatus(() => res.status);
})
.catch((e) => {
@ -119,7 +99,7 @@ function OrgDashboard() {
function copyJoinLink() {
navigator.clipboard.writeText(
`${process.env.REACT_APP_DOMAIN_ROOT}/regsiter?orgID=${orgID}`
`${process.env.REACT_APP_DOMAIN_ROOT}/register?orgID=${orgID}`
);
}
@ -181,7 +161,7 @@ function OrgDashboard() {
<Accordion expanded={open} onChange={handleOpen}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography variant='h6'>
Organizations/{org.orgName}
Organizations/{org.name}
</Typography>
</AccordionSummary>
<AccordionDetails>
@ -194,7 +174,7 @@ function OrgDashboard() {
<Grid item xs={3}>
<Stack>
<Typography variant='body1'>
Organization ID: {org.orgID}
Organization ID: {orgID}
</Typography>
<Typography variant='body1'>
Members: {org.memberCount}
@ -208,10 +188,10 @@ function OrgDashboard() {
<Stack>
<Typography variant='body1'>
Owner:{' '}
{`${org.orgOwner.firstName} ${org.orgOwner.lastName}`}
{`${org.owner.firstName} ${org.owner.lastName}`}
</Typography>
<Typography variant='body1'>
Email: {org.orgOwner.email}
Email: {org.owner.email}
</Typography>
</Stack>
</Grid>
@ -228,14 +208,14 @@ function OrgDashboard() {
to='update'
style={linkStyle}
>
Edit {org.orgName}
Edit {org.name}
</Link>
</Button>
<Button
color='error'
onClick={handleDelete}
>
Delete {org.orgName}
Delete {org.name}
</Button>
</ButtonGroup>
<ButtonGroup

11
client/src/components/orgs/OwnedOrgs.jsx
View file

@ -14,16 +14,7 @@ function JoinedOrgs() {
)}`
)
.then((response) => {
setOrgs(() =>
response.data.map((org) => {
return {
orgID: org.orgID,
orgName: org.orgName,
memberCount: org.memberCount,
createdAt: org.createdAt,
};
})
);
setOrgs(() => response.data);
});
}

6
client/src/components/utils/OrgUnit.jsx
View file

@ -10,7 +10,7 @@ import {
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
function OrgUnit({ org }) {
const { orgID, orgName, memberCount, createdAt } = org;
const { id, name, memberCount, createdAt } = org;
const linkStyle = { textDecoration: 'none', color: 'inherit' };
@ -18,8 +18,8 @@ function OrgUnit({ org }) {
<Accordion>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography>
<Link to={`/org/${orgID}`} style={linkStyle}>
{orgName}
<Link to={`/org/${id}`} style={linkStyle}>
{name}
</Link>
</Typography>
</AccordionSummary>

9
client/src/components/utils/Organizations.jsx
View file

@ -8,14 +8,7 @@ import OrgUnit from './OrgUnit';
function Organizations({ retrieveOrgs }) {
const theme = useTheme();
const [orgs, setOrgs] = useState([
{
orgID: 12341234,
orgName: 'Org',
memberCount: 15,
createdAt: 15,
},
]);
const [orgs, setOrgs] = useState([]);
useEffect(() => {
retrieveOrgs(setOrgs);

1
client/src/components/utils/StackItem.jsx
View file

@ -11,6 +11,7 @@ function StackItem({ text, children }) {
padding: '2vh',
color: theme.palette.text.secondary,
};
return (
<Paper sx={paperStyle}>
<Typography variant='h6'>{text}</Typography>