Skip to content

Commit

Permalink
deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
rockingrohit9639 committed Jul 11, 2021
1 parent 8ba6fad commit ba8f6db
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 12 deletions.
37 changes: 37 additions & 0 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
404.html,1626002868406,daa499dd96d8229e73235345702ba32f0793f0c8e5c0d30e40e37a5872be57aa
asset-manifest.json,1625985564049,be073bd1b1da86ef0273551de26b31b62855f4bd22a94e3f0785192d3599c3ef
index.html,1625985800838,520f917968bc5a39a6a203be5f3ae89a23826bf3661ec123a2762bd01a453056
manifest.json,1623469362378,15477a0c9783a187c990b53d09c6e002d1a0ebbac87ce1b8def9ee2a409f9f12
robots.txt,499162500000,bfe106a3fb878dc83461c86818bf74fc1bdc7f28538ba613cd3e775516ce8b49
static/css/main.ac0f03ce.chunk.css,1625985563954,28bebb5dce9880517657e2e96639a3319c3c56ab0e9cd93d9fca6930749bf1af
static/js/2.cfccbf53.chunk.js.LICENSE.txt,1625985564040,7cc1de3730b9cc7917ea9430f3a5534509a68ef0eecc4a784fa4364a6e3e9631
static/js/runtime-main.d327c69e.js,1625985564038,ce22bbdf15990dd0ff8760f939275fdf6d4ebc8b71660afa550542760364ea3b
static/js/runtime-main.d327c69e.js.map,1625985564046,e1bcd76dbc941f7b559c0124cd831b21f6c3d51251ea471b058ae023ee0aa327
static/media/android.8e9b6a0d.svg,1625985563917,61662a1de4ca3e0dfb5b62baa62ca14ffa4aab1ec086f834d52376bd2c9a6e4b
static/media/dots.6a29ba4b.svg,1625985563915,37d5e118aab9c0947df7e0f04758615f24276972dd5c7150468c07ecec45b957
static/media/down.474a217e.svg,1625985563915,160d50acecd5ade968c78cb613a4d1e063178c8c164290f930f5dca559cdf55f
static/media/js.64dda0b6.svg,1625985563917,cabb53b39abec0741e455db5f437b2eef7e1f63609a9ade3998d49d9b85bf595
static/media/Illustration.15d915df.svg,1625985563884,0c64837b5112a73b8039aa81ab79520b127e53533babdf254d1db137e6999f33
static/media/python.e41c0263.svg,1625985563917,1c058a0c21dfc1d4aa09c0b13ca943c4d27dc3ecfe4e044f623a3f34ba520cdf
static/media/share.d88a0511.svg,1625985563915,3ce44b645eeb8109071a0a0ded1e162bfcf66f84da6ccbb66e922d927bd7c6b7
static/media/react.6ae923cf.svg,1625985563917,718552022c337ca7f7c2a0a86ed16b4bd43c75fc30248f78849e86c5ed0223de
static/media/star.de82f684.svg,1625985563998,d601b99ad3486d2863299eac555ab75fd37981e394e1413dda3fb53228dc0f24
static/media/web.62750436.svg,1625985563917,35062888d6d1edfb27f470868339b6824e6544394cea3013f6e6d1f872af65d1
jpglogo.jpg,1623985421996,e91dfac85de8b9ab59a05a8d21a8a581eb54a5bcaa0e66dc641b8ac01cbf21b2
static/media/user.366a8681.png,1625985563952,f7ae268ee6e0e4fadbb08581c28cb8cfabded6d9fe441e3cc15686c73a884ca3
static/js/main.cd5dfd92.chunk.js,1625985563964,596ac054891ff5cadfd8190bcbf99b25401d223686888dfb4a4f3bc517ed6845
static/media/addprojectimg.e2cae62a.png,1625985563923,5e7c8d6669541b1e0dc5a34962c641bea7578f25e7c86ab604fecab3fc0bbd23
static/media/cardtop.019e04d7.svg,1625985563916,2da5b27077350bd72afd09822a555849d0b9fd6d21b28a362813bd43c97a1ad2
static/css/main.ac0f03ce.chunk.css.map,1625985564041,1425249c59af573cb82eab0abe84fc34674207e5329da42e8da01635479af731
static/media/icon.ac15d41b.png,1625985563917,09394eae3384f76e42eefcb2a111f2f971350dc97c7c270629b838fb279edfb1
favicon.png,1623986147323,e2c61288af9e7c67db98a89f2adaf1eb5447e1c384e32d2a1018461dd251b2b6
static/js/main.cd5dfd92.chunk.js.map,1625985564045,4d131ddaa88b8ce61d3d0f78220fc841dd843c477f166f34e1b717d5aebcd187
static/media/forget.b544a3c3.png,1625985563998,3c7dd60d9c6292e079fbe69637394ee3fef1b73f5becfd5cedbb47338d8d644e
static/css/2.a8858203.chunk.css,1625985564039,c3fbec4d03bfb260a1bf38df6f147aa7e803b77d82db7987df2897631cd06bf3
Landing page.jpg,1624002011666,737981958cf2418e3c82e9e2a6a595b25a6a49b03caed82e7c262317f6af3ac7
static/js/2.cfccbf53.chunk.js,1625985564040,a6abeb82d9afec1b84fee2e9a0259f762f10a6ca1b6c064037fda5cde1c677fc
static/css/2.a8858203.chunk.css.map,1625985564042,8829e41ca9ed03e1840e82df28223c2e34bdf74d087d01fb8c0684c527609128
static/media/loginavatar.ee83fae2.svg,1625985563926,57d009a0a6eebd2b5cdb29a23b2127182674ff050601f11f5c95503623d8cf4d
static/media/signupavatar.82a4e65e.svg,1625985563921,4d14e1b301d14316536df00c8d8222ba9924f11768acb097dd17e798ed1e061c
static/media/avatar.6bad5045.svg,1625985563921,5be6349c28f142ebb86f3201def3d35d058f88d7713e75a1a41b6d2328c4d06f
static/js/2.cfccbf53.chunk.js.map,1625985564048,cd486f7a1c87dd68b30e462fd7c19e40393bc0bb48b5ebabfdaccaf8f0b6a6ee
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "project-zone-5ef1b"
}
}
10 changes: 10 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"hosting": {
"public": "build",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
}
}
25 changes: 13 additions & 12 deletions server/controllers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const bcrypt = require("bcrypt");
const moment = require("moment");
const jwt = require("jsonwebtoken");
const { sendEmail } = require("../utills/sendMail");
const { TrendingUpRounded } = require("@material-ui/icons");

