Home Explore Help
Sign In
fgm
/
kurz
1
0
Fork 0
Files Issues 0 Pull Requests 0
Browse Source

Web UI: first executing template set.

Frederic G. MARAND 6 years ago
parent
c9ae5474d8
commit
7b0f677e11
11 changed files with 110 additions and 21 deletions
Unified View Show Diff Stats
  1. 2 1
      cmd/kurzd/dist.config.yml
  2. 2 0
      cmd/kurzd/serve.go
  3. 1 0
      go.mod
  4. 79 3
      web/get_short.go
  5. 4 4
      web/templates/201.gohtml
  6. 2 2
      web/templates/404.gohtml
  7. 2 2
      web/templates/home.gohtml
  8. 0 0
      web/templates/layout/analytics.gohtml
  9. 0 0
      web/templates/layout/footer.gohtml
  10. 0 0
      web/templates/layout/inlinecss.gohtml
  11. 18 9
      web/web.go

+ 2 - 1
cmd/kurzd/dist.config.yml
View File 

@@ -8,4 +8,5 @@ api:
 
 web:
 
 web:
 
   address: ":3000"
 
   address: ":3000"
 
   # May be absolute or relative to the "kurzd" binary.
 
   # May be absolute or relative to the "kurzd" binary.
 
-  assetsPath: ../../web/public
 
+  assetsPath: ../../web/public
 
+  siteName: "Kurz"

+ 2 - 0
cmd/kurzd/serve.go
View File 

