From: Marius Gavrilescu Date: Mon, 28 Sep 2015 10:24:03 +0000 (+0300) Subject: Merge branch 'nodbic' into newmc-nodbic X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=refs%2Fheads%2Fnewmc-nodbic;hp=-c;p=gruntmaster-page.git Merge branch 'nodbic' into newmc-nodbic --- 5b035519c22363f5ef7134b7e1479aee1f30925f diff --combined Makefile.PL index a1698a1,2584deb..d832309 --- a/Makefile.PL +++ b/Makefile.PL @@@ -10,13 -10,11 +10,12 @@@ WriteMakefile LICENSE => 'AGPL_3', SIGN => 1, clean => { - FILES => 'static/css/ static/js/' + FILES => 'static/css/ static/js/ static/logos/' }, BUILD_REQUIRES => { qw/CSS::Minifier::XS 0 + SVG::SpriteMaker 0 File::Slurp 0 - Test::MockTime 0 Test::More 0 Test::WWW::Mechanize::PSGI 0/, }, @@@ -43,6 -41,7 +42,7 @@@ Plack::Middleware::Auth::Complex 0 Plack::Util 0 Scope::Upper 0 + Sort::ByExample 0 Web::Simple 0.019/, }, META_MERGE => { diff --combined app.psgi index 837dd60,a612540..20c8cb5 --- a/app.psgi +++ b/app.psgi @@@ -14,7 -14,7 +14,7 @@@ default-src 'none connect-src 'self' form-action 'self' frame-ancestors 'none' -img-src 'self' +img-src 'self' https://static.mindcoding.ro referrer origin-when-cross-origin script-src 'self' style-src 'self' @@@ -23,15 -23,11 +23,11 @@@ CS $csp =~ s/\n/; /gr; } - my $db; - sub add_database { my $app = $_[0]; sub { - my ($env) = @_; - $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:'); - $env->{'gruntmaster.dbic'} = $db; - $app->($env) + dbinit $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless db; + $app->(@_) } } diff --combined lib/Plack/App/Gruntmaster/HTML.pm index 6799fb1,c629383..80ecac4 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@@ -8,13 -8,16 +8,16 @@@ use HTML::Element::Library use HTML::TreeBuilder; use POSIX qw//; use Data::Dumper qw/Dumper/; + use Sort::ByExample + sorter => {-as => 'pb_sort', example => [qw/beginner easy medium hard/], xform => sub {$_->{level}}}, + sorter => {-as => 'ct_sort', example => [qw/Running Pending Finished/], xform => sub {$_->{status}}}; my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1}; sub ftime ($) { POSIX::strftime '%c', localtime shift } sub literal ($) { my ($html) = @_; - return unless $html; + return '' unless $html; my $b = HTML::TreeBuilder->new; $b->ignore_unknown(0); $b->parse($html); @@@ -46,7 -49,7 +49,7 @@@ sub HTML::Element::fclass { shift->look sub HTML::Element::namedlink { my ($self, $id, $name) = @_; - $name = $id unless $name =~ /[[:graph:]]/; + $name = $id unless $name && $name =~ /[[:graph:]]/; $self = $self->find('a'); $self->edit_href(sub {s/id/$id/}); $self->replace_content($name); @@@ -161,7 -164,8 +164,8 @@@ sub process_ct $tr->fclass('name')->namedlink($data->{id}, $data->{name}); $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name}); }; - $args{$_} ? $tree->fid($_)->find('tbody')->find('tr')->iter3($args{$_}, $iter) : $tree->fid($_)->detach for qw/running pending finished/; + $_->{status} = $_->{finished} ? 'Finished' : $_->{started} ? 'Running' : 'Pending' for @{$args{ct}}; + $tree->find('tbody')->find('tr')->iter3([ct_sort @{$args{ct}}], $iter); } sub process_pb_entry { @@@ -182,7 -186,10 +186,7 @@@ if ($args{contest_stop}) { $tree->fid('solution')->detach; $tree->fid('solution_modal')->detach; - my $score = $tree->fid('score'); - $score->attr('data-start' => $args{open_time}); - $score->attr('data-stop' => $args{contest_stop}); - $score->attr('data-value' => $args{value}); + $tree->fid('score')->replace_content($args{value}); $tree->fid('countdown')->attr('data-stop' => $args{contest_stop}); } else { $tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private}; @@@ -190,16 -197,11 +194,11 @@@ $_->detach for $tree->fclass('rc'); # requires contest $tree->fid('solution_modal')->replace_content(literal $args{solution}); } - if ($args{cansubmit}) { - $tree->fid('nosubmit')->detach; - $tree->look_down(name => 'problem')->attr(value => $args{id}); - my $contest = $tree->look_down(name => 'contest'); - $contest->attr(value => $args{args}{contest}) if $args{args}{contest}; - $contest->detach unless $args{args}{contest} - } else { - $tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/}); - $tree->fid('submit')->detach - } + + $tree->look_down(name => 'problem')->attr(value => $args{id}); + my $contest = $tree->look_down(name => 'contest'); + $contest->attr(value => $args{args}{contest}) if $args{args}{contest}; + $contest->detach unless $args{args}{contest} } sub process_sol { @@@ -209,21 -211,17 +208,17 @@@ sub process_pb { my ($tree, %args) = @_; - my $titer = sub { + my $iter = sub { my ($data, $tr) = @_; $tr->set_child_content(class => 'author', $data->{author}); + $tr->set_child_content(class => 'level', ucfirst $data->{level}); $tr->fclass('name')->namedlink($data->{id}, $data->{name}); $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest}; $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name}); $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest}; }; - my $iter = sub { - my ($data, $div) = @_; - $div->attr(id => $data); - $div->find('h2')->replace_content(ucfirst $data); - $div->find('tbody')->find('tr')->iter3($args{$data}, $titer); - }; - $tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter); + + $tree->find('tbody')->find('tr')->iter3([pb_sort @{$args{pb}}], $iter); $tree->fid('open-alert')->detach unless $args{contest}; } @@@ -312,7 -310,7 +307,7 @@@ sub process_ed $div->set_child_content(class => 'solution', literal $data->{solution}); $div->fclass('problem')->namedlink($data->{id}, $data->{name}); }; - my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/; + my @pb = sort { $a->{value} <=> $b->{value} } @{$args{pb}}; $tree->fclass('well')->iter3(\@pb, $iter); } diff --combined tmpl/pb_entry.en index 7f04faf,f2709e3..0732636 --- a/tmpl/pb_entry.en +++ b/tmpl/pb_entry.en @@@ -6,7 -6,7 +6,7 @@@
Owner
owner
Level
Easy
Time limit (seconds)
1
-
Score
50
+
Score
50
Contest ends in
01:30
@@@ -15,11 -15,6 +15,6 @@@

Submit solution

-
- The contest has finished.
- To submit solutions to this problem, please visit the problem outside the contest. -
-
@@@ -28,18 -23,18 +23,18 @@@