Skip to content

Commit

Permalink
Fixed newlines in initialization script. Added field "text" into tabl…
Browse files Browse the repository at this point in the history
…e "user".
  • Loading branch information
shoorick committed Jul 1, 2010
1 parent 3157828 commit 818e458
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 18 deletions.
13 changes: 9 additions & 4 deletions init.sql
@@ -1,9 +1,14 @@
BEGIN TRANSACTION;
CREATE TABLE "page" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "title" TEXT, "text" TEXT);
INSERT INTO "page" VALUES(1,'Index','First page\n\nLightweight wiki *mojowka* based on top of "Mojolicious::Lite":http://search.cpan.org/dist/Mojolicious\n\n"Registered user":/login can change content of pages.');
INSERT INTO "page" VALUES(2,'Sitemap','* "First page of site":/\n* "This page":/sitemap');
CREATE TABLE "user" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "login" TEXT, "password" TEXT);
INSERT INTO "user" VALUES(1,'admin','21232f297a57a5a743894a0e4a801fc3');
INSERT INTO "page" VALUES(1,'Index','First page
Lightweight wiki *mojowka* based on top of "Mojolicious::Lite":http://search.cpan.org/dist/Mojolicious
"Registered user":/login can change content of pages.');
INSERT INTO "page" VALUES(2,'Sitemap','* "First page of site":/
* "This page":/sitemap');
CREATE TABLE "user" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "login" TEXT, "password" TEXT, "text" TEXT);
INSERT INTO "user" VALUES(1,'admin','21232f297a57a5a743894a0e4a801fc3','Administrator of site. He can edit pages.');
CREATE UNIQUE INDEX "page_title" on page (title ASC);
CREATE UNIQUE INDEX "user_login" on user (login ASC);
COMMIT;
34 changes: 20 additions & 14 deletions mojowka
Expand Up @@ -22,6 +22,7 @@ use Mojo::ByteStream 'b';
use Text::Textile;
use DBI;


my $dbfile = 'data.sqlite';
our $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile", '', '');

Expand Down Expand Up @@ -273,17 +274,17 @@ sub get_user {
my $login = $self->param('login') || return;

my $row = $dbh->selectrow_hashref(
q{SELECT id FROM user WHERE login=?},
q{SELECT text FROM user WHERE login=?},
{},
$login,
);

if ( $row ) {
return $self->render(
'template' => 'profile',
'login' => $login,
);
} # if $row
return $self->render_text(
markup( b( $row->{'text'} )->decode('UTF-8')->to_string ),
'title' => $login,
'layout' => 'default',
) if $row;

} # sub get_user

__DATA__
Expand All @@ -306,20 +307,14 @@ __DATA__
<h1>Not found</h1><p>Document you requested was not found.</p>
@@ profile.html.ep
% layout 'default';
% stash 'title' => $login;
<p>User was found</p>
@@ default.html.ep
% layout 'default';
<h1><%= $title %></h1>
Text
@@ edit_article.html.ep
% layout 'default';
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down Expand Up @@ -459,3 +454,14 @@ Text
</html>
@@ init.sql
BEGIN TRANSACTION;
CREATE TABLE "page" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "title" TEXT, "text" TEXT);
INSERT INTO "page" VALUES(1,'Index','First page\n\nLightweight wiki *mojowka* based on top of "Mojolicious::Lite":http://search.cpan.org/dist/Mojolicious\n\n"Registered user":/login can change content of pages.');
INSERT INTO "page" VALUES(2,'Sitemap','* "First page of site":/\n* "This page":/sitemap');
CREATE TABLE "user" ("id" INTEGER PRIMARY KEY AUTOINCREMENT,"login" TEXT,"password" TEXT);
INSERT INTO "user" VALUES(1,'admin','21232f297a57a5a743894a0e4a801fc3');
CREATE UNIQUE INDEX "page_title" on page (title ASC);
CREATE UNIQUE INDEX "user_login" on user (login ASC);
COMMIT;

0 comments on commit 818e458

Please sign in to comment.