Skip to content

fix(AllUsers): filtering #89

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
whirleyt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(AllUsers): filtering #89

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
64 changes: 57 additions & 7 deletions src/components/AdvancedSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Button, Form, Select } from 'semantic-ui-react'

const AdvancedSearch = (props) => {
const options = [
{ key: 'GH', text: 'GH', value: 'GH' },
{ key: 'FS', text: 'FS', value: 'FS' },
{ key: 'GH', text: 'GH', value: 'gh' },
{ key: 'FS', text: 'FS', value: 'fs' },
]
return (
<div className="advanced-search-container">
Expand All @@ -28,12 +28,62 @@ const AdvancedSearch = (props) => {
name="cohortId"
/>
</div>
<Form.Input
label='City'
placeholder='City'
<select name="state" id="state"
onChange={props.onInputChange}
name="city"
/>
>
<option value="" selected="selected">State</option>
<option value="al">Alabama</option>
<option value="ak">Alaska</option>
<option value="az">Arizona</option>
<option value="ar">Arkansas</option>
<option value="ca">California</option>
<option value="co">Colorado</option>
<option value="ct">Connecticut</option>
<option value="de">Delaware</option>
<option value="dc">District Of Columbia</option>
<option value="fl">Florida</option>
<option value="ga">Georgia</option>
<option value="hi">Hawaii</option>
<option value="id">Idaho</option>
<option value="il">Illinois</option>
<option value="in">Indiana</option>
<option value="ia">Iowa</option>
<option value="ks">Kansas</option>
<option value="ky">Kentucky</option>
<option value="la">Louisiana</option>
<option value="me">Maine</option>
<option value="md">Maryland</option>
<option value="ma">Massachusetts</option>
<option value="mi">Michigan</option>
<option value="mn">Minnesota</option>
<option value="ms">Mississippi</option>
<option value="mo">Missouri</option>
<option value="mt">Montana</option>
<option value="ne">Nebraska</option>
<option value="nv">Nevada</option>
<option value="nh">New Hampshire</option>
<option value="nj">New Jersey</option>
<option value="nm">New Mexico</option>
<option value="ny">New York</option>
<option value="nc">North Carolina</option>
<option value="nd">North Dakota</option>
<option value="oh">Ohio</option>
<option value="ok">Oklahoma</option>
<option value="or">Oregon</option>
<option value="pa">Pennsylvania</option>
<option value="ri">Rhode Island</option>
<option value="sc">South Carolina</option>
<option value="sd">South Dakota</option>
<option value="tn">Tennessee</option>
<option value="tx">Texas</option>
<option value="ut">Utah</option>
<option value="vt">Vermont</option>
<option value="va">Virginia</option>
<option value="wa">Washington</option>
<option value="wv">West Virginia</option>
<option value="wi">Wisconsin</option>
<option value="wy">Wyoming</option>
</select>
<Form.Input
label='Company'
placeholder='Company'
Expand Down
52 changes: 31 additions & 21 deletions src/components/AllUsers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class AllUsers extends Component {
advancedSearchIsClicked: false,
cohort: '',
cohortId: '',
city: '',
state: '',
company: '',
industry: ''
}
Expand Down Expand Up @@ -68,24 +68,24 @@ class AllUsers extends Component {
if (params.has("cohortId")) {
query = users.where("cohortId", "==", params.get("cohortId"))
}
if (params.has("city")) {
query = users.where("cityLower", "==", params.get("city"))
if (params.has("state")) {
query = users.where("state", "==", params.get("state"))
}
if (params.has("company")) {
query = users.where("companyLower", "==", params.get("company"))
query = users.where("company", "==", params.get("company"))
}

query
.get()
.then(function (users) {
let filteredUsers = [];
users.forEach(user => {
filteredUsers.push(user.data());
})
currentComponent.setState({
allUsers: filteredUsers
.get()
.then(function (users) {
let filteredUsers = [];
users.forEach(user => {
filteredUsers.push(user.data());
})
currentComponent.setState({
allUsers: filteredUsers
})
})
})
}
}

Expand All @@ -94,7 +94,7 @@ class AllUsers extends Component {
if (
this.state.cohort ||
this.state.cohortId ||
this.state.city ||
this.state.state ||
this.state.company ||
this.state.industry
) {
Expand All @@ -106,8 +106,8 @@ class AllUsers extends Component {
if (this.state.cohortId) {
queryParams.push(`cohortId=${this.state.cohortId}`);
}
if (this.state.city) {
queryParams.push(`city=${this.state.city}`);
if (this.state.state) {
queryParams.push(`state=${this.state.state}`);
}
if (this.state.company) {
queryParams.push(`company=${this.state.company}`);
Expand All @@ -116,12 +116,23 @@ class AllUsers extends Component {
searchResultsUrl += queryParamsString;
history.push(searchResultsUrl);
}
this.setState({
cohort: '',
cohortId: '',
state: '',
company: '',
industry: ''
})
}


onInputChange = (evt, param) => {
evt.preventDefault()
if(param){
this.setState({ [param.name]: param.value.toLowerCase() })
} else {
this.setState({[evt.target.name]: evt.target.value})
}
}


Expand Down Expand Up @@ -151,12 +162,11 @@ class AllUsers extends Component {


render() {
console.log('STATE IN ALL USERS: ',this.state)
let filteredUsers;
if (this.state.searchVal) {
filteredUsers = this.filterUsersOnSearch()
}
const allUsers= this.state.allUsers.filter(user => user.id !== this.props.loggedInUser.id)
const allUsers = this.state.allUsers.filter(user => user.id !== this.props.loggedInUser.id)
const { advancedSearchIsClicked, searchVal } = this.state
return (
<div>
Expand All @@ -177,14 +187,14 @@ class AllUsers extends Component {
{advancedSearchIsClicked ? "close" : "search options"}
</a>
</div>
{advancedSearchIsClicked && <AdvancedSearch onInputChange={this.onInputChange} onSubmit={this.onSubmit}/>}
{advancedSearchIsClicked && <AdvancedSearch onInputChange={this.onInputChange} onSubmit={this.onSubmit} />}
</div>
<div className="all-users-results">
{searchVal ? (
this.renderSearchCards(filteredUsers)
) : (
this.renderSearchCards(allUsers)
)}
this.renderSearchCards(allUsers)
)}
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/CommentCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class CommentCard extends Component {
)}
</Card.Header>
<Card.Meta>
{user.cohort}-{user.cohortId}
{user.cohort.toUpperCase()}-{user.cohortId}
</Card.Meta>
{comment.code ? (
<Highlight className="javascript">
Expand Down
104 changes: 81 additions & 23 deletions src/components/EditProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ class EditProfile extends React.Component {
event.preventDefault()
this.setState({ isProfileSaved: true })
if (
this.state.isWorkAdressEdited &&
this.state.isWorkAdressEdited &&
!this.state.isUserDetailsEdited
) {
this.getGeoCodeByAddress()
.then(result => {
const userWorkInfo = {
companyLower: this.state.loggedInUser.companyLower,
workInfo: {
address: this.state.address,
coordinates: result
.then(result => {
const userWorkInfo = {
company: this.state.loggedInUser.company,
workInfo: {
address: this.state.address,
coordinates: result
}
}
}
this.updateUser(userWorkInfo)
})
this.updateUser(userWorkInfo)
})
} else if (
this.state.isWorkAdressEdited &&
this.state.isWorkAdressEdited &&
this.state.isUserDetailsEdited
) {
this.getGeoCodeByAddress()
Expand Down Expand Up @@ -126,14 +126,14 @@ class EditProfile extends React.Component {


onWorkAddressChange = (address) => {
const companyLower = address.split(',')[0].toLowerCase()
const company = address.split(',')[0].toLowerCase()
this.setState({
isWorkAdressEdited: true,
address,
loggedInUser: {
...this.state.loggedInUser,
workInfo: {...this.state.workInfo, address},
companyLower: companyLower,
workInfo: { ...this.state.workInfo, address },
company: company
}
})
}
Expand All @@ -146,8 +146,8 @@ class EditProfile extends React.Component {
onChange: this.onWorkAddressChange,
}
const options = [
{ key: 'GH', text: 'GH', value: 'GH' },
{ key: 'FS', text: 'FS', value: 'FS' },
{ key: 'GH', text: 'GH', value: 'gh' },
{ key: 'FS', text: 'FS', value: 'fs' },
]
return (
<div className="user-profile-container">
Expand Down Expand Up @@ -187,13 +187,61 @@ class EditProfile extends React.Component {
name="city"
value={user.city}
/>
<label className="label">State</label>
<Input
type="text"
onChange={this.onInputChange}
name="state"
value={user.state}
/>
<select name="state" id="state"
onChange={this.onInputChange}>
<option value="" selected="selected">State</option>
<option value="al">Alabama</option>
<option value="ak">Alaska</option>
<option value="az">Arizona</option>
<option value="ar">Arkansas</option>
<option value="ca">California</option>
<option value="co">Colorado</option>
<option value="ct">Connecticut</option>
<option value="de">Delaware</option>
<option value="dc">District Of Columbia</option>
<option value="fl">Florida</option>
<option value="ga">Georgia</option>
<option value="hi">Hawaii</option>
<option value="id">Idaho</option>
<option value="il">Illinois</option>
<option value="in">Indiana</option>
<option value="ia">Iowa</option>
<option value="ks">Kansas</option>
<option value="ky">Kentucky</option>
<option value="la">Louisiana</option>
<option value="me">Maine</option>
<option value="md">Maryland</option>
<option value="ma">Massachusetts</option>
<option value="mi">Michigan</option>
<option value="mn">Minnesota</option>
<option value="ms">Mississippi</option>
<option value="mo">Missouri</option>
<option value="mt">Montana</option>
<option value="ne">Nebraska</option>
<option value="nv">Nevada</option>
<option value="nh">New Hampshire</option>
<option value="nj">New Jersey</option>
<option value="nm">New Mexico</option>
<option value="ny">New York</option>
<option value="nc">North Carolina</option>
<option value="nd">North Dakota</option>
<option value="oh">Ohio</option>
<option value="ok">Oklahoma</option>
<option value="or">Oregon</option>
<option value="pa">Pennsylvania</option>
<option value="ri">Rhode Island</option>
<option value="sc">South Carolina</option>
<option value="sd">South Dakota</option>
<option value="tn">Tennessee</option>
<option value="tx">Texas</option>
<option value="ut">Utah</option>
<option value="vt">Vermont</option>
<option value="va">Virginia</option>
<option value="wa">Washington</option>
<option value="wv">West Virginia</option>
<option value="wi">Wisconsin</option>
<option value="wy">Wyoming</option>
</select>
<label className="label">Country</label>
<Input
type="text"
Expand Down Expand Up @@ -269,3 +317,13 @@ const mapDispatchToProps = {


export default connect(mapStateToProps, mapDispatchToProps)(EditProfile)



// <label className="label">State</label>
// <Input
// type="text"
// onChange={this.onInputChange}
// name="state"
// value={user.state}
// />
2 changes: 1 addition & 1 deletion src/components/PostCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class PostCard extends Component {
)}
</Card.Header>
<Card.Meta>
{user.cohort}-{user.cohortId}
{user.cohort.toUpperCase()}-{user.cohortId}
</Card.Meta>
{post.link ? (
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/SearchCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SearchCard extends Component {
<a className="searchcard-username" onClick={(event) => this.onUserNameClick(event, user)}>{user.firstName} {user.lastName}</a>
</Card.Header>
<Card.Meta>
{user.cohort} - {user.cohortId}
{user.cohort && user.cohort.toUpperCase()} - {user.cohortId}
</Card.Meta>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/UserProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class UserProfile extends React.Component {
null
)}
{user.cohort && user.cohortId ? (
<Header className="user-profile-cohort" as="h4">{user.cohort} {user.cohortId}</Header>
<Header className="user-profile-cohort" as="h4">{user.cohort.toUpperCase()} {user.cohortId}</Header>
) : (
null
)}
Expand All @@ -60,7 +60,7 @@ class UserProfile extends React.Component {
null
)}
{user.city ? (
<Header className="user-profile-details" as="h4">Lives in {user.city}, {user.state} {user.country}</Header>
<Header className="user-profile-details" as="h4">Lives in {user.city}, {user.state.toUpperCase()} {user.country}</Header>
) : (
null
)}
Expand Down