Fixed some merge conflicts

Eevee-Elites-Capstone · Feb 7, 2022 · 84469fb · 84469fb
2 parents f09fe4f + 034647d
commit 84469fb
Show file tree

Hide file tree

Showing 42 changed files with 1,473 additions and 618 deletions.
diff --git a/.env b/.env
diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache
@@ -1,14 +1,14 @@
-404.html,1643929334763,daa499dd96d8229e73235345702ba32f0793f0c8e5c0d30e40e37a5872be57aa
-asset-manifest.json,1643930230902,d27fb45dfa431563b096fa9c568e6f54a285fe7a28933636a47a3de0e3c8eac0
-favicon.ico,1643924365082,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
-index.html,1643930230901,244f1edd6cf2f52160712197a56e4229a6751364b6e70f4c574cb82e8d3083ab
-logo192.png,1643924365165,3ee59515172ee198f3be375979df15ac5345183e656720a381b8872b2a39dc8b
-logo512.png,1643924365198,ee7e2f3fdb8209c4b6fd7bef6ba50d1b9dba30a25bb5c3126df057e1cb6f5331
-manifest.json,1643924365231,5c997de1364b8be939319fa9209abd77f2caf7f8844999a9e2e9173f844e7840
-robots.txt,1643924365247,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
-static/css/main.32704574.css,1643930230913,376aa22efc18a3df1b83c0ea352a55ddc4d43fe048dcbe9ab4101f61a37c9032
-static/css/main.32704574.css.map,1643930230913,b44615b4a3b02f12cd0d562f9c7fa5665e4f72fd431aa3a2073853071217b6a3
-static/js/main.5af5c58b.js,1643930230924,1e92929b971141f8dbdd1dedc199372ff65c8e3d2ec7911402e1c83e78a6a257
-static/js/main.5af5c58b.js.LICENSE.txt,1643930230913,fc4b45099106dd7e31426481fa3dbcc22aeaf9ebcfef9b6bc0da3b4daf60c717
-static/js/main.5af5c58b.js.map,1643930230914,fff5cb356d4701435a365e14de0b52befc8ede6650e526671b3c0b476a827ce8
-static/media/index.06ad11ea3e32fd3e4303.cjs,1643930230913,9c012da182b8279caaf6568c3be86abd82b41c7dd0dcd7125b92ea770bfada1f
+asset-manifest.json,1644004435554,1317c6de3dfc90231d9edf8d7fe57ec4b9332ecfcae5bf4ded9c91c95cd74855
+index.html,1644004470193,bbdaeb13d834651253f786d7fd023a2eae442a2ad0094bfa1404cf2b1fb1ba7f
+manifest.json,1644003422792,5c997de1364b8be939319fa9209abd77f2caf7f8844999a9e2e9173f844e7840
+robots.txt,1644003422792,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
+404.html,1644003422789,3240c6b45513fdd97861a63c8ae3ef0e7d2bf1357ec632ad7e6839473710326c
+favicon.ico,1644003422790,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
+logo192.png,1644003422791,3ee59515172ee198f3be375979df15ac5345183e656720a381b8872b2a39dc8b
+static/js/main.2b9ad023.js.LICENSE.txt,1644004435559,fc4b45099106dd7e31426481fa3dbcc22aeaf9ebcfef9b6bc0da3b4daf60c717
+static/media/index.06ad11ea3e32fd3e4303.cjs,1644004435559,9c012da182b8279caaf6568c3be86abd82b41c7dd0dcd7125b92ea770bfada1f
+static/css/main.eb895fb3.css,1644004435559,da2bc63857d16b0f669e81fd543ecfe19357976c91fc56ea0574619c0fd23a95
+static/css/main.eb895fb3.css.map,1644004435559,558fd8413fb6991154d3d3837d27a48be0b4688feaa41725c8f4403f6d6b4476
+logo512.png,1644003422791,ee7e2f3fdb8209c4b6fd7bef6ba50d1b9dba30a25bb5c3126df057e1cb6f5331
+static/js/main.2b9ad023.js,1644004435559,78b329b1b03a7ddcca11a493167d6b8dc2a2e14f05a18ba9b2f8e4d91f6ec21b
+static/js/main.2b9ad023.js.map,1644004435560,f55994b89a64bd19d73a8cec05d096e6601ad85c395a9b3394e77508c386cdce
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ src/firebase/fbConfig.js
 .env.development.local
 .env.test.local
 .env.production.local
+.env
 
 npm-debug.log*
 yarn-debug.log*

diff --git a/README.md b/README.md
@@ -3,6 +3,17 @@
 firebase@8.5
 react-router-dom@5.1
 
+## Deploy with Firebase
+
+`npm run build
+
+firebase login
+
+firebase init --- Realtime database
+               |- Hosting
+               |- point to build folder
+firebase deploy`
+
 ## Available Scripts
 
 In the project directory, you can run:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,10 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fullcalendar/daygrid": "^5.10.1",
