Skip to content
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

frontend #3

Open
wants to merge 21 commits into
base: frontend
Choose a base branch
from
Open

frontend #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8b7b364
frontend
Pastudillof02 May 1, 2023
604bb7d
Cambios para ciegos
Pastudillof02 May 1, 2023
4148502
Problema de accesibilidad al buscar productos solucionado
4ntoniofr May 2, 2023
8e80d25
Cambios de accesibilidad y alertas
4ntoniofr May 2, 2023
41e4eac
Error navbar solucionado
4ntoniofr May 2, 2023
4ce699c
wishlist link and no date in signup
valentingr080 May 3, 2023
5ad2d01
Accesibilidad y responsiveness
4ntoniofr May 8, 2023
fa223b8
Accesibilidad y responsiveness
4ntoniofr May 11, 2023
ed83365
improved profile
valentingr080 May 11, 2023
483bd22
Merge branch 'main' of https://github.com/4ntoniofr/sporthub
valentingr080 May 11, 2023
20e335e
Alertas mejoradas
4ntoniofr May 11, 2023
e0e2af5
Merge branch 'main' of https://github.com/4ntoniofr/sporthub
4ntoniofr May 11, 2023
f928f1c
Cart API
JCamacho4 May 11, 2023
8247230
change on API
JCamacho4 May 11, 2023
7832fcc
Formulario compra usable
May 11, 2023
f34f66e
fix cart button on nav
JCamacho4 May 11, 2023
7db5cc8
Formulario compra usable
May 11, 2023
7cfb21c
problems with buttons fixed
JCamacho4 May 11, 2023
0f2bbe7
cambios en formularios de credit card y address
Pastudillof02 May 13, 2023
8ce832f
Responsiveness
4ntoniofr May 13, 2023
c80b501
Add database and env
4ntoniofr May 13, 2023
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
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ dist-ssr
*.sw?

