vue

planetary-social · Nov 6, 2022 · 51b5f54 · 51b5f54
1 parent b4b5518
commit 51b5f54
Show file tree

Hide file tree

Showing 26 changed files with 428 additions and 61 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.dockerignore b/.dockerignore
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Unlicense
 
-node_moduels
+node_modules
 ssb-go-room-secrets
 ssb-go-room-secrets/**/*
 .git

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -344,7 +344,7 @@ func runroomsrv() error {
 
 		// See for more https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
 		// helpful: https://report-uri.com/home/generate
-		ContentSecurityPolicy: "default-src 'self'; img-src 'self' data:", // enforce no external content
+		ContentSecurityPolicy: "default-src 'self'; img-src 'self' https://graphql.planetary.pub data: ; connect-src 'self' https://graphql.planetary.pub", // enforce no external content
 
 		BrowserXssFilter: true,
 		FrameDeny:        true,

diff --git a/internal/network/mocked/endpoints.go b/internal/network/mocked/endpoints.go
diff --git a/roomdb/mockdb/aliases.go b/roomdb/mockdb/aliases.go
diff --git a/roomdb/mockdb/auth.go b/roomdb/mockdb/auth.go
diff --git a/roomdb/mockdb/auth_fallback.go b/roomdb/mockdb/auth_fallback.go
diff --git a/roomdb/mockdb/denied.go b/roomdb/mockdb/denied.go
diff --git a/roomdb/mockdb/fixed_pages.go b/roomdb/mockdb/fixed_pages.go
diff --git a/roomdb/mockdb/invites.go b/roomdb/mockdb/invites.go
diff --git a/roomdb/mockdb/members.go b/roomdb/mockdb/members.go
diff --git a/roomdb/mockdb/pages.go b/roomdb/mockdb/pages.go
diff --git a/roomdb/mockdb/roomconfig.go b/roomdb/mockdb/roomconfig.go
diff --git a/web/.DS_Store b/web/.DS_Store
diff --git a/web/assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.fd84f88b.woff b/web/assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.fd84f88b.woff
diff --git a/web/assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.83be7b2f.woff2 b/web/assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.83be7b2f.woff2
diff --git a/web/assets/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcY.8e94758c.woff b/web/assets/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcY.8e94758c.woff
diff --git a/web/assets/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcel5euIg.35dca8a7.woff2 b/web/assets/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcel5euIg.35dca8a7.woff2
diff --git a/web/assets/index.800a2f23.js b/web/assets/index.800a2f23.js
diff --git a/web/assets/index.f52c3173.css b/web/assets/index.f52c3173.css
diff --git a/web/assets/index.html b/web/assets/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/assets/logo.3c6b6612.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Planetary</title>
+    <script type="module" crossorigin src="/assets/index.800a2f23.js"></script>
+    <link rel="stylesheet" href="/assets/index.f52c3173.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>
diff --git a/web/assets/logo.3c6b6612.svg b/web/assets/logo.3c6b6612.svg
diff --git a/web/assets/style.css b/web/assets/style.css
diff --git a/web/embedded_dev.go b/web/embedded_dev.go
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
+//go:build dev
 // +build dev
 
 package web

diff --git a/web/handlers/http.go b/web/handlers/http.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/sessions"
-	"github.com/russross/blackfriday/v2"
 	"go.mindeco.de/http/auth"
 	"go.mindeco.de/http/render"
 	"go.mindeco.de/log/level"
@@ -311,21 +310,21 @@ func New(
 	})
 
 	// landing page
