diff --git a/client/src/App.js b/client/src/App.js index e831832..9fe889c 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -4,13 +4,11 @@ import { Navbar } from 'react-materialize'; import MakeMoneyMove from './cash/MakeMoneyMove'; import Flow from "./homies/Flow"; import Cash from './cash/Cash'; -import Chips from './chips/Chips'; import Homies from './homies/Homies'; import { BrowserRouter as Router, Route } from "react-router-dom"; import RoutableNavItem from './common/RoutableNavItem'; import { CRIB, - CHIPS, MAKE_MONEY_MOVE, HOMIE_FLOW, HOMIES, PUT_IN_WORK @@ -31,10 +29,6 @@ function App() { Homies - - Chips - - Make Money Move @@ -49,7 +43,6 @@ function App() { - diff --git a/client/src/RouteNames.js b/client/src/RouteNames.js index ae706c3..373711b 100644 --- a/client/src/RouteNames.js +++ b/client/src/RouteNames.js @@ -4,3 +4,4 @@ export const CHIPS = '/chips'; export const MAKE_MONEY_MOVE = '/make-money-move'; export const PUT_IN_WORK = '/put-in-work'; export const HOMIE_FLOW = '/homie/:homie_id/flow'; +export const ONBOARDING = '/og/onboarding'; diff --git a/client/src/homies/NewHomieForm.js b/client/src/homies/NewHomieForm.js index 2e9d9f9..47d04d6 100644 --- a/client/src/homies/NewHomieForm.js +++ b/client/src/homies/NewHomieForm.js @@ -8,31 +8,11 @@ const NewHomieForm = (props) => { const [homieName, setHomieName] = useState(""); const [aboutHomie, setAboutHomie] = useState(""); const [homieImportance, setHomieImportance] = useState(""); - const [homieDefaultChip, setHomieDefaultChip] = useState(""); - const [chips, setChips] = useState([]); 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) => ); - const disableAddButton = () => { return homieName.length === 0 || homieImportance === "" || - homieDefaultChip === "" || busy; } @@ -40,7 +20,6 @@ const NewHomieForm = (props) => { setHomieName(""); setAboutHomie(""); setHomieImportance(""); - setHomieDefaultChip(""); const collapsible = document.getElementById('new-homie-form-container'); const collapsibleInstance = M.Collapsible.getInstance(collapsible); @@ -54,8 +33,7 @@ const NewHomieForm = (props) => { homie: { name: homieName, about: aboutHomie, - importance: parseInt(homieImportance), - chip_id: parseInt(homieDefaultChip) + importance: parseInt(homieImportance) } } @@ -103,12 +81,6 @@ const NewHomieForm = (props) => { - - -
diff --git a/client/src/ogOnboarding/ChipSelection.js b/client/src/ogOnboarding/ChipSelection.js new file mode 100644 index 0000000..800be81 --- /dev/null +++ b/client/src/ogOnboarding/ChipSelection.js @@ -0,0 +1,7 @@ +import React from 'react'; + +const ChipSelection = (props) => { + +} + +export default ChipSelection; \ No newline at end of file