mirror of https://github.com/dirtbags/moth.git
Stop trying to put static files in the binary
This commit is contained in:
parent
9963f4181f
commit
229b18191e
|
@ -5,4 +5,5 @@ RUN go build -o /mothd /src/*.go
|
||||||
|
|
||||||
FROM alpine
|
FROM alpine
|
||||||
COPY --from=builder /mothd /mothd
|
COPY --from=builder /mothd /mothd
|
||||||
|
COPY theme /theme
|
||||||
ENTRYPOINT [ "/mothd" ]
|
ENTRYPOINT [ "/mothd" ]
|
||||||
|
|
1
build.sh
1
build.sh
|
@ -4,6 +4,7 @@ set -e
|
||||||
|
|
||||||
version=$(date +%Y%m%d%H%M)
|
version=$(date +%Y%m%d%H%M)
|
||||||
|
|
||||||
|
cd $(dirname $0)
|
||||||
for img in moth moth-devel; do
|
for img in moth moth-devel; do
|
||||||
echo "==== $img"
|
echo "==== $img"
|
||||||
sudo docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --tag dirtbags/$img --tag dirtbags/$img:$version -f Dockerfile.$img .
|
sudo docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --tag dirtbags/$img --tag dirtbags/$img:$version -f Dockerfile.$img .
|
||||||
|
|
|
@ -13,11 +13,11 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type JSend struct {
|
type JSend struct {
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
Data JSendData `json:"data"`
|
Data JSendData `json:"data"`
|
||||||
}
|
}
|
||||||
type JSendData struct {
|
type JSendData struct {
|
||||||
Short string `json:"short"`
|
Short string `json:"short"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ func ShowJSend(w http.ResponseWriter, status Status, short string, description s
|
||||||
resp := JSend{
|
resp := JSend{
|
||||||
Status: "success",
|
Status: "success",
|
||||||
Data: JSendData{
|
Data: JSendData{
|
||||||
Short: short,
|
Short: short,
|
||||||
Description: description,
|
Description: description,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -41,16 +41,24 @@ func ShowJSend(w http.ResponseWriter, status Status, short string, description s
|
||||||
}
|
}
|
||||||
|
|
||||||
respBytes, err := json.Marshal(resp)
|
respBytes, err := json.Marshal(resp)
|
||||||
if (err != nil) {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
w.WriteHeader(http.StatusOK) // RFC2616 makes it pretty clear that 4xx codes are for the user-agent
|
w.WriteHeader(http.StatusOK) // RFC2616 makes it pretty clear that 4xx codes are for the user-agent
|
||||||
w.Write(respBytes)
|
w.Write(respBytes)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Status int
|
||||||
|
|
||||||
|
const (
|
||||||
|
Success = iota
|
||||||
|
Fail
|
||||||
|
Error
|
||||||
|
)
|
||||||
|
|
||||||
// ShowHtml delevers an HTML response to w
|
// ShowHtml delevers an HTML response to w
|
||||||
func ShowHtml(w http.ResponseWriter, status Status, title string, body string) {
|
func ShowHtml(w http.ResponseWriter, status Status, title string, body string) {
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
@ -331,7 +339,29 @@ func (ctx *Instance) contentHandler(w http.ResponseWriter, req *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctx *Instance) staticHandler(w http.ResponseWriter, req *http.Request) {
|
func (ctx *Instance) staticHandler(w http.ResponseWriter, req *http.Request) {
|
||||||
ServeStatic(w, req, ctx.ResourcesDir)
|
path := req.URL.Path
|
||||||
|
if strings.Contains(path, "..") {
|
||||||
|
http.Error(w, "Invalid URL path", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if path == "/" {
|
||||||
|
path = "/index.html"
|
||||||
|
}
|
||||||
|
|
||||||
|
f, err := os.Open(ctx.ResourcePath(path))
|
||||||
|
if err != nil {
|
||||||
|
http.NotFound(w, req)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
d, err := f.Stat()
|
||||||
|
if err != nil {
|
||||||
|
http.NotFound(w, req)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.ServeContent(w, req, path, d.ModTime(), f)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctx *Instance) BindHandlers(mux *http.ServeMux) {
|
func (ctx *Instance) BindHandlers(mux *http.ServeMux) {
|
||||||
|
|
|
@ -93,6 +93,11 @@ func (ctx *Instance) StatePath(parts ...string) string {
|
||||||
return path.Join(ctx.StateDir, tail)
|
return path.Join(ctx.StateDir, tail)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ctx *Instance) ResourcePath(parts ...string) string {
|
||||||
|
tail := path.Join(parts...)
|
||||||
|
return path.Join(ctx.ResourcesDir, tail)
|
||||||
|
}
|
||||||
|
|
||||||
func (ctx *Instance) PointsLog() []*Award {
|
func (ctx *Instance) PointsLog() []*Award {
|
||||||
var ret []*Award
|
var ret []*Award
|
||||||
|
|
||||||
|
|
|
@ -208,7 +208,7 @@ func (ctx *Instance) isEnabled() bool {
|
||||||
log.Print("Suspended: disabled file found")
|
log.Print("Suspended: disabled file found")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
untilspec, err := ioutil.ReadFile(ctx.StatePath("until"))
|
untilspec, err := ioutil.ReadFile(ctx.StatePath("until"))
|
||||||
if err == nil {
|
if err == nil {
|
||||||
untilspecs := strings.TrimSpace(string(untilspec))
|
untilspecs := strings.TrimSpace(string(untilspec))
|
||||||
|
|
14
src/mothd.go
14
src/mothd.go
|
@ -27,18 +27,18 @@ func main() {
|
||||||
)
|
)
|
||||||
mothballDir := flag.String(
|
mothballDir := flag.String(
|
||||||
"mothballs",
|
"mothballs",
|
||||||
"/moth/mothballs",
|
"/mothballs",
|
||||||
"Path to read mothballs",
|
"Path to read mothballs",
|
||||||
)
|
)
|
||||||
stateDir := flag.String(
|
stateDir := flag.String(
|
||||||
"state",
|
"state",
|
||||||
"/moth/state",
|
"/state",
|
||||||
"Path to write state",
|
"Path to write state",
|
||||||
)
|
)
|
||||||
resourcesDir := flag.String(
|
themeDir := flag.String(
|
||||||
"resources",
|
"theme",
|
||||||
"/moth/resources",
|
"/theme",
|
||||||
"Path to static resources (HTML, images, css, ...)",
|
"Path to static theme resources (HTML, images, css, ...)",
|
||||||
)
|
)
|
||||||
maintenanceInterval := flag.Duration(
|
maintenanceInterval := flag.Duration(
|
||||||
"maint",
|
"maint",
|
||||||
|
@ -56,7 +56,7 @@ func main() {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, err := NewInstance(*base, *mothballDir, *stateDir, *resourcesDir)
|
ctx, err := NewInstance(*base, *mothballDir, *stateDir, *themeDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
435
src/static.go
435
src/static.go
|
@ -1,435 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Status int
|
|
||||||
|
|
||||||
const (
|
|
||||||
Success = iota
|
|
||||||
Fail
|
|
||||||
Error
|
|
||||||
)
|
|
||||||
|
|
||||||
// staticStylesheet serves up a basic stylesheet.
|
|
||||||
// This is designed to be usable on small touchscreens (like mobile phones)
|
|
||||||
func staticStylesheet(w http.ResponseWriter) {
|
|
||||||
w.Header().Set("Content-Type", "text/css")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
|
|
||||||
fmt.Fprint(
|
|
||||||
w,
|
|
||||||
`
|
|
||||||
/* http://paletton.com/#uid=63T0u0k7O9o3ouT6LjHih7ltq4c */
|
|
||||||
body {
|
|
||||||
font-family: sans-serif;
|
|
||||||
max-width: 40em;
|
|
||||||
background: #282a33;
|
|
||||||
color: #f6efdc;
|
|
||||||
}
|
|
||||||
a:any-link {
|
|
||||||
color: #8b969a;
|
|
||||||
}
|
|
||||||
h1 {
|
|
||||||
background: #5e576b;
|
|
||||||
color: #9e98a8;
|
|
||||||
}
|
|
||||||
.Fail, .Error {
|
|
||||||
background: #3a3119;
|
|
||||||
color: #ffcc98;
|
|
||||||
}
|
|
||||||
.Fail:before {
|
|
||||||
content: "Fail: ";
|
|
||||||
}
|
|
||||||
.Error:before {
|
|
||||||
content: "Error: ";
|
|
||||||
}
|
|
||||||
p {
|
|
||||||
margin: 1em 0em;
|
|
||||||
}
|
|
||||||
form, pre {
|
|
||||||
margin: 1em;
|
|
||||||
}
|
|
||||||
input {
|
|
||||||
padding: 0.6em;
|
|
||||||
margin: 0.2em;
|
|
||||||
}
|
|
||||||
nav {
|
|
||||||
border: solid black 2px;
|
|
||||||
}
|
|
||||||
nav ul, .category ul {
|
|
||||||
padding: 1em;
|
|
||||||
}
|
|
||||||
nav li, .category li {
|
|
||||||
display: inline;
|
|
||||||
margin: 1em;
|
|
||||||
}
|
|
||||||
iframe#body {
|
|
||||||
border: inherit;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
img {
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
#scoreboard {
|
|
||||||
width: 100%;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
#scoreboard span {
|
|
||||||
font-size: 75%;
|
|
||||||
display: inline-block;
|
|
||||||
overflow: hidden;
|
|
||||||
height: 1.7em;
|
|
||||||
}
|
|
||||||
#scoreboard span.teamname {
|
|
||||||
font-size: inherit;
|
|
||||||
color: white;
|
|
||||||
text-shadow: 0 0 3px black;
|
|
||||||
opacity: 0.8;
|
|
||||||
position: absolute;
|
|
||||||
right: 0.2em;
|
|
||||||
}
|
|
||||||
#scoreboard div * {white-space: nowrap;}
|
|
||||||
.cat0, .cat8, .cat16 {background-color: #a6cee3; color: black;}
|
|
||||||
.cat1, .cat9, .cat17 {background-color: #1f78b4; color: white;}
|
|
||||||
.cat2, .cat10, .cat18 {background-color: #b2df8a; color: black;}
|
|
||||||
.cat3, .cat11, .cat19 {background-color: #33a02c; color: white;}
|
|
||||||
.cat4, .cat12, .cat20 {background-color: #fb9a99; color: black;}
|
|
||||||
.cat5, .cat13, .cat21 {background-color: #e31a1c; color: white;}
|
|
||||||
.cat6, .cat14, .cat22 {background-color: #fdbf6f; color: black;}
|
|
||||||
.cat7, .cat15, .cat23 {background-color: #ff7f00; color: black;}
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// staticIndex serves up a basic landing page
|
|
||||||
func staticIndex(w http.ResponseWriter) {
|
|
||||||
ShowHtml(
|
|
||||||
w, Success,
|
|
||||||
"Welcome",
|
|
||||||
`
|
|
||||||
<h2>Register your team</h2>
|
|
||||||
|
|
||||||
<form action="register" action="post">
|
|
||||||
Team ID: <input name="id"> <br>
|
|
||||||
Team name: <input name="name">
|
|
||||||
<input type="submit" value="Register">
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
If someone on your team has already registered,
|
|
||||||
proceed to the
|
|
||||||
<a href="puzzles.html">puzzles overview</a>.
|
|
||||||
</p>
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func staticScoreboard(w http.ResponseWriter) {
|
|
||||||
ShowHtml(
|
|
||||||
w, Success,
|
|
||||||
"Scoreboard",
|
|
||||||
`
|
|
||||||
<div id="scoreboard"></div>
|
|
||||||
<script>
|
|
||||||
function loadJSON(url, callback) {
|
|
||||||
function loaded(e) {
|
|
||||||
callback(e.target.response);
|
|
||||||
}
|
|
||||||
var xhr = new XMLHttpRequest()
|
|
||||||
xhr.onload = loaded;
|
|
||||||
xhr.open("GET", url, true);
|
|
||||||
xhr.responseType = "json";
|
|
||||||
xhr.send();
|
|
||||||
}
|
|
||||||
|
|
||||||
function scoreboard(element, continuous) {
|
|
||||||
function update(state) {
|
|
||||||
var teamnames = state["teams"];
|
|
||||||
var pointslog = state["points"];
|
|
||||||
var pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || [];
|
|
||||||
if (pointshistory.length >= 20){
|
|
||||||
pointshistory.shift();
|
|
||||||
}
|
|
||||||
pointshistory.push(pointslog);
|
|
||||||
localStorage.setItem("pointshistory", JSON.stringify(pointshistory));
|
|
||||||
var highscore = {};
|
|
||||||
var teams = {};
|
|
||||||
|
|
||||||
// Dole out points
|
|
||||||
for (var i in pointslog) {
|
|
||||||
var entry = pointslog[i];
|
|
||||||
var timestamp = entry[0];
|
|
||||||
var teamhash = entry[1];
|
|
||||||
var category = entry[2];
|
|
||||||
var points = entry[3];
|
|
||||||
|
|
||||||
var team = teams[teamhash] || {__hash__: teamhash};
|
|
||||||
|
|
||||||
// Add points to team's points for that category
|
|
||||||
team[category] = (team[category] || 0) + points;
|
|
||||||
|
|
||||||
// Record highest score in a category
|
|
||||||
highscore[category] = Math.max(highscore[category] || 0, team[category]);
|
|
||||||
|
|
||||||
teams[teamhash] = team;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort by team score
|
|
||||||
function teamScore(t) {
|
|
||||||
var score = 0;
|
|
||||||
|
|
||||||
for (var category in highscore) {
|
|
||||||
score += (t[category] || 0) / highscore[category];
|
|
||||||
}
|
|
||||||
// XXX: This function really shouldn't have side effects.
|
|
||||||
t.__score__ = score;
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
function teamCompare(a, b) {
|
|
||||||
return teamScore(a) - teamScore(b);
|
|
||||||
}
|
|
||||||
|
|
||||||
var winners = [];
|
|
||||||
for (var i in teams) {
|
|
||||||
winners.push(teams[i]);
|
|
||||||
}
|
|
||||||
if (winners.length == 0) {
|
|
||||||
// No teams!
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
winners.sort(teamCompare);
|
|
||||||
winners.reverse();
|
|
||||||
|
|
||||||
// Clear out the element we're about to populate
|
|
||||||
while (element.lastChild) {
|
|
||||||
element.removeChild(element.lastChild);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Populate!
|
|
||||||
var topActualScore = winners[0].__score__;
|
|
||||||
|
|
||||||
// (100 / ncats) * (ncats / topActualScore);
|
|
||||||
var maxWidth = 100 / topActualScore;
|
|
||||||
for (var i in winners) {
|
|
||||||
var team = winners[i];
|
|
||||||
var row = document.createElement("div");
|
|
||||||
var ncat = 0;
|
|
||||||
for (var category in highscore) {
|
|
||||||
var catHigh = highscore[category];
|
|
||||||
var catTeam = team[category] || 0;
|
|
||||||
var catPct = catTeam / catHigh;
|
|
||||||
var width = maxWidth * catPct;
|
|
||||||
|
|
||||||
var bar = document.createElement("span");
|
|
||||||
bar.classList.add("cat" + ncat);
|
|
||||||
bar.style.width = width + "%";
|
|
||||||
bar.textContent = category + ": " + catTeam;
|
|
||||||
bar.title = bar.textContent;
|
|
||||||
|
|
||||||
row.appendChild(bar);
|
|
||||||
ncat += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
var te = document.createElement("span");
|
|
||||||
te.classList.add("teamname");
|
|
||||||
te.textContent = teamnames[team.__hash__];
|
|
||||||
row.appendChild(te);
|
|
||||||
|
|
||||||
element.appendChild(row);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function once() {
|
|
||||||
loadJSON("points.json", update);
|
|
||||||
}
|
|
||||||
if (continuous) {
|
|
||||||
setInterval(once, 60000);
|
|
||||||
}
|
|
||||||
once();
|
|
||||||
}
|
|
||||||
|
|
||||||
function init() {
|
|
||||||
var sb = document.getElementById("scoreboard");
|
|
||||||
scoreboard(sb, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", init);
|
|
||||||
</script>
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func staticPuzzleList(w http.ResponseWriter) {
|
|
||||||
ShowHtml(
|
|
||||||
w, Success,
|
|
||||||
"Open Puzzles",
|
|
||||||
`
|
|
||||||
<section>
|
|
||||||
<div id="puzzles"></div>
|
|
||||||
</section>
|
|
||||||
<script>
|
|
||||||
function init() {
|
|
||||||
let params = new URLSearchParams(window.location.search);
|
|
||||||
let categoryName = params.get("cat");
|
|
||||||
let points = params.get("points");
|
|
||||||
let puzzleId = params.get("pid");
|
|
||||||
|
|
||||||
let base = "content/" + categoryName + "/" + puzzleId + "/";
|
|
||||||
let fn = base + "puzzle.json";
|
|
||||||
|
|
||||||
fetch(fn)
|
|
||||||
.then(function(resp) {
|
|
||||||
return resp.json();
|
|
||||||
}).then(function(obj) {
|
|
||||||
document.getElementById("puzzle").innerHTML = obj.body;
|
|
||||||
document.getElementById("authors").textContent = obj.authors.join(", ");
|
|
||||||
for (let fn of obj.files) {
|
|
||||||
let li = document.createElement("li");
|
|
||||||
let a = document.createElement("a");
|
|
||||||
a.href = base + fn;
|
|
||||||
a.innerText = fn;
|
|
||||||
li.appendChild(a);
|
|
||||||
document.getElementById("files").appendChild(li);
|
|
||||||
}
|
|
||||||
}).catch(function(err) {
|
|
||||||
console.log("Error", err);
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector("body > h1").innerText = categoryName + " " + points
|
|
||||||
document.querySelector("input[name=cat]").value = categoryName;
|
|
||||||
document.querySelector("input[name=points]").value = points;
|
|
||||||
|
|
||||||
function mutated(mutationsList, observer) {
|
|
||||||
for (let mutation of mutationsList) {
|
|
||||||
if (mutation.type == 'childList') {
|
|
||||||
for (let e of mutation.addedNodes) {
|
|
||||||
console.log(e);
|
|
||||||
for (let se of e.querySelectorAll("[src],[href]")) {
|
|
||||||
se.outerHTML = se.outerHTML.replace(/(src|href)="([^/]+)"/i, "$1=\"" + base + "$2\"")
|
|
||||||
console.log(se.outerHTML);
|
|
||||||
}
|
|
||||||
console.log(e.querySelectorAll("[src]"));
|
|
||||||
}
|
|
||||||
console.log(mutation.addedNodes);
|
|
||||||
} else {
|
|
||||||
console.log(mutation);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let puzzle = document.getElementById("puzzle");
|
|
||||||
let observerOptions = {
|
|
||||||
childList: true,
|
|
||||||
attributes: true,
|
|
||||||
subtree: true,
|
|
||||||
};
|
|
||||||
window.observer = new MutationObserver(mutated);
|
|
||||||
observer.observe(puzzle, observerOptions);
|
|
||||||
}
|
|
||||||
document.addEventListener("DOMContentLoaded", init);
|
|
||||||
</script>
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func staticPuzzle(w http.ResponseWriter) {
|
|
||||||
ShowHtml(
|
|
||||||
w, Success,
|
|
||||||
"Open Puzzles",
|
|
||||||
`
|
|
||||||
<section>
|
|
||||||
<div id="body">Loading...</div>
|
|
||||||
</section>
|
|
||||||
<form action="answer" method="post">
|
|
||||||
<input type="hidden" name="cat">
|
|
||||||
<input type="hidden" name="points">
|
|
||||||
Team ID: <input type="text" name="id"> <br>
|
|
||||||
Answer: <input type="text" name="answer"> <br>
|
|
||||||
<input type="submit" value="Submit">
|
|
||||||
</form>
|
|
||||||
<script>
|
|
||||||
function render(obj) {
|
|
||||||
let body = document.getElementById("body");
|
|
||||||
body.innerHTML = obj.body;
|
|
||||||
console.log("XXX: Munge relative URLs (src= and href=) in body")
|
|
||||||
}
|
|
||||||
function init() {
|
|
||||||
let params = new URLSearchParams(window.location.search);
|
|
||||||
let categoryName = params.get("cat");
|
|
||||||
let points = params.get("points");
|
|
||||||
let puzzleId = params.get("pid");
|
|
||||||
|
|
||||||
let fn = "content/" + categoryName + "/" + puzzleId + "/puzzle.json";
|
|
||||||
|
|
||||||
fetch(fn)
|
|
||||||
.then(function(resp) {
|
|
||||||
return resp.json();
|
|
||||||
}).then(function(obj) {
|
|
||||||
render(obj);
|
|
||||||
}).catch(function(err) {
|
|
||||||
console.log("Error", err);
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector("body > h1").innerText = categoryName + " " + points
|
|
||||||
document.querySelector("input[name=cat]").value = categoryName;
|
|
||||||
document.querySelector("input[name=points]").value = points;
|
|
||||||
}
|
|
||||||
document.addEventListener("DOMContentLoaded", init);
|
|
||||||
</script>
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func tryServeFile(w http.ResponseWriter, req *http.Request, path string) bool {
|
|
||||||
f, err := os.Open(path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
d, err := f.Stat()
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
http.ServeContent(w, req, path, d.ModTime(), f)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func ServeStatic(w http.ResponseWriter, req *http.Request, resourcesDir string) {
|
|
||||||
path := req.URL.Path
|
|
||||||
if strings.Contains(path, "..") {
|
|
||||||
http.Error(w, "Invalid URL path", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if path == "/" {
|
|
||||||
path = "/index.html"
|
|
||||||
}
|
|
||||||
|
|
||||||
fpath := filepath.Join(resourcesDir, path)
|
|
||||||
if tryServeFile(w, req, fpath) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
switch path {
|
|
||||||
case "/basic.css":
|
|
||||||
staticStylesheet(w)
|
|
||||||
case "/index.html":
|
|
||||||
staticIndex(w)
|
|
||||||
case "/scoreboard.html":
|
|
||||||
staticScoreboard(w)
|
|
||||||
case "/puzzle-list.html":
|
|
||||||
staticPuzzleList(w)
|
|
||||||
case "/puzzle.html":
|
|
||||||
staticPuzzle(w)
|
|
||||||
default:
|
|
||||||
http.NotFound(w, req)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue