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.

Sign up for GitHub

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

Jump to bottom

fix minor bugs #62

Merged
merged 1 commit into from
Feb 15, 2022
Merged

fix minor bugs #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .firebase/hosting.YnVpbGQ.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Anderson.jpeg,1644730569869,698d250b5a76bac44fc2058251c6dcd7efa2a6781d6fdbedd464
android-chrome-512x512.png,1644891694000,80a4eecc227cd7610630ab7d2fd3fadca843855796b97742994f8a54a3cc9949
default.png,1644351750087,81206609ffc1fba3fd4da2d222a4ff965baded5511496c6a5fac96b39fd63a05
geek.png,1644437063416,0b3dd6959004e3b96bf8677019c55041aa847a9f8e7271f44bf3ef16a70344ee
geekhunt.png,1644874668550,572a5da71d38a446ec7f99e4525eb7778df484d1ae81b74eb218561eb709a9fc
Geek_Hunt-logos_white.png,1644872253938,c5b6650fbdee72fca94f57733b741b8a41abd628b1bf924a0875bcb77bb5ef1d
hunter.png,1644437063420,0d66ecaa9151343fb22f8f3caea5e93e738e8e936d51f3c065d16cf4c79481fe
image.png,1644730569877,739a2685a409b0c9b068252398274753bb926716c579b89ae133511e410ffbec
Expand All @@ -13,12 +14,11 @@ manifest.json,1644251363573,5c997de1364b8be939319fa9209abd77f2caf7f8844999a9e2e9
Melissa.jpeg,1644730569869,1d716c3c88843150315b8e2126fcf5bb8d82eab668cf5b4ed3d4b02b67afcc88
robots.txt,1644251363574,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
_Geek Hunt-logos_white.png,1644437063410,3c2763ede193461a25ac20e6e54ac4c2d190c1e0d82673445d8e866afdb5243f
asset-manifest.json,1644874767400,6995f2878794257fd2187c00ac2fe3574630dedfa90f4726f0f2b553f2f21616
index.html,1644874767400,89ded6a9d03330889ce6161fb06a1575a78ba1ac5fcdea9af2339d50b36d42b9
static/js/main.98d7bfdd.js.LICENSE.txt,1644874767425,fc4b45099106dd7e31426481fa3dbcc22aeaf9ebcfef9b6bc0da3b4daf60c717
static/media/index.06ad11ea3e32fd3e4303.cjs,1644874767425,9c012da182b8279caaf6568c3be86abd82b41c7dd0dcd7125b92ea770bfada1f
static/css/main.66b8d12a.css,1644874767425,077835ecef2844e4758598e37cd6159a0ef8726da4554fb918eaf9885e2b9e28
static/css/main.66b8d12a.css.map,1644874767425,44493ee43f385d73f68cfdde5348bfe782d9f9cbafc6344723f95adc64914e25
geekhunt.png,1644874668550,572a5da71d38a446ec7f99e4525eb7778df484d1ae81b74eb218561eb709a9fc
static/js/main.98d7bfdd.js,1644874767425,7af0c1ed7f982004d7672acff62b57bcb46e9f6d1709f21afcd3b5ef60d850e6
static/js/main.98d7bfdd.js.map,1644874767428,b8744742f902c350a9bc64b110d97299fdb0a790251d2eb00505357f07f7bc98
asset-manifest.json,1644896605854,75bd0c0b974a6b180616f48e752c4b4d6a314ae57bbdb145ccede48a104bac01
index.html,1644896605854,fcb8ba2cce569c9e671225c1e631d16ef229c9e7077032b0888681c49f0f7309
static/js/main.2c01a8fb.js.LICENSE.txt,1644896605870,fc4b45099106dd7e31426481fa3dbcc22aeaf9ebcfef9b6bc0da3b4daf60c717
static/media/index.06ad11ea3e32fd3e4303.cjs,1644896605870,9c012da182b8279caaf6568c3be86abd82b41c7dd0dcd7125b92ea770bfada1f
static/css/main.66b8d12a.css,1644896605870,077835ecef2844e4758598e37cd6159a0ef8726da4554fb918eaf9885e2b9e28
static/css/main.66b8d12a.css.map,1644896605870,82057eb32e90723ccb151ad407a95b0536d505f5211ac63f0180271ed165dd4e
static/js/main.2c01a8fb.js,1644896605871,82964b9863f16006ae2f7d3ea98597899b69e3efa1c3b2d108af4eeba6dd88ec
static/js/main.2c01a8fb.js.map,1644896605873,47c7a1c9bd36df72e1dc7fafeffbcef4dec8931ea2c115664d0d664e228bc245
6 changes: 3 additions & 3 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function App() {
{user ? <Redirect to="/" /> : <SignUp />}
</Route>
<Route exact path="/publicprofile/:id">
<PublicProfile />
{user ? <PublicProfile /> : <Redirect to="/signin" /> }
</Route>
<Route exact path="/profile/:id">
{!user && <Redirect to="/signin" />}
Expand Down Expand Up @@ -93,11 +93,11 @@ function App() {
<Transactions />
</Route>
<Route path="/conversations/:id">
{!user && <Redirect to="/login" />}
{!user && <Redirect to="/signin" />}
{user && <SingleConversation />}
</Route>
<Route exact path="/conversations">
{!user && <Redirect to="/login" />}
{!user && <Redirect to="/signin" />}
{user && <AllConversations />}
</Route>
<Route exact path="/admin">
Expand Down
6 changes: 3 additions & 3 deletions src/components/Messaging/AllMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Link } from "react-router-dom"

export default function AllMessages({ conversation }) {
const { user } = useAuthContext()
const { updateDocument, response } = useFirestore('conversations')
const { updateDocument, response } = useFirestore('conversations')
const [newMessage, setNewMessage] = useState('')

const handleSubmit = async (e) => {
Expand All @@ -35,7 +35,7 @@ export default function AllMessages({ conversation }) {
return (
<div className="flex flex-row h-screen w-screen">
<Sidebar />
<div className="flex flex-auto items-center justify-center">
<div className="flex flex-auto items-center ">
<div className="bg-blue-100 h-5/6 w-3/4 shadow-xl rounded-xl flex-col overflow overflow-auto">
<div className="flex flex-row justify-between p-6">
<h4 className="text-3xl font-bold ml-12 mt-4 "> {conversation.title} with: {conversation.userNames.find(elem => elem !== user.displayName)}</h4>
Expand All @@ -59,7 +59,7 @@ export default function AllMessages({ conversation }) {

</div>)
else return (
<div key={msg.id} className='flex flex-row m-1 space-x-6 border rounded-full bg-transparent bg-yellow-50 shadow-md justify-center'>
<div key={msg.id} className='flex flex-row m-1 space-x-6 border rounded-full bg-transparent bg-yellow-50 shadow-md'>
<div className='ml-6'>
<p className="text-lg font-extrabold font-mono">{msg.senderName} </p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/UI/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function Navbar() {
className="text-xl no-underline
text-white"
>
Hello!,
Hello!
</p>
)}
<a
Expand Down
4 changes: 2 additions & 2 deletions src/components/Users/PublicProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const PublicProfile = () => {
return elem.users.includes(id)
})
finalCheck = checkConvos.includes(true)
}
}

const handleClick = (e) => {
if (!user) {
Expand Down Expand Up @@ -92,7 +92,7 @@ const PublicProfile = () => {
await conversationsRef.add(conversationToCreate);
history.push("/conversations")
}

};

if (!document) {
Expand Down