Skip to content

input validation #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xaoccc merged 1 commit into from
Mar 22, 2025
Merged

input validation #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/public/styles/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ hr {
}

/* forms */
input, textarea {
input, textarea, select {
background-color: #eee;
width: 100%;
padding: 1rem;
Expand Down
23 changes: 23 additions & 0 deletions frontend/src/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export function createErrorMesage(target, message) {
const errorMessage = document.createElement('p');
errorMessage.classList.add('error-message');
errorMessage.textContent = message;
target.insertAdjacentElement('afterend', errorMessage);
}

export function changeInput(e) {
e.target.setCustomValidity('');
const nextElement = e.target.nextElementSibling;
if (nextElement && nextElement.classList.contains('error-message')) {
nextElement.remove();
}
}

export function validate(e, message) {
const nextElement = e.target.nextElementSibling;
if (nextElement && nextElement.classList.contains('error-message')) {
nextElement.remove();
}
e.target.setCustomValidity(' ');
createErrorMesage(e.target, message);
}
81 changes: 51 additions & 30 deletions frontend/src/pages/CreateGirl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
import { useNavigate } from 'react-router-dom';
import api from '../api';
import { useState } from 'react';
import { validate, changeInput } from '../helpers';

export default function CreateGirl() {
const [image, setImage] = useState("");
const [name, setName] = useState("");
const [bio, setBio] = useState("");
const [bio, setBio] = useState("");
const [age, setAge] = useState("");
const [height, setHeight] = useState("");
const [skinColor, setSkinColor] = useState("");
const [hairColor, setHairColor] = useState("");
const [eyeColor, setEyeColor] = useState("");
const [eyeColor, setEyeColor] = useState("");
const navigate = useNavigate();

const createEvent = async (e) => {
e.preventDefault();
api.post("/api/girls/create/", { image, name, bio, age, skin_color: skinColor, hair_color: hairColor, eye_color: eyeColor, height })
.then((res) => {
if (res.status === 201) {
console.log("Girl addes successfully!");
navigate('/strip-club/');
} else {
console.log("Girl was not added!");
}
})
.catch((error) => console.error(`Error: ${error}`));
e.preventDefault();
api.post("/api/girls/create/", { image, name, bio, age, skin_color: skinColor, hair_color: hairColor, eye_color: eyeColor, height })
.then((res) => {
if (res.status === 201) {
console.log("Girl addes successfully!");
navigate('/strip-club/');

} else {
console.log("Girl was not added!");
}

})
.catch((error) => console.error(`Error: ${error}`));

}

return (
Expand Down Expand Up @@ -73,18 +74,16 @@ export default function CreateGirl() {
id="age"
name="age"
required
onChange={(e) => setAge(e.target.value)}
onChange={(e) => {
changeInput(e);
setAge(e.target.value);
}}
onInvalid={(e) => validate(e, 'Please enter a valid age. Age must be between 18 and 70')}
value={age}
min="18"
max="70"
/>
{/* if (age < 18) {
<small className="error">The minimum age is 18</small>
} else if (age > 70) {
<small className="error">The maximum age is 70</small>
} else {
null
} */}

{(age) ? null : <small className="error">This field is required</small>}
<label htmlFor="height">Height:</label>
<input
Expand All @@ -93,31 +92,53 @@ export default function CreateGirl() {
id="height"
name="height"
required
onChange={(e) => setHeight(e.target.value)}
onChange={(e) => {
changeInput(e);
setHeight(e.target.value);
}}
onInvalid={(e) => validate(e, 'Please enter a valid height. Height must be between 100cm and 200cm')}
value={height}
min="100"
max="200"
/>
{(height) ? null : <small className="error">This field is required</small>}
<label htmlFor="skinColor">Skin Color:</label>
<input
<select
type="text"
className="form-input"
id="skinColor"
name="skinColor"
required
onChange={(e) => setSkinColor(e.target.value)}
value={skinColor}
/>
>
<option value="">--Please choose an option--</option>
<option value="white">White</option>
<option value="black">Black</option>
<option value="yellow">Yellow</option>
</select>
{(skinColor) ? null : <small className="error">This field is required</small>}
<label htmlFor="hairColor">Hair Color:</label>
<input
<select
type="text"
className="form-input"
id="hairColor"
name="hairColor"
required
onChange={(e) => setHairColor(e.target.value)}
value={hairColor}
/>
>
<option value="">--Please choose an option--</option>
<option value="blonde">Blonde</option>
<option value="black">Black</option>
<option value="brown">Brown</option>
<option value="red">Red</option>
<option value="blue">Blue</option>
<option value="pink">Pink</option>
<option value="white">White</option>
<option value="bald">Bald</option>
</select>

{(hairColor) ? null : <small className="error">This field is required</small>}
<label htmlFor="eyeColor">Eye Color:</label>
<input
Expand Down
56 changes: 39 additions & 17 deletions frontend/src/pages/EditGirl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useParams, useNavigate } from 'react-router-dom';
import api from '../api';
import { useState, useEffect } from 'react';
import { validate, changeInput } from '../helpers';


export default function EditEscapeRoom() {
Expand Down Expand Up @@ -100,53 +101,74 @@ export default function EditEscapeRoom() {
type="number"
className="form-input"
id="age"
name="age"
required
onChange={(e) => setAge(e.target.value)}
name="age"
onChange={(e) => {
changeInput(e);
setAge(e.target.value);
}}
onInvalid={(e) => validate(e, 'Please enter a valid age. Age must be between 18 and 70')}
value={age}
min="18"
max="70"
required
/>
{/* if (age < 18) {
<small className="error">The minimum age is 18</small>
} else if (age > 70) {
<small className="error">The maximum age is 70</small>
} else {
null
} */}
{(age) ? null : <small className="error">This field is required</small>}
<label htmlFor="height">Height:</label>
<input
type="number"
className="form-input"
id="height"
name="height"
required
onChange={(e) => setHeight(e.target.value)}
onChange={(e) => {
changeInput(e);
setHeight(e.target.value);
}}
onInvalid={(e) => validate(e, 'Please enter a valid height. Height must be between 100cm and 200cm')}
value={height}
min="100"
max="200"
required
/>
{(height) ? null : <small className="error">This field is required</small>}
<label htmlFor="skinColor">Skin Color:</label>
<input
<select
type="text"
className="form-input"
id="skinColor"
name="skinColor"
required
onChange={(e) => setSkinColor(e.target.value)}
onChange={(e) => {
changeInput(e);
setSkinColor(e.target.value);
}}
value={skinColor}
/>
>
<option value="">--Please choose an option--</option>
<option value="white">White</option>
<option value="black">Black</option>
<option value="yellow">Yellow</option>
</select>
{(skinColor) ? null : <small className="error">This field is required</small>}
<label htmlFor="hairColor">Hair Color:</label>
<input
<select
type="text"
className="form-input"
id="hairColor"
name="hairColor"
required
onChange={(e) => setHairColor(e.target.value)}
value={hairColor}
/>
>
<option value="">--Please choose an option--</option>
<option value="blonde">Blonde</option>
<option value="black">Black</option>
<option value="brown">Brown</option>
<option value="red">Red</option>
<option value="blue">Blue</option>
<option value="pink">Pink</option>
<option value="white">White</option>
<option value="bald">Bald</option>
</select>
{(hairColor) ? null : <small className="error">This field is required</small>}
<label htmlFor="eyeColor">Eye Color:</label>
<input
Expand Down