From 4a3b9581312bc58941bf0f72b13049557960c13d Mon Sep 17 00:00:00 2001
From: doanguyen <dungnv2410@gmail.com>
Date: Thu, 26 Dec 2019 23:23:35 +0100
Subject: [PATCH] reformat modified files, resolve PR
 https://github.com/simple-login/app/pull/5

---
 app/dashboard/templates/dashboard/index.html  | 57 +++++++++----------
 .../templates/dashboard/setting.html          |  2 +-
 app/models.py                                 |  4 +-
 ...521_8f53e718c79a_alias_generator_scheme.py |  2 +-
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index b2892f0e..9b4e659d 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -33,38 +33,37 @@
                   class="btn btn-primary mr-2">New Email Alias
           </button>
         </form>
-                    <div class="btn-group" role="group">
-                        <form method="post">
-                            <input type="hidden" name="form-name" value="create-random-email">
-                            <button data-toggle="tooltip"
-                                    title="Create a totally random alias"
-                                    class="btn btn-success">Random Alias
-                            </button>
-                        </form>
-                        <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        </button>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="btnGroupDrop1">
-                            <div class="">
-                                <form method="post">
-                                    <input type="hidden" name="form-name" value="create-random-email">
-                                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
-                                    <button class="dropdown-item">By random words</button>
-                                </form>
-                            </div>
-                            <div class="">
-                                <form method="post">
-                                    <input type="hidden" name="form-name" value="create-random-email">
-                                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
-                                    <button class="dropdown-item">By UUID</button>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
+        <div class="btn-group" role="group">
+            <form method="post">
+                <input type="hidden" name="form-name" value="create-random-email">
+                <button data-toggle="tooltip"
+                        title="Create a totally random alias"
+                        class="btn btn-success">Random Alias
+                </button>
+            </form>
+            <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle"
+                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            </button>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="btnGroupDrop1">
+                <div class="">
+                    <form method="post">
+                        <input type="hidden" name="form-name" value="create-random-email">
+                        <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
+                        <button class="dropdown-item">By random words</button>
+                    </form>
+                </div>
+                <div class="">
+                    <form method="post">
+                        <input type="hidden" name="form-name" value="create-random-email">
+                        <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
+                        <button class="dropdown-item">By UUID</button>
+                    </form>
+                </div>
+            </div>
+        </div>
       </div>
     </div>
 
-
   </div>
 
   <div class="row">
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 8573e787..83bed931 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -71,7 +71,7 @@
     <div class="small-text mb-3">Choose how to create your email alias by default</div>
     <form method="post" class="form-inline">
       <input type="hidden" name="form-name" value="change-alias-generator">
-      <select class="custom-select mr-sm-2" name="alias-generator-scheme" id="alias-generator-scheme">
+      <select class="custom-select mr-sm-2" name="alias-generator-scheme">
         <option value="{{ AliasGeneratorEnum.word.value }}" {% if current_user.alias_generator == AliasGeneratorEnum.word.value %} selected {% endif %} >Based on Random {{ AliasGeneratorEnum.word.name.capitalize() }}</option>
         <option value="{{ AliasGeneratorEnum.uuid.value }}" {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
       </select>
diff --git a/app/models.py b/app/models.py
index 12d0aac2..d8be9fa2 100644
--- a/app/models.py
+++ b/app/models.py
@@ -100,7 +100,7 @@ class User(db.Model, ModelMixin, UserMixin):
     password = db.Column(db.String(128), nullable=False)
     name = db.Column(db.String(128), nullable=False)
     is_admin = db.Column(db.Boolean, nullable=False, default=False)
-    alias_generator = db.Column(db.Integer, nullable=True, default=AliasGeneratorEnum.word.value)
+    alias_generator = db.Column(db.Integer, nullable=False, default=AliasGeneratorEnum.word.value)
 
     activated = db.Column(db.Boolean, default=False, nullable=False)
 
@@ -378,7 +378,7 @@ class OauthToken(db.Model, ModelMixin):
         return self.expired < arrow.now()
 
 
-def generate_email(scheme: int = 1, in_hex: bool = False) -> str:
+def generate_email(scheme: int = AliasGeneratorEnum.word.value, in_hex: bool = False) -> str:
     """generate an email address that does not exist before
     :param scheme: int, value of AliasGeneratorEnum, indicate how the email is generated
     :type in_hex: bool, if the generate scheme is uuid, is hex favorable?
diff --git a/migrations/versions/2019_122521_8f53e718c79a_alias_generator_scheme.py b/migrations/versions/2019_122521_8f53e718c79a_alias_generator_scheme.py
index e0fdf2ce..96bf621a 100644
--- a/migrations/versions/2019_122521_8f53e718c79a_alias_generator_scheme.py
+++ b/migrations/versions/2019_122521_8f53e718c79a_alias_generator_scheme.py
@@ -19,7 +19,7 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('alias_generator', sa.Integer(), nullable=True))
+    op.add_column('users', sa.Column('alias_generator', sa.Integer(), nullable=False))
     # ### end Alembic commands ###