From 29eb3cb52538aae5203c88266c8a2b39a30ab202 Mon Sep 17 00:00:00 2001
From: mrticia <nino.darsavelidze.3@iliauni.edu.ge>
Date: Sat, 7 Nov 2020 17:46:35 +0400
Subject: [PATCH] Modified Classes and Forms

---
 .idea/UnilabPythonDevelopment.iml             |  12 +-
 .idea/misc.xml                                |   5 +-
 .idea/workspace.xml                           | 138 ++++++------------
 .../FlaskLogin/myproject/forms.py             |  37 +++--
 .../FlaskLogin/myproject/models.py            |  33 +++--
 .../FlaskLogin/myproject/views.py             |  31 ++--
 .../examples/FlaskLogin/myproject/forms.py    |  11 +-
 7 files changed, 120 insertions(+), 147 deletions(-)

diff --git a/.idea/UnilabPythonDevelopment.iml b/.idea/UnilabPythonDevelopment.iml
index 6926533..98bfad7 100644
--- a/.idea/UnilabPythonDevelopment.iml
+++ b/.idea/UnilabPythonDevelopment.iml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
+<module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <orderEntry type="jdk" jdkName="Python 3.8 (UnilabPythonDevelopment)" jdkType="Python SDK" />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/venv/Lib/site-packages/alembic/templates" />
+      </list>
+    </option>
+  </component>
 </module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4ffa3b2..6649a8c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (UnilabPythonDevelopment)" project-jdk-type="Python SDK" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 030b333..b95ab55 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -19,128 +19,72 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1d1f4a0a-428d-4703-bce3-27b2d805b4ea" name="Default Changelist" comment="" />
+    <list default="true" id="1d1f4a0a-428d-4703-bce3-27b2d805b4ea" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/UnilabPythonDevelopment.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/UnilabPythonDevelopment.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Chapter12_User/examples/FlaskLogin/myproject/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/Chapter12_User/examples/FlaskLogin/myproject/forms.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1jxeaHTUueFLCk3rkSuoc0xXVN5" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
-  <component name="RunManager">
-    <configuration default="true" type="DjangoTestsConfigurationType">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="TARGET" value="" />
-      <option name="SETTINGS_FILE" value="" />
-      <option name="CUSTOM_SETTINGS" value="false" />
-      <option name="USE_OPTIONS" value="false" />
-      <option name="OPTIONS" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="Python.FlaskServer">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="launchJavascriptDebuger" value="false" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="Tox" factoryName="Tox">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Doctests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
-      <option name="PATTERN" value="" />
-      <option name="USE_PATTERN" value="false" />
-      <method v="2" />
-    </configuration>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="1d1f4a0a-428d-4703-bce3-27b2d805b4ea" name="Default Changelist" comment="" />
+      <created>1604750235415</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1604750235415</updated>
+      <workItem from="1604750255771" duration="1143000" />
+    </task>
     <servers />
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="2" />
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$bycrpt.coverage" NAME="bycrpt Coverage Results" MODIFIED="1604502724103" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$bycript.coverage" NAME="bycript Coverage Results" MODIFIED="1604508703392" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$setup.coverage" NAME="setup Coverage Results" MODIFIED="1602666670117" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/SQLAlchemy_first" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app.coverage" NAME="app Coverage Results" MODIFIED="1604075385876" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter11_structuring/projects/example/PortalProject" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$populate.coverage" NAME="populate Coverage Results" MODIFIED="1603295672587" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/Relationship_Demo" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$demo.coverage" NAME="demo Coverage Results" MODIFIED="1602087312077" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$basic.coverage" NAME="basic Coverage Results" MODIFIED="1602260272943" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/SQLAlchemy_first" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$portal.coverage" NAME="portal Coverage Results" MODIFIED="1603469249753" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter10_DatabaseInViews/projects/example" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$setupdatabase.coverage" NAME="setupdatabase Coverage Results" MODIFIED="1602255128165" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$werkzg.coverage" NAME="werkzg Coverage Results" MODIFIED="1604509147149" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app__2_.coverage" NAME="app (2) Coverage Results" MODIFIED="1601307995899" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter6_Templates/projects/Temur_Chichua" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app__3_.coverage" NAME="app Coverage Results" MODIFIED="1601912632790" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter7_Forms/example" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app__1_.coverage" NAME="app (1) Coverage Results" MODIFIED="1604674203470" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples/FlaskLogin" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$insert.coverage" NAME="insert Coverage Results" MODIFIED="1602089165423" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app__2_.coverage" NAME="app (2) Coverage Results" MODIFIED="1601307995899" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter6_Templates/projects/Temur_Chichua" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$populate.coverage" NAME="populate Coverage Results" MODIFIED="1603295672587" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/Relationship_Demo" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$bycript.coverage" NAME="bycript Coverage Results" MODIFIED="1604508703392" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$demo.coverage" NAME="demo Coverage Results" MODIFIED="1602087312077" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$app__1_.coverage" NAME="app (1) Coverage Results" MODIFIED="1604674203470" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples/FlaskLogin" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$select__1_.coverage" NAME="select (1) Coverage Results" MODIFIED="1602088585254" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$bycrpt.coverage" NAME="bycrpt Coverage Results" MODIFIED="1604502724103" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$reader.coverage" NAME="reader Coverage Results" MODIFIED="1602088149088" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$portal.coverage" NAME="portal Coverage Results" MODIFIED="1603469249753" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter10_DatabaseInViews/projects/example" />
     <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$forms.coverage" NAME="forms Coverage Results" MODIFIED="1603469237072" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter10_DatabaseInViews/projects/example" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$basic.coverage" NAME="basic Coverage Results" MODIFIED="1602260272943" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/SQLAlchemy_first" />
