Skip to content

Commit 9eeacb8

Browse files
committed
important update - vercel new hosting and supabase new db service
1 parent 923c361 commit 9eeacb8

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

heroku-config-postgres.js renamed to db-config-postgres.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//use for development local NOT production
2-
// require("dotenv").config({ path: "config.env" });
2+
require("dotenv").config({ path: "config.env" });
33

44
//use for production
5-
require("dotenv").config();
5+
// require("dotenv").config();
66

77
const { Client } = require("pg");
88

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const usersMethodsRouter = require("./routes/usersRoutes");
44

55
let app = express();
66
//use path for dev
7-
// require("dotenv").config({ path: "config.env" });
7+
require("dotenv").config({ path: "config.env" });
88
//use for production
9-
require("dotenv").config();
9+
// require("dotenv").config();
1010
const PORT = process.env.PORT || 3000;
1111

1212
app.use(express.json());

services/gameMethods.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const client = require("../heroku-config-postgres");
1+
const client = require("../db-config-postgres");
22

33
async function getGames() {
44
const rows = await client.query("SELECT * FROM games");
@@ -8,14 +8,18 @@ async function getGames() {
88
}
99

1010
async function getGameData(gameid) {
11-
const rows = await client.query(`SELECT * FROM games WHERE game_id = ${gameid}`);
11+
const rows = await client.query(
12+
`SELECT * FROM games WHERE game_id = ${gameid}`
13+
);
1214
return {
1315
rows,
1416
};
1517
}
1618

1719
async function getGameCategories(gameid) {
18-
const rows = await client.query(`SELECT * FROM categories WHERE game_id = ${gameid}`);
20+
const rows = await client.query(
21+
`SELECT * FROM categories WHERE game_id = ${gameid}`
22+
);
1923
return {
2024
rows,
2125
};
@@ -54,8 +58,6 @@ async function updateClue(id, answeredClue) {
5458
};
5559
}
5660

57-
58-
5961
async function setScore(gameid, score) {
6062
const rows = await client.query(
6163
`UPDATE games SET game_score = ${score} WHERE game_id=${gameid}`

services/usersMethods.js

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
const client = require("../heroku-config-postgres");
1+
const client = require("../db-config-postgres");
32

43
async function getUsers() {
54
const rows = await client.query(`SELECT * FROM users ORDER BY userid ASC`);
@@ -36,10 +35,9 @@ async function setUserScore(userid, gameid, score) {
3635
}
3736

3837
async function updateUserClue(userid, clueid, answeredCorrect, catid, gameid) {
39-
40-
const rows = await client.query(
41-
`INSERT INTO users_clues (userid_clues, clueid, answeredcorrect,catid, gameid) VALUES (${userid}, ${clueid},${answeredCorrect},${catid}, ${gameid}) ON CONFLICT ON CONSTRAINT sqlpropk_clueid DO UPDATE SET answeredcorrect = ${answeredCorrect} RETURNING *`
42-
);
38+
const rows = await client.query(
39+
`INSERT INTO users_clues (userid_clues, clueid, answeredcorrect,catid, gameid) VALUES (${userid}, ${clueid},${answeredCorrect},${catid}, ${gameid}) ON CONFLICT ON CONSTRAINT sqlpropk_clueid DO UPDATE SET answeredcorrect = ${answeredCorrect} RETURNING *`
40+
);
4341

4442
return {
4543
rows,
@@ -67,10 +65,9 @@ async function updateUserClue(userid, clueid, answeredCorrect, catid, gameid) {
6765
// const rows = await client.query(`SELECT * FROM users_clues WHERE clueid = ${clueid} AND userid = ${userid} ORDER BY value ASC`);
6866
// }
6967

70-
7168
//get clues for categories in game with user clues info for answeredCorrect
7269

73-
async function getUserClue(userid,catid) {
70+
async function getUserClue(userid, catid) {
7471
// const rows = await client.query(`
7572
// SELECT * FROM clues LEFT JOIN users_clues ON clue_id = clueid
7673
// WHERE category_id = ${catid}
@@ -88,27 +85,28 @@ async function getUserClue(userid,catid) {
8885
WHERE
8986
category_id = ${catid}
9087
ORDER BY
91-
value ASC`)
88+
value ASC`
89+
);
9290
return {
9391
rows,
9492
};
9593
}
9694

9795
async function resetUserClues(userid, gameid) {
98-
const rows = await client.query(`UPDATE users_clues SET answeredcorrect = 0 WHERE gameid = ${gameid} AND userid_clues = ${userid} RETURNING *
96+
const rows =
97+
await client.query(`UPDATE users_clues SET answeredcorrect = 0 WHERE gameid = ${gameid} AND userid_clues = ${userid} RETURNING *
9998
`);
10099
return {
101100
rows,
102101
};
103102
}
104103

105-
106104
module.exports = {
107-
getUsers,
108-
getUserGames,
109-
getUserGameInfo,
110-
setUserScore,
111-
updateUserClue,
112-
getUserClue,
113-
resetUserClues
114-
}
105+
getUsers,
106+
getUserGames,
107+
getUserGameInfo,
108+
setUserScore,
109+
updateUserClue,
110+
getUserClue,
111+
resetUserClues,
112+
};

0 commit comments

Comments
 (0)