FS: Bug fixes and entering final phase

Abhinav-Bhattarai · Jan 21, 2021 · a018142 · a018142
1 parent 42add66
commit a018142
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 46 deletions.
diff --git a/client/debug.log b/client/debug.log
@@ -2,3 +2,4 @@
 [0119/093126.682:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [0121/094456.011:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [0121/162819.573:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[0121/201523.771:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
diff --git a/client/src/Components/Credentials/ImageConfig/image-config.jsx b/client/src/Components/Credentials/ImageConfig/image-config.jsx
@@ -62,7 +62,7 @@ const ImageConfig = ({ history, RemoveProfileCard, SetNewProfile }) => {
                 ProfilePicture: profile_pic,
                 MainPost: main_post
             }
-            axios.post(`http://locahost:8000/profile-confirm/${localStorage.getItem('Username')}`, context).then(()=>{})
+            axios.post(`http://localhost:8000/profile-confirm/${localStorage.getItem('Username')}`, context);
             RemoveProfileCard();
         }
     }

diff --git a/client/src/Components/UI/Dropdown/dropdown.jsx b/client/src/Components/UI/Dropdown/dropdown.jsx
@@ -1,8 +1,7 @@
 import React, { Fragment } from 'react';
 import { IconContext } from 'react-icons';
-import { FaCog, FaLock, FaPowerOff } from 'react-icons/fa';
+import { FaLock, FaPowerOff } from 'react-icons/fa';
 import './dropdown.scss';
-import { withRouter } from 'react-router';
 
 const Icon = ()=>{
     return (
@@ -28,15 +27,8 @@ const LockIcon = ()=>{
     )
 }
 
-const SettingsIcon = ()=>{
-    return (
-        <IconContext.Provider value={{ style: { border: '1px solid #fff', padding: '10px 10px', fontSize: '20px', borderRadius: '50%' } }}>
-            <FaCog/>
-        </IconContext.Provider>
-    )
-}
 
-const Dropdown = ({ profile, TriggerDropdown, TriggerLogoutPopup, history }) => {
+const Dropdown = ({ profile, TriggerDropdown, TriggerLogoutPopup }) => {
     return (
         <Fragment>
             <main className='dropdown' onMouseLeave={ TriggerDropdown }>
@@ -50,10 +42,6 @@ const Dropdown = ({ profile, TriggerDropdown, TriggerLogoutPopup, history }) =>
                     <LockIcon/>
                 </header>
 
-                <nav className='dropdown-nav' onClick={ ()=>history.push('/settings') }>
-                    <SettingsIcon/>
-                    <div className='dropdown-nav-name'>Settings</div>
-                </nav>
                 <nav className='dropdown-nav' onClick={ TriggerLogoutPopup }>
                     <Icon/>
                     <div className='dropdown-nav-name'>Logout</div>
@@ -63,4 +51,4 @@ const Dropdown = ({ profile, TriggerDropdown, TriggerLogoutPopup, history }) =>
     )
 }
 
-export default withRouter(Dropdown);
+export default Dropdown;
diff --git a/client/src/Containers/MainPage/mainPage.jsx b/client/src/Containers/MainPage/mainPage.jsx
@@ -39,10 +39,6 @@ const AsyncMessageRoute = React.lazy(() => {
   return import("../../Components/Messages/messages");
 });
 
-const AsyncSettings = React.lazy(() => {
-  return import("../Settings/settings");
-});
-
 const MainPage = ({ authenticate, history }) => {
   const [ people_list, SetPeopleList ] = useState(null);
   const [ requests, SetRequests ] = useState(null);
@@ -657,6 +653,7 @@ const MainPage = ({ authenticate, history }) => {
           SetApiLimiter(true);
         }
       } else {
+        SetPostList(dummy_list)
         SetTempPostList(null);
       }
     }
@@ -977,26 +974,6 @@ const MainPage = ({ authenticate, history }) => {
             }}
           />
 
-          <Route
-            path="/settings"
-            exact
-            render={() => {
-              return (
-                <Suspense fallback={
-                <main className="main-post-container">
-                  <LoadSpinner />
-                </main>}>
-
-                  <AsyncSettings
-                    blur={profile_alert || logout_popup || match_found_timeout ? "5px" : "0px"}
-                    Profile={ my_profile_pic }
-                    ChangeProfile = { (profile)=>SetMyProfilePic(profile) }
-                  />
-                </Suspense>
-              );
-            }}
-          />
-
           <Route
             render={() => {
               return (

diff --git a/server/Routes/profile-confirm.js b/server/Routes/profile-confirm.js
@@ -6,6 +6,7 @@ const cache = redis.createClient();
 const router = express.Router();
 
 router.post('/:Username', (req, res)=>{
+    console.log(true);
     const ProfilePicture = req.body.ProfilePicture;
     const Username = req.params.Username;
     const MainPost = req.body.MainPost;
@@ -15,8 +16,8 @@ router.post('/:Username', (req, res)=>{
                 response.ProfilePicture = ProfilePicture;
                 response.MainPost = MainPost;
                 response.save().then(()=>{
-                    cache.del(`profile-pic/${Username}`);
                     cache.set(`profile-pic/${Username}`, ProfilePicture, ()=>{
+                        console.log('added')
                         return res.json({profile_added: true});
                     })
                 })

diff --git a/server/Routes/profile-route.js b/server/Routes/profile-route.js
@@ -1,8 +1,6 @@
 import express from 'express';
 import ProfilePictureCache from '../Middleware/redis-profile-cache.js';
 import RegistrationModel from '../Models/register-model.js';
-import redis from 'redis';
-const cache = redis.createClient();
 
 const router = express.Router();
 
@@ -11,9 +9,7 @@ router.get('/:Username', ProfilePictureCache, (req, res)=>{
     RegistrationModel.findOne({ Username: Username }).exec().then((response)=>{
         const ProfilePicture = response.ProfilePicture;
         if(ProfilePicture.length >= 10){
-            cache.set(`profile-pic/${Username}`, ProfilePicture, ()=>{   
-                return res.json(ProfilePicture);
-            })
+            return res.json(ProfilePicture);
         }else{
             return res.json(ProfilePicture);
         }