Rewrite phase 1.

Started improved client code structure.

Implemented session based authentication serverside.

Implemented user, match, and sport database models serverside.

Implemented Controllers for variety of C and R operations of CRUD.

sports-matcher/client/src/App.test.js

@@ -0,0 +1,8 @@
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+  render(<App />);
+  const linkElement = screen.getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});

sports-matcher/client/src/Layout.js

@@ -0,0 +1,41 @@
+import "./styles/Layout.css";
+import "./styles/extra.css";
+import React from "react";
+import { NavLink, Route, Routes } from "react-router-dom";
+import Welcome from "./pages/Welcome";
+import Navbar from "react-bootstrap/Navbar";
+import { Container, Nav, NavbarBrand } from "react-bootstrap";
+import NavbarToggle from "react-bootstrap/esm/NavbarToggle";
+import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
+export default class Layout extends React.Component {
+    render() {
+        return (
+            <div id="app">
+                <header>
+                    <Navbar bg="light" expand="md">
+                        <Container>
+                            <NavbarBrand href="/">Sports Matcher</NavbarBrand>
+                            <NavbarToggle aria-controls="navigation"></NavbarToggle>
+                            <NavbarCollapse id="main-nav">
+                                <Nav className="me-auto">
+                                    <li className="nav-item">
+                                        <NavLink className="nav-link" to="/" >Home</NavLink>
+                                    </li>
+                                </Nav>
+                            </NavbarCollapse>
+                        </Container>
+                    </Navbar>
+                </header>
+                <main>
+                    <Routes>
+                        <Route path="/" element={<Welcome></Welcome>}>
+                        </Route>
+                    </Routes>
+                </main>
+                <footer>
+
+                </footer>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/components/GameInfoCard.js

@@ -0,0 +1,36 @@
+import React from "react";
+import { Button, Card } from "react-bootstrap";
+import propTypes from "prop-types";
+import { grammaticalListString } from "../utils/strings";
+export default class GameInfoCard extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+
+    getParticipants() {
+        let participants = [];
+        this.props.match.registeredUsers.array.forEach(user => {
+            participants.push(user.firstName);
+        });
+        return participants;
+    }
+
+    render() {
+        return (
+            <Card style={{ width: "20rem" }}>
+                <Card.Body>
+                    <Card.Title>{this.props.match.sport}</Card.Title>
+                    <Card.Subtitle className="mb-2 text-muted">{this.props.match.sport}</Card.Subtitle>
+                    <Card.Text>
+                        Join <strong>{grammaticalListString(this.getParticipants(), 4)}</strong> to play a few matches of <strong>{this.props.match.sport}</strong> at <strong>{this.props.match.location}</strong> on <strong>{this.props.match.dateTime.toLocaleDateString("en-US")}</strong>!
+                    </Card.Text>
+                    <Button variant="primary">Join!</Button>
+                </Card.Body>
+            </Card>
+        );
+    }
+}
+
+GameInfoCard.propTypes = {
+    match: propTypes.object,
+};

sports-matcher/client/src/components/GameInfoCardDisplay.js

@@ -0,0 +1,21 @@
+import React from "react";
+import propTypes from "prop-types";
+import GameInfoCard from "./GameInfoCard";
+
+export default class GameInfoCardDisplay extends React.Component {
+    constructor(props) {
+        super(props);
+
+    }
+    render() {
+        return (
+            <div className="horizontal-scroller">
+                {this.props.recommendedMatches.map((match) => <GameInfoCard key={match.id} match={match}></GameInfoCard>)}
+            </div>
+        );
+    }
+}
+
+GameInfoCardDisplay.propTypes = {
+    recommendedMatches: propTypes.array,
+};

sports-matcher/client/src/index.js

@@ -0,0 +1,19 @@
+import React from "react";
+import ReactDOM from "react-dom";
+import Layout from "./Layout";
+import reportWebVitals from "./reportWebVitals";
+import { BrowserRouter } from "react-router-dom";
+import "bootstrap/dist/css/bootstrap.min.css"; // This could be optimized by importing individual css components.
+ReactDOM.render(
+    <React.StrictMode>
+        <BrowserRouter>
+            <Layout />
+        </BrowserRouter>
+    </React.StrictMode>,
+    document.getElementById("root")
+);
+
+// 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();

sports-matcher/client/src/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

sports-matcher/client/src/pages/Welcome.js

@@ -0,0 +1,28 @@
+import React from "react";
+import { apiClient } from "../utils/httpClients";
+export default class Welcome extends React.Component {
+    constructor(props) {
+        super(props);
+        this.recentMatchesRequest = apiClient.get("/match/recent/15");
+    }
+
+    render() {
+        return (
+            <div className="page-root">
+                <div className="jumbotron" >
+                    <h1>Sports Matcher</h1>
+                    <p>The best place to find a local match for a good game of your favourite sport!</p>
+                </div>
+                <div className="text-center p-3 mt-2">
+                    <h2>Why?</h2>
+                    <p>Because you want to play the sports you love while meeting new friends!</p>
+                    {/* TODO: All this text should be expanded on. */}
+                </div>
+                <hr />
+                <div className="p-4">
+                    <h2>Available Matches</h2>
+                </div>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/reportWebVitals.js

@@ -0,0 +1,13 @@
+const reportWebVitals = onPerfEntry => {
+    if (onPerfEntry && onPerfEntry instanceof Function) {
+        import("web-vitals").then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+            getCLS(onPerfEntry);
+            getFID(onPerfEntry);
+            getFCP(onPerfEntry);
+            getLCP(onPerfEntry);
+            getTTFB(onPerfEntry);
+        });
+    }
+};
+
+export default reportWebVitals;

sports-matcher/client/src/setupTests.js

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import "@testing-library/jest-dom";

sports-matcher/client/src/styles/Layout.css

@@ -0,0 +1,16 @@
+.page-root,
+main,
+#app,
+#root {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+}
+
+html,
+body {
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+}

sports-matcher/client/src/styles/extra.css

@@ -0,0 +1,19 @@
+.jumbotron {
+  width: 100%;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-top: 12rem;
+  padding-bottom: 1rem;
+  text-align: center;
+  background-size: cover;
+  background-color: black;
+  color: white;
+}
+
+.jumbotron h1 {
+  font-size: 1.5rem;
+}
+
+.horizontal-scroller {
+  overflow-x: scroll;
+}

sports-matcher/client/src/utils/httpClients.js

@@ -0,0 +1,6 @@
+import axios from "axios";
+
+export const apiClient = axios.create({
+    baseURL: process.env.API_HOST,
+    timeout: 5000,
+});

sports-matcher/client/src/utils/strings.js

@@ -0,0 +1,22 @@
+export function grammaticalListString(items, max) {
+    if (!items) return null;
+    if (max < 1) return "";
+    let built = "";
+
+    let index = 0;
+    items.forEach(item => {
+        if (index > max) {
+            built += "and " + items.length + " more ";
+            return;
+        }
+        built += item;
+        built += ", ";
+        if (index == max - 1) {
+            built += "and ";
+        }
+
+        index += 1;
+    });
+
+    return built;
+}