Skip to content

Commit

Permalink
Fixing the pre-commit hook
Browse files Browse the repository at this point in the history
  • Loading branch information
LogicDX342 committed Apr 13, 2024
1 parent 1688797 commit 5a0cca9
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 63 deletions.
15 changes: 7 additions & 8 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ import './App.css';

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<div className='App'>
<header className='App-header'>
<img src={logo} className='App-logo' alt='logo' />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
className='App-link'
href='https://reactjs.org'
target='_blank'
rel='noopener noreferrer'>
Learn React
</a>
</header>
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, screen } from '@testing-library/react';
import {render, screen} from '@testing-library/react';
import App from './App';

test('renders learn react link', () => {
Expand Down
90 changes: 60 additions & 30 deletions client/src/Login.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,68 @@
import React, { useState } from 'react';
import React, {useState} from 'react';
import axios from 'axios';

function Login() {
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');

const handleLogin = async (e) => {
e.preventDefault();
const res = await axios.post('http://localhost:3001/login', { username, password });
console.log(res.data);
};
const handleLogin = async (e) => {
e.preventDefault();
const res = await axios.post('http://localhost:3001/login', {
username,
password,
});
console.log(res.data);
};

const handleRegister = async (e) => {
e.preventDefault();
const res = await axios.post('http://localhost:3001/register', { username, password });
console.log(res.data);
};
const handleRegister = async (e) => {
e.preventDefault();
const res = await axios.post('http://localhost:3001/register', {
username,
password,
});
console.log(res.data);
};

return (
<div>
<form onSubmit={handleLogin}>
<h1>Login</h1>
<input type="text" value={username} onChange={e => setUsername(e.target.value)} placeholder="Username" required />
<input type="password" value={password} onChange={e => setPassword(e.target.value)} placeholder="Password" required />
<button type="submit">Login</button>
</form>
<form onSubmit={handleRegister}>
<h1>Register</h1>
<input type="text" value={username} onChange={e => setUsername(e.target.value)} placeholder="Username" required />
<input type="password" value={password} onChange={e => setPassword(e.target.value)} placeholder="Password" required />
<button type="submit">Register</button>
</form>
</div>
);
return (
<div>
<form onSubmit={handleLogin}>
<h1>Login</h1>
<input
type='text'
value={username}
onChange={(e) => setUsername(e.target.value)}
placeholder='Username'
required
/>
<input
type='password'
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder='Password'
required
/>
<button type='submit'>Login</button>
</form>
<form onSubmit={handleRegister}>
<h1>Register</h1>
<input
type='text'
value={username}
onChange={(e) => setUsername(e.target.value)}
placeholder='Username'
required
/>
<input
type='password'
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder='Password'
required
/>
<button type='submit'>Register</button>
</form>
</div>
);
}

export default Login;
export default Login;
24 changes: 12 additions & 12 deletions client/src/index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import React from "react";
import ReactDOM from "react-dom/client";
import "./index.css";
import App from "./App";
import reportWebVitals from "./reportWebVitals";
import Login from "./Login";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
import Login from './Login';
import {BrowserRouter as Router, Routes, Route} from 'react-router-dom';

const root = ReactDOM.createRoot(document.getElementById("root"));
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<Router>
<Routes>
<Route path="/" element={<App />} />
<Route path="/login" element={<Login />} />
<Route path='/' element={<App />} />
<Route path='/login' element={<Login />} />
</Routes>
</Router>
</React.StrictMode>
</React.StrictMode>,
);

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
reportWebVitals();
4 changes: 2 additions & 2 deletions client/src/reportWebVitals.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const reportWebVitals = onPerfEntry => {
const reportWebVitals = (onPerfEntry) => {
if (onPerfEntry && onPerfEntry instanceof Function) {
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
import('web-vitals').then(({getCLS, getFID, getFCP, getLCP, getTTFB}) => {
getCLS(onPerfEntry);
getFID(onPerfEntry);
getFCP(onPerfEntry);
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"lint-staged": {
"*.js": [
"eslint --cache --fix",
"prettier --write"
"prettier --write",
"git add"
],
"*.json": [
"prettier --write"
Expand Down
18 changes: 9 additions & 9 deletions server/src/models/index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
const Sequelize = require("sequelize");
const UserModel = require("./user");
const Sequelize = require('sequelize');
const UserModel = require('./user');

const sequelize = new Sequelize("cs304_project", "root", "123qweasd", {
host: "localhost",
dialect: "mysql",
const sequelize = new Sequelize('cs304_project', 'root', '123qweasd', {
host: 'localhost',
dialect: 'mysql',
logging: (msg) => {
if (msg.startsWith("Executing")) {
if (msg.startsWith('Executing')) {
console.log(msg);
}
},
});
sequelize
.authenticate()
.then(() =>
console.log("Connection to database has been established successfully.")
console.log('Connection to database has been established successfully.'),
)
.catch((err) => console.error("Unable to connect to the database:", err));
.catch((err) => console.error('Unable to connect to the database:', err));
const User = UserModel(sequelize, Sequelize);

sequelize.sync({ force: false }).then(() => {
sequelize.sync({force: false}).then(() => {
console.log(`Database & tables created!`);
});

Expand Down
1 change: 1 addition & 0 deletions server/src/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ const router = express.Router();
router.use('/users', require('./users'));

module.exports = router;
//

0 comments on commit 5a0cca9

Please sign in to comment.