const maxage = 3 * 24 * 60 * 60;
const createwebToken = (id) =>
Expand Down Expand Up @@ -81,12 +80,12 @@ exports.sendemail = async (req, res) =>
process.env.ACCESS_TOKEN_SECRET_FOREGTPASS,
{ expiresIn: "10m" }
);
// const link = `https://60e5a4164df29368b0329a4b--project-zone.netlify.app/project-zone/forget-password/${token}`;
const link = `project-zone.tech/project-zone/forget-password/${token}`;

/* Above link will be used when client-side is fully deployed, if we are running client-side on local host
then link below will be sent as email */

const link = `${ req.protocol }://${ req.hostname }:3000/project-zone/forget-password/${ token }`;
// const link = `${ req.protocol }://${ req.hostname }:3000/project-zone/forget-password/${ token }`;

const content = `<h2 style={{textAlign ="center"}}>Project-zone account Forget password link</h2>
Expand Down Expand Up @@ -212,7 +211,7 @@ exports.AddNewProject = async (req, res) =>
} else
{
username = doc.firstname;
const link = `http://project-zone.netlify.app/projectdetails/${ resp._id }`;
const link = `project-zone.tech/projectdetails/${ resp._id }`;

/* Above link will be used when client-side is fully deployed, if we are running client-side on local host
then link below will be sent as email */
Expand Down Expand Up @@ -254,12 +253,12 @@ exports.SendContactEmail = async (req, res) =>
{
const id = user._id;

// const link = "https://60e5a4164df29368b0329a4b--project-zone.netlify.app";
const link = "project-zone.tech";

/* Above link will be used when client-side is fully deployed, if we are running client-side on local host
then link below will be sent as email */

const link = `${ req.protocol }://${ req.hostname }:3000/`;
// const link = `${ req.protocol }://${ req.hostname }:3000/`;

const usercontent = `<h3 style="text-align:center">Thanks for contacting us !</h3>
Expand All @@ -268,7 +267,7 @@ exports.SendContactEmail = async (req, res) =>
<p>Feel free to send us your suggestions anytime. We will definitely consider it. Have any query related to Project Zone, Do contact us. </p>
<p> Found any bug in Project Zone. Please, notify us about it. </p>
<hr/>
<h3 style="text-align:center"><a href=${ link }>Visit project-zone again !</a></h3>
<h3 style="text-align:center"><a href=${ link }>Visit Project Zone again !</a></h3>
<hr/>
Thanks You. ! Have a great day!`;
Expand All @@ -279,7 +278,7 @@ exports.SendContactEmail = async (req, res) =>
usercontent
);

const admincontent = `<h3 style="text-align:center"> Hey Rohit ! You have got a contact message from project-zone !</h3>
const admincontent = `<h3 style="text-align:center"> Hey Rohit ! You have got a contact message from Project Zone !</h3>
<p>${ user.firstname } has contacted on project-zone. We have sent him a thank you mail. </p>
<p>These are the ${ user.firstname }'s contact details.</p>
Expand All @@ -292,9 +291,11 @@ exports.SendContactEmail = async (req, res) =>
<hr/>
`;

const adminEmail = "[email protected]";

await sendEmail(
process.env.SENDGRID_VERIFIED_MAIL,
"Got Contact from project-zone",
adminEmail,
"Got Contact from Project Zone",
admincontent
);

Expand Down Expand Up @@ -339,12 +340,12 @@ exports.VerifyEmailSend = async (req, res) =>
}
);

// const link = `https://60e5a4164df29368b0329a4b--project-zone.netlify.app/project-zone/verify-email/${token}`;
const link = `https://60e5a4164df29368b0329a4b--project-zone.netlify.app/project-zone/verify-email/${token}`;

/* Above link will be used when client-side is fully deployed, if we are running client-side on local host
then link below will be sent as email */

const link = `${ req.protocol }://${ req.hostname }:3000/project-zone/verify-email/${ token }`;
// const link = `${ req.protocol }://${ req.hostname }:3000/project-zone/verify-email/${ token }`;

const content = `<h2 style={{textAlign ="center"}}>Project-zone account verification link</h2>
Expand Down

0 comments on commit ba8f6db

Please sign in to comment.