Ads and statistic integration support

.gitignore

@@ -22,4 +22,6 @@ node_modules
 
 assets/dist/*
 
-.env
+.env
+
+templates/partials/extend.html

README.md

@@ -25,7 +25,9 @@ Some features to mention:
 - [x] Authentication
   - [x] Passwordless authentication
   - [x] Patreon account linking
-- [ ] Ads integration
+- [x] Ads and statistic integration support
+- [ ] Feedback form
+- [ ] Chrome extension integration
 - [ ] Embed support
 - [ ] 🚀Switch webtor.io to web-ui-v2
 

services/common.go

@@ -10,6 +10,7 @@ var SHA1R = regexp.MustCompile("(?i)[0-9a-f]{5,40}")
 
 var (
 	DomainFlag     = "domain"
+	DemoMagnetFlag = "demo-magnet"
 	SMTPHostFlag   = "smtp-host"
 	SMTPUserFlag   = "smtp-user"
 	SMTPPassFlag   = "smtp-pass"
@@ -28,6 +29,12 @@ func RegisterFlags(f []cli.Flag) []cli.Flag {
 			Value:  "http://localhost:8080",
 			EnvVar: "DOMAIN",
 		},
+		cli.StringFlag{
+			Name:   DemoMagnetFlag,
+			Usage:  "demo magnet",
+			Value:  "magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.fastcast.nz&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F",
+			EnvVar: "DEMO_MAGNET",
+		},
 		cli.StringFlag{
 			Name:   SMTPHostFlag,
 			Usage:  "smtp host",

services/web/helper.go

@@ -84,9 +84,17 @@ func (s *Helper) GetFuncs() template.FuncMap {
 		"useAuth":       s.UseAuth,
 		"domain":        s.Domain,
 		"has":           Has,
+		"hasAds":        HasAds,
 	}
 }
 
+func HasAds(c *claims.Data) bool {
+	if c == nil {
+		return false
+	}
+	return !c.Claims.Site.NoAds
+}
+
 func (s *Helper) UseAuth() bool {
 	return s.useAuth
 }

services/web/index/handler.go

@@ -5,24 +5,31 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/urfave/cli"
+	"github.com/webtor-io/web-ui-v2/services"
 	"github.com/webtor-io/web-ui-v2/services/template"
 )
 
-type IndexData struct{}
+type IndexData struct {
+	DemoMagnet string
+}
 
 type Handler struct {
 	tm *template.Manager
+	dm string
 }
 
 func RegisterHandler(c *cli.Context, r *gin.Engine, tm *template.Manager) {
 	h := &Handler{
 		tm: tm,
+		dm: c.String(services.DemoMagnetFlag),
 	}
 	r.GET("/", h.index)
 
 	h.tm.RegisterViews("*")
 }
 
 func (s *Handler) index(c *gin.Context) {
-	s.tm.MakeTemplate("index").HTML(http.StatusOK, c, &IndexData{})
+	s.tm.MakeTemplate("index").HTML(http.StatusOK, c, &IndexData{
+		DemoMagnet: s.dm,
+	})
 }

services/web/resource/handler.go

@@ -3,6 +3,7 @@ package resource
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/urfave/cli"
+	"github.com/webtor-io/web-ui-v2/services"
 	"github.com/webtor-io/web-ui-v2/services/api"
 	"github.com/webtor-io/web-ui-v2/services/template"
 	j "github.com/webtor-io/web-ui-v2/services/web/job"
@@ -12,13 +13,15 @@ type Handler struct {
 	api  *api.Api
 	jobs *j.Handler
 	tm   *template.Manager
+	dm   string
 }
 
 func RegisterHandler(c *cli.Context, r *gin.Engine, tm *template.Manager, api *api.Api, jobs *j.Handler) {
 	h := &Handler{
 		api:  api,
 		jobs: jobs,
 		tm:   tm,
+		dm:   c.String(services.DemoMagnetFlag),
 	}
 	r.POST("/", h.post)
 	r.GET("/:resource_id", h.get)
@@ -33,5 +36,6 @@ func RegisterHandler(c *cli.Context, r *gin.Engine, tm *template.Manager, api *a
 		"makeImage":        MakeImage,
 		"makeAudio":        MakeAudio,
 		"makeVideo":        MakeVideo,
+		"isDemoMagnet":     h.IsDemoMagnet,
 	})
 }

services/web/resource/helpers.go

@@ -162,3 +162,7 @@ func MakePagination(lr *ra.ListResponse, page uint, pageSize uint) []Pagination
 	})
 	return res
 }
+
+func (s *Handler) IsDemoMagnet(m string) bool {
+	return s.dm == m
+}

templates/layouts/main.html

@@ -12,7 +12,7 @@
         <script>window._sessionExpired = {{ .User.Expired }};</script>
         <script async src="{{ "auth.js" | asset }}"></script>
         {{- end }}
-        {{- template "head" . }}
+        {{- template "head_extra" . }}
     </head>
     <body style="background-color: rgb(15, 23, 42);">
         <script>document.body.style.display = 'none';</script>

templates/partials/extend_base.html

@@ -0,0 +1,4 @@
+{{ define "head_extra" }}
+{{ end }}
+{{ define "get_extra" }}
+{{ end }}

templates/views/index.html

@@ -35,7 +35,7 @@
 </form>
 <div class="divider h-12">OR</div>
 <form class="flex flex-col justify-center items-center" action="/" method="post" enctype="multipart/form-data" async-target="main">
-    <input type="hidden" name="resource" value="magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.fastcast.nz&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F" />
+    <input type="hidden" name="resource" value="{{ .DemoMagnet }}" />
     <button type="submit" class="btn btn-accent btn-outline">Try demo!</button>
 </form>
 {{ end }}

templates/views/resource/get.html

@@ -16,4 +16,5 @@
 {{ end }}
 <script async src="{{ "resource/get.js" | asset }}"></script>
 {{ if dev }}<script async src="{{ "resource/get.js" | devAsset }}"></script>{{ end }}
+{{ template "get_extra" . }}
 {{ end }}