-	m.Get(router.CompleteIndex).Handler(r.HTML("landing/index.tmpl", func(w http.ResponseWriter, req *http.Request) (interface{}, error) {
-		// TODO: try websocket upgrade (issue #)
-
-		notice, err := dbs.PinnedNotices.Get(req.Context(), roomdb.NoticeDescription, "en-GB")
-		if err != nil {
-			return nil, fmt.Errorf("failed to find description: %w", err)
-		}
-		markdown := blackfriday.Run([]byte(notice.Content), blackfriday.WithNoExtensions())
-		return noticeShowData{
-			ID:       notice.ID,
-			Title:    notice.Title,
-			Content:  template.HTML(markdown),
-			Language: notice.Language,
-		}, nil
-	}))
+	// m.Get(router.CompleteIndex).Handler(r.HTML("landing/index.tmpl", func(w http.ResponseWriter, req *http.Request) (interface{}, error) {
+	// 	// TODO: try websocket upgrade (issue #)
+
+	// 	notice, err := dbs.PinnedNotices.Get(req.Context(), roomdb.NoticeDescription, "en-GB")
+	// 	if err != nil {
+	// 		return nil, fmt.Errorf("failed to find description: %w", err)
+	// 	}
+	// 	markdown := blackfriday.Run([]byte(notice.Content), blackfriday.WithNoExtensions())
+	// 	return noticeShowData{
+	// 		ID:       notice.ID,
+	// 		Title:    notice.Title,
+	// 		Content:  template.HTML(markdown),
+	// 		Language: notice.Language,
+	// 	}, nil
+	// }))
 
 	// notices (the mini-CMS)
 	var nh = noticeHandler{
@@ -366,6 +365,7 @@ func New(
 	m.Get(router.OpenModeCreateInvite).HandlerFunc(r.HTML("admin/invite-created.tmpl", ih.createOpenMode))
 
 	// static assets
+
 	m.PathPrefix("/assets/").Handler(http.StripPrefix("/assets/", http.FileServer(web.Assets)))
 
 	// TODO: doesnt work because of of mainMux wrapper, see issue #35
@@ -375,6 +375,12 @@ func New(
 
 	// hook up main stdlib mux to the gorrilla/mux with named routes
 	// TODO: issue #35
+
+	http.Handle("/assets/", http.StripPrefix("/assets/", http.FileServer(http.Dir("assets"))))
+
+	m.PathPrefix("/test").HandlerFunc(IndexHandler2("../../web/assets/index.html"))
+	m.PathPrefix("/").HandlerFunc(IndexHandler("../../web/assets/index.html"))
+
 	mainMux.Handle("/", m)
 
 	consumeURL := urlTo(router.CompleteInviteConsume)
@@ -425,3 +431,21 @@ func concatTemplates(lst ...[]string) []string {
 	}
 	return catted
 }
+
+func IndexHandler2(entrypoint string) func(w http.ResponseWriter, r *http.Request) {
+	fn := func(w http.ResponseWriter, r *http.Request) {
+		// fmt.Fprint(w, web.Assets)
+		http.ServeFile(w, r, entrypoint)
+	}
+
+	return http.HandlerFunc(fn)
+}
+
+func IndexHandler(entrypoint string) func(w http.ResponseWriter, r *http.Request) {
+	fn := func(w http.ResponseWriter, r *http.Request) {
+		// fmt.Fprint(w, web.Assets)
+		http.ServeFile(w, r, entrypoint)
+	}
+
+	return http.HandlerFunc(fn)
+}
diff --git a/web/router/complete.go b/web/router/complete.go
@@ -10,7 +10,7 @@ import (
 
 // constant names for the named routes
 const (
-	CompleteIndex = "complete:index"
+	// CompleteIndex = "complete:index"
 
 	CompleteNoticeShow = "complete:notice:show"
 	CompleteNoticeList = "complete:notice:list"
@@ -30,14 +30,21 @@ const (
 	OpenModeCreateInvite = "open:invites:create"
 )
 
+// |
+// |-dev.go
+// |-main.go
+// |-prod.go
+// |-server
+
 // CompleteApp constructs a mux.Router containing the routes for batch Complete html frontend
 func CompleteApp() *mux.Router {
 	m := mux.NewRouter()
 
+	// It's important that this is before your catch-all route ("/")
 	Auth(m)
 	Admin(m.PathPrefix("/admin").Subrouter())
 
-	m.Path("/").Methods("GET").Name(CompleteIndex)
+	// m.Path("/").Methods("GET").Name(CompleteIndex)
 
 	m.Path("/alias/{alias}").Methods("GET").Name(CompleteAliasResolve)
 
@@ -55,5 +62,17 @@ func CompleteApp() *mux.Router {
 
 	m.Path("/set-language").Methods("POST").Name(CompleteSetLanguage)
 
+	// Catch-all: Serve our JavaScript application's entry-point (index.html).
+
+	// m.PathPrefix("/assets/").Handler(http.StripPrefix("/assets/", http.FileServer(web.Assets)))
+
 	return m
 }
+
+// func HealthCheck(w http.ResponseWriter, r *http.Request) {
+// 	fmt.Fprint(w, "API is alive and ready")
+// }
+
+// func handle(w http.ResponseWriter, r *http.Request) {
+// 	http.Redirect(w, r, "/notice/list", http.StatusMovedPermanently)
+// }