# Database
*.db
.env
.vercel
Binary file added Informes/tareasSegundoTest.docx
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions backend/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TOKEN_KEY: 'X7&DJ&3niDw6!JF'
230 changes: 158 additions & 72 deletions backend/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ app.get("/userInfo/:username", (req, res) => {

app.post("/newUser", (req, res) => {
const { username, password, name, email, lastName, date } = req.body;
const sql = `INSERT INTO users (username, password, name, email, lastname, date, profileImage) VALUES (?, ?, ?, ?, ?, ?, ?)`;
const sql = `INSERT INTO users (username, password, name, email, lastname, profileImage) VALUES (?, ?, ?, ?, ?, ?)`;
bcrypt.hash(password, saltRounds, (err, hash) => {
if (err) {
console.error(err.message);
Expand All @@ -71,18 +71,25 @@ app.post("/newUser", (req, res) => {
.status(400)
.send("The username was already inserted in the database");
} else {
db.run(sql, [username, hash, name, email, lastName, date, null], (err) => {
if (err) {
if (err.message.includes("UNIQUE constraint failed")) {
res.status(400).send("Username already exists");
db.run(
sql,
[username, hash, name, email, lastName, null],
(err) => {
if (err) {
if (err.message.includes("UNIQUE constraint failed")) {
res.status(400).send("Username already exists");
}
console.error(err.message);
res.status(500).send("Internal server error");
} else {
token = jwt.sign(
{ username: username },
process.env.TOKEN_KEY
);
res.status(200).send(token);
}
console.error(err.message);
res.status(500).send("Internal server error");
} else {
token = jwt.sign({ username: username }, process.env.TOKEN_KEY);
res.status(200).send(token);
}
});
);
}
}
);
Expand Down Expand Up @@ -120,7 +127,6 @@ app.post("/login", (req, res) => {
});
});


app.post("/userByToken", (req, res) => {
try {
const { token } = req.body;
Expand Down Expand Up @@ -154,53 +160,80 @@ app.post("/setUserProfile", upload.single("image"), (req, res) => {
});

app.post("/updateUser", (req, res) => {
const { username, password, name, email, date, lastname, phone, address1, address2, country, postalcode, gender} = req.body;
const {
username,
password,
name,
email,
date,
lastname,
phone,
address1,
address2,
country,
postalcode,
gender,
} = req.body;
const sql = `UPDATE users SET username = ?, name = ?, email = ?, date = ?, lastname = ?, phone = ?, address1 = ?, address2 = ?, country = ?, postalcode = ?, gender = ? WHERE username = ?`;
db.get(
"SELECT * FROM users WHERE username = ?",
[username],
(err, rows) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
let user = rows;
if (user) {
bcrypt.compare(password, user.password, function (err, result) {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
if (result) {
db.run(sql, [username, name, email, date, lastname, phone, address1, address2, country, postalcode, gender,username], (err) => {
if (err) {
if (err.message.includes("UNIQUE constraint failed")) {
console.log("porla");
res.status(400).send("Username already exists");
}
console.error(err.message);
res.status(500).send("Internal server error");
} else {
token = jwt.sign({ username: username }, process.env.TOKEN_KEY);
res.status(200).send(token);
db.get("SELECT * FROM users WHERE username = ?", [username], (err, rows) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
let user = rows;
if (user) {
bcrypt.compare(password, user.password, function (err, result) {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
if (result) {
db.run(
sql,
[
username,
name,
email,
date,
lastname,
phone,
address1,
address2,
country,
postalcode,
gender,
username,
],
(err) => {
if (err) {
if (err.message.includes("UNIQUE constraint failed")) {
console.log("porla");
res.status(400).send("Username already exists");
}
});
} else {
console.log("password not valid");
res.status(403).send("Password not valid");
console.error(err.message);
res.status(500).send("Internal server error");
} else {
token = jwt.sign(
{ username: username },
process.env.TOKEN_KEY
);
res.status(200).send(token);
}
}
}
});
} else {
console.log("username not valid");
res.status(403).send("Username not valid");
);
} else {
res.sendStatus(403);
}
}
}
});
} else {
console.log("username not valid");
res.status(403).send("Username not valid");
}
);
}
});
});


/**
* API PRODUCTOS
*/
Expand Down Expand Up @@ -238,10 +271,11 @@ app.post("/newProduct", (req, res) => {
*/

app.post("/addToWishlist", (req, res) => {
const { username, productId } = req.body;
const sql = "INSERT INTO wishlist(user, product) VALUES ((SELECT id FROM users WHERE username = ?),?)";

db.run(sql, [username,productId], (err) => {
const { username, productId } = req.body;
const sql =
"INSERT INTO wishlist(user, product) VALUES ((SELECT id FROM users WHERE username = ?),?)";

db.run(sql, [username, productId], (err) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
Expand All @@ -252,10 +286,11 @@ app.post("/addToWishlist", (req, res) => {
});

app.post("/removeFromWishlist", (req, res) => {
const { username, productId } = req.body;
const sql = "DELETE FROM wishlist WHERE user = (SELECT id FROM users WHERE username = ?) and product = ?";

db.run(sql, [username,productId], (err) => {
const { username, productId } = req.body;
const sql =
"DELETE FROM wishlist WHERE user = (SELECT id FROM users WHERE username = ?) and product = ?";

db.run(sql, [username, productId], (err) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
Expand All @@ -266,19 +301,70 @@ app.post("/removeFromWishlist", (req, res) => {
});

app.post("/getWishlist", (req, res) => {
const { username } = req.body;
const sql = "SELECT product FROM wishlist WHERE user = (SELECT id FROM users WHERE username = ?)";

db.all(sql, [username], (err, rows) => {
if(err){
console.log(err.message);
res.status(500).send("Internal Server ERROR");
}else{
res.status(200).send(rows);
}
});
const { username } = req.body;
const sql =
"SELECT product FROM wishlist WHERE user = (SELECT id FROM users WHERE username = ?)";

db.all(sql, [username], (err, rows) => {
if (err) {
console.log(err.message);
res.status(500).send("Internal Server ERROR");
} else {
res.status(200).send(rows);
}
});
});

/**
* API CART
*/

app.post("/addToCart", (req, res) => {
const { username, productId } = req.body;
const sql =
"INSERT INTO cart(user, product) VALUES ((SELECT id FROM users WHERE username = ?),?)";

db.run(sql, [username, productId], (err) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
res.status(200).send();
}
});
});

app.post("/removeFromCart", (req, res) => {
const { username, productId } = req.body;
const sql =
"DELETE FROM cart WHERE user = (SELECT id FROM users WHERE username = ?) and product = ?";

db.run(sql, [username, productId], (err) => {
if (err) {
console.error(err.message);
res.status(500).send("Internal server error");
} else {
res.status(200).send();
}
});
});

app.post("/getCart", (req, res) => {
const { username } = req.body;
const sql =
"SELECT product FROM cart WHERE user = (SELECT id FROM users WHERE username = ?)";

db.all(sql, [username], (err, rows) => {
if (err) {
console.log(err.message);
res.status(500).send("Internal Server ERROR");
} else {
res.status(200).send(rows);
}
});
});

app.listen(port, () => {
console.log(`Listening on port ${port}...`);
});
});

Binary file added backend/database.db
View file
Open in desktop
Binary file not shown.
Loading