chore(deps): Bumping httputils and folks

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · May 22, 2021 · a530917 · a530917
1 parent f71ba13
commit a530917
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,8 @@ Usage of ketchup:
         [notifier] Pushgateway URL {KETCHUP_NOTIFIER_PUSH_URL}
   -okStatus int
         [http] Healthy HTTP Status code {KETCHUP_OK_STATUS} (default 204)
+  -pathPrefix string
+        Root Path Prefix {KETCHUP_PATH_PREFIX}
   -port uint
         [server] Listen port {KETCHUP_PORT} (default 1080)
   -prometheusAddress string

diff --git a/cmd/ketchup/templates/index.html b/cmd/ketchup/templates/index.html
@@ -233,7 +233,7 @@
 
     @media print {
       body::after {
-        content: 'Save ink, share link. {{ .PublicURL }}';
+        content: 'Save ink, share link. {{ publicURL "" }}';
       }
 
       body > * {
@@ -289,7 +289,7 @@
       <div class="content">
         <header class="flex padding">
           <h1 class="no-margin no-padding">
-            <a href="{{ with .Root }}{{ . }}{{ end }}" class="no-style clear">{{ .Title }}</a>
+            <a href="{{ url "" }}{{ with .Root }}{{ . }}{{ end }}" class="no-style clear">{{ .Title }}</a>
           </h1>
 
           <span class="flex-grow"></span>

diff --git a/cmd/ketchup/templates/ketchup.html b/cmd/ketchup/templates/ketchup.html
@@ -9,19 +9,19 @@ <h2 class="header">Create ketchup</h2>
         <p class="padding no-margin flex">
           <span class="flex-grow center">
             <label for="create-kind-github" class="block">
-              <img class="icon icon-large clickable" src="/svg/github?fill=silver" alt="Github icon">
+              <img class="icon icon-large clickable" src="{{ url "/svg/github?fill=silver" }}" alt="Github icon">
             </label>
             <input id="create-kind-github" type="radio" name="kind" value="github" checked>
           </span>
           <span class="flex-grow center">
             <label for="create-kind-helm" class="block">
-              <img class="icon icon-large clickable" src="/svg/helm?fill=silver" alt="Helm icon">
+              <img class="icon icon-large clickable" src="{{ url "/svg/helm?fill=silver" }}" alt="Helm icon">
             </label>
             <input id="create-kind-helm" type="radio" name="kind" value="helm">
           </span>
           <span class="flex-grow center">
             <label for="create-kind-docker" class="block">
-              <img class="icon icon-large clickable" src="/svg/docker?fill=silver" alt="Docker icon">
+              <img class="icon icon-large clickable" src="{{ url "/svg/docker?fill=silver" }}" alt="Docker icon">
             </label>
             <input id="create-kind-docker" type="radio" name="kind" value="docker">
           </span>
@@ -42,7 +42,7 @@ <h2 class="header">Create ketchup</h2>
 'stable': latest version without beta.
 '^1.0': latest with fixed major version.
 '~1.1': latest with fixed major and minor version.
-'^1.0-0': include beta (works also for '~')." src="/svg/question?fill=silver" alt="question icon"></label>
+'^1.0-0': include beta (works also for '~')." src="{{ url "/svg/question?fill=silver" }}" alt="question icon"></label>
           <input id="create-pattern" type="text" name="pattern" placeholder="stable" class="full">
         </p>
 
@@ -98,7 +98,7 @@ <h2 class="header">Create ketchup</h2>
       <h2 class="header">Edit ketchup</h2>
 
       <p class="padding no-margin center">
-        <img class="icon" src="/svg/{{ .Repository.Kind.String }}?fill=silver" alt="{{ .Repository.Kind.String }} icon">
+        <img class="icon" src="{{ url "/svg/{{ .Repository.Kind.String }}?fill=silver" }}" alt="{{ .Repository.Kind.String }} icon">
       </p>
 
       <p class="no-margin center padding">{{ .Repository.Name }}</p>
@@ -114,7 +114,7 @@ <h2 class="header">Edit ketchup</h2>
 'stable': latest version without beta.
 '^1.0': latest with fixed major version.
 '~1.1': latest with fixed major and minor version.
-'^1.0-0': include beta (works also for '~')." src="/svg/question?fill=silver" alt="question icon"></label>
+'^1.0-0': include beta (works also for '~')." src="{{ url "/svg/question?fill=silver" }}" alt="question icon"></label>
           <input id="edit-pattern-{{ .Repository.ID }}" name="pattern" type="text" value="{{ .Pattern }}">
         </p>
 
@@ -317,7 +317,7 @@ <h2 class="header small ellipsis">{{ if eq .Repository.Kind.String "helm" }}{{ .
         <div>
           {{ if ne .Version (index .Repository.Versions .Pattern) }}
             <a href="{{ .Repository.CompareURL .Version .Pattern }}" class="button button-icon" title="Compare">
-              <img class="icon" src="/svg/eyes?fill=silver" alt="Compare icon">
+              <img class="icon" src="{{ url "/svg/eyes?fill=silver" }}" alt="Compare icon">
             </a>
 
             <form method="POST" action="/app/ketchups/{{ .Repository.ID }}" class="inline">
@@ -327,16 +327,16 @@ <h2 class="header small ellipsis">{{ if eq .Repository.Kind.String "helm" }}{{ .
               <input type="hidden" name="version" value="{{ index .Repository.Versions .Pattern }}">
 
               <button type="submit" class="button button-icon" title="Update to latest">
-                <img class="icon" src="/svg/circle-up?fill=silver" alt="Update icon">
+                <img class="icon" src="{{ url "/svg/circle-up?fill=silver" }}" alt="Update icon">
               </button>
             </form>
           {{ end }}
 
           <a href="#edit-modal-{{ .Repository.ID }}" class="button button-icon" title="Edit">
-            <img class="icon" src="/svg/edit?fill=silver" alt="Edit icon">
+            <img class="icon" src="{{ url "/svg/edit?fill=silver" }}" alt="Edit icon">
           </a>
           <a href="#delete-modal-{{ .Repository.ID }}" class="button button-icon" title="Delete">
-            <img class="icon" src="/svg/times?fill=silver" alt="Delete icon">
+            <img class="icon" src="{{ url "/svg/times?fill=silver" }}" alt="Delete icon">
           </a>
         </div>
       </div>
@@ -367,7 +367,7 @@ <h2 class="header small ellipsis">{{ .Name }}</h2>
             <input type="hidden" name="version" value="{{ .Versions.stable }}">
 
             <button type="submit" class="button button-icon" title="Add suggestion">
-              <img class="icon" src="/svg/add?fill=silver" alt="Add icon">
+              <img class="icon" src="{{ url "/svg/add?fill=silver" }}" alt="Add icon">
               Add suggestion
             </a>
           </form>

diff --git a/cmd/ketchup/templates/public.html b/cmd/ketchup/templates/public.html
@@ -3,28 +3,28 @@
 
   <title>{{ .Title }}</title>
   <meta name="description" content="{{ $description }}">
-  <link rel="canonical" href="https://ketchup.vibioh.fr">
+  <link rel="canonical" href="{{ publicURL "" }}">
   <meta name="twitter:card" content="summary">
   <meta name="twitter:creator" content="@ViBiOh">
-  <meta name="twitter:site" content="https://ketchup.vibioh.fr">
-  <meta name="twitter:image" content="https://ketchup.vibioh.fr/favicon/android-chrome-512x512.png?v={{ .Version }}">
+  <meta name="twitter:site" content="{{ publicURL "" }}">
+  <meta name="twitter:image" content="{{ publicURL "/favicon/android-chrome-512x512.png" }}?v={{ .Version }}">
   <meta name="twitter:title" content="{{ .Title }}">
   <meta name="twitter:description" content="{{ $description }}">
   <meta property="og:type" content="website">
-  <meta property="og:url" content="https://ketchup.vibioh.fr">
+  <meta property="og:url" content="{{ publicURL "" }}">
   <meta property="og:title" content="{{ .Title }}">
   <meta property="og:description" content="{{ $description }}">
-  <meta property="og:image" content="https://ketchup.vibioh.fr/favicon/android-chrome-512x512.png?v={{ .Version }}">
+  <meta property="og:image" content="{{ publicURL "/favicon/android-chrome-512x512.png" }}?v={{ .Version }}">
   <meta property="og:image:height" content="512">
   <meta property="og:image:width" content="512">
 {{ end }}
 
 {{ define "favicon" }}
-  <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png?v={{ .Version }}">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png?v={{ .Version }}">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png?v={{ .Version }}">
-  <link rel="manifest" href="/favicon/site.webmanifest?v={{ .Version }}">
-  <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg?v={{ .Version }}" color="#5bbad5">
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ url "/favicon/apple-touch-icon.png" }}?v={{ .Version }}">
+  <link rel="icon" type="image/png" sizes="32x32" href="{{ url "/favicon/favicon-32x32.png" }}?v={{ .Version }}">
+  <link rel="icon" type="image/png" sizes="16x16" href="{{ url "/favicon/favicon-16x16.png" }}?v={{ .Version }}">
+  <link rel="manifest" href="{{ url "/favicon/site.webmanifest" }}?v={{ .Version }}">
+  <link rel="mask-icon" href="{{ url "/favicon/safari-pinned-tab.svg" }}?v={{ .Version }}" color="#5bbad5">
   <meta name="theme-color" content="#f8f8f8">
 {{ end}}
 
@@ -55,7 +55,7 @@
   </style>
 
   <h2 class="center">
-    <a href="/app/" class="active-link">Login</a> or <a href="#signup" class="active-link">Signup</a>
+    <a href="{{ url "/app/" }}" class="active-link">Login</a> or <a href="#signup" class="active-link">Signup</a>
   </h2>
 
   <fieldset id="signup">

diff --git a/cmd/ketchup/templates/suggest.html b/cmd/ketchup/templates/suggest.html
@@ -39,7 +39,7 @@ <h3>Suggestions</h3>
           <h2 class="header small ellipsis">{{ .Name }}</h2>
 
           <div class="padding">
-            <img class="icon" src="/svg/{{ .Kind.String }}?fill=silver" alt="{{ .Kind.String }} icon">
+            <img class="icon" src="{{ url "/svg/" }}{{ .Kind.String }}?fill=silver" alt="{{ .Kind.String }} icon">
           </div>
 
           <div class="ketchup__version">

diff --git a/go.mod b/go.mod
@@ -4,10 +4,10 @@ go 1.16
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/ViBiOh/auth/v2 v2.8.1
-	github.com/ViBiOh/httputils/v4 v4.10.2
-	github.com/ViBiOh/mailer v1.17.1
-	github.com/lib/pq v1.10.1
+	github.com/ViBiOh/auth/v2 v2.8.4
+	github.com/ViBiOh/httputils/v4 v4.11.4
+	github.com/ViBiOh/mailer v1.18.0
+	github.com/lib/pq v1.10.2
 	github.com/prometheus/client_golang v1.10.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )