Merge development into main (#20) (#28)

* Fixed recording on RecordMp3 element to work (#17)

* Completed reponsive window sizes on desktop, tablet, and mobile (#18)

* Changed the location of sequelizerc file (#19)
This commit is contained in:
Ceferino Patino 2022-04-02 16:52:58 -05:00 committed by GitHub
commit 57fff6a5e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions

View file

@ -16,7 +16,11 @@ import {
AccordionDetails,
useMediaQuery,
} from '@mui/material';
<<<<<<< HEAD
import { styled } from '@mui/material/styles';
=======
import { styled, useTheme } from '@mui/material/styles';
>>>>>>> main
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import Dashboard from '../utils/Dashboard';

View file

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