Merge backend + frontend #1
@@ -1,9 +1,7 @@
 | 
				
			|||||||
import React from "react";
 | 
					import React from "react";
 | 
				
			||||||
import { render, screen } from "@testing-library/react";
 | 
					import { render } from "@testing-library/react";
 | 
				
			||||||
import App from "./App";
 | 
					import App from "./App";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
test("renders learn react link", () => {
 | 
					test("renders the app", () => {
 | 
				
			||||||
  render(<App />);
 | 
					  render(<App />);
 | 
				
			||||||
  const linkElement = screen.getByText(/learn react/i);
 | 
					 | 
				
			||||||
  expect(linkElement).toBeInTheDocument();
 | 
					 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,29 +1,23 @@
 | 
				
			|||||||
import React from "react";
 | 
					import React from "react";
 | 
				
			||||||
import logo from "./logo.svg";
 | 
					 | 
				
			||||||
import "./App.css";
 | 
					import "./App.css";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Roboto font and its weights
 | 
				
			||||||
import "@fontsource/roboto/300.css";
 | 
					import "@fontsource/roboto/300.css";
 | 
				
			||||||
import "@fontsource/roboto/400.css";
 | 
					import "@fontsource/roboto/400.css";
 | 
				
			||||||
import "@fontsource/roboto/500.css";
 | 
					import "@fontsource/roboto/500.css";
 | 
				
			||||||
import "@fontsource/roboto/700.css";
 | 
					import "@fontsource/roboto/700.css";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Theming
 | 
				
			||||||
 | 
					import ThemeProvider from "./ThemeProvider";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Material UI stuffs
 | 
				
			||||||
 | 
					import Container from "@mui/material/Container";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function App() {
 | 
					function App() {
 | 
				
			||||||
  return (
 | 
					  return (
 | 
				
			||||||
    <div className="App">
 | 
					    <ThemeProvider>
 | 
				
			||||||
      <header className="App-header">
 | 
					      <Container maxWidth="md"></Container>
 | 
				
			||||||
        <img src={logo} className="App-logo" alt="logo" />
 | 
					    </ThemeProvider>
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
          Edit <code>src/App.tsx</code> and save to reload.
 | 
					 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
        <a
 | 
					 | 
				
			||||||
          className="App-link"
 | 
					 | 
				
			||||||
          href="https://reactjs.org"
 | 
					 | 
				
			||||||
          target="_blank"
 | 
					 | 
				
			||||||
          rel="noopener noreferrer"
 | 
					 | 
				
			||||||
        >
 | 
					 | 
				
			||||||
          Learn React
 | 
					 | 
				
			||||||
        </a>
 | 
					 | 
				
			||||||
      </header>
 | 
					 | 
				
			||||||
    </div>
 | 
					 | 
				
			||||||
  );
 | 
					  );
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user