Merge pull request #8 from stanbianca/diana

Merged branch "diana"
bianca-mihaela-stan · Jun 10, 2021 · dbe845c · dbe845c
2 parents a6cd164 + a901723
commit dbe845c
Show file tree

Hide file tree

Showing 17 changed files with 240 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -158,4 +158,7 @@ sketch
 !.vscode/extensions.json
 *.code-workspace
 
+### other ###
+*.txt
+
 # End of https://www.toptal.com/developers/gitignore/api/vscode,react,firebase,node
diff --git a/meetsy/public/index.html b/meetsy/public/index.html
@@ -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>Meetsy</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/meetsy/src/components/Account/index.js b/meetsy/src/components/Account/index.js
@@ -2,20 +2,22 @@ import React from 'react';
 import { AuthUserContext, withAuthorization } from '../Session';
 import { PasswordForgetForm } from '../PasswordForget';
 import PasswordChangeForm from '../PasswordChange';
+import Firebase from '../Firebase/firebase';
 
 
 const AccountPage = () => (
   <AuthUserContext.Consumer>
-  {authUser => (
-    <div>
-      <h1>Account: {authUser.email}</h1>
-      <PasswordForgetForm />
-      <PasswordChangeForm />
-    </div>
-  )}
-</AuthUserContext.Consumer>
+    {authUser => (
+      <div>
+        <h1>Account: {authUser.email}</h1>
+        <PasswordForgetForm />
+        <PasswordChangeForm />
+      </div>
+    )
+    }
+  </AuthUserContext.Consumer>
 );
- 
+
 const condition = authUser => !!authUser;
- 
+
 export default withAuthorization(condition)(AccountPage);
diff --git a/meetsy/src/components/Calendar/calendar.css b/meetsy/src/components/Calendar/calendar.css
@@ -11,6 +11,10 @@ body {
     background: rgb(0, 0, 0) !important;
 }
 
+.rbc-btn-group > button:focus {
+    background-color: #01abf4 !important;
+}
+
 .rbc-btn-group > button {
     color: white !important;
 }

diff --git a/meetsy/src/components/Calendar/index.js b/meetsy/src/components/Calendar/index.js
@@ -1,5 +1,6 @@
 import { Calendar, momentLocalizer } from 'react-big-calendar';
 import moment from 'moment';
+import { withAuthorization } from '../Session';
 import 'react-big-calendar/lib/css/react-big-calendar.css';
 import './calendar.css';
 
@@ -26,4 +27,5 @@ const MyCalendar = props => (
     </div>
 )
 
-export default MyCalendar;
+const condition = authUser => !!authUser;
+export default withAuthorization(condition)(MyCalendar);
diff --git a/meetsy/src/components/Firebase/firebase.js b/meetsy/src/components/Firebase/firebase.js
@@ -41,7 +41,10 @@ class Firebase {
     doSignInWithEmailAndPassword = (email, password) =>
         this.auth.signInWithEmailAndPassword(email, password);
 
-    doSignOut = () => this.auth.signOut();
+  doSignOut = () => {
+    this.auth.signOut();
+    window.location.reload();
+  }
 
     doPasswordReset = email => this.auth.sendPasswordResetEmail(email);
 

diff --git a/meetsy/src/components/Landing/MainLanding.js b/meetsy/src/components/Landing/MainLanding.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import styled from "styled-components";
+import { AuthUserContext, withAuthorization } from '../Session';
 
 const MainLanding = () => {
     return (
@@ -25,4 +26,5 @@ h1 {
 }
 `;
 
-export default MainLanding;
+const condition = authUser => !authUser;
+export default withAuthorization(condition)(MainLanding);