mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

tools/vcreate: fix web app (#18019)

Browse Source
This commit is contained in:
Hitalo Souza 2023-04-22 21:43:40 -03:00 committed by GitHub
parent 3fb32a866c
commit cd90bc65b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/tools/vcreate/vcreate.v
View File

@ -461,8 +461,8 @@ pub fn (mut app App) controller_auth(username string, password string) vweb.Resu
content: 'module main
struct AuthRequestDto {
username string [required]
password string [required]
username string [nonull]
password string [nonull]
}
'
}
@ -504,9 +504,10 @@ fn (mut app App) service_auth(username string, password string) !string {
db.close() or { panic(err) }
}
user := sql db {
select from User where username == username limit 1
}
users := sql db {
select from User where username == username
}!
user := users.first()
if user.username != username {
return error('user not found')
}
@ -588,6 +589,9 @@ fn auth_verify(token string) bool {
</div>
</form>
<script type='text/javascript'>
// function eraseCookie(name) {
// document.cookie = name + '=; Max-Age=0'
// }
async function addUser() {
const form = document.querySelector('#index_form');
const formData = new FormData(form);
@ -659,6 +663,7 @@ fn main() {
sql db {
create table User
create table Product
} or { panic('error on create table: \${err}') }
db.close() or { panic(err) }
@ -752,7 +757,7 @@ pub fn (mut app App) controller_create_product(product_name string) vweb.Result
struct Product {
id int [primary; sql: serial]
user_id int
name string [required; sql_type: 'TEXT']
name string [nonull; sql_type: 'TEXT']
created_at string [default: 'CURRENT_TIMESTAMP']
}
"
@ -786,7 +791,7 @@ fn (mut app App) service_add_product(product_name string, user_id int) ! {
}
}
fn (mut app App) service_get_all_products_from(user_id int) ?[]Product {
fn (mut app App) service_get_all_products_from(user_id int) ![]Product {
mut db := databases.create_db_connection() or {
println(err)
return err
@ -798,7 +803,7 @@ fn (mut app App) service_get_all_products_from(user_id int) ?[]Product {
results := sql db {
select from Product where user_id == user_id
}
}!
return results
}
@ -875,6 +880,7 @@ import json
['/controller/users'; get]
pub fn (mut app App) controller_get_all_user() vweb.Result {
// token := app.get_cookie('token') or { '' }
token := app.req.header.get_custom('token') or { '' }
if !auth_verify(token) {
@ -891,6 +897,7 @@ pub fn (mut app App) controller_get_all_user() vweb.Result {
['/controller/user'; get]
pub fn (mut app App) controller_get_user() vweb.Result {
// token := app.get_cookie('token') or { '' }
token := app.req.header.get_custom('token') or { '' }
if !auth_verify(token) {
@ -941,8 +948,8 @@ pub fn (mut app App) controller_create_user(username string, password string) vw
pub struct User {
mut:
id int [primary; sql: serial]
username string [required; sql_type: 'TEXT'; unique]
password string [required; sql_type: 'TEXT']
username string [nonull; sql_type: 'TEXT'; unique]
password string [nonull; sql_type: 'TEXT']
active bool
products []Product [fkey: 'user_id']
}
@ -982,7 +989,7 @@ fn (mut app App) service_add_user(username string, password string) ! {
}
}
fn (mut app App) service_get_all_user() ?[]User {
fn (mut app App) service_get_all_user() ![]User {
mut db := databases.create_db_connection() or {
println(err)
return err
@ -994,12 +1001,12 @@ fn (mut app App) service_get_all_user() ?[]User {
results := sql db {
select from User
}
}!
return results
}
fn (mut app App) service_get_user(id int) ?User {
fn (mut app App) service_get_user(id int) !User {
mut db := databases.create_db_connection() or {
println(err)
return err
@ -1011,9 +1018,9 @@ fn (mut app App) service_get_user(id int) ?User {
results := sql db {
select from User where id == id
}
}!
return results
return results.first()
}
"
}