Skip to content

Commit

Permalink
change to meetlH + logo
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Sep 6, 2024
1 parent 0626d4e commit 932d4b3
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 24 deletions.
Binary file modified client/public/favicon.ico
Binary file not shown.
4 changes: 2 additions & 2 deletions client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
content="Online video calling site for MLH"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>MeetLH</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file added client/public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/public/logo192.png
Binary file not shown.
Binary file removed client/public/logo512.png
Binary file not shown.
14 changes: 2 additions & 12 deletions client/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "MeetLH",
"name": "MeetLH",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
Expand Down
3 changes: 2 additions & 1 deletion client/src/pages/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ const HomePage = () => {
return (
<div className="flex flex-col items-center justify-center min-h-screen bg-gray-100">
<Toaster position="top-center" reverseOrder={false} />
<h1 className="text-4xl font-bold mb-8">Welcome to VMeet</h1>
<img style={{ height: '120px' }} className="m-16" src={`${process.env.PUBLIC_URL}/logo.png`} alt="MLH Logo"/>
<h1 className="text-4xl font-bold mb-8">Welcome to MeetLH</h1>
<div className="w-full max-w-md">
<Input
type="text"
Expand Down
9 changes: 7 additions & 2 deletions client/src/pages/MeetingPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,13 @@ const MeetingPage = () => {
<div className="flex flex-col h-screen bg-gray-100">
<Toaster position="top-center" reverseOrder={false} />
<header className="bg-blue-600 text-white p-4">
<h1 className="text-2xl">Meeting: {meeting_id}</h1>
<p>Welcome, {username}!</p>
<div className="flex flex-row justify-between items-center">
<div>
<h1 className="text-2xl">{meeting_id}</h1>
<p>Welcome, {username}!</p>
</div>
<img style={{ height: '60px' }} className="m-4" src={`${process.env.PUBLIC_URL}/logo.png`} alt="MLH Logo"/>
</div>
</header>
<main className="flex flex-1 overflow-hidden">
<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 p-4">
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
restart: always
environment:
- [email protected]
- CERTBOT_DOMAINS=vmeet.ericzhang.tech
- CERTBOT_DOMAINS=meetlh.ericzhang.tech
ports:
- 80:80
- 443:443
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion prod.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export REACT_APP_API_URL="https://vmeet.ericzhang.tech"
export REACT_APP_API_URL="https://meetlh.ericzhang.tech"
export PRODUCTION="true"

(cd client && rm -rf build && npm i && npm run build)
Expand Down
8 changes: 4 additions & 4 deletions user_conf.d/vmeet.conf
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
server {
listen 80;
server_name vmeet.ericzhang.tech;
server_name meetlh.ericzhang.tech;

# Redirect all HTTP traffic to HTTPS
return 301 https://$host$request_uri;
}

server {
listen 443 ssl http2;
server_name vmeet.ericzhang.tech;
server_name meetlh.ericzhang.tech;

# SSL certificates (use Let's Encrypt certificates or any other trusted provider)
ssl_certificate /etc/letsencrypt/live/vmeet.ericzhang.tech/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/vmeet.ericzhang.tech/privkey.pem;
ssl_certificate /etc/letsencrypt/live/meetlh.ericzhang.tech/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/meetlh.ericzhang.tech/privkey.pem;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
Expand Down

0 comments on commit 932d4b3

Please sign in to comment.