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.

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

Implemented search bar for giphy #324

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
38,625 changes: 38,625 additions & 0 deletions client/package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ function App() {
return (
<div className="">
<Layout>
{/* Insert your compoents inside this layout entity */}
{/* Insert your components inside this layout entity */}
<Giphy />
<BrowserRouter>
<Switch>
<Route exact path="/" component={ToolsView} />
Expand Down
Binary file added client/src/assets/giphy/displaypic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions client/src/assets/giphy/searchhh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/giphy/settingsgif.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion client/src/components/Apps/Giphy/Giphy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import React from "react";
import GiphyHeader from "./GiphyHeader/GiphyHeader";

const Giphy = () => {
return <div>This is the giphy page</div>;
return (
<div>
<GiphyHeader />
</div>
);
};

export default Giphy;
22 changes: 22 additions & 0 deletions client/src/components/Apps/Giphy/GiphyHeader/GiphyHeader.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.giphy-headerr {
display: flex;
width: 100%;
align-items: center;
}

.giphy-headerr .settingsgiphy,
.giphy-headerr .dpgiphy {
margin-left: 1.5rem;
margin-top: 0.5rem;
}

.giphy-headerr img.settingsgiphy {
width: 20px;
height: 20px;
margin-top: 0.8rem;
}

.giphy-headerr img.dpgiphy {
width: 35px;
height: 35px;
}
17 changes: 17 additions & 0 deletions client/src/components/Apps/Giphy/GiphyHeader/GiphyHeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
import SearchBar from "../searchcomponent/searchbar.component";
import Settings from "../../../../assets/giphy/settingsgif.svg";
import DisplayPic from "../../../../assets/giphy/displaypic.png";
import "./GiphyHeader.css";

const GiphyHeader = () => {
return (
<div className="giphy-headerr">
<SearchBar text="Search Zuri" />
<img src={Settings} alt="" className="settingsgiphy" />
<img src={DisplayPic} alt="" className="dpgiphy" />
</div>
);
};

export default GiphyHeader;
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react";
import SearchIcon from "../../../../assets/giphy/searchhh.svg";
import "./searchbar.css";
// Styles

const SearchBar = (props) => {
return (
<div className="appsearchbarr">
<input type="text " placeholder={props.text} />
<img src={SearchIcon} alt="" />
</div>
);
};

export default SearchBar;
49 changes: 49 additions & 0 deletions client/src/components/Apps/Giphy/searchcomponent/searchbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

.appsearchbarr {
display: flex;
position: relative;
margin-top: 1rem;
width: 85%;
}

.appsearchbarr input {
position: relative;
width: 100%;
margin-left: 2rem;
padding-left: 1rem;
background: rgba(255, 255, 255, 0.4);
border: 0.8px solid rgba(153, 153, 153, 0.2);
box-sizing: border-box;
border-radius: 5px;
height: 35px;
outline: none;
font-size: 0.9rem;
}

.appsearchbarr input::placeholder {
font-size: 0.7rem;
position: absolute;
top: 0.55rem;
}
.appsearchbarr img {
position: absolute;
right: 0.6rem;
top: 0.35rem;
}

@media (max-width: 920px) {
.appsearchbarr {
width: 80%;
}
}

@media (max-width: 500px) {
.appsearchbarr {
width: 50%;
}
}
7 changes: 0 additions & 7 deletions client/src/components/searchbar.component.js

This file was deleted.

Loading