First attempt at react interface
This commit is contained in:
@@ -2,10 +2,7 @@ package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"log"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"go-sjles-pta-vote/server/config"
|
||||
|
||||
|
||||
@@ -102,15 +102,22 @@ func adminIDHandler(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "GET" {
|
||||
filePath := "./server/templates/members.html"
|
||||
log.Printf("Serving members.html from %s", filePath)
|
||||
http.ServeFile(w, r, filePath)
|
||||
// Redirect to client's AdminMembersPage instead of serving members.html
|
||||
w.Header().Set("Location", "/admin-members")
|
||||
w.WriteHeader(http.StatusFound)
|
||||
return
|
||||
} else if r.Method == "POST" {
|
||||
var year int
|
||||
var err error
|
||||
r.ParseForm()
|
||||
|
||||
if err = r.ParseMultipartForm(10 << 20); err != nil {
|
||||
http.Error(w, "Failed to parse multipart form", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
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
|
||||
@@ -130,13 +137,12 @@ func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
err = services.ParseMembersFromBytes(year, fileBytes)
|
||||
if err != nil {
|
||||
if err = services.ParseMembersFromBytes(year, fileBytes); err != nil {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]bool{"success": true})
|
||||
} else {
|
||||
@@ -144,6 +150,16 @@ 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)
|
||||
@@ -161,6 +177,24 @@ func main() {
|
||||
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)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Add this line to handle client's AdminMembersPage
|
||||
http.HandleFunc("/admin-members", adminMembersClientHandler)
|
||||
|
||||
log.Fatal(http.ListenAndServe(":8080", nil))
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ type Member struct {
|
||||
Email string
|
||||
}
|
||||
|
||||
BATCH_SIZE := 100
|
||||
const BATCH_SIZE = 100
|
||||
|
||||
func ParseMembersFromBytes(year int, fileBytes []byte) error {
|
||||
reader := csv.NewReader(strings.NewReader(string(fileBytes)))
|
||||
|
||||
@@ -4,15 +4,77 @@
|
||||
<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>
|
||||
<h1>Upload Members CSV</h1>
|
||||
<form action="/admin/members" method="post" enctype="multipart/form-data">
|
||||
<label for="year">Year:</label>
|
||||
<input type="number" id="year" name="year" required><br><br>
|
||||
<label for="members.csv">CSV File:</label>
|
||||
<input type="file" id="members.csv" name="members.csv" accept=".csv" required><br><br>
|
||||
<button type="submit">Upload</button>
|
||||
</form>
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user