Skip to content

Commit

Permalink
Merge pull request #64 from chetandabli/fw21_0943_day-5
Browse files Browse the repository at this point in the history
now deployed on render
  • Loading branch information
chetandabli committed May 31, 2023
2 parents f143e84 + 7017ec6 commit 75543d7
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion config/google-oauth.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const client_secret = process.env.client_secret;
passport.use(new GoogleStrategy({
clientID: client_id,
clientSecret: client_secret,
callbackURL: "https://busy-motion-6100-production.up.railway.app/auth/google/callback"
callbackURL: "https://easemeet.onrender.com/auth/google/callback"
},
async function(accessToken, refreshToken, profile, cb) {
const {name, email, picture} = profile._json;
Expand Down
1 change: 0 additions & 1 deletion public/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ nav img {
width: 200px;
}
nav{
width: 60%;
margin: auto;
}
:root {
Expand Down
10 changes: 5 additions & 5 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ <h3><i class="fa-solid fa-globe"></i> English <i class="fa-solid fa-chevron-down
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Product</a>
<a class="nav-link active" aria-current="page" href="./dashboard.html">Product</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Solutions</a>
<a class="nav-link" href="./dashboard.html">Solutions</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Team & Companies</a>
<a class="nav-link" href="./dashboard.html">Team & Companies</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Pricing</a>
<a class="nav-link" href="./dashboard.html">Pricing</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Resources</a>
<a class="nav-link" href="./dashboard.html">Resources</a>
</li>
</ul>
<span id="acc_btn">
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/appointments.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ window.addEventListener("load", () => {

async function appenddata() {
try {
let responsedata = await fetch("https://busy-motion-6100-production.up.railway.app/user/appointments",{
let responsedata = await fetch("https://easemeet.onrender.com/user/appointments",{

headers: {
"Content-Type": "application/json",
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/book.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const get = (x)=>{
return document.getElementById(`${x}`)
}

const baseUrl = "https://busy-motion-6100-production.up.railway.app/"
const baseUrl = "https://easemeet.onrender.com/"

get("name").innerText = x.name
get("userimg").src = x.picture
Expand Down
16 changes: 8 additions & 8 deletions public/scripts/dashboard.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseUrl = "https://busy-motion-6100-production.up.railway.app/";
const baseUrl = "https://easemeet.onrender.com/";

let myname, myUserId;

Expand Down Expand Up @@ -42,7 +42,7 @@ const livebtn = document.getElementById("livemeeting").onclick = ()=>{
async function appenddata() {

try {
let responsedata = await fetch("https://busy-motion-6100-production.up.railway.app/user/meetings",{
let responsedata = await fetch("https://easemeet.onrender.com/user/meetings",{

headers: {
"Content-Type": "application/json",
Expand Down Expand Up @@ -90,7 +90,7 @@ function append(x, data){
booking.setAttribute("id","book")
booking.style.color = "blue"
booking.addEventListener("click", function () {
window.open(`https://busy-motion-6100-production.up.railway.app/user/${x[0]._id}`)
window.open(`https://easemeet.onrender.com/user/${x[0]._id}`)
});
let hra = document.createElement("hr")
hra.style.color = "#ededed"
Expand All @@ -100,7 +100,7 @@ function append(x, data){
link.innerText = "Copy link";
link.addEventListener("click", async () => {
try {
await navigator.clipboard.writeText(`https://busy-motion-6100-production.up.railway.app/user/${x[0]._id}`);
await navigator.clipboard.writeText(`https://easemeet.onrender.com/user/${x[0]._id}`);
link.innerText = "Copied"
setTimeout(() => {
link.innerText = "Copy link"
Expand Down Expand Up @@ -133,9 +133,9 @@ let a = data[0].email

document.getElementById("namecircle").innerText = ` ${data[0].name[0]}`
// document.querySelector("#span").innerText = `localhost:3000/user/${data[0]._id}`
document.querySelector("#span").innerText = `https://busy-motion-6100-production.up.railway.app/user/${data[0]._id}`
document.querySelector("#span").innerText = `https://easemeet.onrender.com/user/${data[0]._id}`
document.querySelector("#span").onclick = ()=>{
window.open(`https://busy-motion-6100-production.up.railway.app/user/${data[0]._id}`)
window.open(`https://easemeet.onrender.com/user/${data[0]._id}`)
}
document.querySelector("#span").style.color = "blue"

Expand Down Expand Up @@ -175,7 +175,7 @@ function showtime(start,end){

async function removed(id){
try {
let responsedata = await fetch(`https://busy-motion-6100-production.up.railway.app/meeting/${id}`,{
let responsedata = await fetch(`https://easemeet.onrender.com/meeting/${id}`,{
method:"DELETE",
headers: {
"Authorization":`Bearer ${JSON.parse(localStorage.getItem("token"))}`
Expand Down Expand Up @@ -237,7 +237,7 @@ async function appendremain(when) {


try {
let responsedata = await fetch(`https://busy-motion-6100-production.up.railway.app/user/meetings/${when}`,{
let responsedata = await fetch(`https://easemeet.onrender.com/user/meetings/${when}`,{

headers: {
"Content-Type": "application/json",
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let refresh_token = params.get("rtoken");
const loginbtn = document.getElementById("my_ac_btn")
const logoutbtn = document.getElementById("logout_btn");
const signup = document.getElementById("signupf")
const baseUrl = "https://busy-motion-6100-production.up.railway.app/"
const baseUrl = "https://easemeet.onrender.com/"
document.getElementById("logo").onclick = ()=>{
location.assign("../index.html")
}
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/one-o-one.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ let postData = () => {
location: event_location,
}
console.log(event_data)
fetch("https://busy-motion-6100-production.up.railway.app/meeting",{
fetch("https://easemeet.onrender.com/meeting",{
method:"POST",
headers:{
"Content-type":"application/json",
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/signup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fetch("https://busy-motion-6100-production.up.railway.app/auth/google")
fetch("https://easemeet.onrender.com/auth/google")
.then((res)=>{
console.log(res.json())
})
Expand Down

0 comments on commit 75543d7

Please sign in to comment.