Fix dumbass craco config file failing the ESLint workflow

danerkestey · Jul 22, 2021 · 8109d16 · 8109d16
1 parent e0be788
commit 8109d16
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/craco.config.js b/craco.config.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 const path = require("path");
 
 module.exports = {

diff --git a/src/assets/testProfPic.jpg → src/assets/default_profile.jpg b/src/assets/testProfPic.jpg → src/assets/default_profile.jpg
diff --git a/src/assets/index.js b/src/assets/index.js
@@ -1,6 +1,5 @@
 import Icon from "./icon.svg";
 import Logo from "./logo.svg";
-import testProfPic from "./testProfPic.jpg";
 import DefaultCover from "./DefaultCover.png";
 
-export { Icon, Logo, testProfPic, DefaultCover };
+export { Icon, Logo, DefaultCover };
diff --git a/src/components/organisms/LeaderBoard.jsx b/src/components/organisms/LeaderBoard.jsx
@@ -1,8 +1,8 @@
 import React from "react";
-import { Component } from "react";
 import Styled from "styled-components";
+
 import { LeaderBoardLabel, LeaderBoardStat } from "@atoms"; 
-import { testProfPic } from "@assets";
+import { Firebase } from "@functions";
 
 const StyledDiv = Styled.div`
     color:${props => props.theme.colors.black};
@@ -48,21 +48,36 @@ const StyledText = Styled.p`
 `;
 
 function LeaderBoard({ text }){
+    const [profilePic, setProfilePic ] = React.useState(null);
+    const user = Firebase.auth.currentUser;
+
+    React.useEffect(() => {
+        if(!profilePic)
+            getProfilePic();
+
+    }, []);
+
+    async function getProfilePic() {
+        const x = await Firebase.db.collection("users").doc(user.uid).get("profile_picture");
+        setProfilePic(x);
+
+    }
+
     return (
         <StyledDiv>
             <StyledText>Leaderboard</StyledText>
             <StyledInnerDiv>
                 <LeaderBoardLabel text="Top Listening Hours:"/>
                 <StyledInnerDiv>
-                    <LeaderBoardStat number={1} username="username" hours={1337} href="/" src={testProfPic}></LeaderBoardStat>
-                    <LeaderBoardStat number={2} username="username" hours={420} href="/" src={testProfPic}></LeaderBoardStat>
-                    <LeaderBoardStat number={3} username="username" hours={69} href="/" src={testProfPic}></LeaderBoardStat>
+                    <LeaderBoardStat number={1} username="username" hours={1337} href="/" src={profilePic}></LeaderBoardStat>
+                    <LeaderBoardStat number={2} username="username" hours={420} href="/" src={profilePic}></LeaderBoardStat>
+                    <LeaderBoardStat number={3} username="username" hours={69} href="/" src={profilePic}></LeaderBoardStat>
                 </StyledInnerDiv>
                 <LeaderBoardLabel text="Number of Unique Artists:"/>
                 <StyledInnerDiv>
-                    <LeaderBoardStat number={1} username="username" hours={96} href="/" src={testProfPic}></LeaderBoardStat>
-                    <LeaderBoardStat number={2} username="username" hours={69} href="/" src={testProfPic}></LeaderBoardStat>
-                    <LeaderBoardStat number={3} username="username" hours={69} href="/" src={testProfPic}></LeaderBoardStat>
+                    <LeaderBoardStat number={1} username="username" hours={96} href="/" src={profilePic}></LeaderBoardStat>
+                    <LeaderBoardStat number={2} username="username" hours={69} href="/" src={profilePic}></LeaderBoardStat>
+                    <LeaderBoardStat number={3} username="username" hours={69} href="/" src={profilePic}></LeaderBoardStat>
                 </StyledInnerDiv>
             </StyledInnerDiv>
         </StyledDiv>

diff --git a/src/components/organisms/Sidebar.jsx b/src/components/organisms/Sidebar.jsx
@@ -33,8 +33,22 @@ const StyledText = Styled.h1`
 `;
 
 function Sidebar() {
-    const username = Firebase.auth.currentUser.displayName;
-    const profilePicture = Firebase.auth.currentUser.photoURL;
+    const [profilePic, setProfilePic ] = React.useState(null);
+
+    const user = Firebase.auth.currentUser;
+    const username = user.displayName;
+
+    React.useEffect(() => {
+        if(!profilePic)
+            getProfilePic();
+
+    }, []);
+
+    async function getProfilePic() {
+        const x = await Firebase.db.collection("users").doc(user.uid).get("profile_picture");
+        setProfilePic(x);
+
+    }
 
     return (
         <StyledDiv>
@@ -63,7 +77,7 @@ function Sidebar() {
             <UserButton
                 text={username}
                 location="/settings"
-                profileImage={profilePicture}
+                profileImage={profilePic}
             >
             </UserButton>
         </StyledDiv>

diff --git a/src/functions/Firebase.js b/src/functions/Firebase.js
@@ -70,7 +70,8 @@ async function storeNewUserData(id, email, firstName, lastName, username, dob) {
         "firstName": firstName,
         "lastName": lastName,
         "username": username,
-        "dob": dob
+        "dob": dob,
+        "profile_picture": "https://firebasestorage.googleapis.com/v0/b/cp-317.appspot.com/o/default_profile.jpg?alt=media&token=4ed26d80-388b-4814-95b3-01740138285a"
     };
 
     await db.collection("users")