paul/go-sjles-pta-vote
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Better handling of react app

Browse Source
This commit is contained in:
paul
2026-01-21 14:21:11 -05:00
parent 3c489b7c32
commit ce4f8ba7df
29 changed files with 810 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/.gitignore vendored Normal file
View File

@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*

1162
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

35
client/package.json
View File

@@ -1,30 +1,25 @@
{
"name": "go-sjles-pta-vote-client",
"version": "1.0.0",
"description": "",
"main": "index.js",
"name": "client",
"version": "0.1.0",
"private": true,
"dependencies": {
"cra-template-pwa": "2.0.0",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"react-router": "7.12.0",
"react-scripts": "5.0.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"dependencies": {
"@testing-library/jest-dom": "6.9.1",
"@testing-library/react": "16.3.2",
"@testing-library/user-event": "14.6.1",
"axios":"1.13.2",
"css-loader": "7.1.2",
"react": "19.2.3",
"react-dom": "19.2.3",
"react-router": "7.12.0",
"react-scripts": "5.0.1",
"sass-loader": "16.0.6",
"webpack": "5.104.1",
"webpack-cli": "6.0.1"
},
"devDependencies": {
"typescript": "^4"
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [

BIN
client/public/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

30
client/public/index.html
View File

@@ -4,9 +4,37 @@
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>PTA Vote System</title>
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>

BIN
client/public/logo192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
client/public/logo512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

25
client/public/manifest.json Normal file
View File

@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}

3
client/public/robots.txt Normal file
View File

@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:

24
client/src/App.css
View File

@@ -2,6 +2,17 @@
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
@@ -12,3 +23,16 @@
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

40
client/src/App.js
View File

@@ -1,27 +1,19 @@
import React from 'react';
import { BrowserRouter as Router, Routes, Route } from 'react-router';
import './App.css';
import AdminMembersPage from './pages/AdminMembersPage';
import React from "react";
import { BrowserRouter, Routes, Route, Link } from "react-router";
import Home from "./pages/Home";
import AdminMembers from "./pages/AdminMembers";
function App() {
export default function App() {
return (
<Router>
<div className="App">
<header className="App-header">
<h1>PTA Vote System</h1>
{/* Add navigation link */}
<nav>
<a href="/admin-members">Upload Members</a>
</nav>
</header>
<main>
<Routes>
<Route path="/admin-members" element={<AdminMembersPage />} />
</Routes>
</main>
</div>
</Router>
);
}
<BrowserRouter>
<nav style={{ padding: "1rem", background: "#f5f5f5" }}>
<Link to="/">Home</Link> | <Link to="/admin-members">Admin Members</Link>
</nav>
export default App;
<Routes>
<Route path="/" element={<Home />} />
<Route path="/admin-members" element={<AdminMembers />} />
</Routes>
</BrowserRouter>
);
}

9
client/src/App.test.js Normal file
View File

@@ -0,0 +1,9 @@
import React from 'react';
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();
});

63
client/src/components/MembersForm.js
View File

@@ -1,63 +0,0 @@
import React, { useState } from 'react';
import axios from '../services/api';
function MembersForm() {
const [year, setYear] = useState('');
const [file, setFile] = useState(null);
const handleSubmit = async (e) => {
e.preventDefault();
if (!year || !file) {
alert('Both year and file are required!');
return;
}
try {
const formData = new FormData();
formData.append('year', year);
formData.append('members.csv', file);
await axios.post('/admin/members', formData, {
headers: { 'Content-Type': 'multipart/form-data' }
});
alert('Members uploaded successfully!');
setYear('');
setFile(null);
} catch (error) {
alert(`Error uploading members: ${error.response?.data.error || error.message}`);
}
};
return (
<form onSubmit={handleSubmit}>
<h1>Upload Members CSV</h1>
<div className="form-group">
<label htmlFor="year">Year:</label>
<input
type="number"
id="year"
value={year}
onChange={(e) => setYear(e.target.value)}
required
/>
</div>
<div className="form-group">
<label htmlFor="members.csv">CSV File:</label>
<input
type="file"
id="members.csv"
accept=".csv"
onChange={(e) => setFile(e.target.files[0])}
required
/>
</div>
<button type="submit">Upload</button>
</form>
);
}
export default MembersForm;

48
client/src/components/VoteForm.js
View File

