Browse Source

making sure code is up-to-date

jacob-kruger-work 3 weeks ago
parent
commit
99a3ba67cf
4 changed files with 48 additions and 16 deletions
  1. 3 3
      cv_database.sql
  2. 41 13
      flask_app/app/templates/auth/login.html
  3. 3 0
      flask_app/app/templates/mine.css
  4. 1 0
      flask_app/config.py

+ 3 - 3
cv_database.sql

@@ -845,14 +845,14 @@ INSERT INTO cv_data.tbl_role_departments VALUES (1, 'IT and Technology');
 -- Data for Name: tbl_roles; Type: TABLE DATA; Schema: cv_data; Owner: cv_database_user
 --
 
-INSERT INTO cv_data.tbl_roles VALUES (1, 1, 'Systems Administrator', 'General network and server 

+INSERT INTO cv_data.tbl_roles VALUES (1, 1, 'Systems Administrator', 'General network and server 


 management/maintenance');
 INSERT INTO cv_data.tbl_roles VALUES (2, 1, 'Network Administrator', '');
 INSERT INTO cv_data.tbl_roles VALUES (3, 1, 'Software Developer / Software Engineer', 'Software development');
 INSERT INTO cv_data.tbl_roles VALUES (4, 2, 'Sales and Marketing Manager', 'Sales management');
 INSERT INTO cv_data.tbl_roles VALUES (5, 2, 'Digital Marketing Specialist', 'Online media');
 INSERT INTO cv_data.tbl_roles VALUES (6, 1, 'Database Administrator (DBA)', 'Database administrator, RDBMS');
-INSERT INTO cv_data.tbl_roles VALUES (7, 1, 'Technical Support Specialist / IT Support Technician', 'Technical Support Specialist / IT Support 

+INSERT INTO cv_data.tbl_roles VALUES (7, 1, 'Technical Support Specialist / IT Support Technician', 'Technical Support Specialist / IT Support 


 Technician');
 INSERT INTO cv_data.tbl_roles VALUES (8, 1, 'Mobile App Developer', 'Mobile App Developer');
 
@@ -898,7 +898,7 @@ INSERT INTO qualifications_certifications.tbl_qualification_types VALUES (1, 'Ce
 INSERT INTO qualifications_certifications.tbl_qualifications VALUES (1, 1, 'certificate in programming', 'almost any form of programming');
 INSERT INTO qualifications_certifications.tbl_qualifications VALUES (3, 1, 'certificate in something', 'something...');
 INSERT INTO qualifications_certifications.tbl_qualifications VALUES (4, 6, 'Computer Science', 'BSc Computer Science');
-INSERT INTO qualifications_certifications.tbl_qualifications VALUES (6, 1, 'AWS Basics', 'Amazon Web Services introduction webinar 

+INSERT INTO qualifications_certifications.tbl_qualifications VALUES (6, 1, 'AWS Basics', 'Amazon Web Services introduction webinar 


 completion');
 
 

+ 41 - 13
flask_app/app/templates/auth/login.html

@@ -1,24 +1,52 @@
 {% extends 'base.html' %}
+{% block head_extra %}
+<style>
+table.login {
+text-align: center;
+border: 0px solid transparent;
+}
+table.login th {
+text-align: right;
+}
+table.login td {
+text-align: left;
+}
+</style>
+{% endblock head_extra %}
 
 {% block content %}
 <span class="title"><h2>{% block title %} Login {% endblock %}</h2></span>
 <div class="content-container content">
+{% if form.errors %}
+<div>
+{{ form.errors }}
+</div>
+{% endif %}
 <form method="POST" action="{{ url_for("auth.login") }}">
 {{ form.csrf_token }}
-<p>
-{{ form.txt_user_id.label }}
-{{ form.txt_user_id(size=50, autofocus="", value=s_user_id) }}
-</p>
-<p>
-{{ form.txt_password.label }}
-</p>
-{{ form.txt_password(size=50) }}
-<p>
-{{ form.chk_remember }}&nbsp;{{ form.chk_remember.label }}
-</p>
-<p>
+<table class="login">
+<tr>
+<th>{{ form.txt_user_id.label }}</th>
+<td>{{ form.txt_user_id(size=50, autofocus="", value=user_id) }}</td>
+</tr>
+<tr>
+<th>{{ form.txt_password.label }}</th>
+<td>{{ form.txt_password(size=50) }}</td>
+</tr>
+<tr>
+<td colspan=2" style="text-align: center;">{{ form.chk_remember }}&nbsp;{{ form.chk_remember.label }}</td>
+</tr>
+</table>
 <input type="submit" value="Login">
-</p>
 </form>
 </div>
+<script type="text/javascript">
+$(document).ready( function() {
+var logo_div = $(".logo-area")[0];
+var s_bg = String($(logo_div).css("background-image"));
+$("#div_hidden").text(s_bg);
+$("#div_hidden").redraw();
+});// end of additional document ready
+</script>
+<div id="div_hidden" style="font-size: 2px; color: white;"></div>
 {% endblock %}

+ 3 - 0
flask_app/app/templates/mine.css

@@ -0,0 +1,3 @@
+<div>
+{{ static_prefix|safe }}
+</div>

+ 1 - 0
flask_app/config.py

@@ -10,6 +10,7 @@ class Config:
     SECRET_KEY = os.environ.get('SECRET_KEY', "5!kmnNoL5ABC")
     SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URI")\
     or "postgresql://cv_database_user:cVdB-123@localhost:5432/cv_database"
+    # "postgresql://jacob:#Jacob#01@41.185.21.50:5432/cv_database"
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     MAX_CONTENT_LENGTH = 1024 * 1024 * 10 # 10MB per request
     ADMIN_PWD = os.getenv("ADMIN_PWD", "admin-123") # admin password