change "username" textbox in login scene to "email" textbox

This commit is contained in:
Particle_G
2020-11-24 02:34:46 +08:00
committed by MrZ626
parent 8f2b62ccc0
commit b924656abd
3 changed files with 7 additions and 8 deletions

View File

@@ -492,7 +492,7 @@ return{
login={
title="登录",
register="注册",
username="用户名",
email="邮箱",
password="密码",
},
register={

View File

@@ -1,14 +1,14 @@
function keyDown.login(key)
if key=="return"then
local username= WIDGET.active.username.value
local email= WIDGET.active.email.value
local password= WIDGET.active.password.value
if #username==0 then
LOG.print(text.noUsername)return
if #email==0 or not email:match("^[a-zA-Z0-9_]+@[a-zA-Z0-9_-]+%.[a-zA-Z0-9_]+$") then
LOG.print(text.wrongEmail)return
elseif #password==0 then
LOG.print(text.noPassword)return
end
local success,data=json.encode({
username=username,
email=email,
password=password,
})
if not success then
@@ -32,7 +32,7 @@ end
WIDGET.init("login",{
WIDGET.newText{name="title", x=80, y=50,font=70,align="L"},
WIDGET.newButton{name="register", x=1140, y=100,w=170,h=80,color="green",code=function()SCN.swapTo("register","swipeR")end},
WIDGET.newTextBox{name="username", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z_]"},
WIDGET.newTextBox{name="email", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z@._-]"},
WIDGET.newTextBox{name="password", x=380, y=300,w=626,h=60,secret=true,regex="[ -~]"},
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK},
})

View File

@@ -155,8 +155,7 @@ function Tick.httpREQ_login(data)
if response.code==200 then
local success,content=json.decode(response.body)
if success then
-- LOG.print(text.registerSuccessed..": "..content.message)
-- TODO: display a login success message
LOG.print(text.loginSuccessed..": "..content.message)
-- TODO: save {content.token} to storage and a global variable
-- TODO: save {content.user_id} to a global variable
else