Move JS and CSS external

This isn't all JS and CSS, just the big bits
google · Oct 21, 2020 · ab083d3 · ab083d3
1 parent 5d24f4a
commit ab083d3
Show file tree

Hide file tree

Showing 48 changed files with 402 additions and 518 deletions.
diff --git a/cmd/adminapi/main.go b/cmd/adminapi/main.go
@@ -148,10 +148,7 @@ func realMain(ctx context.Context) error {
 		sub.Use(requireAPIKey)
 		sub.Use(processFirewall)
 
-		issueapiController, err := issueapi.New(ctx, cfg, db, limiterStore, h)
-		if err != nil {
-			return fmt.Errorf("issueapi.New: %w", err)
-		}
+		issueapiController := issueapi.New(ctx, cfg, db, limiterStore, h)
 		sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST")
 
 		codeStatusController := codestatus.NewAPI(ctx, cfg, db, h)

diff --git a/cmd/server/assets/admin/caches/index.html b/cmd/server/assets/admin/caches/index.html
@@ -34,8 +34,6 @@ <h5 class="mb-1">{{$cache.Name}}</h5>
       </ul>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/email/show.html b/cmd/server/assets/admin/email/show.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -82,8 +81,6 @@ <h1>System email config</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/info.html b/cmd/server/assets/admin/info.html
@@ -25,8 +25,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/edit.html b/cmd/server/assets/admin/realms/edit.html
@@ -8,7 +8,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -121,8 +120,6 @@ <h1>Edit realm</h1>
       </div>
     {{end}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/index.html b/cmd/server/assets/admin/realms/index.html
@@ -59,8 +59,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/new.html b/cmd/server/assets/admin/realms/new.html
@@ -7,7 +7,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -105,8 +104,6 @@ <h1>New realm</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/sms/show.html b/cmd/server/assets/admin/sms/show.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -74,8 +73,6 @@ <h1>System SMS config</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
@@ -60,8 +60,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/users/new.html b/cmd/server/assets/admin/users/new.html
@@ -7,7 +7,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -56,8 +55,6 @@ <h1>New system admin</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 
 </html>

diff --git a/cmd/server/assets/apikeys/edit.html b/cmd/server/assets/apikeys/edit.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -62,8 +61,6 @@ <h1>Edit API key</h1>
       </p>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/index.html b/cmd/server/assets/apikeys/index.html
@@ -84,8 +84,6 @@ <h1>API keys</h1>
     </p>
     {{end}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/new.html b/cmd/server/assets/apikeys/new.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -54,8 +53,6 @@ <h1>New API key</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/show.html b/cmd/server/assets/apikeys/show.html
@@ -99,8 +99,6 @@ <h1>{{$authApp.Name}} API key</h1>
     </div>
   </main>
 
-  {{template "scripts" .}}
-
   {{if $stats}}
   <script src="https://www.gstatic.com/charts/loader.js"></script>
   <script>

diff --git a/cmd/server/assets/codestatus/index.html b/cmd/server/assets/codestatus/index.html
@@ -6,7 +6,6 @@
 <html lang="en">
 
 <head>
-  {{template "floatingform" .}}
   {{template "head" .}}
 </head>
 
@@ -66,7 +65,6 @@ <h1>Verification code status</h1>
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $check= $('#check');

diff --git a/cmd/server/assets/codestatus/show.html b/cmd/server/assets/codestatus/show.html
@@ -64,7 +64,6 @@ <h5 class="mb-1">SMS link expiry</h5>
     <a href="/code/status" class="card-link">&larr; Enter another code</a>
   </main>
 
-  {{template "scripts" .}}
   {{template "codescripts" .}}
 
   {{if not .code.Claimed}}