Update firebase login for Google login

package.json

@@ -60,6 +60,7 @@
     "chart.js": "^2.9.3",
     "clsx": "^1.1.0",
     "draft-js": "^0.11.5",
+    "firebase": "^7.19.1",
     "formik": "^2.1.4",
     "history": "^4.10.1",
     "immer": "^6.0.3",
@@ -86,6 +87,7 @@
     "react-draft-wysiwyg": "^1.14.4",
     "react-dropzone": "^10.2.2",
     "react-feather": "^2.0.3",
+    "react-firebaseui": "^4.1.0",
     "react-helmet": "^5.2.1",
     "react-markdown": "^4.3.1",
     "react-material-ui-form-validator": "^2.1.1",

src/actions/accountActions.js

@@ -2,30 +2,23 @@ import axios from 'src/utils/axios';
 import authService from 'src/services/authService';
 
 export const LOGIN_REQUEST = '@account/login-request';
+export const DISMISS_LOGIN = '@account/dismiss-login';
 export const LOGIN_SUCCESS = '@account/login-success';
 export const LOGIN_FAILURE = '@account/login-failure';
 export const SILENT_LOGIN = '@account/silent-login';
 export const LOGOUT = '@account/logout';
 export const REGISTER = '@account/register';
 export const UPDATE_PROFILE = '@account/update-profile';
 
