Skip to content

search bar added, filteration not applied, card view again change to … #2

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

Open
muhammad-bilal-ali wants to merge 1 commit into
base: Ahmer-Bin-Sajid
Choose a base branch
from
Open

search bar added, filteration not applied, card view again change to … #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion MernApp/client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions MernApp/client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { Route, Switch} from "react-router-dom";
import ComponentA from "./Components/Test/ComponentA";
import Driver from './Driver'
import React, { Component } from 'react';
import { Route, Switch } from "react-router-dom";
import Driver from "./Driver";
import React, { Component } from "react";

class App extends Component {

render() {
// console.log("A render")
return (
<div>
<Driver/>
{/* <ComponentA/> */}
<Driver />
{/* <ComponentA/> */}
</div>
);
}
}

export default App;
export default App;
235 changes: 138 additions & 97 deletions MernApp/client/src/Components/frontend-components/RestaurantListShow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,153 @@
import React, { Component } from 'react';
import React, { Component } from "react";
import "../../css/restaurantlistshow.css";
import axios from 'axios'
import SelectBranch from '../frontend-components/FilterBranch';
import WaiterImage from '../../images/waiter.png';
import axios from "axios";
import SelectBranch from "../frontend-components/FilterBranch";
import WaiterImage from "../../images/waiter.png";