@@ -1,48 +0,0 @@
import React, { useState } from 'react';
import axios from 'axios';
function VoteForm() {
const [email, setEmail] = useState('');
const [voteOption, setVoteOption] = useState('');
const handleSubmit = async (e) => {
e.preventDefault();
try {
await axios.post('http://localhost:8080/vote', {
email,
voteOption
});
alert('Vote submitted successfully!');
} catch (error) {
console.error(error);
alert('Error submitting vote');
}
};
return (
<form onSubmit={handleSubmit}>
<input
type="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="Enter your email"
required
/>
<select
value={voteOption}
onChange={(e) => setVoteOption(e.target.value)}
required
>
<option value="">Select an option</option>
{/* Add options dynamically based on poll data */}
</select>
<button type="submit">Submit Vote</button>
</form>
);
}
export default VoteForm;

13
client/src/index.css Normal file
View File

@@ -0,0 +1,13 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

16
client/src/index.js
View File

@@ -1,11 +1,7 @@
import React from 'react';
import {createRoot} from 'react-dom/client';
import './App.css';
import App from './App';
import React from "react";
import { createRoot } from "react-dom/client";
import App from "./App";
import "./index.css"; // optional – keep CRA default styling
const root = createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
);
const container = document.getElementById("root");
createRoot(container).render(<App />);

7
client/src/logo.svg Normal file
View File

@@ -0,0 +1,7 @@
<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>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

83
client/src/pages/AdminMembers.js Normal file
View File

@@ -0,0 +1,83 @@
import React, { useState } from "react";
export default function AdminMembers() {
const [year, setYear] = useState("");
const [file, setFile] = useState(null);
const [status, setStatus] = useState("");
const handleSubmit = async (e) => {
e.preventDefault();
if (!year) {
setStatus("⚠️ Please enter a year.");
return;
}
if (!file) {
setStatus("⚠️ Please select a CSV file.");
return;
}
const formData = new FormData();
formData.append("year", year);
formData.append("members.csv", file); // name must match the Go handler
try {
const resp = await fetch("/api/admin/members", {
method: "POST",
body: formData,
});
const data = await resp.json();
if (data.success) {
setStatus(`✅ Uploaded!`);
} else {
setStatus(`❌ Server error: ${data.error}`);
}
} catch (err) {
setStatus(`❌ Network error: ${err.message}`);
}
};
return (
<div style={{ padding: "2rem" }}>
<h2>Upload Members CSV</h2>
<form onSubmit={handleSubmit}>
<div style={{ marginBottom: "1rem" }}>
<label htmlFor="year">Year:</label>
<input
type="number"
id="year"
name="year"
value={year}
onChange={(e) => setYear(e.target.value)}
required
min="1900"
max="2100"
style={{ width: "150px", padding: "0.3rem" }}
/>
</div>
<div style={{ marginBottom: "1rem" }}>
<label htmlFor="members.csv">CSV File:</label>
<input
type="file"
id="members.csv"
name="members.csv"
accept=".csv"
onChange={(e) => setFile(e.target.files[0])}
required
/>
</div>
<button type="submit" style={{ padding: "0.5rem 1rem" }}>
Upload
</button>
</form>
{status && <p style={{ marginTop: "1rem" }}>{status}</p>}
</div>
);
}

13
client/src/pages/AdminMembersPage.js
View File

@@ -1,13 +0,0 @@
import React from 'react';
import MembersForm from '../components/MembersForm';
function AdminMembersPage() {
return (
<div className="admin-members-page">
<h1>Upload Members</h1>
<MembersForm />
</div>
);
}
export default AdminMembersPage;

8
client/src/pages/Home.js Normal file
View File

@@ -0,0 +1,8 @@
export default function Home() {
return (
<div style={{ padding: "2rem" }}>
<h1>Welcome!</h1>
<p>This is the landing page. Use the navigation bar to go to the admin page.</p>
</div>
);
}

13
client/src/reportWebVitals.js Normal file
View File

@@ -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;

72
client/src/service-worker.js Normal file
View File

