From d0f0d5671a4d3f6776f681323d6ddee0aaff03ec Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:30:39 +0800 Subject: [PATCH 01/18] Deploy --- config/DBConfig.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/DBConfig.js b/config/DBConfig.js index c0ea3f3..aed612d 100644 --- a/config/DBConfig.js +++ b/config/DBConfig.js @@ -3,10 +3,10 @@ const Sequelize = require("sequelize"); require('dotenv').config() const sequelize = new Sequelize( - process.env.DB_NAME, process.env.DB_USER, process.env.DB_PWD, + process.env.CLEARDB_DATABASE_URL, { - host: process.env.DB_HOST, // Name or IP of MySQL server - port: process.env.DB_PORT, // Port of MySQL server + // host: process.env.DB_HOST, // Name or IP of MySQL server + // port: process.env.DB_PORT, // Port of MySQL server dialect: 'mysql', // Tells squelize that MySQL is used logging: false, // Disable logging; default: console.log pool: { From f9b58213ce39406e36d5bd639c4bfc755cdf433b Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:43:05 +0800 Subject: [PATCH 02/18] deploy --- config/DBConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/DBConfig.js b/config/DBConfig.js index aed612d..85de858 100644 --- a/config/DBConfig.js +++ b/config/DBConfig.js @@ -3,7 +3,7 @@ const Sequelize = require("sequelize"); require('dotenv').config() const sequelize = new Sequelize( - process.env.CLEARDB_DATABASE_URL, + process.env.DB_NAME, process.env.DB_USER, process.env.DB_PWD, { // host: process.env.DB_HOST, // Name or IP of MySQL server // port: process.env.DB_PORT, // Port of MySQL server From 4d11c2f8c5211b05add263954d648e74470e313c Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:45:30 +0800 Subject: [PATCH 03/18] remove .env --- .env | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 89fe06f..0000000 --- a/.env +++ /dev/null @@ -1,9 +0,0 @@ -DB_HOST = 'localhost' -DB_PORT = 3306 -DB_NAME = 'codeoverflow' -DB_USER = 'admin69' -DB_PWD = 'password' -STRIPE_SECRET_KEY = 'sk_test_51L5mAuGwc6VaRqW2Cw32gXfTJjA7SNoAOLMQP7R9nPgMObdeoDCr9pC91MoMhOJXdpglix2p9H4zWf13cHQR8FOY00rXFqUfzD' -STRIPE_PUBLIC_KEY = 'pk_test_51L5mAuGwc6VaRqW2TedYbYI4AiHKvQUXakCY9EfIiXOQ5601kqJESOjzSvQc0YqUY3nyATjfvxAf49b5C0H7W5Sp00THRKbfMM' -WEBHOOK_SECRET = 'whsec_f4043c4a5811b6e3ea97012646107b78034625935321a7d01ccee15473d8808d' -SERVER_URL = https://localhost:5000 \ No newline at end of file From 836b59c5bb24e6a12e7b4614558d0e3672dcfb00 Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:50:46 +0800 Subject: [PATCH 04/18] fix db --- .gitignore | 3 ++- config/DBConfig.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c0ab0ee..adb0889 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ -TODO.txt \ No newline at end of file +TODO.txt +.env \ No newline at end of file diff --git a/config/DBConfig.js b/config/DBConfig.js index 85de858..c0ea3f3 100644 --- a/config/DBConfig.js +++ b/config/DBConfig.js @@ -5,8 +5,8 @@ require('dotenv').config() const sequelize = new Sequelize( process.env.DB_NAME, process.env.DB_USER, process.env.DB_PWD, { - // host: process.env.DB_HOST, // Name or IP of MySQL server - // port: process.env.DB_PORT, // Port of MySQL server + host: process.env.DB_HOST, // Name or IP of MySQL server + port: process.env.DB_PORT, // Port of MySQL server dialect: 'mysql', // Tells squelize that MySQL is used logging: false, // Disable logging; default: console.log pool: { From 554f048df20f4bc1b231c1f72a9064c90f649d0a Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:53:21 +0800 Subject: [PATCH 05/18] test --- config/DBConfig.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/DBConfig.js b/config/DBConfig.js index c0ea3f3..aed612d 100644 --- a/config/DBConfig.js +++ b/config/DBConfig.js @@ -3,10 +3,10 @@ const Sequelize = require("sequelize"); require('dotenv').config() const sequelize = new Sequelize( - process.env.DB_NAME, process.env.DB_USER, process.env.DB_PWD, + process.env.CLEARDB_DATABASE_URL, { - host: process.env.DB_HOST, // Name or IP of MySQL server - port: process.env.DB_PORT, // Port of MySQL server + // host: process.env.DB_HOST, // Name or IP of MySQL server + // port: process.env.DB_PORT, // Port of MySQL server dialect: 'mysql', // Tells squelize that MySQL is used logging: false, // Disable logging; default: console.log pool: { From 7b1c8b42199e88a36d456f5d16bfee08dd2bf21e Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 22:56:01 +0800 Subject: [PATCH 06/18] Yes --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4a0481e..186ec3d 100644 --- a/index.js +++ b/index.js @@ -49,7 +49,7 @@ app.set('io', io) // Library to use MySQL to store session objects const MySQLStore = require('express-mysql-session'); - +console.log(process.env.DB_HOST); var options = { host: process.env.DB_HOST, port: process.env.DB_PORT, From 64c36de8424dbc22df4d9e4972e3c176809e7b29 Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 23:02:36 +0800 Subject: [PATCH 07/18] test --- .env | 9 +++++++++ .gitignore | 3 +-- config/DBConfig.js | 6 +++--- index.js | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..7b52b92 --- /dev/null +++ b/.env @@ -0,0 +1,9 @@ +DB_HOST = 'us-cdbr-east-06.cleardb.net' +DB_PORT = 3306 +DB_NAME = 'heroku_00bb94ebe7ad0d8' +DB_USER = 'bb54857612b750' +DB_PWD = '21424770' +STRIPE_SECRET_KEY = 'sk_test_51L5mAuGwc6VaRqW2Cw32gXfTJjA7SNoAOLMQP7R9nPgMObdeoDCr9pC91MoMhOJXdpglix2p9H4zWf13cHQR8FOY00rXFqUfzD' +STRIPE_PUBLIC_KEY = 'pk_test_51L5mAuGwc6VaRqW2TedYbYI4AiHKvQUXakCY9EfIiXOQ5601kqJESOjzSvQc0YqUY3nyATjfvxAf49b5C0H7W5Sp00THRKbfMM' +WEBHOOK_SECRET = 'whsec_f4043c4a5811b6e3ea97012646107b78034625935321a7d01ccee15473d8808d' +SERVER_URL = https://localhost:5000 \ No newline at end of file diff --git a/.gitignore b/.gitignore index adb0889..c0ab0ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ node_modules/ -TODO.txt -.env \ No newline at end of file +TODO.txt \ No newline at end of file diff --git a/config/DBConfig.js b/config/DBConfig.js index aed612d..c0ea3f3 100644 --- a/config/DBConfig.js +++ b/config/DBConfig.js @@ -3,10 +3,10 @@ const Sequelize = require("sequelize"); require('dotenv').config() const sequelize = new Sequelize( - process.env.CLEARDB_DATABASE_URL, + process.env.DB_NAME, process.env.DB_USER, process.env.DB_PWD, { - // host: process.env.DB_HOST, // Name or IP of MySQL server - // port: process.env.DB_PORT, // Port of MySQL server + host: process.env.DB_HOST, // Name or IP of MySQL server + port: process.env.DB_PORT, // Port of MySQL server dialect: 'mysql', // Tells squelize that MySQL is used logging: false, // Disable logging; default: console.log pool: { diff --git a/index.js b/index.js index 186ec3d..2e30d60 100644 --- a/index.js +++ b/index.js @@ -49,7 +49,6 @@ app.set('io', io) // Library to use MySQL to store session objects const MySQLStore = require('express-mysql-session'); -console.log(process.env.DB_HOST); var options = { host: process.env.DB_HOST, port: process.env.DB_PORT, From 4662f5e638f218acd717c9ce8106a39a6205ba9b Mon Sep 17 00:00:00 2001 From: Perry M Date: Thu, 1 Sep 2022 23:07:03 +0800 Subject: [PATCH 08/18] fix port --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 2e30d60..0ba74b4 100644 --- a/index.js +++ b/index.js @@ -182,6 +182,6 @@ const port = 5000; // Starts the server and listen to port -httpServer.listen(port, () => { +httpServer.listen(process.env.PORT || 5000, () => { console.log(`Server started on port ${port}`); }); \ No newline at end of file From 95cc1f5b8477eaf7a971244974c74bfe672346e6 Mon Sep 17 00:00:00 2001 From: Perry M Date: Fri, 2 Sep 2022 00:01:45 +0800 Subject: [PATCH 09/18] fixes --- helpers/googlelogin.js | 2 +- public/scripts/payment.js | 2 +- routes/transactions.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/googlelogin.js b/helpers/googlelogin.js index 49d2b56..0578398 100644 --- a/helpers/googlelogin.js +++ b/helpers/googlelogin.js @@ -11,7 +11,7 @@ function googlelogin() { passport.use(new GoogleStrategy({ clientID: GOOGLE_CLIENT_ID, clientSecret: GOOGLE_CLIENT_SECRET, - callbackURL: "http://localhost:5000/login-google/callback" + callbackURL: "https://code-overdose.herokuapp.com/login-google/callback" }, async function(accessToken, refreshToken, profile, done) { const [user, created] = await User.findOrCreate({ diff --git a/public/scripts/payment.js b/public/scripts/payment.js index cfab607..0eada3b 100644 --- a/public/scripts/payment.js +++ b/public/scripts/payment.js @@ -94,7 +94,7 @@ function checkoutcheck() { var address = document.getElementById('address').value var unit_number = document.getElementById('unit_number').value var postalcode = document.getElementById('postalcode').value - fetch("http://localhost:5000/checkout", { + fetch("https://code-overdose.herokuapp.com/checkout", { method: "POST", headers: { "Content-Type": "application/json", diff --git a/routes/transactions.js b/routes/transactions.js index 45154c4..4ed8396 100644 --- a/routes/transactions.js +++ b/routes/transactions.js @@ -107,8 +107,8 @@ router.post('/payment', ensureAuthenticated, async (req, res) => { chatId: `${req.body.id}`, orderOwnerName: `${req.body.fname}`, }, - success_url: `http://localhost:5000${req.body.curl}`, - cancel_url: `http://localhost:5000${req.body.curl}`, + success_url: `https://code-overdose.herokuapp.com${req.body.curl}`, + cancel_url: `https://code-overdose.herokuapp.com${req.body.curl}`, }) res.json({ url: session.url }) } catch (e) { From a1bbf128f2e49857172889031e068d24339b6a8d Mon Sep 17 00:00:00 2001 From: Perry M Date: Fri, 2 Sep 2022 00:04:42 +0800 Subject: [PATCH 10/18] fixes --- views/inbox/index.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/inbox/index.handlebars b/views/inbox/index.handlebars index be9ba84..ab63153 100644 --- a/views/inbox/index.handlebars +++ b/views/inbox/index.handlebars @@ -93,7 +93,7 @@ \ No newline at end of file From 005a0c08156af969cbbfcd8d47f627cff5018980 Mon Sep 17 00:00:00 2001 From: Perry M Date: Fri, 2 Sep 2022 01:21:42 +0800 Subject: [PATCH 17/18] agfaij --- views/myListing.handlebars | 423 ++++++++++++++++++------------------- 1 file changed, 202 insertions(+), 221 deletions(-) diff --git a/views/myListing.handlebars b/views/myListing.handlebars index b33e8d0..3ec6bc0 100644 --- a/views/myListing.handlebars +++ b/views/myListing.handlebars @@ -1,245 +1,226 @@ - - - - - - - + +

My Listing

-

My Wishlist

{{!-- product --}}
- - - - - \ No newline at end of file From b76a332b2c2fed1717a6d5aec0763ad9d3ecb18b Mon Sep 17 00:00:00 2001 From: Perry M Date: Fri, 2 Sep 2022 01:23:23 +0800 Subject: [PATCH 18/18] nt --- views/myListing.handlebars | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/views/myListing.handlebars b/views/myListing.handlebars index 3ec6bc0..5be1149 100644 --- a/views/myListing.handlebars +++ b/views/myListing.handlebars @@ -90,23 +90,8 @@ function loadProduct() { `+name+` `+price_info - if(sold == 1){ - overlay = `
`+image_id+`
`+btns+`
-
- -

Sold Out

-
- -
-
-
` - }else{ - overlay = `
`+image_id+`
`+btns+`
` - } - image_id = `
`+image+`
` - $(".product-items").append(`
`+overlay+productInfo+`
`) + $(".product-items").append(`
`+image_id+`
`+btns+`
`+productInfo+`
`) /*$('body').append(modal)*/ } @@ -121,25 +106,6 @@ function loadProduct() { }