class Rest extends Component {

constructor(props) {
super(props);
this.state = {
isParent :false ,
isChild :false ,
branchesdetails:[] ,
restaurantData:[] ,
restaurantId:null,
isLoaded:false,
button:'<button type="btn" class="btn btn-info">Click</button>'
}
this.goBack = this.goBack.bind(this);
constructor(props) {
super(props);
this.state = {
isParent: false,
isChild: false,
branchesdetails: [],
restaurantData: [],
restaurantId: null,
isLoaded: false,
button: '<button type="btn" class="btn btn-info">Click</button>',
};
this.goBack = this.goBack.bind(this);
}
goBack(){
goBack() {
this.setState({
isParent :true ,
isChild :false
})
isParent: true,
isChild: false,
});
}
showHome(id){

this.setState({
isParent :false ,
isChild :true ,
restaurantId:id
})
}
componentDidMount=()=>{
this.goBack();
this.setState({
resData:[]
})
showHome(id) {
this.setState({
isParent: false,
isChild: true,
restaurantId: id,
});
}
componentDidMount = () => {
this.goBack();
this.setState({
resData: [],
});
try {
//FETCHING RESTAURANTS
axios.get('/restaurant/get')
.then((data)=>{
if(data.data.status == "error")
{
// alert(data.data.message);
console.log(data.data.message);
}
else if(data.data.status == "ok" && data.data.resData.length)
{
this.setState({
restaurantData:data.data.resData,
isLoaded:true,
isParent:true
})
console.log(this.state.restaurantData)
// alert("Restaurant fetched successfully!");
}
//FETCHING RESTAURANTS
axios
.get("/restaurant/get")
.then((data) => {
if (data.data.status == "error") {
// alert(data.data.message);
console.log(data.data.message);
} else if (data.data.status == "ok" && data.data.resData.length) {
this.setState({
restaurantData: data.data.resData,
isLoaded: true,
isParent: true,
});
console.log(this.state.restaurantData);
// alert("Restaurant fetched successfully!");
}
})
.catch((e)=>{
alert(e);
console.log(e);
.catch((e) => {
alert(e);
console.log(e);
});
}
catch (error) {
console.log(error);
}
}
render() {
const {isChild , isParent , isLoaded} = this.state;
if(isParent && isLoaded){
return (
<div className="container mt-4 mb-4 p-2 bg-light"> <div className="d-flex justify-content-center mb-4"><span style={{letterSpacing:2,fontFamily:'sans-serif',fontSize:40,color:'darkslategrey',fontWeight:'bold'}}>Restaurant Cards</span></div>
<div className="row justify-content-around">
{this.state.restaurantData.map((rs) => (
<div class="col-md-3 p-2 m-2 shadow bg-dark text-white card rounded" style={{width:'30rem'}} style={{cursor:'pointer'}}>
<img class="card-img-top border-dark" src={`/Images/Restaurants/${rs.fName}`} alt="Card image cap" id={rs._id} onClick={this.showHome.bind(this , rs._id)}/>
<div class="card-body">
<h2 className="res-name-hover" style={{letterSpacing:2,fontFamily:'sans-serif'}}>{rs.name}</h2>
<p className="small" style={{letterSpacing:1,fontFamily:'sans-serif',color:'blue'}}>branches{rs.branches}</p>
<p class="card-text" style={{letterSpacing:1}}>{rs.description}</p>
</div>
} catch (error) {
console.log(error);
}
};
render() {
const { isChild, isParent, isLoaded } = this.state;
if (isParent && isLoaded) {
return (
<div className="container">
<div class="wrapper">
<div class="searchBar">
<input
id="searchQueryInput"
type="text"
name="searchQueryInput"
placeholder="Search"
value=""
/>
<button
id="searchQuerySubmit"
type="submit"
name="searchQuerySubmit"
>
<i class="fas fa-search"></i>
</button>
</div>
))}
</div>
</div>
);
}else if(isChild && isLoaded){
return(
<div>
<SelectBranch
resId = {this.state.restaurantId} />
</div>
)
}
else if(!isLoaded){
return(
<div className=" mx-auto d-flex flex-row justify-content-center mt-4 mb-4 pt-4 pb-4">
<div className="d-flex align-items-center">
<h2 className="p-2 m-2" style={{fontFamily:'sans-serif',letterSpacing:2,fontWeight:'bold'}}>Your restaurant data will load here.</h2>
</div>

<div className="row justify-content-around mb-5">
{this.state.restaurantData.map((rs) => (
<div
className="single-restaurant-list mt-1 mb-1"
id={rs._id}
onClick={this.showHome.bind(this, rs._id)}
>
<div className="d-flex restaurant-flex flex-row">
<div className="restaurant-list-photo p-3">
<div className="restaurant-image-box">
<img
class="restaurant-list-img"
src={`/Images/Restaurants/${rs.fName}`}
/>
</div>
</div>
<div className="restaurant-list-details p-3">
<div className="d-flex flex-column ">
<div className="d-flex flex-row align-items-center">
<div className="name p2">
<h2>{rs.name}</h2>
<hr />
</div>
</div>
<div className="mt-0">
<p className="text-muted pt-2">{rs.description}</p>
</div>
</div>
</div>
</div>
</div>
))}
</div>
</div>
<div className="p-2 m-2">
<img src={WaiterImage} style={{width:'22vw',height:'48vh'}}/>
);
} else if (isChild && isLoaded) {
return (
<div>
<SelectBranch resId={this.state.restaurantId} />
</div>
</div>
)
}

);
} else if (!isLoaded) {
return (
<div className=" mx-auto d-flex flex-row justify-content-center mt-4 mb-4 pt-4 pb-4">
<div className="d-flex align-items-center">
<h2
className="p-2 m-2"
style={{
fontFamily: "sans-serif",
letterSpacing: 2,
fontWeight: "bold",
}}
>
Your restaurant data will load here.
</h2>
</div>
<div className="p-2 m-2">
<img src={WaiterImage} style={{ width: "22vw", height: "48vh" }} />
</div>
</div>
);
}
}
}
export default Rest;
92 changes: 87 additions & 5 deletions MernApp/client/src/css/restaurantlistshow.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,88 @@
.res-name-hover:hover{
color:aqua
.restaurant-list-holder {
overflow: hidden;
}
.single-restaurant-list {
background-color: #26272b;
width: 80vw;
overflow: hidden;
margin-left: auto;
margin-right: auto;
}
.single-restaurant-list:hover {
transform: scale(1.01);
/* opacity: 0.85; */
}

.restaurant-image-box {
position: relative;
background-color: white;
width: 100%;
height: auto;
}
.restaurant-list-img {
position: relative;
height: 150px;
width: 150px;
border: 0.001rem solid white;
}
.restaurant-list-para {
font-size: 15px;
font-family: Arial, Helvetica, sans-serif;
}
.restaurant-list-details div {
color: white;
font-size: 15px;
}
.name {
font-family: Arial, Helvetica, sans-serif;
font-weight: bold;
letter-spacing: 0.3vw;
}
.p2 h2 {
color: rgb(27, 184, 184);
text-decoration: none;
}
.single-restaurant-list:hover {
cursor: pointer;
}

button {
font-family: "Times New Roman", Times, serif;
letter-spacing: 3px;
}

.wrapper {
width: 100%;
max-width: 25.25rem;
margin: 1rem auto;
}

.searchBar {
width: 100%;
display: flex;
align-items: center;
}

#searchQueryInput {
width: 100%;
height: 2.8rem;
background: #f5f5f5;
outline: none;
border: none;
border-radius: 1.625rem;
padding: 0 3.5rem 0 1.5rem;
font-size: 1rem;
}

#searchQuerySubmit {
width: 3.5rem;
height: 2.8rem;
margin-left: -3.5rem;
background: none;
border: none;
outline: none;
}

#searchQuerySubmit:hover {
cursor: pointer;
}
.res-name-hover{
color:bisque;
}