+    "@fullcalendar/react": "^5.10.1",
     "@tailwindcss/forms": "^0.4.0",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
+    "dotenv": "^16.0.0",
     "firebase": "8.5",
     "firebase-admin": "^10.0.2",
     "firebase-functions": "^3.16.0",

diff --git a/public/default.png b/public/default.png
diff --git a/src/App.js b/src/App.js
@@ -17,74 +17,83 @@ import EditProfile from './components/EditProfile';
 import FetchProfiles from './components/Home/FetchProfiles';
 import MessagingPage from './components/Messaging/MessagingPage'
 import SingleConversation from './components/Messaging/SingleConversation'
+import Calendar from './components/Calendar/Calendar';
+import GoogleCalendar from './components/Calendar/GoogleCalendar';
 import AllConversations from './components/Messaging/AllConversations'
 
 function App() {
-  const { authIsReady, user } = useAuthContext()
+  const { authIsReady, user } = useAuthContext();
 
   return (
-    <div className="min-h-max">
-      {/* <div>
+    <>
+      <div className="min-h-max">
+        {/* <div>
       <Navbar />
       </div> */}
-      <div>
-        {authIsReady && (
-          <BrowserRouter>
-            <Switch>
-              <Route exact path="/">
-                <LandingPage />
-              </Route>
-              <Route exact path="/landing">
-                <LandingPage />
-              </Route>
-
-              <Route exact path="/home">
-                {user ? <Home /> : <Redirect to="/signin" />}
-              </Route>
-              <Route path="/home" component={Home} />
-              <Route path="/signin">
-                <SignIn />
-              </Route>
-              <Route path="/signup">
-                {user ? <Redirect to="/" /> : <SignUp />}
-              </Route>
-              <Route exact path="/profile">
-                <Profile />
-              </Route>
-              <Route exact path="/editprofile">
-                <EditProfile />
-              </Route>
-              <Route path="/dashboard">
-                <Dashboard />
-                {user && <OnlineUsers />}
-              </Route>
-              <Route path="/createproject">
-                {!user && <Redirect to="/signin" />}
-                {user && <CreateProject />}
-              </Route>
-              <Route path="/projects/:id">
-                {!user && <Redirect to="/signin" />}
-                {user && <SingleProject />}
-              </Route>
-              <Route path="/fetchProfiles">
-                <FetchProfiles />
-              </Route>
-              <Route path="/messages">
-                <MessagingPage />
-              </Route>
-              <Route path="/conversations/:id">
-                {!user && <Redirect to="/login" />}
-                {user && <SingleConversation />}
-              </Route>
-              <Route path="/allconversations">
-                {!user && <Redirect to="/login" />}
-                {user && <AllConversations />}
-              </Route>
-            </Switch>
-          </BrowserRouter>
-        )}
+        <div>
+          {authIsReady && (
+            <BrowserRouter>
+              <Switch>
+                <Route exact path="/">
+                  <LandingPage />
+                </Route>
+                <Route exact path="/landing">
+                  <LandingPage />
+                </Route>
+                <Route exact path="/home">
+                  {user ? <Home /> : <Redirect to="/signin" />}
+                </Route>
+                <Route path="/home" component={Home} />
+                <Route path="/signin">
+                  <SignIn />
+                </Route>
+                <Route path="/signup">
+                  {user ? <Redirect to="/" /> : <SignUp />}
+                </Route>
+                <Route exact path="/profile">
+                  {!user && <Redirect to="/signin" />}
+                  {user && <Profile />}
+                </Route>
+                <Route exact path="/editprofile">
+                  <EditProfile />
+                </Route>
+                <Route path="/dashboard">
+                  <Dashboard />
+                  {user && <OnlineUsers />}
+                </Route>
+                <Route path="/createproject">
+                  {!user && <Redirect to="/signin" />}
+                  {user && <CreateProject />}
+                </Route>
+                <Route path="/projects/:id">
+                  {!user && <Redirect to="/signin" />}
+                  {user && <SingleProject />}
+                </Route>
+                <Route path="/fetchProfiles">
+                  <FetchProfiles />
+                </Route>
+                <Route path="/calendar">
+                  {!user && <Redirect to="/signin" />}
+                  {user && <GoogleCalendar />}
+                </Route>
+                <Route path="/messages">
+                  <MessagingPage />
+                </Route>
+                <Route path="/conversations/:id">
+                  {!user && <Redirect to="/login" />}
+                  {user && <SingleConversation />}
+                </Route>
+                <Route path="/allconversations">
+                  {!user && <Redirect to="/login" />}
+                  {user && <AllConversations />}
+                </Route>
+              </Switch>
+            </BrowserRouter>
+          )}
+        </div>
       </div>
-    </div>
+      <Footer />
+    </>
   );
 }