Compare commits
67 Commits
118fbd79b3
...
v0.1.1
Author | SHA1 | Date | |
---|---|---|---|
a0fe0024f2 | |||
6e3c4bf647 | |||
26988ecf6a | |||
9408ce99e3 | |||
af036b4909 | |||
e60e6114bd | |||
600044c621 | |||
77a90cb4f1 | |||
34e9e9edd5 | |||
4d1faf3d4a | |||
78addbd8e3 | |||
304d3aa2e0 | |||
f44291e278 | |||
3be16781e7 | |||
4fffc1c696 | |||
ceab7281e9 | |||
450dd79e51 | |||
c45df4bf1a | |||
6d3a28a6ce | |||
3d3fb3c826 | |||
f52674b179 | |||
697939a17a | |||
f10220f936 | |||
a1a6b6c29f | |||
42596756de | |||
8530c76f2d | |||
c6b2a17220 | |||
88e0d5086c | |||
fa5f189cda | |||
4d65be195b | |||
582f25bec7 | |||
052d36b01b | |||
ea45da66b7 | |||
3822a3f30e | |||
f1abb9d353 | |||
6baaec5b33 | |||
4aa4fff5e8 | |||
a9c61c5a11 | |||
dd50c4f385 | |||
b74036343f | |||
45036fe286 | |||
8f7ac979a3 | |||
2da17014e4 | |||
4e2cae74bb | |||
4b5929911e | |||
f59321b9c6 | |||
cba3c663c9 | |||
59029c86a9 | |||
8f5739fb68 | |||
49988edd82 | |||
36f7a92a06 | |||
f716e9f0b5 | |||
f3c8cd6fa5 | |||
280e88a526 | |||
8ef6b6472d | |||
2e08600814 | |||
068bf045a7 | |||
96fe38726c | |||
75a21eeb9f | |||
6020b24e44 | |||
ebfe01069c | |||
5d41543543 | |||
2ccc9c7397 | |||
c5623fe4fd | |||
ee04a2a351 | |||
aa034701df | |||
ad9bfb2439 |
@@ -10,7 +10,9 @@ type CliArgs struct {
|
||||
DBName string
|
||||
KeyFile string
|
||||
LogFile string
|
||||
Port string
|
||||
PicsDir string
|
||||
RSSFile string
|
||||
WebDir string
|
||||
}
|
||||
|
||||
@@ -18,9 +20,11 @@ func HandleCliArgs() (*CliArgs, error) {
|
||||
var err error
|
||||
cliArgs := new(CliArgs)
|
||||
|
||||
keyFile := flag.String("key", "/var/www/cpolis.key", "key file")
|
||||
keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file")
|
||||
logFile := flag.String("log", "/var/log/cpolis.log", "log file")
|
||||
picsDir := flag.String("pics", "/var/www/cpolis/pics", "pictures directory")
|
||||
cliArgs.Port = fmt.Sprint(":", flag.Int("port", 8080, "port"))
|
||||
rssFile := flag.String("rss", "/var/www/cpolis/cpolis.rss", "RSS file")
|
||||
webDir := flag.String("web", "/var/www/cpolis/web", "web directory")
|
||||
flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
|
||||
flag.Parse()
|
||||
@@ -29,14 +33,22 @@ func HandleCliArgs() (*CliArgs, error) {
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error finding absolute path for KeyFile: %v", err)
|
||||
}
|
||||
|
||||
cliArgs.LogFile, err = filepath.Abs(*logFile)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err)
|
||||
}
|
||||
|
||||
cliArgs.PicsDir, err = filepath.Abs(*picsDir)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err)
|
||||
}
|
||||
|
||||
cliArgs.RSSFile, err = filepath.Abs(*rssFile)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error finding absolute path for RSSFile: %v", err)
|
||||
}
|
||||
|
||||
cliArgs.WebDir, err = filepath.Abs(*webDir)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error finding absolute path for WebDir: %v", err)
|
||||
|
@@ -78,5 +78,5 @@ func main() {
|
||||
mux.HandleFunc("POST /update-user/", view.UpdateUser(args, db, store))
|
||||
mux.HandleFunc("POST /upload-image/", view.UploadImage(args))
|
||||
|
||||
log.Fatalln(http.ListenAndServe(":8080", mux))
|
||||
log.Fatalln(http.ListenAndServe(args.Port, mux))
|
||||
}
|
||||
|
@@ -319,7 +319,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if err = control.SaveRSS("tmp/orientexpress_alle.rss", feed); err != nil {
|
||||
if err = control.SaveRSS(c.RSSFile, feed); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
|
@@ -18,8 +18,42 @@
|
||||
{{end}}
|
||||
</div>
|
||||
|
||||
<div id="editor-images">
|
||||
<input name="article-image" type="file" hx-encoding="multipart/form-data" hx-post="/upload-image/"
|
||||
hx-swap="beforeend" hx-target="#editor-images" />
|
||||
</div>
|
||||
|
||||
<input type="submit" value="Senden" hx-post="/resubmit-article/" hx-target="#page-content" />
|
||||
</form>
|
||||
|
||||
<button hx-get="/hub/" hx-target="#page-content">Zurück</button>
|
||||
|
||||
<script>
|
||||
function copyToClipboard(text) {
|
||||
event.preventDefault(); // Get-Request verhindern
|
||||
|
||||
var textarea = document.createElement("textarea");
|
||||
textarea.textContent = text;
|
||||
document.body.appendChild(textarea);
|
||||
|
||||
textarea.select();
|
||||
try {
|
||||
document.execCommand('copy');
|
||||
} catch (err) {
|
||||
console.warn('Fehler beim Kopieren', err);
|
||||
}
|
||||
|
||||
document.body.removeChild(textarea);
|
||||
}
|
||||
|
||||
</script>
|
||||
{{end}}
|
||||
|
||||
{{define "editor-images"}}
|
||||
{{if gt (len .) 0}}
|
||||
<div>
|
||||
{{.}}
|
||||
<button onclick="copyToClipboard('{{.}}')">Kopieren</button>
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
Reference in New Issue
Block a user