Skip to content

Commit

Permalink
real-time ui update
Browse files Browse the repository at this point in the history
  • Loading branch information
MuskanGarg24 committed Jul 12, 2024
1 parent db35951 commit 4f1aebf
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
index.html,1720809969709,a839a56bb0750a1a812aa27fff69e82b0209ab8c6b02ede45ab45a44f75d8eb0
vite.svg,1720706613180,699a02e0e68a579f687d364bbbe7633161244f35af068220aee37b1b33dfb3c7
404.html,1720809094198,762bf484ba67404bd1a3b181546ea28d60dfddf18e9dd4795d8d25bcf3c1a890
assets/index-DA5WumIt.css,1720809969710,95462bff06232e4ec88557ad793d1511d7c1ebc747e6adf5e237aa61f73551b0
assets/index-CxQph2Dc.js,1720809969710,b1ca2d6de323d668ba72b0bea8cde5f66027761c6b06f558684b02e96d809456
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "realtime-chat-app-8c3df"
}
}
20 changes: 20 additions & 0 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
on:
push:
branches:
- master
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_REALTIME_CHAT_APP_8C3DF }}
channelId: live
projectId: realtime-chat-app-8c3df
21 changes: 21 additions & 0 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
on: pull_request
permissions:
checks: write
contents: read
pull-requests: write
jobs:
build_and_preview:
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_REALTIME_CHAT_APP_8C3DF }}
projectId: realtime-chat-app-8c3df
16 changes: 16 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
33 changes: 33 additions & 0 deletions public/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Page Not Found</title>

<style media="screen">
body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
#message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
#message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
#message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
#message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
#message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
#message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
#message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
#load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
@media (max-width: 600px) {
body, #message { margin-top: 0; background: white; box-shadow: none; }
body { border-top: 16px solid #ffa100; }
}
</style>
</head>
<body>
<div id="message">
<h2>404</h2>
<h1>Page Not Found</h1>
<p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
<h3>Why am I seeing this?</h3>
<p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
</div>
</body>
</html>
12 changes: 12 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en" data-theme="light">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>Realtime Chat App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
15 changes: 10 additions & 5 deletions src/components/Conversation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ const Conversation = ({ searchQuery, selectedUser, onUserSelect }) => {
}
}, [messages]);

const lastMessageText = lastMessage?.[1]?.text ? lastMessage?.[1]?.text : "";
const lastMessageTimestamp = lastMessage?.[1]?.timestamp
? new Date(lastMessage?.[1]?.timestamp).toLocaleTimeString([], {
hour: "2-digit",
minute: "2-digit",
})
: "";

return (
<div className="p-1">
{filteredData.length === 0 && (
Expand All @@ -34,11 +42,8 @@ const Conversation = ({ searchQuery, selectedUser, onUserSelect }) => {
{filteredData.map((item, index) => (
<div className="mt-3" onClick={() => onUserSelect(item)} key={index}>
<ConversationItem
message={lastMessage?.[1]?.text}
time={new Date(lastMessage?.[1]?.timestamp).toLocaleTimeString([], {
hour: "2-digit",
minute: "2-digit",
})}
message={lastMessageText}
time={lastMessageTimestamp}
name={item.name}
active={selectedUser?.isOnline}
messageStatus={lastMessage?.[1]?.messageStatus}
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useMessagesData.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const useMessagesData = (loggedInUserId, selectedUserId) => {
setMessages(getAllMessages);
};
fetchMessages();
}, [loggedInUserId, selectedUserId]);
}, [loggedInUserId, selectedUserId, messages]);

return messages;
};
Expand Down

0 comments on commit 4f1aebf

Please sign in to comment.