@@ -0,0 +1,72 @@
/* eslint-disable no-restricted-globals */
// This service worker can be customized!
// See https://developers.google.com/web/tools/workbox/modules
// for the list of available Workbox modules, or add any other
// code you'd like.
// You can also remove this file if you'd prefer not to use a
// service worker, and the Workbox build step will be skipped.
import { clientsClaim } from 'workbox-core';
import { ExpirationPlugin } from 'workbox-expiration';
import { precacheAndRoute, createHandlerBoundToURL } from 'workbox-precaching';
import { registerRoute } from 'workbox-routing';
import { StaleWhileRevalidate } from 'workbox-strategies';
clientsClaim();
// Precache all of the assets generated by your build process.
// Their URLs are injected into the manifest variable below.
// This variable must be present somewhere in your service worker file,
// even if you decide not to use precaching. See https://cra.link/PWA
precacheAndRoute(self.__WB_MANIFEST);
// Set up App Shell-style routing, so that all navigation requests
// are fulfilled with your index.html shell. Learn more at
// https://developers.google.com/web/fundamentals/architecture/app-shell
const fileExtensionRegexp = new RegExp('/[^/?]+\\.[^/]+$');
registerRoute(
// Return false to exempt requests from being fulfilled by index.html.
({ request, url }) => {
// If this isn't a navigation, skip.
if (request.mode !== 'navigate') {
return false;
} // If this is a URL that starts with /_, skip.
if (url.pathname.startsWith('/_')) {
return false;
} // If this looks like a URL for a resource, because it contains // a file extension, skip.
if (url.pathname.match(fileExtensionRegexp)) {
return false;
} // Return true to signal that we want to use the handler.
return true;
},
createHandlerBoundToURL(process.env.PUBLIC_URL + '/index.html')
);
// An example runtime caching route for requests that aren't handled by the
// precache, in this case same-origin .png requests like those from in public/
registerRoute(
// Add in any other file extensions or routing criteria as needed.
({ url }) => url.origin === self.location.origin && url.pathname.endsWith('.png'), // Customize this strategy as needed, e.g., by changing to CacheFirst.
new StaleWhileRevalidate({
cacheName: 'images',
plugins: [
// Ensure that once this runtime cache reaches a maximum size the
// least-recently used images are removed.
new ExpirationPlugin({ maxEntries: 50 }),
],
})
);
// This allows the web app to trigger skipWaiting via
// registration.waiting.postMessage({type: 'SKIP_WAITING'})
self.addEventListener('message', (event) => {
if (event.data && event.data.type === 'SKIP_WAITING') {
self.skipWaiting();
}
});
// Any other custom service worker logic can go here.

137
client/src/serviceWorkerRegistration.js Normal file
View File

@@ -0,0 +1,137 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://cra.link/PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
);
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://cra.link/PWA'
);
});
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then((registration) => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://cra.link/PWA.'
);
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
};
})
.catch((error) => {
console.error('Error during service worker registration:', error);
});
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { 'Service-Worker': 'script' },
})
.then((response) => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
}
})
.catch(() => {
console.log('No internet connection found. App is running in offline mode.');
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready
.then((registration) => {
registration.unregister();
})
.catch((error) => {
console.error(error.message);
});
}
}

7
client/src/services/api.js
View File

@@ -1,7 +0,0 @@
import axios from 'axios';
const api = axios.create({
baseURL: '/api',
});
export default api;

5
client/src/setupTests.js Normal file
View File

@@ -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';

3
server/db/db.go
View File

