setUsername(e.target.value)}/>
diff --git a/vault/src/backend/app.py b/vault/src/backend/app.py
index 39cc44b..46c3fcb 100644
--- a/vault/src/backend/app.py
+++ b/vault/src/backend/app.py
@@ -16,8 +16,10 @@ def init_db():
CREATE TABLE IF NOT EXISTS users (
user_id INTEGER PRIMARY KEY AUTOINCREMENT,
username TEXT UNIQUE NOT NULL,
- email TEXT UNIQUE,
+ email TEXT UNIQUE NOT NULL,
password TEXT NOT NULL,
+ first_name TEXT NOT NULL,
+ last_name TEXT NOT NULL,
profile_pic TEXT,
bio TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
@@ -57,18 +59,6 @@ def get_db_connection():
connection = sqlite3.connect('vault_database.db', timeout=10.0)
return connection
-def insert_new_user(username, password):
- conn = get_db_connection()
- cursor = conn.cursor()
-
- cursor.execute('''
- INSERT INTO users (username, password) VALUES (?, ?)
- ''', (username, password))
-
- conn.commit()
- conn.close()
-
-
# Initializes the database (will only need to be run when first creating the DB and anytime we add new fields/schemas to the tables
@app.route('/init', methods=['GET'])
def initialize_database():
@@ -95,10 +85,16 @@ def login():
conn = get_db_connection()
cursor = conn.cursor()
- # Checking if username is in database and if password is correct
- cursor.execute("SELECT username, password FROM users WHERE username = ? AND password = ?", (username, password))
- user = cursor.fetchone()
- conn.close()
+ if '@' not in username:
+ # Checking if username is in database and if password is correct
+ cursor.execute("SELECT username, password FROM users WHERE username = ? AND password = ?", (username, password))
+ user = cursor.fetchone()
+ conn.close()
+ else:
+ # Checking if email is in database and if password is correct
+ cursor.execute("SELECT email, password FROM users WHERE email = ? AND password = ?", (username, password))
+ user = cursor.fetchone()
+ conn.close()
if user:
return jsonify({"status": "success", "message": "Login successful!"}), 200
@@ -109,8 +105,13 @@ def login():
@app.route('/register', methods=['POST'])
def register():
data = request.json
+
+ firstName = data['firstName']
+ lastName = data['lastName']
+ email = data['email']
username = data['username']
password = data['password']
+ confirmedPassword = data['confirmedPassword']
conn = get_db_connection()
cursor = conn.cursor()
@@ -121,15 +122,19 @@ def register():
if existing_user:
# Username is already in database/is taken
conn.close()
- return jsonify({"error": "Username already taken"}), 409
+ return jsonify({"status": "failure", "message": "Username already taken"}), 409
+
+ # Checking if passwords match
+ if password != confirmedPassword:
+ return jsonify({"status": "failure", "message": "Passwords do not match."}), 401
- # Adding username and password into the database
- cursor.execute("INSERT INTO users (username, password) VALUES (?, ?)", (username, password))
+ # Adding user info into the database
+ cursor.execute("INSERT INTO users (username, email, password, first_name, last_name) VALUES (?, ?, ?, ?, ?)",
+ (username, email, password, firstName, lastName))
conn.commit()
conn.close()
return jsonify({"status": "success", "message": "Account created!"}), 201
-
# Retrieve single user by ID
@app.route('/users/
', methods=['GET'])
def get_user(user_id):
diff --git a/vault/src/backend/vault_database.db b/vault/src/backend/vault_database.db
index b64ec47..7eeac5c 100644
Binary files a/vault/src/backend/vault_database.db and b/vault/src/backend/vault_database.db differ
diff --git a/vault/src/index.js b/vault/src/index.js
index 65b1962..99809da 100644
--- a/vault/src/index.js
+++ b/vault/src/index.js
@@ -2,7 +2,6 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
-import reportWebVitals from './reportWebVitals';
import { BrowserRouter } from 'react-router-dom';
const root = ReactDOM.createRoot(document.getElementById('root'));
@@ -13,8 +12,3 @@ root.render(
);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/vault/src/logo.svg b/vault/src/logo.svg
deleted file mode 100644
index 9dfc1c0..0000000
--- a/vault/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/vault/src/reportWebVitals.js b/vault/src/reportWebVitals.js
deleted file mode 100644
index 5253d3a..0000000
--- a/vault/src/reportWebVitals.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const reportWebVitals = onPerfEntry => {
- if (onPerfEntry && onPerfEntry instanceof Function) {
- import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
- getCLS(onPerfEntry);
- getFID(onPerfEntry);
- getFCP(onPerfEntry);
- getLCP(onPerfEntry);
- getTTFB(onPerfEntry);
- });
- }
-};
-
-export default reportWebVitals;
diff --git a/vault/src/setupTests.js b/vault/src/setupTests.js
deleted file mode 100644
index 8f2609b..0000000
--- a/vault/src/setupTests.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';