From b43f9ceca9f7e02248f1d88245ede5267e8b72c8 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Thu, 9 Jun 2022 12:51:19 +0200 Subject: [frontend] Restructure Frontend Sources (#634) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐸restructure frontend stuff, include admin and future user panel in main repo, properly deduplicate bundles for css+js across uses * rename bundled to dist, caught by gitignore * re-include status.css for profile template * default to localhost * serve frontend panels * add todo message for abstraction * refactor oauth registration flow * oauth restructure * update footer template * change panel routes * remove superfluous css imports * write bundle to disk from test server, use forked budo-express * wrap all page content in container for robustness with addons etc injection other elements in body * update documentation, goreleaser, Dockerfile * update template meta tags * add AGPL-3.0+ license header everywhere * only attach update listener on EventEmitter * cleaner config for various frontend bundles * fix bundler script paths * Merge commit 'd191931932b9293ce1be44ed08a1e69b9fcc1e25' * fix up dockerfile, goreleaser * go mod tidy * add uglifyify * move status hide/show js to frontend bundle * fix stylesheet color( func regressions * update contributing docs for new build path * update goreleaser + docker building * resolve dependency paths properly * update package name * use api errorhandler Co-authored-by: tsmethurst --- web/template/footer.tmpl | 40 +++++++++++++++++++++++----------------- web/template/frontend.tmpl | 5 +++++ web/template/header.tmpl | 32 +++++++++++++++++--------------- web/template/profile.tmpl | 15 --------------- web/template/thread.tmpl | 15 --------------- 5 files changed, 45 insertions(+), 62 deletions(-) create mode 100644 web/template/frontend.tmpl (limited to 'web/template') diff --git a/web/template/footer.tmpl b/web/template/footer.tmpl index f95d8b71b..075682f60 100644 --- a/web/template/footer.tmpl +++ b/web/template/footer.tmpl @@ -1,19 +1,25 @@ - - + + + + {{ if .javascript }} + {{ range .javascript }} + + {{ end }} + {{ end }} \ No newline at end of file diff --git a/web/template/frontend.tmpl b/web/template/frontend.tmpl new file mode 100644 index 000000000..b667bc191 --- /dev/null +++ b/web/template/frontend.tmpl @@ -0,0 +1,5 @@ +{{ template "header.tmpl" .}} +

+{{ template "footer.tmpl" .}} \ No newline at end of file diff --git a/web/template/header.tmpl b/web/template/header.tmpl index 72f17d2a4..86f5cca89 100644 --- a/web/template/header.tmpl +++ b/web/template/header.tmpl @@ -1,29 +1,31 @@ - + - - + + - + + {{range .stylesheets}} {{end}} {{.instance.Title}} - GoToSocial - -

- {{.instance.Title}} -

- \ No newline at end of file +

+ +

+ {{.instance.Title}} +

+ diff --git a/web/template/profile.tmpl b/web/template/profile.tmpl index 71914b7e7..b1c3aa571 100644 --- a/web/template/profile.tmpl +++ b/web/template/profile.tmpl @@ -31,19 +31,4 @@ {{end}}

- {{ template "footer.tmpl" .}} diff --git a/web/template/thread.tmpl b/web/template/thread.tmpl index b6b91fd31..d0f003b91 100644 --- a/web/template/thread.tmpl +++ b/web/template/thread.tmpl @@ -16,19 +16,4 @@ {{end}} - {{ template "footer.tmpl" .}} \ No newline at end of file -- cgit v1.2.3