@@ -40,11 +40,8 @@ CREATE TABLE IF NOT EXISTS members (
var db *sql.DB
func Connect() (*sql.DB, error) {
log.Printf("Connecting to database")
db_config := config.GetConfig()
log.Printf("Database path: %s", db_config.DBPath)
db, err := sql.Open("sqlite", db_config.DBPath)
if err != nil {
log.Printf("Error opening database: %v", err)

61
server/main.go
View File

@@ -7,6 +7,7 @@ import (
"net/http"
"os"
"strconv"
"path/filepath"
"github.com/gorilla/mux"
"go-sjles-pta-vote/server/models"
@@ -56,7 +57,6 @@ func voteIDHandler(w http.ResponseWriter, r *http.Request) {
func statsHandler(w http.ResponseWriter, r *http.Request) {
if r.Method == "GET" {
filePath := "./server/templates/stats.html"
log.Printf("Serving stats.html from %s", filePath)
http.ServeFile(w, r, filePath)
} else if r.Method == "POST" {
vars := mux.Vars(r)
@@ -117,7 +117,6 @@ func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
if y := r.FormValue("year"); y != "" {
year, err = strconv.Atoi(y)
log.Printf("Parsed year: %d", year)
if err != nil {
http.Error(w, "Invalid year", http.StatusBadRequest)
return
@@ -150,51 +149,31 @@ func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
}
}
// Add a new handler for the client's AdminMembersPage
func adminMembersClientHandler(w http.ResponseWriter, r *http.Request) {
filePath := "./client/build/admin-members.html"
if _, err := os.Stat(filePath); err == nil {
http.ServeFile(w, r, filePath)
} else {
w.WriteHeader(http.StatusNotFound)
}
}
func main() {
log.SetOutput(os.Stdout)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Printf("Starting server on :8080")
http.HandleFunc("/api/vote", voteHandler)
http.HandleFunc("/api/vote/{id}", voteIDHandler)
http.HandleFunc("/api/stats", statsHandler)
http.HandleFunc("/api/stats/{id}", statsIDHandler)
http.HandleFunc("/api/admin", adminHandler)
http.HandleFunc("/api/admin/{id}", adminIDHandler)
http.HandleFunc("/api/admin/members", adminMembersHandler)
http.HandleFunc("/vote", voteHandler)
http.HandleFunc("/vote/{id}", voteIDHandler)
http.HandleFunc("/stats", statsHandler)
http.HandleFunc("/stats/{id}", statsIDHandler)
http.HandleFunc("/admin", adminHandler)
http.HandleFunc("/admin/{id}", adminIDHandler)
http.HandleFunc("/admin/members", adminMembersHandler)
http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
filePath := "./server/icons/favicon.ico"
http.ServeFile(w, r, filePath)
})
http.Handle("/", http.FileServer(http.Dir("./client/build")))
// Add this function to handle static files during development
http.HandleFunc("/static/", func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/" {
http.ServeFile(w, r, "./client/build/index.html")
} else {
file := "./client/build" + r.URL.Path
if _, err := os.Stat(file); err == nil {
http.ServeFile(w, r, file)
} else {
w.WriteHeader(http.StatusNotFound)
}
buildPath := filepath.Join(".", "client", "build")
fs := http.FileServer(http.Dir(buildPath))
http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// If the file exists on disk, let the file server handle it.
if _, err := os.Stat(filepath.Join(buildPath, r.URL.Path)); err == nil {
fs.ServeHTTP(w, r)
return
}
})
// Add this line to handle client's AdminMembersPage
http.HandleFunc("/admin-members", adminMembersClientHandler)
// Otherwise serve index.html (so React Router can handle the route)
http.ServeFile(w, r, filepath.Join(buildPath, "index.html"))
}))
log.Printf("Starting server on :8080")
log.Fatal(http.ListenAndServe(":8080", nil))
}

80
server/templates/members.html
View File

@@ -1,80 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Upload Members</title>
<link rel="icon" type="image/x-icon" href="/favicon.ico">
<script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
<script src="https://unpkg.com/react@17/umd/react.production.min.js"></script>
<script src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js"></script>
</head>
<body>
<div id="root"></div>
<script type="text/babel">
function MembersForm() {
const [year, setYear] = React.useState(0);
const [file, setFile] = React.useState(null);
const handleSubmit = (e) => {
e.preventDefault();
if (!year || !file) {
alert('Both year and file are required!');
return;
}
const formData = new FormData();
formData.append('year', year);
formData.append('members.csv', file);
fetch('/admin/members', {
method: 'POST',
body: formData
})
.then(response => response.json())
.then(data => {
if (data.success) {
alert('Members uploaded successfully!');
} else {
alert(`Error: ${data.error}`);
}
});
};
return (
<form onSubmit={handleSubmit}>
<h1>Upload Members CSV</h1>
<label htmlFor="year">Year:</label>
<input
type="number"
id="year"
name="year"
value={year}
onChange={(e) => setYear(e.target.value)}
required
/><br/><br/>
<label htmlFor="members.csv">CSV File:</label>
<input
type="file"
id="members.csv"
name="members.csv"
accept=".csv"
onChange={(e) => setFile(e.target.files[0])}
required
/><br/><br/>
<button type="submit">Upload</button>
</form>
);
}
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<MembersForm />
);
</script>
</body>
</html>

10
server/templates/stats.html
View File

@@ -1,10 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Stats</title>
</head>
<body>
<h1>Hello World!</h1>
</body>
</html>