From ec5686a905808d2f920423d391216fa5321a7a8d Mon Sep 17 00:00:00 2001 From: mynah Date: Wed, 15 Aug 2018 02:47:30 -0500 Subject: [PATCH] publish --- lib/Dojo/Model/Users.pm | 2 +- lib/Dojo/Model/Vuelo.pm | 6 +++--- public/home/home/cssAnimation.css | 17 +++++++++++++++++ script/dojo | 1 + templates/home/home.html.ep | 10 +++++++++- templates/layouts/admin.html.ep | 4 ++-- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/lib/Dojo/Model/Users.pm b/lib/Dojo/Model/Users.pm index bd89c88..e22ec04 100644 --- a/lib/Dojo/Model/Users.pm +++ b/lib/Dojo/Model/Users.pm @@ -34,7 +34,7 @@ sub check { sub _read{ my ($q,@bind)=@_; my (@empty,$arr); - my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::GRULLADB.":".Dojo::Conf::GRULLADB_H,Dojo::Conf::GRULLADB_UR,Dojo::Conf::GRULLADB_URP); + my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::GRULLADB.":".Dojo::Conf::GRULLADB_H,Dojo::Conf::GRULLADB_UR,Dojo::Conf::GRULLADB_URP,{mysql_enable_utf8 => 1}); return \@empty unless($dbh); #$dbh->do(qq{SET NAMES 'utf8'}); my $h=$dbh->selectall_arrayref($q,{ Slice => {} },@bind); diff --git a/lib/Dojo/Model/Vuelo.pm b/lib/Dojo/Model/Vuelo.pm index 016ecb2..b1b46ee 100644 --- a/lib/Dojo/Model/Vuelo.pm +++ b/lib/Dojo/Model/Vuelo.pm @@ -6,8 +6,8 @@ use Mojo::Base 'Mojolicious::Controller'; use File::Basename; +use Encode qw(decode_utf8 encode_utf8); use Text::Markdown qw{ markdown }; -use Encode qw{ decode_utf8 }; use DBI; use Dojo::Conf; @@ -147,7 +147,7 @@ sub tst{ sub _read{ my ($q,@bind)=@_; my @empty; - my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::VUELODB.":".Dojo::Conf::VUELODB_H,Dojo::Conf::VUELODB_UR,Dojo::Conf::VUELODB_URP); + my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::VUELODB.":".Dojo::Conf::VUELODB_H,Dojo::Conf::VUELODB_UR,Dojo::Conf::VUELODB_URP, {mysql_enable_utf8 => 1}); return \@empty unless($dbh); my $h=$dbh->selectall_arrayref($q,{ Slice => {} },@bind); $dbh->disconnect(); @@ -158,7 +158,7 @@ sub _read{ sub _write{ my ($q,@bind)=@_; my (@empty); - my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::VUELODB.":".Dojo::Conf::VUELODB_H,Dojo::Conf::VUELODB_UW,Dojo::Conf::VUELODB_UWP); + my $dbh = DBI->connect("DBI:mysql:".Dojo::Conf::VUELODB.":".Dojo::Conf::VUELODB_H,Dojo::Conf::VUELODB_UW,Dojo::Conf::VUELODB_UWP ); return 0 unless($dbh); my $h=$dbh->do($q,{ Slice => {} },@bind); $dbh->disconnect(); diff --git a/public/home/home/cssAnimation.css b/public/home/home/cssAnimation.css index 5c2ae84..c36ecae 100755 --- a/public/home/home/cssAnimation.css +++ b/public/home/home/cssAnimation.css @@ -7,6 +7,7 @@ div.logo{ background-repeat: no-repeat; } #courtain{ + height:150vh; -webkit-animation: oopacity 2s ease-out 6s, clear 3s 6.5s; -webkit-animation-fill-mode:both,both; } @@ -26,14 +27,30 @@ animation-delay:5s; animation-duration:1s; animation-fill-mode:backwards; } +div.dotsw{ + margin-left: 44vw; +} +div.dots{ + width: 32px; + height: 11px; + display: inline-block; + background-color:#c22a39; + animation-name:color; + animation-timing-function:ease-in; + animation-delay:0s; + animation-duration:6s; + animation-fill-mode:forwards; +} @keyframes modIntro{ 0%{opacity:0;} 100%{opacity:1;} } @keyframes oopacity { 0%{ opacity:1; } 100%{ opacity:0; } } @keyframes clear{ 0%{ height:150vh; } 100%{ height:0px; } } @keyframes nintro{ 0% { position:absolute; top:-200px; } 100% { top:0px;} } +@keyframes color{ 0%{background-color:#ffff;} 100%{background-color:#c22a39;} } @-webkit-keyframes modIntro{ 0%{opacity:0;} 100%{opacity:1;} } @-webkit-keyframes oopacity { 0%{ opacity:1; } 100%{ opacity:0; } } @-webkit-keyframes clear{ 0%{ height:150vh; } 100%{ height:0px; } } @-webkit-keyframes nintro{ 0% { position:absolute; top:-200px; } 100% { top:0px;} } +@-webkit-keyframes color{ 0%{background-color:#ffff;} 100%{background-color:#c22a39;} } diff --git a/script/dojo b/script/dojo index 6febe6b..a734c72 100755 --- a/script/dojo +++ b/script/dojo @@ -2,6 +2,7 @@ use strict; use warnings; +use utf8; use FindBin; BEGIN { unshift @INC, "$FindBin::Bin/../lib" } diff --git a/templates/home/home.html.ep b/templates/home/home.html.ep index 37ac036..f89a8a3 100755 --- a/templates/home/home.html.ep +++ b/templates/home/home.html.ep @@ -1,5 +1,13 @@
-
+
+ +
+
+
+
+
+
+

<%= $mod %>

diff --git a/templates/layouts/admin.html.ep b/templates/layouts/admin.html.ep index d3350fe..9ed0292 100644 --- a/templates/layouts/admin.html.ep +++ b/templates/layouts/admin.html.ep @@ -1,9 +1,9 @@ - <%= title %> - + + <%= title %> <%= javascript "/ext/d3.v4.min.js"; %> <%= stylesheet "/global/layout.css" %>