add V2

UI_V2/pages/auth/auth.py

@@ -0,0 +1,34 @@
+import flet as ft
+from pages.auth.login import Login
+from pages.auth.register import Register
+
+class Auth:
+    def __init__(self, page: ft.Page, go_to = 'login'):
+        self.page = page
+        self.go_to = go_to
+        self.logo = ft.Image("images/tainagustului.png", width=200)
+        self.login = Login(self.page, self)
+        self.register = Register(self.page, self, self.login)
+
+        go_to = 'login' if self.page.session.get('go_to') == None or 'login' else self.page.session.get('go_to')
+        if go_to == 'login':
+            self.placeholder = ft.Container(
+                content=self.login.build(),
+                width=350
+            )
+        if go_to == 'register':
+            self.placeholder = ft.Container(
+                content=self.register.build(),
+                width=350
+            )
+
+    def build(self):
+        return ft.Container(
+            content=ft.Column(
+                [
+                    self.logo,
+                    self.placeholder,
+                ],
+                horizontal_alignment=ft.CrossAxisAlignment.CENTER
+            )
+        )

UI_V2/pages/auth/forgot_password.py

@@ -0,0 +1,159 @@
+import flet as ft
+from dbActions.users import Users
+from helpers.emails import send_gmail
+import re
+import string
+import secrets
+
+class ForgotPassword:
+    def __init__(self, page: ft.Page, auth, login):
+        self.page = page
+        self.auth = auth
+        self.login = login
+        self.email = ft.TextField(label="E-mail")
+        self.password = ft.TextField(label="Parola", password=True, can_reveal_password=True)
+        self.repeat_password = ft.TextField(label="Repeta Parola", password=True, can_reveal_password=True)
+        self.inserted_code = ft.TextField(label="Inserati codul primit prin e-mail")
+        self.error_message = ft.Text("", color=ft.Colors.RED)
+        self.placeholder = ft.Column([], horizontal_alignment=ft.CrossAxisAlignment.CENTER)
+        self.otp_code = self._generate_numeric_code()
+        self.user_manager = Users()
+        self.trimite_code_placeholder = ft.Column(
+            [
+                self.email,
+                ft.Button("Trimite cod", on_click=self.send_code_on_email, width=150),
+            ],
+            alignment=ft.MainAxisAlignment.CENTER,
+            horizontal_alignment=ft.CrossAxisAlignment.CENTER
+        )
+        self.code_placeholder = ft.Column([], horizontal_alignment=ft.CrossAxisAlignment.CENTER)
+
+    def _generate_numeric_code(self) -> str:
+        digits = string.digits 
+        return ''.join(secrets.choice(digits) for _ in range(6))
+
+    def send_code_on_email(self, e):
+        if self._is_valid_email(self.email.value):
+            self.trimite_code_placeholder.controls = []
+            self.trimite_code_placeholder.update()
+            self.code_placeholder.controls.clear()
+            self.code_placeholder.controls.append(self.inserted_code)
+            self.code_placeholder.controls.append(ft.Button("Verifica", width=150, on_click=self.verfy_code))
+            self.code_placeholder.update()
+            print(self.otp_code)
+            # send_gmail(
+            #     to_email=self.email.value,
+            #     subject="Codul de verificare",
+            #     body=f"Codul de verificare este: {self.otp_code}"
+            # ) 
+        
+    
+    def _are_all_fields_inserted(self, password=None, repeat_password=None):
+        valid = True
+        self.error_message.value = ''
+        if not password:
+            valid = False
+        if not repeat_password:
+            valid = False
+        if not valid:
+            self.error_message.value = "All fields are required!"
+        self.error_message.update()
+        return valid
+    
+    def _check_repeat_password(self, password, confirm_password):
+        if password == confirm_password:
+            self.error_message.value = ""
+            self.error_message.update()
+            return True
+        else:
+            self.error_message.value = "The passwords don't match!"
+            self.error_message.update()
+            return False
+        
+    def _is_password_strong(self, password):
+        self.error_message.value = ""
+        if len(password) < 8:
+            self.error_message.value = "Password must be at least 8 characters long!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[A-Z]", password):
+            self.error_message.value = "Password must contain at least one uppercase letter!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[a-z]", password):
+            self.error_message.value = "Password must contain at least one lowercase letter!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[0-9]", password):
+            self.error_message.value = "Password must contain at least one digit!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[^a-zA-Z0-9]", password):
+            self.error_message.value = "Password must contain at least one special character!"
+            self.error_message.update()
+            return False
+        self.error_message.update()
+        return True
+
+    def on_save_btn_click(self, e):
+        password = self.password.value
+        repeat_password = self.repeat_password.value
+        if self._are_all_fields_inserted(password, repeat_password):
+            if self._is_password_strong(password):
+                if self._check_repeat_password(password, repeat_password):
+                    print(self.email.value)
+                    print(password)
+                    if self.user_manager.update_password(self.email.value, password):
+                        self.error_message.value = "Parola a fost salvata cu success."
+                        self.error_message.color = ft.Colors.GREEN
+                        self.error_message.update()
+                    else:
+                        self.error_message.value = "Nu am gasit un cont valid cu aceasta adresa de email."
+                        self.error_message.update()
+
+    def verfy_code(self, e):
+        self.code_placeholder.controls = []
+        self.code_placeholder.update()
+        inserted_code = self.inserted_code.value
+        if inserted_code == self.otp_code:
+            self.placeholder.controls.clear()
+            self.placeholder.controls.append(self.password)
+            self.placeholder.controls.append(self.repeat_password)
+            self.placeholder.controls.append(
+                ft.Button("Salveaza", width=150, on_click=self.on_save_btn_click)
+            )
+            self.placeholder.update()
+            
+        else:
+            print(inserted_code)
+            print(self.otp_code)
+
+    def on_back_btn_click(self, e):
+        self.auth.placeholder.content.clean()
+        self.auth.placeholder.content = self.login.build()
+        self.auth.placeholder.update()
+
+    def _is_valid_email(self, email: str) -> bool:
+        email_regex = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
+        if re.fullmatch(email_regex, email) is not None:
+            self.error_message.value = ""
+            self.error_message.update()
+            return True
+        else: 
+            self.error_message.value = "Va rugam inserati o adresa de e-mail valida!"
+            self.error_message.update()
+            return False
+
+    def build(self):
+        return ft.Container(
+            content=ft.Column(
+                [
+                    self.trimite_code_placeholder,
+                    self.code_placeholder,
+                    self.placeholder,
+                    self.error_message,
+                    ft.TextButton("Inapoi la Autentificare.", on_click=self.on_back_btn_click)
+                ],
+                horizontal_alignment=ft.CrossAxisAlignment.CENTER
+            )
+        )

