Merge branch 'feature/interface' of https://github.com/CreateThrive/react-firebase-admin into feature/interface

Author: TOPOFGR

README.md

@@ -64,7 +64,7 @@ React Firebase Admin is our in-house admin dashboard boilerplate, used in many o
 - PWA ready thanks to CRA and Firebase
 - Multi-tenancy
 - Internationalization (English/Spanish)
-- Interface to choose between Real Time Database and Firestore
+- Ability to choose between Firebase Realtime Database or Firestore
 
 ## Tech Stack
 

firestore.rules

@@ -13,15 +13,15 @@ service cloud.firestore {
 
     match /users/{userId} {
 
-    function isUser() {
+    function isIdentified() {
       return request.auth.uid == userId;
     }
 
-      allow read: if isAuthenticated() && (isAdmin() || isUser());
+      allow read: if isAuthenticated() && (isAdmin() || isIdentified());
 
       allow write: if isAuthenticated() && isAdmin();
 
-      allow update: if isAuthenticated() && (isAdmin() || isUser());
+      allow update: if isAuthenticated() && (isAdmin() || isIdentified());
 
       allow delete: if isAuthenticated() && isAdmin();
     }

functions/package-lock.json

@@ -33,7 +33,7 @@ const questions = [
     type: 'list',
     name: 'database',
     message: 'Select the database of your choice:',
-    choices: ['Real Time Database', 'Firestore'],
+    choices: ['Realtime Database', 'Firestore'],
   },
 ];
 

functions/setupProject.js

@@ -6,7 +6,7 @@ import 'mocha';
 
 chai.use(chaiAsPromised);
 
-describe('onDelete Real Time Database', () => {
+describe('onDelete Realtime Database', () => {
   let userRecord: any;
 
   it('should delete the user from the authentication section', async () => {

functions/test/db/users/onDelete.test.ts

@@ -3,7 +3,7 @@ import * as chai from 'chai';
 import onUpdate from '../../../src/db/users/onUpdate.function';
 import 'mocha';
 
-describe('onUpdate Real Time Database', () => {
+describe('onUpdate Realtime Database', () => {
   let userRecord: any;
 
   before(async () => {

functions/test/db/users/onUpdate.test.ts

@@ -12,18 +12,22 @@ import './UserForm.scss';
 import DatePicker from '../DatePicker';
 
 const UserForm = ({ isEditing, isProfile, user, setUser, action }) => {
-  const { loading } = useSelector(
+  const { loading, success } = useSelector(
     (state) => ({
       loading: state.users.loading,
+      success: state.users.success,
     }),
     shallowEqual
   );
 
   const dispatch = useDispatch();
 
   useEffect(() => {
+    if (success) {
+      setUser((prevState) => ({ ...prevState, file: null }));
+    }
     return () => dispatch(usersCleanUp());
-  }, [dispatch]);
+  }, [dispatch, success]);
 
   const onChangeHandler = useChangeHandler(setUser);
 
@@ -242,7 +246,7 @@ const UserForm = ({ isEditing, isProfile, user, setUser, action }) => {
                           />
                           <span className="file-cta">
                             <span className="file-icon">
-                              <i className="fas fa-upload" />
+                              <i className="mdi mdi-upload" />
                             </span>
                             <span className="file-label">
                               {user.file

src/components/UserForm/index.jsx

@@ -3,6 +3,7 @@ import 'firebase/database';
 import 'firebase/auth';
 import 'firebase/storage';
 import 'firebase/functions';
+import 'firebase/firestore';
 
 const config = {
   apiKey: process.env.REACT_APP_FIRE_BASE_KEY,
@@ -12,7 +13,7 @@ const config = {
   storageBucket: process.env.REACT_APP_FIRE_BASE_STORAGE_BUCKET,
   messagingSenderId: process.env.REACT_APP_FIRE_BASE_MESSAGING_SENDER_ID,
   appId: process.env.REACT_APP_FIRE_BASE_APP_ID,
-  measurementId: process.env.REACT_APP_FIRE_BASE_MEASURMENT_ID
+  measurementId: process.env.REACT_APP_FIRE_BASE_MEASURMENT_ID,
 };
 
 firebase.initializeApp(config);

src/firebase.js

@@ -30,7 +30,7 @@ const Users = () => {
 
   const dispatch = useDispatch();
 
-  const [search, setSearch] = useState();
+  const [search, setSearch] = useState('');
 
   useEffect(() => {
     if (isAdmin) {

src/pages/Users/index.jsx

@@ -9,7 +9,7 @@ import {
   fetchDocument,
   createDocument,
   deleteDocument,
-  modifyDocument,
+  updateDocument,
 } from '../api';
 
 export const USERS_FETCH_DATA_INIT = createAction('USERS_FETCH_DATA_INIT');
@@ -256,7 +256,7 @@ export const modifyUser = ({
       isAdmin,
       logoUrl: logoUrl || newLogoUrl,
     };
-    const updateUserDbTask = modifyDocument('users', id, userData);
+    const updateUserDbTask = updateDocument('users', id, userData);
 
     try {
       await Promise.all([deleteLogoTask, uploadLogoTask, updateUserDbTask]);