diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e64fa046..595e8cf4 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -477,6 +477,7 @@ return{ register="Sign up", email="Email address", password="Password", + login="Log in", }, register={ title="Sign up", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index ecb745ac..26388020 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -474,6 +474,7 @@ return{ register="Enregistrement", email="E-mail", password="Mot de passe", + login="Connexion", }, register={ title="Enregistrement", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 82b05da0..5985974b 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -479,6 +479,7 @@ return{ register="Registrarse", email="Correo Elec.", password="Contraseña", + login="Entrar", }, register={ title="Registrarse", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index d9acdb8a..93e04a22 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -397,6 +397,7 @@ return{ register="Sign up", email="@", password="*", + login="Log in", }, register={ title="Sign up", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 16e26816..9e0d1a3e 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -500,6 +500,7 @@ return{ register="注册", email="邮箱", password="密码", + login="登录", }, register={ title="注册", diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index b60e65d8..1d2bb170 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -1,25 +1,27 @@ local scene={} +function login() + local email= WIDGET.active.email.value + local password= WIDGET.active.password.value + 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 + httpRequest( + TICK.httpREQ_newLogin, + PATH.api..PATH.auth, + "GET", + {["Content-Type"]="application/json"}, + json.encode{ + email=email, + password=password, + } + ) +end + function scene.keyDown(key) - if key=="return"then - local email= WIDGET.active.email.value - local password= WIDGET.active.password.value - 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 - httpRequest( - TICK.httpREQ_newLogin, - PATH.api..PATH.auth, - "GET", - {["Content-Type"]="application/json"}, - json.encode{ - email=email, - password=password, - } - ) - elseif key=="escape"then + if key=="escape"then SCN.back() else WIDGET.keyPressed(key) @@ -31,6 +33,7 @@ scene.widgetList={ WIDGET.newButton{name="register", x=1140, y=100,w=170,h=80,color="green",code=function()SCN.swapTo("register","swipeR")end}, 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.newKey{name="login", x=1140, y=540,w=170,h=80,font=40,code=login}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}, }