fix: frontend fixes

PiroX4256 · Feb 5, 2021 · 301cede · 301cede
1 parent 75590b4
commit 301cede
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/DD/assets/Model/DD-Model.asta b/DD/assets/Model/DD-Model.asta
diff --git a/IT/Implementation/Backend/src/main/resources/public/signup.html b/IT/Implementation/Backend/src/main/resources/public/signup.html
@@ -43,7 +43,7 @@
 
             <p style="font-size: 12px; margin: auto; text-align: center">
                 Password must be at leat 8 characters long and must
-                contain at leas one symbol, one uppercase letter and one number.
+                contain at leas one symbol (!@#\$&*~), one uppercase letter and one number.
             </p>
             <div class="wrap-input100 validate-input m-b-25" data-validate="Enter password">
                 <input class="input100" type="password" name="password" placeholder="password" id="password">

diff --git a/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js b/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js
@@ -19,7 +19,7 @@ var signupContainer = new Vue({
 
 function submitForm() {
     var form = document.signUpForm;
-    const passRegexp = new RegExp("r'^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\\$&*~]).{8,}$'");
+    const passRegexp = new RegExp("(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\\$&*~]).{8,}$");
     if (/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(form.username.value)) {
         let role, jsonReq;
         if (signupContainer.manager) {

diff --git a/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js b/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js
@@ -49,6 +49,9 @@ $(document).ready(function () {
                     }
                 }
             });
+            $('#ticketsTable').DataTable( {
+                "order": [[ 1, "desc" ]]
+            } );
         },
         error: function (err) {
             if (err.status == 403) {

diff --git a/IT/Implementation/Backend/src/main/resources/public/tickets.html b/IT/Implementation/Backend/src/main/resources/public/tickets.html
@@ -7,6 +7,8 @@
     <link rel="stylesheet" type="text/css" href="/static/semantic/semantic.min.css">
     <link rel="stylesheet" type="text/css" href="/static/css/style.css">
     <link rel="stylesheet" type="text/css" href="/static/css/home.css">
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.23/css/dataTables.semanticui.min.css">
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css">
 </head>
 <body>
 <div class="bodyContent">
@@ -36,8 +38,8 @@ <h1 class="ui center aligned icon header">
             <i class="circular tags icon"></i>
             My Tickets
         </h1>
-        <div>
-            <table class="ui table" style="width: 70%; margin: 10px auto auto;">
+        <div class="ui raised segment" style="max-width: 70%; margin: auto">
+            <table class="ui table" style="margin: 10px auto auto;" id="ticketsTable">
                 <thead>
                 <th scope="col">Store</th>
                 <th scope="col">Date</th>
@@ -119,12 +121,13 @@ <h4 class="ui inverted header">About Us</h4>
     </div>
 </div>
 
-
 <script src="https://cdn.jsdelivr.net/npm/vue@2/dist/vue.js"></script>
 <script src="/static/js/jquery-3.5.1.min.js"></script>
 <script src="/static/js/qrcode.min.js"></script>
 <script src="/static/semantic/semantic.min.js"></script>
 <script type="text/JavaScript" src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.print/1.6.0/jQuery.print.js"></script>
 <script src="/static/js/tickets.js"></script>
+<script type="text/JavaScript" src="https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js"></script>
+
 </body>
 </html>
diff --git a/IT/dd.pdf b/IT/dd.pdf