Skip to content

Commit 11ef91a

Browse files
committed
convert to WW2.18 mojo::template approach
1 parent 3ac56a0 commit 11ef91a

25 files changed

+3294
-990
lines changed

Diff for: lib/RenderApp.pm

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
use strict;
2+
use warnings;
3+
# use feature 'signatures';
4+
# no warnings qw(experimental::signatures);
5+
16
package RenderApp;
27
use Mojo::Base 'Mojolicious';
38

@@ -15,7 +20,7 @@ BEGIN {
1520
$ENV{PG_ROOT} = $main::dirname . '/PG';
1621

1722
# Used for reconstructing library paths from sym-links.
18-
$ENV{OPL_DIRECTORY} = "webwork-open-problem-library";
23+
$ENV{OPL_DIRECTORY} = "$ENV{RENDER_ROOT}/webwork-open-problem-library";
1924

2025
$ENV{MOJO_CONFIG} = (-r "$ENV{RENDER_ROOT}/render_app.conf") ? "$ENV{RENDER_ROOT}/render_app.conf" : "$ENV{RENDER_ROOT}/render_app.conf.dist";
2126
# $ENV{MOJO_MODE} = 'production';
@@ -26,8 +31,9 @@ use lib "$main::dirname";
2631
print "home directory " . $main::dirname . "\n";
2732

2833
use RenderApp::Model::Problem;
29-
use RenderApp::Controller::RenderProblem;
3034
use RenderApp::Controller::IO;
35+
use WeBWorK::RenderProblem;
36+
use WeBWorK::FormatRenderedProblem;
3137

3238
sub startup {
3339
my $self = shift;
@@ -66,6 +72,7 @@ sub startup {
6672
$self->helper(newProblem => sub { shift; RenderApp::Model::Problem->new(@_) });
6773

6874
# Helpers
75+
$self->helper(format => sub { WeBWorK::FormatRenderedProblem::formatRenderedProblem(@_) });
6976
$self->helper(validateRequest => sub { RenderApp::Controller::IO::validate(@_) });
7077
$self->helper(parseRequest => sub { RenderApp::Controller::Render::parseRequest(@_) });
7178
$self->helper(croak => sub { RenderApp::Controller::Render::croak(@_) });
@@ -107,20 +114,7 @@ sub startup {
107114
$r->any('/pg_files/CAPA_Graphics/*static')->to('StaticFiles#CAPA_graphics_file');
108115
$r->any('/pg_files/tmp/*static')->to('StaticFiles#temp_file');
109116
$r->any('/pg_files/*static')->to('StaticFiles#pg_file');
110-
$r->any('/*fail')->to('StaticFiles#public_file');
111-
# # any other requests fall through
112-
# $r->any('/*fail' => sub {
113-
# my $c = shift;
114-
# my $report = $c->stash('fail')."\nCOOKIE:";
115-
# for my $cookie (@{$c->req->cookies}) {
116-
# $report .= "\n".$cookie->to_string;
117-
# }
118-
# $report .= "\nFORM DATA:";
119-
# foreach my $k (@{$c->req->params->names}) {
120-
# $report .= "\n$k = ".join ', ', @{$c->req->params->every_param($k)};
121-
# }
122-
# $c->log->fatal($report);
123-
# $c->rendered(404)});
117+
$r->any('/*static')->to('StaticFiles#public_file');
124118
}
125119

126120
1;

0 commit comments

Comments
 (0)