Skip to content

Commit

Permalink
Merge pull request #1 from oslabs-beta/mma/moduleupdate
Browse files Browse the repository at this point in the history
build! : updated dependencies chore!: update import statement for font chore!: update to createRoot from render BREAKING CHANGE
  • Loading branch information
misterjoecool authored May 15, 2024
2 parents 703fb91 + 1218b04 commit 92ed050
Show file tree
Hide file tree
Showing 4 changed files with 6,693 additions and 6,071 deletions.
4 changes: 2 additions & 2 deletions frontend/components/modal/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react';
import { LinearProgress } from '@mui/material';
import { ipcRenderer } from 'electron';
import styled, { ExecutionContext } from 'styled-components';
import styled from 'styled-components';

interface Props {
$show: boolean;
Expand All @@ -11,7 +11,7 @@ const StyledLinearProg = styled(LinearProgress)<Props>`
/* Material Ui Drawer component used by sidebar has z-index: 1200 */
z-index: 1300;
height: 5px;
visibility: ${(props?) => (props.$show ? 'visible' : 'hidden')};
visibility: ${(props?) => (props?.$show ? 'visible' : 'hidden')};
`;

let delayTimer: NodeJS.Timeout;
Expand Down
15 changes: 5 additions & 10 deletions frontend/index.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
import React from 'react';
import { render } from 'react-dom';
// import { createRoot } from 'react-dom/client';
// import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';

import App from './components/App';
// import 'codemirror/lib/codemirror.css';

import 'fontsource-roboto';
import '@fontsource/roboto';

const root = document.createElement('div');
const root = createRoot(document.createElement('div'));
root.id = 'root';
document.body.appendChild(root);

render(
<div>
<App />
</div>,
document.getElementById('root'),
);
root.render(<App />);

// const container = document.getElementById('root') as HTMLElement;
// const root = createRoot(container);
Expand Down
Loading

0 comments on commit 92ed050

Please sign in to comment.