make auth work correctly
This commit is contained in:
parent
a50a06d371
commit
014a8fc1ff
@ -7,6 +7,7 @@ user.py is a source for all user endpoints.
|
|||||||
|
|
||||||
from flask import request, jsonify
|
from flask import request, jsonify
|
||||||
import os
|
import os
|
||||||
|
import mysql.connector
|
||||||
|
|
||||||
def registerUserEndpoints(app, database):
|
def registerUserEndpoints(app, database):
|
||||||
@app.route('/users/isSet', methods=['GET'])
|
@app.route('/users/isSet', methods=['GET'])
|
||||||
@ -15,7 +16,7 @@ def registerUserEndpoints(app, database):
|
|||||||
try:
|
try:
|
||||||
query = "SELECT * FROM users WHERE Name=%s"
|
query = "SELECT * FROM users WHERE Name=%s"
|
||||||
result = database.query(query, params=(user_name,))
|
result = database.query(query, params=(user_name,))
|
||||||
return jsonify(bool(result and result[0][2])), 200
|
return jsonify(bool(result)), 200
|
||||||
except mysql.connector.Error as err:
|
except mysql.connector.Error as err:
|
||||||
# Log the error or handle it as necessary
|
# Log the error or handle it as necessary
|
||||||
app.logger.error(f"Error: {err}")
|
app.logger.error(f"Error: {err}")
|
||||||
|
|||||||
@ -3,6 +3,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: backend
|
context: backend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "2027:5000"
|
- "2027:5000"
|
||||||
container_name: "${BACKEND_CT_NAME:-nyi-backend}"
|
container_name: "${BACKEND_CT_NAME:-nyi-backend}"
|
||||||
|
|||||||
@ -1,9 +1,98 @@
|
|||||||
#root {
|
#root {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 1280px;
|
max-width: 1280px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Overall Body Style */
|
||||||
|
body {
|
||||||
|
background-color: #b8b6b6; /* Light background for contrast */
|
||||||
|
color: #4b2e2e; /* Darker red brown for readability */
|
||||||
|
font-family: 'Arial', sans-serif;
|
||||||
|
margin: 0;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header Style */
|
||||||
|
header {
|
||||||
|
background-color: #a41e34; /* Christmas red */
|
||||||
|
color: white;
|
||||||
|
text-align: center;
|
||||||
|
padding: 20px 0;
|
||||||
|
border-bottom: 5px solid #b7c9b5; /* Light green border */
|
||||||
|
}
|
||||||
|
|
||||||
|
header h1 {
|
||||||
|
font-size: 2.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Navigation Menu */
|
||||||
|
nav a {
|
||||||
|
text-decoration: none;
|
||||||
|
color: white;
|
||||||
|
padding: 15px 25px;
|
||||||
|
border-radius: 5px;
|
||||||
|
transition: background-color 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
nav a:hover {
|
||||||
|
background-color: #c28f8f; /* Softer red when hovering */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Section Style */
|
||||||
|
section {
|
||||||
|
background-color: #e4f7e0; /* Light green background */
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 10px;
|
||||||
|
margin: 15px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Festive Buttons */
|
||||||
|
button {
|
||||||
|
background-color: #b77de5; /* Purple with a slight festive flair */
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 10px 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 1.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:hover {
|
||||||
|
background-color: #9b6bb5; /* Darker purple on hover */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Footer Style */
|
||||||
|
footer {
|
||||||
|
text-align: center;
|
||||||
|
padding: 20px;
|
||||||
|
background-color: #a41e34; /* Same red as header */
|
||||||
|
color: white;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Christmas Decorations */
|
||||||
|
.christmas-tree {
|
||||||
|
background-image: url('path/to/christmas-tree.png'); /* Add a Christmas tree image */
|
||||||
|
width: 50px;
|
||||||
|
height: 100px;
|
||||||
|
display: inline-block;
|
||||||
|
background-size: cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
.snowflakes {
|
||||||
|
position: absolute;
|
||||||
|
z-index: 1;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background-image: url('path/to/snowflake-pattern.png'); /* Snowflakes pattern */
|
||||||
|
opacity: 0.3; /* Make it subtle */
|
||||||
|
pointer-events: none; /* Allow clicks to go through */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* General table styles */
|
/* General table styles */
|
||||||
table {
|
table {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -15,22 +104,74 @@ table {
|
|||||||
|
|
||||||
/* Table header styles */
|
/* Table header styles */
|
||||||
th {
|
th {
|
||||||
background-color: #4CAF50; /* Green */
|
background-color: #a41e34;
|
||||||
|
/* Christmas red */
|
||||||
color: white;
|
color: white;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
padding: 10px 15px;
|
||||||
|
border-bottom: 3px solid #b7c9b5;
|
||||||
|
/* Light green border for header */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Table cell styles */
|
/* Table cell styles */
|
||||||
td {
|
td {
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
|
padding: 10px 15px;
|
||||||
|
/* Added padding for better spacing */
|
||||||
|
background-color: #e4f7e0;
|
||||||
|
/* Light green background for cells */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Zebra striping for table rows */
|
/* Zebra striping for table rows */
|
||||||
tr:nth-child(even) {
|
tr:nth-child(even) {
|
||||||
background-color: #f2f2f2;
|
background-color: #f9f9f9;
|
||||||
|
/* Light gray for even rows */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hover effect for rows */
|
/* Hover effect for rows */
|
||||||
tr:hover {
|
tr:hover {
|
||||||
background-color: #f1f1f1;
|
background-color: #c28f8f;
|
||||||
|
/* Softer red when hovering */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Additional table styling for Christmas theme */
|
||||||
|
table {
|
||||||
|
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
|
||||||
|
/* Shadow for depth */
|
||||||
|
border-radius: 8px;
|
||||||
|
/* Rounded corners */
|
||||||
|
overflow: hidden;
|
||||||
|
/* Ensures border radius works */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add some festive decorations */
|
||||||
|
th::after {
|
||||||
|
content: '🎄';
|
||||||
|
/* Small Christmas tree icon in the header */
|
||||||
|
margin-left: 10px;
|
||||||
|
font-size: 1.2em;
|
||||||
|
/* Slightly larger */
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
position: relative;
|
||||||
|
/* For potential decorations */
|
||||||
|
}
|
||||||
|
|
||||||
|
td::before {
|
||||||
|
content: '';
|
||||||
|
/* Placeholder for decoration */
|
||||||
|
position: absolute;
|
||||||
|
background-image: url('path/to/snowflake-icon.png');
|
||||||
|
/* Snowflake icon */
|
||||||
|
width: 16px;
|
||||||
|
/* Adjust as necessary */
|
||||||
|
height: 16px;
|
||||||
|
opacity: 0.1;
|
||||||
|
/* Very subtle */
|
||||||
|
top: 5px;
|
||||||
|
/* Position it nicely */
|
||||||
|
left: 5px;
|
||||||
|
pointer-events: none;
|
||||||
|
/* Ignore mouse events */
|
||||||
}
|
}
|
||||||
@ -15,17 +15,10 @@ const InitialSetup = () => {
|
|||||||
const { userSet, passwordCreate, signUser, validToken } = useFetchUser(); // Destructure functions from the hook
|
const { userSet, passwordCreate, signUser, validToken } = useFetchUser(); // Destructure functions from the hook
|
||||||
const notify = useNotification();
|
const notify = useNotification();
|
||||||
|
|
||||||
useEffect(() => {
|
const checkUserPassword = async (name: string) => {
|
||||||
const validateToken = async () => {
|
const passwordStatus = await userSet(name);
|
||||||
const isTokenValid = await validToken(token, selectedName);
|
setIsPasswordSet(passwordStatus);
|
||||||
setIsSubmitted(isTokenValid);
|
};
|
||||||
};
|
|
||||||
|
|
||||||
validateToken();
|
|
||||||
if (selectedName) {
|
|
||||||
checkUserPassword(selectedName)
|
|
||||||
}
|
|
||||||
}, [selectedName]);
|
|
||||||
|
|
||||||
const handleSelect = (event: React.ChangeEvent<HTMLSelectElement>) => {
|
const handleSelect = (event: React.ChangeEvent<HTMLSelectElement>) => {
|
||||||
const name = event.target.value;
|
const name = event.target.value;
|
||||||
@ -34,10 +27,15 @@ const InitialSetup = () => {
|
|||||||
checkUserPassword(name);
|
checkUserPassword(name);
|
||||||
};
|
};
|
||||||
|
|
||||||
const checkUserPassword = async (name: string) => {
|
useEffect(() => {
|
||||||
const passwordStatus = await userSet(name);
|
const validateToken = async () => {
|
||||||
setIsPasswordSet(passwordStatus);
|
const isTokenValid = await validToken(token, selectedName);
|
||||||
};
|
setIsSubmitted(isTokenValid);
|
||||||
|
};
|
||||||
|
if (selectedName !== undefined) checkUserPassword(selectedName)
|
||||||
|
if (token && selectedName) validateToken();
|
||||||
|
}, [selectedName]);
|
||||||
|
|
||||||
|
|
||||||
const handlePasswordCreate = async () => {
|
const handlePasswordCreate = async () => {
|
||||||
const message= await passwordCreate(selectedName!, password);
|
const message= await passwordCreate(selectedName!, password);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user