Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added search bar in home #838

Merged
merged 17 commits into from
Jul 20, 2023
Merged

Added search bar in home #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c119ea8
Added search bar in home
krutikajichkar Jul 16, 2023
3c5ee68
Merge branch 'master' into krutikajichkar
narayan954 Jul 17, 2023
4e717e0
Merge branch 'master' into krutikajichkar
narayan954 Jul 18, 2023
9372571
fixed styles
narayan954 Jul 18, 2023
c2f05e5
Merge branch 'master' into krutikajichkar
narayan954 Jul 18, 2023
50f473c
removed console.log and fixed alignment of search bar
krutikajichkar Jul 18, 2023
d2547d8
fixed alignment of search bar and removed console
krutikajichkar Jul 18, 2023
84090a0
Merge branch 'master' into krutikajichkar
narayan954 Jul 18, 2023
82a7ccc
formatting
narayan954 Jul 18, 2023
db9ad86
aligned search bar
krutikajichkar Jul 18, 2023
a3fae60
made search bar accessible for global posts
krutikajichkar Jul 19, 2023
1726591
removed console
krutikajichkar Jul 19, 2023
a3116d0
resolved conflicts
krutikajichkar Jul 19, 2023
1b02887
format
narayan954 Jul 19, 2023
38735b1
Merge branch 'master' into krutikajichkar
narayan954 Jul 20, 2023
81d62a0
add style to search bar
narayan954 Jul 20, 2023
2b154ed
refactored css in index.css
narayan954 Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 101 additions & 36 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { auth, db } from "./lib/firebase";

import ErrorBoundary from "./reusableComponents/ErrorBoundary";
import { FaArrowCircleUp } from "react-icons/fa";
import { FaSearch } from "react-icons/fa";
import { RowModeContext } from "./hooks/useRowMode";
import { makeStyles } from "@mui/styles";

Expand Down Expand Up @@ -77,6 +78,8 @@ function App() {
const [postText, setPostText] = useState("");
const [rowMode, setRowMode] = useState(false);
const [showScroll, setShowScroll] = useState(false);
const [searchText, setSearchText] = useState("");
const [searchedPosts, setSearchedPosts] = useState([]);

const navigate = useNavigate();
const location = useLocation();
Expand All @@ -89,6 +92,10 @@ function App() {
}
};

const handleSearch = (e) => {
setSearchText(e.target.value);
};

const scrollTop = () => {
window.scrollTo({ top: 0, behavior: "smooth" });
};
Expand Down Expand Up @@ -156,6 +163,24 @@ function App() {
setLoadMorePosts(false);
}, [loadMorePosts]);

useEffect(() => {
const fetchSearchResults = async () => {
setSearchedPosts(
posts.filter(
(post) =>
post.post?.displayName
?.toLowerCase()
.includes(searchText?.toLowerCase()) ||
post.post?.username
?.toLowerCase()
.includes(searchText?.toLowerCase())
)
);
};

fetchSearchResults();
}, [searchText, posts.length]);

return (
<RowModeContext.Provider value={rowMode}>
<ErrorBoundary inApp={true}>
Expand Down Expand Up @@ -185,48 +210,88 @@ function App() {
path="/dummygram/"
element={
user ? (
<div className="flex">
<div style={{ display: "flex", justifyContent: "center" }}>
<ErrorBoundary inApp={true}>
<SideBar />
</ErrorBoundary>
<div
className="home-posts-container"
style={
!loadingPosts
? {}
: {
width: "100%",
minHeight: "100vh",
display: "flex",
justifyContent: "center",
alignItems: "center",
}
}
style={{
display: "flex",
justifyContent: "center",
flexDirection: rowMode ? "row" : "column",
}}
>
{loadingPosts ? (
<Loader />
) : (
<div
className={`${
rowMode ? "app__posts" : "app_posts_column flex"
}`}
>
<ErrorBoundary inApp>
{posts.map(({ id, post }) => (
<Post
rowMode={rowMode}
key={id}
postId={id}
user={user}
post={post}
shareModal={setOpenShareModal}
setLink={setCurrentPostLink}
setPostText={setPostText}
<div
className="home-posts-container"
style={
!loadingPosts
? {}
: {
width: "100%",
minHeight: "100vh",
display: "flex",
flexDirection: rowMode ? "row" : "column",
justifyContent: "center",
alignItems: "center",
}
}
>
{loadingPosts ? (
<Loader />
) : (
<div
style={{ display: "flex", flexDirection: "column" }}
className={`${
rowMode ? "app__posts " : "app_posts_column flex"
}`}
>
<div
className="search-bar"
style={{ minWidth: "300px" }}
>
<input
type="search"
className="search-input"
value={searchText}
placeholder="Search Here..."
onChange={handleSearch}
/>
))}
</ErrorBoundary>
</div>
)}
<label className="search-icon">
<FaSearch />
</label>
</div>
<ErrorBoundary inApp={true}>
<div className={rowMode ? "app__posts" : ""}>
{searchText
? searchedPosts.map(({ id, post }) => (
<Post
rowMode={rowMode}
key={id}
postId={id}
user={user}
post={post}
shareModal={setOpenShareModal}
setLink={setCurrentPostLink}
setPostText={setPostText}
/>
))
: posts.map(({ id, post }) => (
<Post
rowMode={rowMode}
key={id}
postId={id}
user={user}
post={post}
shareModal={setOpenShareModal}
setLink={setCurrentPostLink}
setPostText={setPostText}
/>
))}
</div>
</ErrorBoundary>
</div>
)}
</div>
</div>
</div>
) : (
Expand Down
39 changes: 0 additions & 39 deletions src/components/SearchBar/index.css
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions src/components/SearchBar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import "./index.css";

import React, { memo, useEffect, useState } from "react";
import { auth, db } from "../../lib/firebase";

Expand Down Expand Up @@ -68,7 +66,10 @@ function SearchBar() {
currentPostLink={currentPostLink}
postText={postText}
/>
<div className="search-bar" style={{ marginTop: "-150px" }}>
<div
className="search-bar"
style={{ marginTop: "-150px", minWidth: "380px" }}
>
<input
type="search"
className="search-input"
Expand Down
Loading
Loading