UI_V2/pages/auth/login.py

@@ -0,0 +1,68 @@
+import flet as ft
+from pages.auth.register import Register
+from dbActions.users import Users
+from pages.auth.forgot_password import ForgotPassword
+
+class Login:
+    def __init__(self, page: ft.Page, auth):
+        self.page = page
+        self.auth = auth
+        self.user_manager = Users()
+        self.email = ft.TextField(label="E-mail")
+        self.password = ft.TextField(label="Parola", password=True, can_reveal_password=True)
+        self.error_message = ft.Text("", color=ft.Colors.RED)
+        self.register = Register(self.page, self.auth, self)
+
+    def on_login_btn_click(self, e):
+        email = self.email.value
+        password = self.password.value
+        password_hash = self.user_manager.hash_password(password)
+        user = self.user_manager.authenticate_user(email, password_hash)
+        if user:
+            self.page.client_storage.set("is_authenticated", True)
+            self.page.session.set("user", user)
+            self.error_message.value = ''
+            self.error_message.update()
+            if user['role'] == 'admin':
+                self.page.go('/admin')
+            else: 
+                if user['name'] is None or len(user['name'])<=1:
+                    self.page.go("/profil")
+                else:
+                    self.page.go('/')
+        else:
+            self.error_message.value = 'E-mail sau parola sunt gresite!'
+            self.error_message.update()
+
+    def on_register_btn_click(self, e):
+        self.auth.placeholder.content = self.register.build()
+        self.auth.placeholder.update()
+
+    def on_forgot_password_btn_click(self, e):
+        forgot_password = ForgotPassword(self.page, self.auth, self)
+        self.auth.placeholder.content.clean()
+        self.auth.placeholder.content = forgot_password.build()
+        self.auth.placeholder.update()
+
+    def build(self):
+        return ft.Column(
+            [
+                self.email,
+                self.password,
+                self.error_message,
+                ft.Row(
+                    [
+                        ft.Button("Autentificare", width=200, on_click=self.on_login_btn_click)
+                    ],
+                    alignment=ft.MainAxisAlignment.CENTER
+                ),
+                ft.Text(),
+                ft.Row(
+                    [
+                        ft.TextButton("Creaza cont", on_click=self.on_register_btn_click),
+                        ft.TextButton("Ai uitat parola?", on_click=self.on_forgot_password_btn_click)
+                    ],
+                    alignment=ft.MainAxisAlignment.SPACE_BETWEEN
+                )
+            ]
+        )

