1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-06 05:55:23 +02:00

feat: improved registration signup flow (#1188)

refactored signup flow for entire registration process. Utilized seed data option for optional seeding of Foods, Units, and Labels. Localized registration page.
This commit is contained in:
Hayden 2022-05-06 11:18:06 -08:00 committed by GitHub
parent 6ee9a31c92
commit 7e4da3e5a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 1056 additions and 316 deletions

View file

@ -0,0 +1,38 @@
def validate_locale(locale: str) -> bool:
valid = {
"el-GR",
"it-IT",
"ko-KR",
"es-ES",
"ja-JP",
"zh-CN",
"tr-TR",
"ar-SA",
"hu-HU",
"pt-PT",
"no-NO",
"sv-SE",
"ro-RO",
"sk-SK",
"uk-UA",
"fr-CA",
"pl-PL",
"da-DK",
"pt-BR",
"de-DE",
"ca-ES",
"sr-SP",
"cs-CZ",
"fr-FR",
"zh-TW",
"af-ZA",
"ru-RU",
"he-IL",
"nl-NL",
"en-US",
"en-GB",
"fi-FI",
"vi-VN",
}
return locale in valid

View file

@ -1,46 +1,7 @@
from pydantic import validator
from mealie.schema._mealie.mealie_model import MealieModel
def validate_locale(locale: str) -> bool:
valid = {
"el-GR",
"it-IT",
"ko-KR",
"es-ES",
"ja-JP",
"zh-CN",
"tr-TR",
"ar-SA",
"hu-HU",
"pt-PT",
"no-NO",
"sv-SE",
"ro-RO",
"sk-SK",
"uk-UA",
"fr-CA",
"pl-PL",
"da-DK",
"pt-BR",
"de-DE",
"ca-ES",
"sr-SP",
"cs-CZ",
"fr-FR",
"zh-TW",
"af-ZA",
"ru-RU",
"he-IL",
"nl-NL",
"en-US",
"en-GB",
"fi-FI",
"vi-VN",
}
return locale in valid
from mealie.schema._mealie.validators import validate_locale
class SeederConfig(MealieModel):
@ -49,5 +10,5 @@ class SeederConfig(MealieModel):
@validator("locale")
def valid_locale(cls, v, values, **kwargs):
if not validate_locale(v):
raise ValueError("passwords do not match")
raise ValueError("invalid locale")
return v

View file

@ -2,6 +2,7 @@ from pydantic import validator
from pydantic.types import NoneStr, constr
from mealie.schema._mealie import MealieModel
from mealie.schema._mealie.validators import validate_locale
class CreateUserRegistration(MealieModel):
@ -14,6 +15,15 @@ class CreateUserRegistration(MealieModel):
advanced: bool = False
private: bool = False
seed_data: bool = False
locale: str = "en-US"
@validator("locale")
def valid_locale(cls, v, values, **kwargs):
if not validate_locale(v):
raise ValueError("invalid locale")
return v
@validator("password_confirm")
@classmethod
def passwords_match(cls, value, values):
@ -24,7 +34,7 @@ class CreateUserRegistration(MealieModel):
@validator("group_token", always=True)
@classmethod
def group_or_token(cls, value, values):
if bool(value) is False and bool(values["group"]) is False:
if not bool(value) and not bool(values["group"]):
raise ValueError("group or group_token must be provided")
return value