From f6e8d35e2030002ecf0e0893716fde2ce82240fe Mon Sep 17 00:00:00 2001 From: AliTahir10 <74157964+AliTahir10@users.noreply.github.com> Date: Thu, 4 May 2023 19:42:56 +0100 Subject: [PATCH] Remove redundant code 1 --- front-end/src/App.js | 7 +----- front-end/src/Feed.js | 13 ++--------- front-end/src/Followers.js | 9 -------- front-end/src/Followings.js | 7 ------ front-end/src/Header.js | 9 ++------ front-end/src/Home.js | 6 +---- front-end/src/ListSong.js | 5 +--- front-end/src/Login.js | 17 ++------------ front-end/src/Messages.css | 22 ------------------ front-end/src/Messages.js | 17 -------------- front-end/src/Post.css | 46 ------------------------------------- front-end/src/Post.js | 45 ------------------------------------ front-end/src/firebase.js | 20 ---------------- 13 files changed, 9 insertions(+), 214 deletions(-) delete mode 100644 front-end/src/Messages.css delete mode 100644 front-end/src/Messages.js delete mode 100644 front-end/src/Post.css delete mode 100644 front-end/src/Post.js delete mode 100644 front-end/src/firebase.js diff --git a/front-end/src/App.js b/front-end/src/App.js index 955e9f6f..374c2862 100644 --- a/front-end/src/App.js +++ b/front-end/src/App.js @@ -11,7 +11,6 @@ import { import axios from "axios"; import { AuthContext } from "./helpers/AuthContext"; import Home from "./Home"; -import Messages from "./Messages"; import MyRates from "./MyRates"; import Profile from "./Profile"; import User from "./User"; @@ -19,7 +18,7 @@ import Login from "./Login"; import Register from "./Register"; import Song from "./Song"; import Header from "./Header"; -import { ToastContainer, toast } from "react-toastify"; +import { ToastContainer } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; import Followers from "./Followers"; import Followings from "./Followings"; @@ -59,7 +58,6 @@ function App() { createRoutesFromElements( <Route path="/" element={<Root />}> <Route index element={<Home />} /> - <Route path="/messages" element={<Messages />} /> <Route path="/myRates" element={<MyRates />} /> <Route path="/myProfile" element={<Profile />} /> <Route path="/login" element={<Login />} /> @@ -81,9 +79,6 @@ function App() { <RouterProvider router={router} /> {console.log(authState)} </AuthContext.Provider> - {/* <Sidebar /> */} - {/* <Feed /> - <Widgets /> */} </div> ); } diff --git a/front-end/src/Feed.js b/front-end/src/Feed.js index 54bc1926..0d825b22 100644 --- a/front-end/src/Feed.js +++ b/front-end/src/Feed.js @@ -2,9 +2,9 @@ import React, { useState, useEffect, useContext } from "react"; import "./Feed.css"; import { AuthContext } from "./helpers/AuthContext"; import axios from "axios"; -import { ToastContainer, toast } from "react-toastify"; +import { toast } from "react-toastify"; -function Feed() { +export default function Feed() { const { userID, authState } = useContext(AuthContext); const [feedData, setFeedData] = useState([]); const [notified, setNotified] = useState(false); @@ -21,7 +21,6 @@ function Feed() { if (response.data.error) { alert(response.data.error); } else { - console.log(response.data); setFeedData(response.data); } }); @@ -32,7 +31,6 @@ function Feed() { if (response.data.error) { alert(response.data.error); } else { - console.log(response.data); setFeedData(response.data); } }); @@ -42,7 +40,6 @@ function Feed() { if (authState) { await getFeed(); // logged in // if logged in and have no feed - console.log(feedData.length); } else { await getGenericFeed(); // not logged in } @@ -102,7 +99,6 @@ function Feed() { function ListPost({ result }) { return ( <> - {/* <h4>{result[0]}</h4> */} <ListSong result={result[0]} /> <div className="userRating"> @@ -125,7 +121,6 @@ function Feed() { function GenericPost({ result }) { return ( <> - {/* <h4>{result[0]}</h4> */} <ListSong result={result[0]} /> <div className="userRating"> @@ -146,8 +141,6 @@ function Feed() { <h2>Home</h2> </div> - {/* {feedData.length === 0 && <div>You are not following anyone</div>} */} - <div className="feedContainer"> {feedData && feedData.map((post) => { @@ -171,5 +164,3 @@ function Feed() { </div> ); } - -export default Feed; diff --git a/front-end/src/Followers.js b/front-end/src/Followers.js index 633926a9..99652025 100644 --- a/front-end/src/Followers.js +++ b/front-end/src/Followers.js @@ -1,13 +1,11 @@ import React, { useState, useContext, useEffect } from "react"; import { AuthContext } from "./helpers/AuthContext"; import Widgets from "./Widgets"; -import { useNavigate } from "react-router"; import axios from "axios"; import "./Followers.css"; import { Link } from "react-router-dom"; export default function Followers() { - const navigate = useNavigate(); const { userID, authState } = useContext(AuthContext); const [followers, setFollowers] = useState([]); const [numOfFolowers, setNumOfFolowers] = useState([]); @@ -24,12 +22,9 @@ export default function Followers() { if (response.data.error) { alert(response.data.error); } else { - // setFollowers(response.data); - response.data.forEach((follower) => { getUser(follower.followerID); }); - // console.log(response.data); setNumOfFolowers(response.data.length); } }); @@ -64,10 +59,6 @@ export default function Followers() { return content; } - // useEffect(() => { - // getFollowers(); - // }, []); - useEffect(() => { getFollowers(); }, [authState]); diff --git a/front-end/src/Followings.js b/front-end/src/Followings.js index 0565784c..f946bdda 100644 --- a/front-end/src/Followings.js +++ b/front-end/src/Followings.js @@ -23,12 +23,9 @@ export default function Followings() { if (response.data.error) { alert(response.data.error); } else { - // setFollowers(response.data); - response.data.forEach((follower) => { getUser(follower.userID); }); - // console.log(response.data); setNumOfFolowings(response.data.length); } }); @@ -63,10 +60,6 @@ export default function Followings() { return content; } - // useEffect(() => { - // getFollowers(); - // }, []); - useEffect(() => { getFollowers(); }, [authState]); diff --git a/front-end/src/Header.js b/front-end/src/Header.js index 2313ed1a..3721b49d 100644 --- a/front-end/src/Header.js +++ b/front-end/src/Header.js @@ -3,14 +3,12 @@ import "./Header.css"; import logo from "./logo.png"; import { Button } from "@material-ui/core"; import { AuthContext } from "./helpers/AuthContext"; - import { useNavigate } from "react-router-dom"; -// import "./Sidebar.css"; -function Header() { +export default function Header() { const navigate = useNavigate(); - const pathname = window.location.pathname; //returns the current url minus the domain name const { authState, logout } = useContext(AuthContext); + function handleLogout() { logout(); navigate("/login"); @@ -22,11 +20,9 @@ function Header() { <img className="logo" src={logo} alt="BestListens logo" /> <h1>BestListens</h1> </div> - {/* <div>Other header content here</div> */} {authState ? ( <Button - // href="/login" variant="outlined" className="login__button" onClick={handleLogout} @@ -48,4 +44,3 @@ function Header() { ); } -export default Header; diff --git a/front-end/src/Home.js b/front-end/src/Home.js index 3d722c9e..19835614 100644 --- a/front-end/src/Home.js +++ b/front-end/src/Home.js @@ -3,13 +3,9 @@ import Feed from "./Feed"; import Widgets from "./Widgets"; import "./Home.css"; import { AuthContext } from "./helpers/AuthContext"; -import axios from "axios"; -import { useNavigate } from "react-router-dom"; function Home() { - const navigate = useNavigate(); - const { userID, authState } = useContext(AuthContext); - const [feed, setFeed] = useState([]); + const { userID } = useContext(AuthContext); useEffect(() => {}, [userID]); diff --git a/front-end/src/ListSong.js b/front-end/src/ListSong.js index 1390e566..62ca1a8d 100644 --- a/front-end/src/ListSong.js +++ b/front-end/src/ListSong.js @@ -1,7 +1,7 @@ import React from "react"; import "./ListSong.css"; -function ListSong(props) { +export default function ListSong(props) { return ( <div className="list-song"> <div className="songtitle"> @@ -9,9 +9,6 @@ function ListSong(props) { </div> <div className="artist">{props.result[2]}</div> <div className="album">{props.result[3]}</div> - {/* {props.result[1]}, {props.result[2]}, {props.result[3]} */} </div> ); } - -export default ListSong; diff --git a/front-end/src/Login.js b/front-end/src/Login.js index b2234295..7449be28 100644 --- a/front-end/src/Login.js +++ b/front-end/src/Login.js @@ -6,14 +6,10 @@ import { Button } from "@material-ui/core"; import "./Login.css"; import "./Home.css"; -function Login() { +export default function Login() { const navigate = useNavigate(); - - // React States const [errorMessages, setErrorMessages] = useState({}); const [isSubmitted, setIsSubmitted] = useState(false); - // const [username, setUsername] = useState(""); - // const [password, setPassword] = useState(""); const { authState, setAuthState, setUserID } = useContext(AuthContext); const login = (username, password) => { @@ -22,7 +18,6 @@ function Login() { if (response.data.error) { alert(response.data.error); } else { - console.log(response.data); localStorage.setItem("accessToken", response.data.accessToken); localStorage.setItem("userID", response.data.userID); setAuthState(true); @@ -56,8 +51,6 @@ function Login() { <input type="text" name="uname" - // value={username} - // onChange={(event) => setUsername(event.target.value)} required /> {renderErrorMessage("uname")} @@ -67,8 +60,6 @@ function Login() { <input type="password" name="pass" - // value={password} - // onChange={(event) => setPassword(event.target.value)} required /> {renderErrorMessage("pass")} @@ -87,12 +78,10 @@ function Login() { Don't have an account? <a href="/register">Register</a>. </p> </div> - {/* <div className="button-container"> - <input type="submit" /> - </div> */} </form> </div> ); + return ( <div className="home"> {authState ? ( @@ -118,5 +107,3 @@ function Login() { </div> ); } - -export default Login; diff --git a/front-end/src/Messages.css b/front-end/src/Messages.css deleted file mode 100644 index 5b021ec2..00000000 --- a/front-end/src/Messages.css +++ /dev/null @@ -1,22 +0,0 @@ -.messages { - flex: 0.4; - border-right: 1px solid var(--bestListen-background); - /* min-width: fit-content; */ - min-width: 40vw; - } - - - .messages__header { - position: sticky; - top: 0; - background-color: white; - z-index: 100; - border: 1px solid var(--bestListen-background); - padding: 15px 20px; - } - - .messages__header > h2 { - font-size: 20px; - font-weight: 800; - } - \ No newline at end of file diff --git a/front-end/src/Messages.js b/front-end/src/Messages.js deleted file mode 100644 index 84e4d466..00000000 --- a/front-end/src/Messages.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react' -import "./Messages.css"; -import "./Home.css"; - -function Messages() { - return ( - <div className="home"> - <div className="messages"> - <div className="messages__header"> - <h2>Messages</h2> - </div> - </div> - </div> - ) -} - -export default Messages \ No newline at end of file diff --git a/front-end/src/Post.css b/front-end/src/Post.css deleted file mode 100644 index 4146b2a0..00000000 --- a/front-end/src/Post.css +++ /dev/null @@ -1,46 +0,0 @@ -.post { - display: flex; - align-items: flex-start; - border-bottom: 1px solid var(--bestListen-background); - padding-bottom: 10px; -} - -.post__body { - flex: 1; - padding: 10px; -} - -.post__body > img { - border-radius: 20px; -} - -.post__footer { - display: flex; - justify-content: space-between; - margin-top: 20px; -} - -.post__headerDescription { - margin-bottom: 10px; - font-size: 15px; -} - -.post__headerText > h3 { - font-size: 15px; - margin-bottom: 5px; -} - -.post__badge { - font-size: 14px !important; - color: var(--bestListen-color); -} - -.post__headerSpecial { - font-weight: 600; - font-size: 12px; - color: gray; -} - -.post__avatar { - padding: 20px; -} diff --git a/front-end/src/Post.js b/front-end/src/Post.js deleted file mode 100644 index bfe2d149..00000000 --- a/front-end/src/Post.js +++ /dev/null @@ -1,45 +0,0 @@ -import React, { forwardRef } from "react"; -import "./Post.css"; -import { Avatar } from "@material-ui/core"; -import VerifiedUserIcon from "@material-ui/icons/VerifiedUser"; -import ChatBubbleOutlineIcon from "@material-ui/icons/ChatBubbleOutline"; -import RepeatIcon from "@material-ui/icons/Repeat"; -import FavoriteBorderIcon from "@material-ui/icons/FavoriteBorder"; -import PublishIcon from "@material-ui/icons/Publish"; - -const Post = forwardRef( - ({ displayName, username, verified, text, image, avatar }, ref) => { - return ( - <div className="post" ref={ref}> - <div className="post__avatar"> - <Avatar src={avatar} /> - </div> - <div className="post__body"> - <div className="post__header"> - <div className="post__headerText"> - <h3> - {displayName}{" "} - <span className="post__headerSpecial"> - {verified && <VerifiedUserIcon className="post__badge" />} @ - {username} - </span> - </h3> - </div> - <div className="post__headerDescription"> - <p>{text}</p> - </div> - </div> - <img src={image} alt="" /> - <div className="post__footer"> - <ChatBubbleOutlineIcon fontSize="small" /> - <RepeatIcon fontSize="small" /> - <FavoriteBorderIcon fontSize="small" /> - <PublishIcon fontSize="small" /> - </div> - </div> - </div> - ); - } -); - -export default Post; diff --git a/front-end/src/firebase.js b/front-end/src/firebase.js deleted file mode 100644 index 78aba0dc..00000000 --- a/front-end/src/firebase.js +++ /dev/null @@ -1,20 +0,0 @@ -import firebase from "firebase/compat/app"; -import "firebase/compat/auth"; -import "firebase/compat/firestore"; - -const firebaseConfig = { - apiKey: "AIzaSyCw-li0IscS2rJr68dSjoJL3KM3eFq5PfE", - authDomain: "twitter-clone-1faac.firebaseapp.com", - databaseURL: "https://twitter-clone-1faac.firebaseio.com", - projectId: "twitter-clone-1faac", - storageBucket: "twitter-clone-1faac.appspot.com", - messagingSenderId: "316208638057", - appId: "1:316208638057:web:75a37bf24fab32ff145af8", - measurementId: "G-HGFP2LDXP9", -}; - -const firebaseApp = firebase.initializeApp(firebaseConfig); - -const db = firebaseApp.firestore(); - -export default db; -- GitLab