@@ -4,6 +4,7 @@ import (
 
 	"code.osinet.fr/fgm/kurz/web"
 
 	"code.osinet.fr/fgm/kurz/web"
 
 	"context"
 
 	"context"
 
 	"database/sql"
 
 	"database/sql"
 
+	"github.com/davecgh/go-spew/spew"
 
 	"github.com/spf13/viper"
 
 	"github.com/spf13/viper"
 
 	"log"
 
 	"log"
 
 	"net/http"
 
 	"net/http"
 
@@ -70,6 +71,7 @@ func serveHandler(_ *cobra.Command, args []string) {
 
 
 
 	router := mux.NewRouter()
 
 	router := mux.NewRouter()
 
 	api.SetupRoutes(router)
 
 	api.SetupRoutes(router)
 
+	spew.Dump(viper.Get("web"))
 
 	web.SetupRoutes(router, assetsPath)
 
 	web.SetupRoutes(router, assetsPath)
 
 	http.Handle("/", router)
 
 	http.Handle("/", router)

+ 1 - 0
go.mod
View File 

@@ -2,6 +2,7 @@ module code.osinet.fr/fgm/kurz
 
 
 
 require (
 
 require (
 
 	github.com/BurntSushi/toml v0.3.1 // indirect
 
 	github.com/BurntSushi/toml v0.3.1 // indirect
 
+	github.com/davecgh/go-spew v1.1.1
 
 	github.com/go-sql-driver/mysql v1.4.0
 
 	github.com/go-sql-driver/mysql v1.4.0
 
 	github.com/gorilla/context v1.1.1 // indirect
 
 	github.com/gorilla/context v1.1.1 // indirect
 
 	github.com/gorilla/mux v1.6.2
 
 	github.com/gorilla/mux v1.6.2

+ 79 - 3
web/get_short.go
View File 

@@ -1,11 +1,64 @@
 
 package web
 
 package web
 
 
 
 import (
 
 import (
 
+	"fmt"
 
+	"net/http"
 
+	"time"
 
+
 
 	"code.osinet.fr/fgm/kurz/domain"
 
 	"code.osinet.fr/fgm/kurz/domain"
 
 	"github.com/gorilla/mux"
 
 	"github.com/gorilla/mux"
 
-	"net/http"
 
 )
 
 )
 
 
 
+/*
 
+Template variables:
 
+
 
+  - FullyQualifiedAssetsBaseURL http://plusvite-cdn.osinet.eu
 
+  - FullyQualifiedShortURL      (short string)
 
+  - FullyQualifiedSiteURL       http://plusvite.net/
 
+  - FullyQualifiedTargetURL     (target string)
 
+  - RefreshDelay                (seconds int)
 
+  - SiteName                    PlusVite
 
+*/
 
+
 
+type bytes = []byte
 
+
 
+func build403(w http.ResponseWriter, short string) (bytes, error) {
 
+	type Short403Data struct {
 
+		FullyQualifiedAssetsBaseURL string
 
+		FullyQualifiedShortURL      string
 
+		FullyQualifiedSiteURL       string
 
+		RefreshDelay                time.Duration
 
+		SiteName                    string
 
+	}
 
+
 
+	data := Short403Data{}
 
+	tmpl.Execute(w, data)
 
+	return bytes(""), nil
 
+}
 
+
 
+func build404(w http.ResponseWriter, short string) (bytes, error) {
 
+	type Short404Data struct {
 
+		AssetsVersion               int
 
+		FullyQualifiedAssetsBaseURL string
 
+		FullyQualifiedShortURL      string
 
+		FullyQualifiedSiteURL       string
 
+		FullyQualifiedTargetURL     string
 
+		RefreshDelay                time.Duration
 
+		SiteName                    string
 
+	}
 
+
 
+	data := Short404Data{}
 
+	err := tmpl.Execute(w, data)
 
+	if err != nil {
 
+		fmt.Println(err)
 
+	}
 
+	return bytes(""), nil
 
+}
 
+
 
+func build451(w http.ResponseWriter, short string) (bytes, error) {
 
+	return nil, nil
 
+}
 
+
 
 // handleGetShort handles path /<short>
 
 // handleGetShort handles path /<short>
 
 func handleGetShort(w http.ResponseWriter, r *http.Request) {
 
 func handleGetShort(w http.ResponseWriter, r *http.Request) {
 
 	short, ok := mux.Vars(r)["short"]
 
 	short, ok := mux.Vars(r)["short"]
 
@@ -36,14 +89,37 @@ func handleGetShort(w http.ResponseWriter, r *http.Request) {
 
 	switch domainErr.Kind {
 
 	switch domainErr.Kind {
 
 	case domain.ShortNotFound:
 
 	case domain.ShortNotFound:
 
 		status = http.StatusNotFound
 
 		status = http.StatusNotFound
 
+		if page, err := build404(w, short); err != nil {
 
+			status = http.StatusInternalServerError
 
+			w.WriteHeader(status)
 
+		} else {
 
+			w.WriteHeader(status)
 
+			w.Write(page)
 
+		}
 
+
 
 	case domain.TargetBlockedError:
 
 	case domain.TargetBlockedError:
 
 		status = http.StatusForbidden
 
 		status = http.StatusForbidden
 
+		if page, err := build403(w, short); err != nil {
 
+			status = http.StatusInternalServerError
 
+			w.WriteHeader(status)
 
+		} else {
 
+			w.WriteHeader(status)
 
+			w.Write(page)
 
+		}
 
+
 
 	case domain.TargetCensoredError:
 
 	case domain.TargetCensoredError:
 
 		status = http.StatusUnavailableForLegalReasons
 
 		status = http.StatusUnavailableForLegalReasons
 
+		if page, err := build451(w, short); err != nil {
 
+			status = http.StatusInternalServerError
 
+			w.WriteHeader(status)
 
+		} else {
 
+			w.WriteHeader(status)
 
+			w.Write(page)
 
+		}
 
+
 
 	default:
 
 	default:
 
 		// TargetInvalid is not supposed to happen in this case, so it is an internal error too.
 
 		// TargetInvalid is not supposed to happen in this case, so it is an internal error too.
 
 		status = http.StatusInternalServerError
 
 		status = http.StatusInternalServerError
 
+		w.WriteHeader(status)
 
 	}
 
 	}
 
-
 
-	w.WriteHeader(status)
 
 }
 
 }

+ 4 - 4
web/templates/201.gohtml
View File 

@@ -3,8 +3,8 @@
 
 <head>
 
 <head>
 
     <title>{{.SiteName}}: vers {{.FullyQualifiedTargetURL}}</title>
 
     <title>{{.SiteName}}: vers {{.FullyQualifiedTargetURL}}</title>
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/plusvite.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/plusvite.css?v={{.AssetsVersion}}" />
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/riff.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/riff.css?v={{.AssetsVersion}}" />
 
     {{template "analytics" .}}
 
     {{template "analytics" .}}
 
     {{template "inlinecss"}}
 
     {{template "inlinecss"}}
 
 </head>
 
 </head>
 
@@ -15,9 +15,9 @@
 
         <p>Vous pouvez dorénavant aller plus vite vers</p>
 
         <p>Vous pouvez dorénavant aller plus vite vers</p>
 
         <pre><a href="{{.FullyQualifiedTargetURL}}" class="url-source">{{.FullyQualifiedTargetURL}}</a></pre>
 
         <pre><a href="{{.FullyQualifiedTargetURL}}" class="url-source">{{.FullyQualifiedTargetURL}}</a></pre>
 
         <p>en utilisant le nouvel URL</p>
 
         <p>en utilisant le nouvel URL</p>
 
-        <pre><a href=".FullyQualifiedShortURL">.FullyQualifiedShortURL</a></pre>
 
+        <pre><a href="{{.FullyQualifiedShortURL}}">{{.FullyQualifiedShortURL}}</a></pre>
 
         <p>pour y faire référence.</p>
 
         <p>pour y faire référence.</p>
 
-        <p><a href=".FullyQualifiedSiteURL">Retour</a></p>
 
+        <p><a href="{{.FullyQualifiedSiteURL}}">Retour</a></p>
 
     </div>
 
     </div>
 
 
 
     {{template "footer"}}
 
     {{template "footer"}}

+ 2 - 2
web/templates/404.gohtml
View File 

@@ -3,8 +3,8 @@
 
 <head>
 
 <head>
 
     <title>{{.SiteName}}: {{.FullyQualifiedShortURL}}</title>
 
     <title>{{.SiteName}}: {{.FullyQualifiedShortURL}}</title>
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/plusvite.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/plusvite.css?v={{.AssetsVersion}}" />
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/riff.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/riff.css?v={{.AssetsVersion}}" />
 
     {{template "analytics" .}}
 
     {{template "analytics" .}}
 
     {{template "inlinecss"}}
 
     {{template "inlinecss"}}
 
     <meta http-equiv="Refresh" content="{{.RefreshDelay}};{{.FullyQualifiedSiteURL}}" />
 
     <meta http-equiv="Refresh" content="{{.RefreshDelay}};{{.FullyQualifiedSiteURL}}" />

+ 2 - 2
web/templates/home.gohtml
View File 

@@ -3,8 +3,8 @@
 
 <head>
 
 <head>
 
     <title>Plus Vite sur le Net: service gratuit d'URLs raccourcis</title>
 
     <title>Plus Vite sur le Net: service gratuit d'URLs raccourcis</title>
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
     <link rel="shortcut icon" href="{{.FullyQualifiedAssetsBaseURL}}/favicon.ico?v=1">
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/plusvite.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/plusvite.css?v={{.AssetsVersion}}" />
 
-    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/css/riff.css?v={{.AssetsVersion}}" />
 
+    <link rel="stylesheet" type="text/css" href="{{.FullyQualifiedAssetsBaseURL}}/public/css/riff.css?v={{.AssetsVersion}}" />
 
     {{template "analytics" .}}
 
     {{template "analytics" .}}
 
     {{template "inlinecss"}}
 
     {{template "inlinecss"}}
 
 </head>
 
 </head>

+ 0 - 0
web/templates/layout/_analytics.gohtml → web/templates/layout/analytics.gohtml
View File


+ 0 - 0
web/templates/layout/_footer.gohtml → web/templates/layout/footer.gohtml
View File


+ 0 - 0
web/templates/layout/_inlinecss.gohtml → web/templates/layout/inlinecss.gohtml
View File


+ 18 - 9
web/web.go
View File 

@@ -8,6 +8,8 @@ a complete application.
 
 package web
 
 package web
 
 
 
 import (
 
 import (
 
+	"github.com/davecgh/go-spew/spew"
 
+	"html/template"
 
 	"net/http"
 
 	"net/http"
 
 	"path/filepath"
 
 	"path/filepath"
 
 
 
@@ -30,22 +32,17 @@ const (
 
 	HtmlTypeRegex = HtmlType
 
 	HtmlTypeRegex = HtmlType
 
 )
 
 )
 
 
 
-/**
 
+var tmpl *template.Template
 
-FullyQualifiedAssetsBaseURL	http://plusvite-cdn.osinet.eu
 
+
 
-FullyQualifiedShortURL		(short string)
 
-FullyQualifiedSiteURL		http://plusvite.net/
 
-FullyQualifiedTargetURL		(target string)
 
-RefreshDelay				(seconds int)
 
-SiteName					PlusVite
 
-*/
 
 // SetupRoutes() configures Web UI routes on the passed mux.Router.
 
 // SetupRoutes() configures Web UI routes on the passed mux.Router.
 
 func SetupRoutes(router *mux.Router, configAssetsPath string) {
 
 func SetupRoutes(router *mux.Router, configAssetsPath string) {
 
+	const assetsPrefix = "/public"
 
 	absAssetsDir, err := filepath.Abs(configAssetsPath)
 
 	absAssetsDir, err := filepath.Abs(configAssetsPath)
 
 	if err != nil {
 
 	if err != nil {
 
 		panic(err)
 
 		panic(err)
 
 	}
 
 	}
 
 	fs := http.FileServer(http.Dir(absAssetsDir))
 
 	fs := http.FileServer(http.Dir(absAssetsDir))
 
-	router.PathPrefix("/public").Handler(http.StripPrefix("/public", fs))
 
+	router.PathPrefix(assetsPrefix).Handler(http.StripPrefix(assetsPrefix, fs))
 
 	router.Handle("/favicon.ico", fs)
 
 	router.Handle("/favicon.ico", fs)
 
 
 
 	// BUG(fgm): improve Accept header matchers once https://github.com/golang/go/issues/19307 is completed.
 
 	// BUG(fgm): improve Accept header matchers once https://github.com/golang/go/issues/19307 is completed.
 
@@ -60,4 +57,16 @@ func SetupRoutes(router *mux.Router, configAssetsPath string) {
 
 	router.HandleFunc("/", handleGetRoot).
 
 	router.HandleFunc("/", handleGetRoot).
 
 		Methods("GET", "HEAD").
 
 		Methods("GET", "HEAD").
 
 		Name(RouteGetRoot)
 
 		Name(RouteGetRoot)
 
+
 
+	base, _ := filepath.Abs(configAssetsPath + "/../templates/")
 
+	spew.Dump(base)
 
+	layout := base + "/layout"
 
+	tmpl = template.Must(template.ParseFiles(
 
+		base+"/201.gohtml",
 
+		base+"/404.gohtml",
 
+		base+"/home.gohtml",
 
+		layout+"/analytics.gohtml",
 
+		layout+"/footer.gohtml",
 
+		layout+"/inlinecss.gohtml",
 
+	))
 
 }
 
 }