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.

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

fix: cal video issues #12546

Merged
merged 7 commits into from
Nov 28, 2023
Merged

fix: cal video issues #12546

merged 7 commits into from
Nov 28, 2023

Conversation

Udit-takkar
Copy link
Contributor

@Udit-takkar Udit-takkar commented Nov 26, 2023

Fixes: #11136

  1. Hydration error
  2. Access cal video meeting link

Before:-
image

After:-

Screenshot 2023-11-27 at 5 15 46 PM

Copy link

vercel bot commented Nov 26, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 27, 2023 7:02pm
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 27, 2023 7:02pm
5 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ai ⬜️ Ignored (Inspect) Visit Preview Nov 27, 2023 7:02pm
cal ⬜️ Ignored (Inspect) Visit Preview Nov 27, 2023 7:02pm
cal-demo ⬜️ Ignored (Inspect) Visit Preview Nov 27, 2023 7:02pm
qa ⬜️ Ignored (Inspect) Visit Preview Nov 27, 2023 7:02pm
ui ⬜️ Ignored (Inspect) Visit Preview Nov 27, 2023 7:02pm

Copy link
Contributor

github-actions bot commented Nov 26, 2023

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link to collect XP and win prizes!

Copy link
Contributor

github-actions bot commented Nov 26, 2023

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

Copy link

deploysentinel bot commented Nov 26, 2023

No failed tests 🎉

@Udit-takkar Udit-takkar changed the title fix: cal video issues fix: cal video hydration Nov 26, 2023
@@ -214,7 +214,7 @@ export function VideoMeetingInfo(props: VideoMeetingInfo) {
<h3>{t("invitee_timezone")}:</h3>
<p>{booking.user?.timeZone}</p>
<h3>{t("when")}:</h3>
<p>
<p suppressHydrationWarning={true}>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines 1 to 23
const { createServer } = require("https");
const { parse } = require("url");
const next = require("next");
const fs = require("fs");
const port = 3000;
const dev = process.env.NODE_ENV !== "production";
const app = next({ dev });
const handle = app.getRequestHandler();

const httpsOptions = {
key: fs.readFileSync("./app.cal.local-key.pem"),
cert: fs.readFileSync("./app.cal.local.pem"),
};

app.prepare().then(() => {
createServer(httpsOptions, async (req, res) => {
const parsedUrl = parse(req.url, true);
await handle(req, res, parsedUrl);
}).listen(port, (err) => {
if (err) throw err;
console.log(`ready - started server on url: https://app.cal.local:${port}`);
});
});
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This script is for serving nextjs server over https for testing organization's cal video meeting links

apps/web/server.js Outdated Show resolved Hide resolved
Copy link
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, need @hariombalhara for final review for org changes

PeerRich
PeerRich previously approved these changes Nov 27, 2023
Copy link
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, need @hariombalhara for final review for org changes

Copy link
Member

@zomars zomars left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this PR with only the proposed fix.

Copy link
Member

@zomars zomars left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code now LGTM. Waiting for checks

@zomars zomars enabled auto-merge (squash) November 28, 2023 18:17
@zomars zomars merged commit 6704e18 into main Nov 28, 2023
29 checks passed
@zomars zomars deleted the fix/cal-video branch November 28, 2023 18:28
jakazzy pushed a commit to jakazzy/cal.com that referenced this pull request Dec 5, 2023
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cal video core area: core, team members only High priority Created by Linear-GitHub Sync
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cal video meeting urls error in organizations
5 participants