-    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$setup.coverage" NAME="setup Coverage Results" MODIFIED="1602666670117" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter8_Database/example/SQLAlchemy_first" />
+    <SUITE FILE_PATH="coverage/UnilabPythonDevelopment$werkzg.coverage" NAME="werkzg Coverage Results" MODIFIED="1604509147149" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Chapter12_User/examples" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py
index 41d474e..39f1769 100644
--- a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py
+++ b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/forms.py
@@ -1,16 +1,35 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField, IntegerField, SubmitField, PasswordField
-from wtforms.fields.html5 import EmailField
+from wtforms import StringField, PasswordField, SubmitField
+from wtforms.validators import DataRequired, Email, EqualTo
+from wtforms import ValidationError
+from myproject.models import User
 
 
 class UserRegistration(FlaskForm):
-    name = StringField('Name: ')
-    surname = StringField('Surname: ')
-    username = StringField('Username: ')
-    email = EmailField('Email: ')
-    password = PasswordField('Password: ')
+    name = StringField('Name: ', validators=[DataRequired()])
+    surname = StringField('Surname: ', validators=[DataRequired()])
+    username = StringField('Username: ', validators=[DataRequired(), Email()])
+    email = StringField('Email: ', validators=[DataRequired()])
+    password = PasswordField('Password',
+                             validators=[DataRequired(), EqualTo('pass_confirm', message='Passwords Must Match!')])
+    pass_confirm = PasswordField('Confirm password', validators=[DataRequired()])
+    submit = SubmitField('Register!')
+
+    def validate_email(self, email):
+        if User.query.filter_by(email=self.email.data).first():
+            raise ValidationError('This email is already used by another user!')
+
+    def validate_username(self, username):
+        if User.query.filter_by(username=self.username.data).first():
+            raise ValidationError('This username is already used!')
 
 
 class LoginForm(FlaskForm):
-    username = StringField('Username: ')
-    password = PasswordField('Password: ')
+    username = StringField('Username: ', validators=[DataRequired()])
+    password = StringField('Password: ', validators=[DataRequired()])
+    submit = SubmitField('Login')
+
+    def validate_password(self, password):
+        if not self.check_password:
+            raise ValidationError('Password is incorrect!')
+
diff --git a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py
index a38b621..29d2ecb 100644
--- a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py
+++ b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/models.py
@@ -1,28 +1,29 @@
-from myproject import db
+from myproject import db, login_manager
+from werkzeug.security import generate_password_hash, check_password_hash
+from flask_login import UserMixin
 
 
-class Registration(db.Model):
-    __tablename__ = 'registration_users'
+@login_manager.user_loader
+def load_user(user_id):
+    return User.query.get(user_id)
+
+
+class User(db.Model, UserMixin):
+    __tablename__ = 'users'
 
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String)
     surname = db.Column(db.String)
