From 317b2dc57993b7ac8c6beb0452c57969f85df9cf Mon Sep 17 00:00:00 2001 From: Lukas Neubert Date: Tue, 7 Jul 2020 22:01:18 +0200 Subject: [PATCH] tutorials: fix index() (#5732) --- tutorials/building-a-simple-web-blog-with-vweb.md | 8 ++++---- tutorials/code/blog/.gitignore | 1 + tutorials/code/blog/blog.sqlite | 2 +- tutorials/code/blog/blog.v | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 tutorials/code/blog/.gitignore diff --git a/tutorials/building-a-simple-web-blog-with-vweb.md b/tutorials/building-a-simple-web-blog-with-vweb.md index bbed9f10c9..a010ee1df2 100644 --- a/tutorials/building-a-simple-web-blog-with-vweb.md +++ b/tutorials/building-a-simple-web-blog-with-vweb.md @@ -64,7 +64,7 @@ fn main() { vweb.run(8081) } -fn (mut app App) index() vweb.Result { +pub fn (mut app App) index() vweb.Result { app.vweb.text('Hello, world from vweb!') return vweb.Result{} } @@ -132,7 +132,7 @@ Let's return an HTML view instead. Create `index.html` in the same directory: and update our `index()` action so that it returns the HTML view we just created: ```v -fn (mut app App) index() vweb.Result { +pub fn (mut app App) index() vweb.Result { message := 'Hello, world from Vweb!' return $vweb.html() } @@ -178,7 +178,7 @@ We'll be using V's builtin ORM and a SQLite database. Create a SQLite file with the schema: ```sql -drop table Article; +drop table if exists Article; create table Article ( id integer primary key, @@ -252,7 +252,7 @@ pub fn (app &App) find_all_articles() []Article { Let's fetch the articles in the `index()` action: ```v -fn (app &App) index() vweb.Result { +pub fn (app &App) index() vweb.Result { articles := app.find_all_articles() return $vweb.html() } diff --git a/tutorials/code/blog/.gitignore b/tutorials/code/blog/.gitignore new file mode 100644 index 0000000000..2fdf6da015 --- /dev/null +++ b/tutorials/code/blog/.gitignore @@ -0,0 +1 @@ +blog.db diff --git a/tutorials/code/blog/blog.sqlite b/tutorials/code/blog/blog.sqlite index cebd36acec..c5956d68d1 100644 --- a/tutorials/code/blog/blog.sqlite +++ b/tutorials/code/blog/blog.sqlite @@ -1,4 +1,4 @@ -drop table Article; +drop table if exists Article; create table Article ( id integer primary key, diff --git a/tutorials/code/blog/blog.v b/tutorials/code/blog/blog.v index bd34dcaf51..308f4105b7 100644 --- a/tutorials/code/blog/blog.v +++ b/tutorials/code/blog/blog.v @@ -16,18 +16,18 @@ fn main() { } /* -fn (mut app App) index_text() vweb.Result { +pub fn (mut app App) index_text() vweb.Result { app.vweb.text('Hello, world from vweb!') return vweb.Result{} } -fn (app &App) index_html() vweb.Result { +pub fn (app &App) index_html() vweb.Result { message := 'Hello, world from Vweb!' return $vweb.html() } */ -fn (app &App) index() vweb.Result { +pub fn (app &App) index() vweb.Result { articles := app.find_all_articles() return $vweb.html() }