remove default chip from homies - frontend

This commit is contained in:
Bilal
2020-09-18 01:30:13 +03:00
committed by Senad Uka
parent a8b836b03f
commit 77469a469b
4 changed files with 9 additions and 36 deletions

View File

@@ -4,13 +4,11 @@ import { Navbar } from 'react-materialize';
import MakeMoneyMove from './cash/MakeMoneyMove'; import MakeMoneyMove from './cash/MakeMoneyMove';
import Flow from "./homies/Flow"; import Flow from "./homies/Flow";
import Cash from './cash/Cash'; import Cash from './cash/Cash';
import Chips from './chips/Chips';
import Homies from './homies/Homies'; import Homies from './homies/Homies';
import { BrowserRouter as Router, Route } from "react-router-dom"; import { BrowserRouter as Router, Route } from "react-router-dom";
import RoutableNavItem from './common/RoutableNavItem'; import RoutableNavItem from './common/RoutableNavItem';
import { import {
CRIB, CRIB,
CHIPS,
MAKE_MONEY_MOVE, MAKE_MONEY_MOVE,
HOMIE_FLOW, HOMIE_FLOW,
HOMIES, PUT_IN_WORK HOMIES, PUT_IN_WORK
@@ -31,10 +29,6 @@ function App() {
Homies Homies
</RoutableNavItem> </RoutableNavItem>
<RoutableNavItem href={CHIPS}>
Chips
</RoutableNavItem>
<RoutableNavItem href={MAKE_MONEY_MOVE}> <RoutableNavItem href={MAKE_MONEY_MOVE}>
Make Money Move Make Money Move
</RoutableNavItem> </RoutableNavItem>
@@ -49,7 +43,6 @@ function App() {
<Route exact path={CRIB} component={Cash} /> <Route exact path={CRIB} component={Cash} />
<Route exact path={HOMIES} component={Homies} /> <Route exact path={HOMIES} component={Homies} />
<Route path={HOMIE_FLOW} component={Flow} /> <Route path={HOMIE_FLOW} component={Flow} />
<Route path={CHIPS} component={Chips} />
<Route path={MAKE_MONEY_MOVE} component={MakeMoneyMove} /> <Route path={MAKE_MONEY_MOVE} component={MakeMoneyMove} />
<Route path={PUT_IN_WORK} component={PutInWork} /> <Route path={PUT_IN_WORK} component={PutInWork} />
</div> </div>

View File

@@ -4,3 +4,4 @@ export const CHIPS = '/chips';
export const MAKE_MONEY_MOVE = '/make-money-move'; export const MAKE_MONEY_MOVE = '/make-money-move';
export const PUT_IN_WORK = '/put-in-work'; export const PUT_IN_WORK = '/put-in-work';
export const HOMIE_FLOW = '/homie/:homie_id/flow'; export const HOMIE_FLOW = '/homie/:homie_id/flow';
export const ONBOARDING = '/og/onboarding';

View File

@@ -8,31 +8,11 @@ const NewHomieForm = (props) => {
const [homieName, setHomieName] = useState(""); const [homieName, setHomieName] = useState("");
const [aboutHomie, setAboutHomie] = useState(""); const [aboutHomie, setAboutHomie] = useState("");
const [homieImportance, setHomieImportance] = useState(""); const [homieImportance, setHomieImportance] = useState("");
const [homieDefaultChip, setHomieDefaultChip] = useState("");
const [chips, setChips] = useState([]);
const [busy, setBusy] = useState(false); const [busy, setBusy] = useState(false);
useEffect(() => {
(async () => {
try {
const response = await axios.get('/api/chips');
if (response.status === 200 && response.data) {
setChips(response.data);
}else {
errorToast();
}
}catch (e) {
errorToast();
}
})();
}, []);
const chipOptions = chips.map((chip, index) => <option key={index} value={chip.id}>{ chip.name }</option>);
const disableAddButton = () => { const disableAddButton = () => {
return homieName.length === 0 || return homieName.length === 0 ||
homieImportance === "" || homieImportance === "" ||
homieDefaultChip === "" ||
busy; busy;
} }
@@ -40,7 +20,6 @@ const NewHomieForm = (props) => {
setHomieName(""); setHomieName("");
setAboutHomie(""); setAboutHomie("");
setHomieImportance(""); setHomieImportance("");
setHomieDefaultChip("");
const collapsible = document.getElementById('new-homie-form-container'); const collapsible = document.getElementById('new-homie-form-container');
const collapsibleInstance = M.Collapsible.getInstance(collapsible); const collapsibleInstance = M.Collapsible.getInstance(collapsible);
@@ -54,8 +33,7 @@ const NewHomieForm = (props) => {
homie: { homie: {
name: homieName, name: homieName,
about: aboutHomie, about: aboutHomie,
importance: parseInt(homieImportance), importance: parseInt(homieImportance)
chip_id: parseInt(homieDefaultChip)
} }
} }
@@ -103,12 +81,6 @@ const NewHomieForm = (props) => {
<option value={0}>Guy from the hood</option> <option value={0}>Guy from the hood</option>
</Select> </Select>
<label className="required">Homie default chip: </label>
<Select value={homieDefaultChip} onChange={(e) => setHomieDefaultChip(e.target.value)} name="defaultChip">
<option disabled value="">Set default chip</option>
{ chipOptions }
</Select>
<br/> <br/>
<Button disabled={disableAddButton()} onClick={addNewHomie}>Add to the hood</Button> <Button disabled={disableAddButton()} onClick={addNewHomie}>Add to the hood</Button>

View File

@@ -0,0 +1,7 @@
import React from 'react';
const ChipSelection = (props) => {
}
export default ChipSelection;