Merge branch 't'

consumerWebsite/public/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.env

consumerWebsite/public/css/sp.css

@@ -45,7 +45,7 @@ body {
     100% +
       220px
   );
-  padding: 20px
+  padding: 35px
     140px;
   border-radius: 50%;
   height: 100%;
@@ -56,7 +56,7 @@ body {
 }
 .wrapper.active
   .form.login {
-  bottom: -12%;
+  bottom: -10%;
   border-radius: 35%;
   box-shadow: 0 -5px
     10px rgba(0, 0, 0, 0.1);
@@ -88,9 +88,10 @@ body {
   form {
   display: flex;
   flex-direction: column;
-  gap: 20px;
-  margin-top: 40px;
+  gap: 15px;
+  margin-top: 50px;
 }
+
 form
   input {
   height: 60px;

consumerWebsite/public/js/contact.js

@@ -1,4 +1,5 @@
 const newAccessKey = '7f7ce777-6a56-4e5e-bfac-3b83c6453e65';
+//const newAccessKey = process.env.ACCESS_KEY;
 
 document.addEventListener('DOMContentLoaded', () => {
     const form = document.getElementById('form');

consumerWebsite/public/js/server.js

@@ -1,7 +1,13 @@
 const express = require('express');
+const dotenv = require('dotenv');
 const bodyParser = require('body-parser');
 const mysql = require('mysql');
 
+dotenv.config();
+
+
+app.use(express.static('public'));
+
 const app = express();
 const port = 3000;
 

consumerWebsite/public/signuplogin.html

@@ -13,9 +13,11 @@
     <section class="wrapper">
         <div class="form signup">
             <header>Signup</header>
-            <form action="user.js" method="get">
+            <form action="routes/user.js/register" method="get">
                 <input type="text" id="username" placeholder="Username" required />
                 <input type="text" id="email" placeholder="Email" required />
+                <input type="text" id="address" placeholder="Address" required />
+                <input type="text" id="phone" placeholder="Phone Number" required />
                 <input type="password" id="password" placeholder="Password" required />
                 <input type="password" id="confirmPassword" placeholder="Confirm Password" required />
                 <div class="checkbox">

package.json

@@ -39,6 +39,7 @@
     "qrcode": "^1.5.3",
     "sanitize-html": "^2.11.0",
     "sequelize": "^6.35.2",
+    "sql": "^0.78.0",
     "validator": "^13.11.0"
   },
   "devDependencies": {