finish update to 2.19

drdrew42 · drdrew42 · commit 3e126551a7cd · 2024-08-20T17:53:03.000Z
diff --git a/lib/PG b/lib/PG
@@ -1 +1 @@
-Subproject commit 63d034d1a2fc27c18391cd26580d8b1724ba4a47
+Subproject commit 4b3e564cf4e5a36807ca5a341734f8d604e8b77d
diff --git a/lib/RenderApp.pm b/lib/RenderApp.pm
@@ -104,6 +104,21 @@ sub startup {
 	$r->any('/render-api')->to('render#problem');
 	$r->any('/render-ptx')->to('render#render_ptx');
 	$r->any('/health' => sub { shift->rendered(200) });
+	$r->any('/health' => sub {shift->rendered(200)});
+	if ($self->mode eq 'development' || $self->config('FULL_APP_INSECURE')) {
+		$r->any('')->to('pages#twocolumn');
+		$r->any('/')->to('pages#twocolumn');
+		$r->any('/opl')->to('pages#oplUI');
+		$r->any('/die' => sub {die "what did you expect, flowers?"});
+		$r->any('/timeout' => sub {
+			my $c = shift;
+			my $tx = $c->render_later->tx;
+			Mojo::IOLoop->timer(2 => sub {
+				$tx = $tx; # prevent $tx from going out of scope
+				$c->rendered(200);
+			});
+		});
+  }
 
 	# Enable problem editor & OPL browser -- NOT recommended for production environment!
 	supplementalRoutes($r) if ($self->mode eq 'development' || $self->config('FULL_APP_INSECURE'));
diff --git a/lib/RenderApp/Controller/Render.pm b/lib/RenderApp/Controller/Render.pm
@@ -1,4 +1,3 @@
-
 package RenderApp::Controller::Render;
 use Mojo::Base 'Mojolicious::Controller', -async_await;
 
diff --git a/public/js/apps/Problem/problem.js b/public/js/apps/Problem/problem.js
@@ -1,5 +1,5 @@
 (() => {
-	const frame = window.frameElement.id || window.frameElement.data.id;
+	const frame = window.frameElement.id || window.frameElement.dataset.id || 'no-id';
 	// Activate the popovers in the results table.
 	document.querySelectorAll('.attemptResults .answer-preview[data-bs-toggle="popover"]')
 		.forEach((preview) => {
diff --git a/templates/layouts/navbar.html.ep b/templates/layouts/navbar.html.ep
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <base href="<%= $main::basehref %>">
     <title>WeBWorK Standalone Renderer</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400" rel="stylesheet">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`package RenderApp::Controller::Render;`
`3`	`2`	`use Mojo::Base 'Mojolicious::Controller', -async_await;`
`4`	`3`