-    username = db.Column(db.String, db.ForeighKey('login_user.username'), unique=True)
-    email = db.Column(db.String)
-    password = db.Column(db.String, db.ForeighKey('login_user.password'))
+    username = db.Column(db.String(30), unique=True, index=True)
+    email = db.Column(db.String(50), unique=True, index=True)
+    password_hash = db.Column(db.String(12))
     
-    def __init__(self, name, surname, username, email, password):
+    def __init__(self, name, surname, username, email, password_hash):
         self.name = name
         self.surname = surname
         self. username = username
         self.email = email
-        self.password = password
-
-
-class Login(db.Model):
-    __tablename__ = 'login_users'
-    
-    id = db.Column(db.Integer, primary_key=True)
-    username = db.relationship('Registration', backref='login_user', uselist=False)
-    password = db.relationship('Registration', backref='login_user', uselist=False)
+        self.password_hash = password_hash
 
+    def check_password(self, password):
+        return check_password_hash(self.password_hash, password)
\ No newline at end of file
diff --git a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/views.py b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/views.py
index fd702af..dc3b949 100644
--- a/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/views.py
+++ b/Chapter12_User/Nina_Darsavelidze/FlaskLogin/myproject/views.py
@@ -1,14 +1,10 @@
 from flask import render_template, redirect, url_for, Blueprint
-from myproject import db
-from myproject.models import Student
-from myproject.templates.forms import Registration, Login
+from myproject import db, app
+from myproject.models import User
+from myproject.forms import UserRegistration, LoginForm
 
-student_blueprint = Blueprint('login_users',
-                              __name__,
-                              template_folder='templates')
 
-
-@registration_blueprint.route('/registration', methods=['GET', 'POST'])
+@app.route('/registration', methods=['GET', 'POST'])
 def registration():
     
     form = UserRegistration()
@@ -20,27 +16,28 @@ def registration():
         email = form.email.data
         password = form.password.data
 
-        new_user = (name, surname, username, email, password)
+        new_user = User(name, surname, username, email, password)
         db.session.add(new_user)
         db.session.commit()
         return redirect('welcome')
     return render_template('registration.html', form=form)
 
 
-@login_blueprint.route('/login', methods=['GET', 'POST'])  
+@app.route('/login', methods=['GET', 'POST'])
 def login():
     
     form = LoginForm()
     
     if form.validate_on_submit():
-        username = form.username.data
+        username = User.query.filter_by(username=form.username.data).first()
+
         password = form.password.data
-        
-        user = Login(username, password)
-        db.session.add(user)
-        db.session.commit()
-        return redirect(url_for('welcome'))
+        if username.check_password(password) and username is not None:
+            return redirect(url_for('welcome'))
+
     return render_template('login.html', form=form)
         
-    
 
+@app.route('/welcome')
+def welcome():
+    return render_template('welcome.html')
diff --git a/Chapter12_User/examples/FlaskLogin/myproject/forms.py b/Chapter12_User/examples/FlaskLogin/myproject/forms.py
index 58f0639..da57e44 100644
--- a/Chapter12_User/examples/FlaskLogin/myproject/forms.py
+++ b/Chapter12_User/examples/FlaskLogin/myproject/forms.py
@@ -4,11 +4,6 @@
 from wtforms import ValidationError
 from myproject.models import User
 
-class LoginForm(FlaskForm):
-    email = StringField('Email', validators=[DataRequired(), Email()])
-    password = PasswordField('Password', validators=[DataRequired()])
-    submit = SubmitField('Log In')
-
 
 class RegistrationForm(FlaskForm):
     email = StringField('Email', validators=[DataRequired(), Email()])
@@ -25,3 +20,9 @@ def validate_email(self, email):
     def validate_username(self, username):
         if User.query.filter_by(username=self.username.data).first():
             raise ValidationError('Username has been registered')
+
+
+class LoginForm(FlaskForm):
+    email = StringField('Email', validators=[DataRequired(), Email()])
+    password = PasswordField('Password', validators=[DataRequired()])
+    submit = SubmitField('Log In')
\ No newline at end of file