diff --git a/.dockerignore b/.dockerignore index 71ae6f6..f65b82a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,5 @@ feed\.json podcasts/ feed\.rss + +.travis\.yml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 138e1ea..93486c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ RUN apt update; apt install build-essential -y && \ make linux && chmod +x whiterabbit && \ ls -al && \ mkdir podcasts && \ - touch feed.rss feed.json && echo '{}' >feed.json + touch assets/web/feed.rss assets/web/feed.json && \ + echo '{}' >assets/web/feed.json EXPOSE 8000 diff --git a/src/Godeps/Godeps.json b/Godeps/Godeps.json similarity index 94% rename from src/Godeps/Godeps.json rename to Godeps/Godeps.json index 48391ea..ca2a65e 100644 --- a/src/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "podcast/src", + "ImportPath": "podcast", "GoVersion": "go1.8", "GodepVersion": "v79", "Deps": [ diff --git a/src/Godeps/Readme b/Godeps/Readme similarity index 100% rename from src/Godeps/Readme rename to Godeps/Readme diff --git a/Makefile b/Makefile index b72d119..91ac33b 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ all: - go build src/webserver.go src/admin.go src/generate_rss.go src/setup.go src/configreader.go + go build webserver.go admin.go generate_rss.go setup.go configreader.go -windows: src/admin.go src/webserver.go src/generate_rss.go - go build -o pogoapp.exe src/webserver.go src/admin.go src/generate_rss.go src/setup.go +windows: admin.go webserver.go generate_rss.go + go build -o pogoapp.exe webserver.go admin.go generate_rss.go setup.go -linux: src/admin.go src/webserver.go src/generate_rss.go - go build -o pogoapp src/webserver.go src/admin.go src/generate_rss.go src/setup.go +linux: admin.go webserver.go generate_rss.go + go build -o pogoapp webserver.go admin.go generate_rss.go setup.go install: go get github.com/gmemstr/feeds @@ -17,5 +17,5 @@ docker: docker build . and run: - go build src/webserver.go src/admin.go src/generate_rss.go src/setup.go + go build webserver.go admin.go generate_rss.go setup.go ./pogoapp.exe \ No newline at end of file diff --git a/src/admin.go b/admin.go similarity index 94% rename from src/admin.go rename to admin.go index 3251aa7..d275d21 100644 --- a/src/admin.go +++ b/admin.go @@ -23,7 +23,7 @@ func CustomCss(w http.ResponseWriter, r *http.Request) { filename := "custom.css" - err := ioutil.WriteFile("./assets/static/"+filename, []byte(css), 0644) + err := ioutil.WriteFile("./assets/web/static/"+filename, []byte(css), 0644) if err != nil { w.Write([]byte("")) @@ -32,7 +32,7 @@ func CustomCss(w http.ResponseWriter, r *http.Request) { w.Write([]byte("")) } } else { - css, err := ioutil.ReadFile("./assets/static/custom.css") + css, err := ioutil.ReadFile("./assets/web/static/custom.css") if err != nil { panic(err) } else { diff --git a/users.json b/assets/config/users.json similarity index 100% rename from users.json rename to assets/config/users.json diff --git a/assets/admin.html b/assets/web/admin.html similarity index 100% rename from assets/admin.html rename to assets/web/admin.html diff --git a/assets/index.html b/assets/web/index.html similarity index 100% rename from assets/index.html rename to assets/web/index.html diff --git a/assets/setup.html b/assets/web/setup.html similarity index 100% rename from assets/setup.html rename to assets/web/setup.html diff --git a/assets/web/static/custom.css b/assets/web/static/custom.css new file mode 100644 index 0000000..a0512fd --- /dev/null +++ b/assets/web/static/custom.css @@ -0,0 +1,19 @@ +/* + * This is the file of custom CSS styling that + * can be set by the publisher. + * + * If you're writing the custom CSS, please see the reference: + * https://github.com/gmemstr/Pogo/wiki/Custom-CSS/ + */ + +.container {} /* Basic container from styles.css */ +.title {} /* Page title */ +.adminlink {} /* Link to admin interface */ + +.podcastlist {} /* Chronological podcast list */ + +.podcastitem {} /* Single podcast item (group of elements) */ +.podcasttitle {} /* Title of podcast item */ +.podcastdate {} /* Date podcast item was published */ +.podcastdesc {} /* Podcast item description */ +.podcastaudio {} /* Podcast