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

Finalize css #60

Merged
merged 3 commits into from
Feb 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 20 additions & 14 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
23783406_10207571272718173_570143501309450992_o.jpg,1644730569869,21b29524d3484d50049e71deea5be84f0f9d061ff89813bae276e17e56c788a0
404.html,1644251363572,3240c6b45513fdd97861a63c8ae3ef0e7d2bf1357ec632ad7e6839473710326c
asset-manifest.json,1644423014081,f062c93ab1ef08c1406324fa9e3aa86205a1ba08f55bab993b313a0b9335af35
Anderson.jpeg,1644730569869,698d250b5a76bac44fc2058251c6dcd7efa2a6781d6fdbedd464f2bc09373e1f
android-chrome-512x512.png,1644891694000,80a4eecc227cd7610630ab7d2fd3fadca843855796b97742994f8a54a3cc9949
default.png,1644351750087,81206609ffc1fba3fd4da2d222a4ff965baded5511496c6a5fac96b39fd63a05
geek.png,1644437063416,0b3dd6959004e3b96bf8677019c55041aa847a9f8e7271f44bf3ef16a70344ee
Geek_Hunt-logos_white.png,1644872253938,c5b6650fbdee72fca94f57733b741b8a41abd628b1bf924a0875bcb77bb5ef1d
hunter.png,1644437063420,0d66ecaa9151343fb22f8f3caea5e93e738e8e936d51f3c065d16cf4c79481fe
image.png,1644730569877,739a2685a409b0c9b068252398274753bb926716c579b89ae133511e410ffbec
logo192.png,1644251363573,3ee59515172ee198f3be375979df15ac5345183e656720a381b8872b2a39dc8b
logo512.png,1644251363573,ee7e2f3fdb8209c4b6fd7bef6ba50d1b9dba30a25bb5c3126df057e1cb6f5331
manifest.json,1644251363573,5c997de1364b8be939319fa9209abd77f2caf7f8844999a9e2e9173f844e7840
Melissa.jpeg,1644730569869,1d716c3c88843150315b8e2126fcf5bb8d82eab668cf5b4ed3d4b02b67afcc88
robots.txt,1644251363574,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
index.html,1644423014080,2830e6fa948c446ccde56a8e1af6d64058e8260371bfc22d4088776d242083f1
logo192.png,1644251363573,3ee59515172ee198f3be375979df15ac5345183e656720a381b8872b2a39dc8b
static/media/chat-icon.f032be1de526b90c22006c9ce07d23d8.svg,1644423014106,18f6d558b38f092fcea12aa13fd4966dc1ecc6739ef8d39be9fc1ae26f6954e7
static/js/main.71b19ece.js.LICENSE.txt,1644423014107,fc4b45099106dd7e31426481fa3dbcc22aeaf9ebcfef9b6bc0da3b4daf60c717
favicon.ico,1644251363572,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
static/media/index.06ad11ea3e32fd3e4303.cjs,1644423014106,9c012da182b8279caaf6568c3be86abd82b41c7dd0dcd7125b92ea770bfada1f
static/media/logo-no-bg.4d881dc9874adc7364eb819a01793fa1.svg,1644423014106,d08bfc42a3dd4f100b415ce742c3d89b9358f02ef7cf4a288095f4625f5526da
static/media/notification.aa8f8c40faaac8a754c9.mp3,1644423014107,eed43f0e0a1d69b724acf4dfa5628b0232d80dcad25bc2118a7beb62da38dc53
default.png,1644351750087,81206609ffc1fba3fd4da2d222a4ff965baded5511496c6a5fac96b39fd63a05
static/css/main.163def93.css,1644423014107,56965644e48eb59f7049379acb30aa59193955c46324010e6fb59a878dd2e4a1
static/css/main.163def93.css.map,1644423014107,d66465a35dac015469681b284abcfcd292810f2bc8907462f829368dedb92542
static/js/main.71b19ece.js,1644423014107,399e70de25f584b35c3379034dc86835d4a431ba71c55677336cb7be48328ac0
static/js/main.71b19ece.js.map,1644423014110,0fb34941b73cb4d09599421dd58ab86ac4d7d080c346cf123a288d6492926be4
_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
4 changes: 4 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@
"destination": "/index.html"
}
]
},
"firestore": {
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
}
}
61 changes: 61 additions & 0 deletions firestore.indexes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"indexes": [
{
"collectionGroup": "conversations",
"queryScope": "COLLECTION",
"fields": [
{
"fieldPath": "users",
"arrayConfig": "CONTAINS"
},
{
"fieldPath": "updatedAt",
"order": "DESCENDING"
}
]
},
{
"collectionGroup": "notifications",
"queryScope": "COLLECTION",
"fields": [
{
"fieldPath": "time",
"order": "DESCENDING"
},
{
"fieldPath": "user",
"order": "ASCENDING"
}
]
},
{
"collectionGroup": "projects",
"queryScope": "COLLECTION",
"fields": [
{
"fieldPath": "uid",
"order": "ASCENDING"
},
{
"fieldPath": "createdAt",
"order": "DESCENDING"
}
]
},
{
"collectionGroup": "transactions",
"queryScope": "COLLECTION",
"fields": [
{
"fieldPath": "uid",
"order": "ASCENDING"
},
{
"fieldPath": "createdAt",
"order": "DESCENDING"
}
]
}
],
"fieldOverrides": []
}
8 changes: 8 additions & 0 deletions firestore.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
rules_version = '2';
service cloud.firestore {
match /databases/{database}/documents {
match /{document=**} {
allow read, write: if true;
}
}
}
1 change: 0 additions & 1 deletion public/5MFoz12RbHaRROhQXAF8svMdxjk2

