Use relative URLs for all assets in admin and example site templates. Closes #46.

knadh · knadh · commit 32866d80abe3 · 2025-04-03T20:16:36.000+05:30
diff --git a/admin/base.html b/admin/base.html
@@ -4,13 +4,13 @@
 <head>
 	<title>{{ .Title }} {{ if .Title }}|{{ end}} DictPress</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="{{ .Consts.RootURL }}/admin/static/grid.css?v={{ .AssetVer }}">
-	<link rel="stylesheet" type="text/css" href="{{ .Consts.RootURL }}/admin/static/style.css?v={{ .AssetVer }}">
-	<link rel="shortcut icon" href="{{ .Consts.RootURL }}/admin/static/favicon.png?v={{ .AssetVer }}" type="image/x-icon" />
+	<link rel="stylesheet" type="text/css" href="/admin/static/grid.css?v={{ .AssetVer }}">
+	<link rel="stylesheet" type="text/css" href="/admin/static/style.css?v={{ .AssetVer }}">
+	<link rel="shortcut icon" href="/admin/static/favicon.png?v={{ .AssetVer }}" type="image/x-icon" />
 
-	<script>window._ROOT_URL = "{{ .Consts.RootURL }}";</script>
-	<script defer src="{{ .Consts.RootURL }}/admin/static/main.js?v={{ .AssetVer }}"></script>
-	<script defer src="{{ .Consts.RootURL }}/admin/static/alpine.js?v={{ .AssetVer }}"></script>
+	<script>window._ROOT_URL = "";</script>
+	<script defer src="/admin/static/main.js?v={{ .AssetVer }}"></script>
+	<script defer src="/admin/static/alpine.js?v={{ .AssetVer }}"></script>
 
 	{{ range $j := .Consts.AdminAssets -}}
 		{{- if (hasSuffix ".js" $j) -}}
@@ -26,17 +26,17 @@
 		<header class="header">
 			<div class="row">
 				<div class="three columns logo">
-					<a href="{{ .Consts.RootURL }}/admin"><img src="{{ .Consts.RootURL }}/admin/static/logo.svg?v={{ .AssetVer }}" alt="logo" /></a>
+					<a href="/admin"><img src="/admin/static/logo.svg?v={{ .AssetVer }}" alt="logo" /></a>
 					<template x-if="Object.keys(loading).length > 0"><span class="loading"></span></template>
 				</div>
 				<nav class="eight columns nav">
 					<a href="" @click.prevent="onNewEntry">Add new</a>
-					<a href="{{ .Consts.RootURL }}/admin/pending">Pending</a>
+					<a href="/admin/pending">Pending</a>
 				</nav>
 			</div>
 		</header>
 
-		<form class="search" action="{{ .Consts.RootURL }}/admin/search" x-data="searchFormComponent()" @submit="onSearch">
+		<form class="search" action="/admin/search" x-data="searchFormComponent()" @submit="onSearch">
 			<fieldset class="row">
 				<div class="column four">
 	    			<select name="from_lang" x-model="fromLang">
diff --git a/cmd/dictpress/handlers.go b/cmd/dictpress/handlers.go
@@ -106,7 +106,6 @@ func handleServeBundle(c echo.Context, bundleType string, staticDir string) erro
 		fname = filepath.Clean(fname)
 		if strings.Contains(fname, "..") {
 			return echo.NewHTTPError(http.StatusBadRequest, "invalid filename")
-			continue
 		}
 
 		fullPath := filepath.Join(staticDir, fname)
diff --git a/site/base.html b/site/base.html
@@ -23,18 +23,18 @@
   {{- end -}}
 
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
-	<script>window._ROOT_URL = "{{ .Consts.RootURL }}";</script>
-	<link rel="shortcut icon" href="{{ .Consts.RootURL }}/static/favicon.png?v={{ .AssetVer }}" type="image/x-icon" />
-  <link href="{{ .Consts.RootURL }}/static/flexit.css?v={{ .AssetVer }}" rel="stylesheet" type="text/css" />
-  <link href="{{ .Consts.RootURL }}/static/style.css?v={{ .AssetVer }}" rel="stylesheet" type="text/css" />
+	<script>window._ROOT_URL = "/";</script>
+	<link rel="shortcut icon" href="/static/favicon.png?v={{ .AssetVer }}" type="image/x-icon" />
+  <link href="/static/flexit.css?v={{ .AssetVer }}" rel="stylesheet" type="text/css" />
+  <link href="/static/style.css?v={{ .AssetVer }}" rel="stylesheet" type="text/css" />
 </head>
 <body class="{{ if eq .Data.PageType "/"}}home{{ end }}">
 <div class="container">
   <section class="main">
     <header class="header">
       <div class="row">
         <div class="logo four columns">
-          <a href="{{ .Consts.RootURL }}"><img src="{{ .Consts.RootURL }}/static/logo.svg?v={{ .AssetVer }}" alt="Dictionary logo" /></a>
+          <a href=""><img src="/static/logo.svg?v={{ .AssetVer }}" alt="Dictionary logo" /></a>
           <h3 class="intro">
             {{- .L.T "public.subTitle" -}}
           </h3>
@@ -57,7 +57,7 @@ <h3 class="intro">
             <div>
               <input autofocus autocomplete="off" required placeholder="" aria-label="Search keyword"
                 type="text" id="q" name="q" value="{{ if .Data.Query }}{{ .Data.Query.Query }}{{ end }}" />
-              <button type="submit"><img src="{{ .Consts.RootURL }}/static/search.svg?v={{ .AssetVer }}" alt="{{- .L.T "global.btnSearch" -}}" /></button>
+              <button type="submit"><img src="/static/search.svg?v={{ .AssetVer }}" alt="{{- .L.T "global.btnSearch" -}}" /></button>
             </div>
           </form>
         </div>
@@ -98,8 +98,8 @@ <h4>{{ .L.T "public.submitTitle" }}</h4>
   </div>
   </form>
 
-  <script src="{{ .Consts.RootURL }}/static/main.js?v={{ .AssetVer }}"></script>
+  <script src="/static/main.js?v={{ .AssetVer }}"></script>
 </body>
 
 </html>
-{{ end }}
+{{ end }}

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ func handleServeBundle(c echo.Context, bundleType string, staticDir string) erro`
`106`	`106`	`fname = filepath.Clean(fname)`
`107`	`107`	`if strings.Contains(fname, "..") {`
`108`	`108`	`return echo.NewHTTPError(http.StatusBadRequest, "invalid filename")`
`109`		`- continue`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`fullPath := filepath.Join(staticDir, fname)`