-export function login(email, password) {
+export function login() {
   return async dispatch => {
-    try {
       dispatch({ type: LOGIN_REQUEST });
+  };
+}
 
-      const user = await authService.loginWithEmailAndPassword(email, password);
-
-      dispatch({
-        type: LOGIN_SUCCESS,
-        payload: {
-          user
-        }
-      });
-    } catch (error) {
-      dispatch({ type: LOGIN_FAILURE });
-      throw error;
-    }
+export function dismissLogin() {
+  return async dispatch => {
+      dispatch({ type: DISMISS_LOGIN });
   };
 }
 
@@ -42,7 +35,6 @@ export function setUserData(user) {
 export function logout() {
   return async dispatch => {
     authService.logout();
-
     dispatch({
       type: LOGOUT
     });

src/components/Auth.js

@@ -1,38 +1,33 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
-import SplashScreen from 'src/components/SplashScreen';
 import { setUserData, logout } from 'src/actions/accountActions';
 import authService from 'src/services/authService';
 
 function Auth({ children }) {
   const dispatch = useDispatch();
-  const [isLoading, setLoading] = useState(true);
 
   useEffect(() => {
     const initAuth = async () => {
       authService.setAxiosInterceptors({
         onLogout: () => dispatch(logout())
       });
 
-      await authService.handleAuthentication();
+      authService.handleAuthentication();
+      authService.firebase
+        .auth()
+        .onAuthStateChanged((user) => {
+          dispatch(setUserData(user));
+          user.getIdToken().then((token) => {
+            authService.setSession(token);
+          })
+        });
 
-      console.log(authService.isAuthenticated());
-
-      if (authService.isAuthenticated()) {
-        const user = await authService.loadUserProfile();
-        await dispatch(setUserData(user));
-      }
-
-      setLoading(false);
     };
-
     initAuth();
+
   }, [dispatch]);
 
-  if (isLoading) {
-    return <SplashScreen />;
-  }
 
   return children;
 }

src/data/courses/advanced/CompetitiveJava.js

@@ -8,16 +8,7 @@ export const competitiveJava = {
   upcoming: 'Oct 1st',
   schedule: [
     {
-      dates: "1st Oct - 5th Dec",
-      days: "Sat, Sun, Tue, Thur",
-      timing: "06:00 PM - 08:00 PM (IST)",
-      link: "",
-      priceCut: "22,000 INR",
-      price: "6,850 INR",
-      active: true,
-    },
-    {
-      dates: "10th Jan - 10th Apr",
+      dates: "10th Jan - 15th Apr",
       days: "Sat, Sun, Wed",
       timing: "06:00 PM - 08:00 PM (IST)",
       link: "",
@@ -28,136 +19,67 @@ export const competitiveJava = {
   ],
   projects: [
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
-    },
-    {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
-    },
-    {
-      title: 'Mobile App Development',
+      title: 'Under Development',
       img: '/static/images/projects/p1.png'
     },
-    {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
-    },
-    {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
-    }
   ],
   topics: [
     {
-      title: 'Revising Python Fundamentals',
+      title: 'Revisiting Java Collection Framework',
       classes: 'Classes 1-4',
       subtopics: [
         'In-built Data Structures',
-        'Control Flow Statements ',
-        'Underatanding OOPS and Modules',
-        'Various File operations'
+        'Classes, Interfaces and Inheritance',
+        'Best practices with Generics and Collections',
+        'lurking over recursion problems'
       ]
     },
     {
-      title: 'Data Discovery and Visualiation',
+      title: 'Getting started with Codeforces',
       classes: 'Classes 5-8',
       subtopics: [
-        'Numpy and array computation',
-        'Processing Images with Numpy',
-        'Data Acquisition - Web Scrapping, Web APIs',
-        'Data Analysis using Pandas',
-        'Importing and Exporting Data '
+        'Start Competitive Programming on Codeforces',
+        'Set up Sublime Text for Competitive Coding',
+        'Create Template to save time in Competitive Coding'
       ]
     },
     {
-      title: 'Classical Machine Learning Algorithms',
+      title: 'Bit Masking and Manipulation',
       classes: 'Classes 9-13',
       subtopics: [
-        'K-Nearest Neighbour search',
-        'K-means clustering',
-        'Linear Regression',
-        'Logistic Regression',
-        'Decision trees and Ensembling Learning',
-        'Random Forest Classifiers',
-        'Support Vector Machines'
-      ]
-    },
-    {
-      title: 'Natural Language Processing',
-      classes: 'Classes 14-18',
-      subtopics: [
-        'Text generation using Markov Chain',
-        'Text classification using Naive Bayes',
-        'Deploy ML model with flask on heroku',
-        'Create a facebook chatbot with flask'
+        'Get, Set, Clear and Update bits',
+        'Fast Exponentiation using Bitmasking',
+        'Generate Subsets using Bitmasking',
+        'Decimal to Binary using Bitwise',
+        'Inclusion Exclusion Concept + Implementation',
       ]
     },
     {
-      title: 'Deep Neural Networks',
-      classes: 'Classes 19-22',
-      subtopics: [
-        'Neural Architectures and Training',
-        'Deep Learning with Keras',
-        'Convolutions and the GoogLe Net',
-        'Transfer Learning with ResNet and AlexNet',
-        'Dimensionality Reduction using Auto-encoders'
-      ]
+      title: 'Under Development',
+      classes: 'Classes 14-30',
+      subtopics: []
     },
-    {
-      title: 'Advanced Deep Learning',
-      classes: 'Classes 23-27',
-      subtopics: [
-        'Recurrent Neural Network',
-        'Long Short Term Memory',
-        'Music Generation using LSTM',
-        'Predict Gender from name with LSTM',
-        'Generative Adversarial Nets'
-      ]
-    },
-    {
-      title: 'Reinforcemnt Learning',
-      classes: 'Classes 27-30',
-      subtopics: [
-        'Foundational Reinforcemnt Learning',
-        'Evolutionary Algorithms and Genetic Algorithms',
-        'Deep Q-learning and training',
-        'Training on OpenAI Gym Simulaters'
-      ]
-    }
   ],
   slides: [
     {
       heading: 'Create Facebook Chatbot',
       subheading: 'Using Natural Language Processing',
       image: '/static/swipes/bot.png'
     },
-    {
-      heading: 'Dedect and recognize Faces',
-      subheading: 'Using Deep Learning',
-      image: '/static/swipes/cup.png'
-    },
-    {
-      heading: 'Generate machine made music',
-      subheading: 'Using Deep Learning',
-      image: '/static/swipes/cup.png'
-    },
-    {
-      heading: 'Learn To make Snapchat Filters',
-      subheading: 'Using Image Processing',
-      image: '/static/swipes/ar.png'
-    }
   ],
   tags: [
-    'ML',
-    'Image Processing',
-    'Deep Learning',
-    'Neural Network',
-    'CNN',
-    'Python'
+    'Dynamic Programming',
+    'Tree',
+    'Graph',
+    'Bitwise',
+    'Pigeonhole Principle',
+    'Number Theory',
+    'Segment Tree',
+    'Fenwick Tree',
+    'Decompositions'
+
   ],
   overview: [
-    "While VR is all about taking people into virtual worlds, AR is about bringing virtual elements into your real world. Imagine learning about dinosaurs by having life-sized ones walk in front of you. See how a particular dress fits you just by having it be augmented onto your body using your phone's camera. Want a virtual pet to roam around in your house? AR can make that possible.",
-    "We’ve been teaching VR for over 12 months but this AR course is BRAND NEW! You’ll learn to design and code Augmented Reality apps using Camp K12's very own HatchXR platform."
+    "Under Development"
   ]
 };

src/data/courses/advanced/MachineLearning.js

@@ -28,24 +28,28 @@ export const machineLearning = {
   ],
   projects: [
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
+      title: 'Movie Recommendation System',
+      img: '/static/images/courses/projects/ml/movie.jpg'
     },
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
+      title: 'Face Detection and Recognition',
+      img: '/static/images/courses/projects/ml/face.jpg'
     },
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
+      title: 'Image Classsification with Neural Network',
+      img: '/static/images/courses/projects/ml/classification.jpg'
     },
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
+      title: 'Text Based Sentiment Analysis',
+      img: '/static/images/courses/projects/ml/sentiment.png'
     },
     {
-      title: 'Mobile App Development',
-      img: '/static/images/projects/p1.png'
+      title: 'Generate new faces with GAN',
+      img: '/static/images/courses/projects/ml/gan.jpg'
+    },
+    {
+      title: 'Simmulator Learning with OpenAI Gym',
+      img: '/static/images/courses/projects/ml/gym.jpg'
     }
   ],
   topics: [