This file was deleted.

Binary file added public/android-chrome-512x512.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 public/favicon.ico
Binary file not shown.
Binary file added public/geekhunt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/geekhunt.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/geekhunt.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
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>Geek Hunt</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dashboard/Dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export default function Dashboard() {
<div className="flex flex-row p-4 space-x-6 h-4/5 justify-center items-center ">

{error && <p className="error">{error}</p>}
{documents && <div className="bg-blue-100 border-slate-200 p-8 flex-wrap overflow overflow-auto rounded-3xl shadow-md resize"><AllProjects projects={documents} /></div>}
{!documents && <p>No projects to show</p>}
{documents && <div className="bg-blue-100 border-slate-200 p-8 flex-wrap overflow overflow-auto rounded-3xl shadow-md md:w-3/4 md:max-w-screen-xl md:h-3/4 md:max-h-screen-lg resize"><AllProjects projects={documents} /></div>}
{!documents && <p>No project to show</p>}
{/* <div className="bg-green-200 border-slate-200 w-1/2 p-8 flex-wrap overflow overflow-auto rounded-3xl shadow-md">
Report
</div> */}
Expand Down
8 changes: 4 additions & 4 deletions src/components/Dashboard/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function Sidebar() {


return (<>
<div className="top-0 left-0 w-64 resize-x bg-grey-100 h-full border-r overflow overflow-auto">
<div className="top-0 left-0 w-64 resize bg-grey-100 h-full border-r overflow overflow-auto">
<div className="flex flex-shrink-0 items-center justify-center h-36 border-b space-x-3 flex-col ">
<Avatar src={user.photoURL} />
<div>
Expand Down Expand Up @@ -96,15 +96,15 @@ export default function Sidebar() {
<span className="ml-2 text-sm tracking-wide truncate">Home</span>
</p>
</Link>
<Link to="/profile">
<Link to={"/profile/" + user.uid}>
<p href="#" className="relative flex flex-row items-center h-11 focus:outline-none hover:bg-gray-50 text-gray-600 hover:text-gray-800 border-l-4 border-transparent hover:border-indigo-500 pr-6">
<span className="inline-flex justify-center items-center ml-4">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
</span>
<span className="ml-2 text-sm tracking-wide truncate">Profile</span>
</p>
</Link>
<Link to="/discover">
{/* <Link to="/discover">
<p href="#" className="relative flex flex-row items-center h-11 focus:outline-none hover:bg-gray-50 text-gray-600 hover:text-gray-800 border-l-4 border-transparent hover:border-indigo-500 pr-6">
<span className="inline-flex justify-center items-center ml-4">
<svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
Expand All @@ -113,7 +113,7 @@ export default function Sidebar() {
</span>
<span className="ml-2 text-sm tracking-wide truncate">Discover</span>
</p>
</Link>
</Link> */}

{!isPending && (
<li
Expand Down
4 changes: 2 additions & 2 deletions src/components/Messaging/AllConversations.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export default function AllConversations() {
return (
<div className="flex flex-row">
<Sidebar />
<div className="flex flex-auto bg-white-200 items-center justify-center">
<div className="bg-blue-100 h-4/5 w-3/4 shadow-xl rounded-xl flex-col m-6 overflow overflow-auto resize">
<div className="flex flex-auto bg-white-200 justify-center">
<div className="bg-blue-100 h-screen w-3/4 shadow-xl rounded-xl flex-col m-6 overflow overflow-auto resize">
<div className="flex flex-col ml-8 p-6 justify-between">
<h3 className="text-3xl font-bold "> All Conversations </h3>
{selectedConvo.map(conv => (
Expand Down
6 changes: 3 additions & 3 deletions src/components/UI/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Navbar() {
className="text-xl no-underline
text-white"
>
Hello!, {user.displayName}
Hello, {user.displayName}!
</p>
) : (
<p
Expand Down Expand Up @@ -100,7 +100,7 @@ function Navbar() {
>
My Profile
</a>

</>
)}
<a
Expand All @@ -111,7 +111,7 @@ function Navbar() {
Dashboard
</a>
{!isPending && (

<button
className="text-xl px-2 no-underline text-white hover:text-blue-dark ml-2"
onClick={handleLogout}
Expand Down
8 changes: 4 additions & 4 deletions src/components/UI/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Table = () => {
Do you just want to see?
</p>
<p className="text-base text-body-color leading-loose mb-1">
Go to Profiles and see all of our geeks, if you are interested in contacting them just
Go to Profiles and see all of our geeks, if you are interested in contacting them just
</p>
<p className="text-body-color leading-loose font-bold text-lg">
Sign up.
Expand Down Expand Up @@ -367,7 +367,7 @@ const Table = () => {
Are you a Hunter??
</p>
<p className="text-base text-body-color leading-loose mb-1">
Go to the profiles and see the work our geeks have done. If someone
Go to the profiles and see the work our geeks have done. If someone
catches your attention you can contact them right here.
</p>
<p className="text-base text-[#2E4C6D] leading-loose mb-1 font-bold">
Expand Down Expand Up @@ -681,10 +681,10 @@ const Table = () => {
- Manage and show your projects
</p>
<p className="text-base text-body-color leading-loose mb-1">
- Save your transantion.
- Save your transactions.
</p>
<p className="text-base text-body-color leading-loose mb-1">
- Found new Oportunities.
- Find new Opportunities.
</p>
</div>
<div>
Expand Down