UI_V2/pages/auth/register.py

@@ -0,0 +1,123 @@
+import flet as ft
+from dbActions.users import Users
+import re
+import time
+
+class Register:
+    def __init__(self, page: ft.Page, auth, login):
+        self.page = page
+        self.auth = auth
+        self.login = login
+        self.users_manager = Users()
+        self.email = ft.TextField(label="E-mail")
+        self.password = ft.TextField(label="Parola", password=True, can_reveal_password=True)
+        self.repeat_password = ft.TextField(label="Repeta parola", password=True, can_reveal_password=True)
+        self.error_message = ft.Text("", color=ft.Colors.RED)
+
+    def on_login_btn_click(self, e):
+        self.auth.placeholder.content = self.login.build()
+        self.auth.placeholder.update()
+
+    def _is_valid_email(self, email: str) -> bool:
+        email_regex = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
+        if re.fullmatch(email_regex, email) is not None:
+            self.error_message.value = ""
+            self.error_message.update()
+            return True
+        else: 
+            self.error_message.value = "Va rugam inserati un e-mail valid!"
+            self.error_message.update()
+            return False
+    
+    def _are_all_fields_inserted(self, email=None, password=None, repeat_password=None):
+        valid = True
+        self.error_message.value = ''
+        if not email:
+            valid = False
+        if not password:
+            valid = False
+        if not repeat_password:
+            valid = False
+        if not valid:
+            self.error_message.value = "Toate campurile sunt obligatori!"
+        self.error_message.update()
+        return valid
+    
+    def _check_repeat_password(self, password, confirm_password):
+        if password == confirm_password:
+            self.error_message.value = ""
+            self.error_message.update()
+            return True
+        else:
+            self.error_message.value = "Parolele nu se potrivesc!"
+            self.error_message.update()
+            return False
+        
+    def _is_password_strong(self, password):
+        self.error_message.value = ""
+        if len(password) < 8:
+            self.error_message.value = "Parola trebuie sa fie cel putin 8 caractere!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[A-Z]", password):
+            self.error_message.value = "Parola trebuie sa contina cel putin o litera mare!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[a-z]", password):
+            self.error_message.value = "Parola trebuie sa contina cel putin o litera mica!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[0-9]", password):
+            self.error_message.value = "Parola trebuie sa contina cel putin un numar!"
+            self.error_message.update()
+            return False
+        if not re.search(r"[^a-zA-Z0-9]", password):
+            self.error_message.value = "Parola trebuie sa contina cel putin un caracter special (exp: !@#$%^&*)!"
+            self.error_message.update()
+            return False
+        self.error_message.update()
+        return True
+
+
+    def on_register_btn_click(self, e):
+        email = self.email.value
+        password = self.password.value
+        repeat_password = self.repeat_password.value
+        if self._are_all_fields_inserted(email, password, repeat_password):
+            print("All fileds are inserted")
+            if self._is_valid_email(email):
+                print("Email is valid")
+                if self._is_password_strong(password):
+                    print('Password is string')
+                    if self._check_repeat_password(password, repeat_password):
+                        print("Password is valid!")
+                        password_hash = self.users_manager.hash_password(password)
+                        self.users_manager.register_user(email, password_hash)
+                        self.error_message.value = "Inregistrarea a avut loc cu succes, va puteti autentifica!"
+                        self.error_message.color = ft.Colors.GREEN
+                        self.error_message.update()
+                        time.sleep(3)
+                        self.on_login_btn_click('')
+
+    def build(self):
+        return ft.Column(
+            [
+                self.email,
+                self.password,
+                self.repeat_password,
+                self.error_message,
+                ft.Row(
+                    [
+                        ft.Button("Creaza cont", width=200, on_click=self.on_register_btn_click)
+                    ],
+                    alignment=ft.MainAxisAlignment.CENTER
+                ),
+                ft.Text(),
+                ft.Row(
+                    [
+                        ft.TextButton("Inapoi la Autentificare", on_click=self.on_login_btn_click),
+                    ],
+                    alignment=ft.MainAxisAlignment.CENTER
+                )
+            ]
+        )