Merge branch 'add-support-for-gangs' into 'master'
Add support for gangs See merge request saburly/gangsta/roraccounting!25
This commit was merged in pull request #25.
This commit is contained in:
40
app/controllers/gangs_controller.rb
Normal file
40
app/controllers/gangs_controller.rb
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
class GangsController < ApplicationController
|
||||||
|
def index
|
||||||
|
json_response Gang.all
|
||||||
|
rescue StandardError
|
||||||
|
error_response :bad_request
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
gang = Gang.create(gang_params)
|
||||||
|
if gang.save
|
||||||
|
json_response Gang.all
|
||||||
|
else
|
||||||
|
error_response :bad_request
|
||||||
|
end
|
||||||
|
|
||||||
|
rescue StandardError
|
||||||
|
error_response :bad_request
|
||||||
|
end
|
||||||
|
|
||||||
|
def update
|
||||||
|
if gang_params[:chip_scale].to_i.positive?
|
||||||
|
Gang.update(gang_params)
|
||||||
|
json_response onboarded: true
|
||||||
|
else
|
||||||
|
error_response :bad_request
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def gang_params
|
||||||
|
params.require(:gang).permit :name,
|
||||||
|
:about,
|
||||||
|
:chip_name,
|
||||||
|
:chip_code,
|
||||||
|
:chip_symbol,
|
||||||
|
:chip_scale,
|
||||||
|
:chip_prefixed
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
class HomiesController < ApplicationController
|
class HomiesController < ApplicationController
|
||||||
def index
|
def index
|
||||||
json_response(Homie.all.order(importance: :desc, name: :asc))
|
homies = Homie.where(gang: params[:gang_id]).order(importance: :desc, name: :asc)
|
||||||
|
# json_response(Homie.all.order(importance: :desc, name: :asc))
|
||||||
|
json_response homies
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -23,7 +25,8 @@ class HomiesController < ApplicationController
|
|||||||
|
|
||||||
def info
|
def info
|
||||||
importance = params[:importance].present? ? params[:importance].to_i : -1
|
importance = params[:importance].present? ? params[:importance].to_i : -1
|
||||||
json_response(Homie.info(importance))
|
gang = params[:gang_id]
|
||||||
|
json_response(Homie.info(importance, gang))
|
||||||
end
|
end
|
||||||
|
|
||||||
def settle
|
def settle
|
||||||
@@ -46,7 +49,8 @@ class HomiesController < ApplicationController
|
|||||||
params.require(:homie).permit(
|
params.require(:homie).permit(
|
||||||
:name,
|
:name,
|
||||||
:importance,
|
:importance,
|
||||||
:about
|
:about,
|
||||||
|
:gang_id
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
class OriginalGangstasController < ApplicationController
|
|
||||||
def show
|
|
||||||
if OriginalGangsta.count.zero?
|
|
||||||
OriginalGangsta.create.save
|
|
||||||
end
|
|
||||||
|
|
||||||
json_response OriginalGangsta.first
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
|
||||||
if original_gangsta_params[:chip_scale].to_i.positive?
|
|
||||||
OriginalGangsta.update(original_gangsta_params)
|
|
||||||
json_response onboarded: true
|
|
||||||
else
|
|
||||||
error_response :bad_request
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def original_gangsta_params
|
|
||||||
params.require(:original_gangsta).permit :chip_name,
|
|
||||||
:chip_code,
|
|
||||||
:chip_symbol,
|
|
||||||
:chip_scale,
|
|
||||||
:chip_prefixed
|
|
||||||
end
|
|
||||||
end
|
|
||||||
3
app/models/gang.rb
Normal file
3
app/models/gang.rb
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
class Gang < ApplicationRecord
|
||||||
|
has_many :homies
|
||||||
|
end
|
||||||
@@ -2,11 +2,15 @@ class Homie < ApplicationRecord
|
|||||||
has_many :money_moves
|
has_many :money_moves
|
||||||
has_many :work
|
has_many :work
|
||||||
|
|
||||||
def self.info(importance)
|
belongs_to :gang
|
||||||
|
|
||||||
|
def self.info(importance, gang)
|
||||||
|
# TODO: This can be improved
|
||||||
|
|
||||||
cash_totals = Homie.all.joins(:money_moves).group(:id).order(:id).sum(:amount)
|
cash_totals = Homie.all.joins(:money_moves).group(:id).order(:id).sum(:amount)
|
||||||
work_totals = Homie.all.joins(:work).group(:id).order(:id).sum(:amount)
|
work_totals = Homie.all.joins(:work).group(:id).order(:id).sum(:amount)
|
||||||
|
|
||||||
Homie.where(["importance > ?", importance]).map do |homie|
|
Homie.where(['importance > ? and gang_id = ?', importance, gang]).map do |homie|
|
||||||
cash_total = cash_totals.fetch(homie.id, 0)
|
cash_total = cash_totals.fetch(homie.id, 0)
|
||||||
work_total = work_totals.fetch(homie.id, 0)
|
work_total = work_totals.fetch(homie.id, 0)
|
||||||
{ homie: homie, amount: cash_total, work: work_total }
|
{ homie: homie, amount: cash_total, work: work_total }
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
class OriginalGangsta < ApplicationRecord
|
|
||||||
|
|
||||||
end
|
|
||||||
@@ -55,3 +55,7 @@
|
|||||||
height: 90%;
|
height: 90%;
|
||||||
margin-left: 40%;
|
margin-left: 40%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bump {
|
||||||
|
margin-left: 2em;
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import './App.css';
|
import './App.css';
|
||||||
import { Navbar } from 'react-materialize';
|
import { Navbar, Dropdown, Icon } 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';
|
||||||
@@ -10,27 +10,31 @@ import RoutableNavItem from './common/RoutableNavItem';
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import {
|
import {
|
||||||
CRIB,
|
CRIB,
|
||||||
|
GANGS,
|
||||||
MAKE_MONEY_MOVE,
|
MAKE_MONEY_MOVE,
|
||||||
HOMIE_FLOW,
|
HOMIE_FLOW,
|
||||||
HOMIES,
|
HOMIES,
|
||||||
PUT_IN_WORK
|
PUT_IN_WORK
|
||||||
} from './RouteNames';
|
} from './RouteNames';
|
||||||
import PutInWork from "./cash/PutInWork";
|
import PutInWork from "./cash/PutInWork";
|
||||||
import ChipSelection from "./originalGangstaOnboarding/ChipSelection";
|
import GangOnboarding from "./gangOnboarding/GangOnboarding";
|
||||||
|
import Gangs from './gangs/Gangs';
|
||||||
import {errorToast} from "./common/errorHelpers";
|
import {errorToast} from "./common/errorHelpers";
|
||||||
|
|
||||||
|
|
||||||
const App = (props) => {
|
const App = (props) => {
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [originalGangsta, setOriginalGangsta] = useState({});
|
const [gangs, setGangs] = useState([]);
|
||||||
|
const [selectedGang, setSelectedGang] = useState({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async() => {
|
(async() => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const response = await axios.get(`/api/original_gangstas/0`);
|
const response = await axios.get(`/api/gangs`);
|
||||||
if (response.status === 200 && response.data){
|
if (response.status === 200 && response.data){
|
||||||
setOriginalGangsta(response.data);
|
setGangs(response.data);
|
||||||
|
setSelectedGang(response.data[0]);
|
||||||
}else{
|
}else{
|
||||||
errorToast();
|
errorToast();
|
||||||
}
|
}
|
||||||
@@ -42,15 +46,16 @@ const App = (props) => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const routes = ([
|
const routes = ([
|
||||||
<Route key='1' exact path={CRIB} component={() => <Cash originalGangsta={originalGangsta} />} />,
|
<Route key='1' exact path={CRIB} component={() => <Cash gang={selectedGang} />} />,
|
||||||
<Route key='2' exact path={HOMIES} component={() => <Homies originalGangsta={originalGangsta} />} />,
|
<Route key='2' exact path={GANGS} component={() => <Gangs gangs={gangs} gangsSetter={setGangs} />} />,
|
||||||
<Route key='3' path={HOMIE_FLOW} component={() => <Flow originalGangsta={originalGangsta} />} />,
|
<Route key='3' exact path={HOMIES} component={() => <Homies gang={selectedGang} />} />,
|
||||||
<Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove originalGangsta={originalGangsta} />} />,
|
<Route key='4' path={HOMIE_FLOW} component={() => <Flow gang={selectedGang} />} />,
|
||||||
<Route key='5' path={PUT_IN_WORK} component={() => <PutInWork originalGangsta={originalGangsta} />} />
|
<Route key='5' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove gang={selectedGang} />} />,
|
||||||
|
<Route key='6' path={PUT_IN_WORK} component={() => <PutInWork gang={selectedGang} />} />
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
const onboarded = () => originalGangsta.chip_name && originalGangsta.chip_name.length > 0;
|
const onboarded = () => selectedGang.chip_name && selectedGang.chip_name.length > 0;
|
||||||
|
|
||||||
const preloaderCircle = (
|
const preloaderCircle = (
|
||||||
<div className="container">
|
<div className="container">
|
||||||
@@ -72,15 +77,42 @@ const App = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const navbarLogoWithGang = (
|
||||||
|
<div>
|
||||||
|
<a href='/'>GKS</a>
|
||||||
|
|
||||||
|
<Dropdown
|
||||||
|
id="gang_dropdown"
|
||||||
|
options={{
|
||||||
|
alignment: 'left',
|
||||||
|
autoTrigger: true,
|
||||||
|
closeOnClick: true,
|
||||||
|
constrainWidth: true,
|
||||||
|
coverTrigger: false,
|
||||||
|
hover: false,
|
||||||
|
inDuration: 150,
|
||||||
|
outDuration: 250
|
||||||
|
}}
|
||||||
|
trigger={<a className="bump">{selectedGang && selectedGang.name && selectedGang.name.length > 0 ? `${selectedGang.name} gang` : '[No name gang]'}<Icon right>arrow_drop_down</Icon></a>}
|
||||||
|
>
|
||||||
|
{gangs.map(gang => <a key={`gang-${gang.id}`} onClick={() => setSelectedGang(gang)}>{gang.name}</a>)}
|
||||||
|
</Dropdown>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Router>
|
<Router>
|
||||||
<div className="navbar-fixed">
|
<div className="navbar-fixed">
|
||||||
<Navbar brand={<a href='/'>GKS</a>} alignLinks="right">
|
<Navbar brand={navbarLogoWithGang} alignLinks="right">
|
||||||
<RoutableNavItem href={CRIB}>
|
<RoutableNavItem href={CRIB}>
|
||||||
Crib
|
Crib
|
||||||
</RoutableNavItem>
|
</RoutableNavItem>
|
||||||
|
|
||||||
|
<RoutableNavItem href={GANGS}>
|
||||||
|
Gangs
|
||||||
|
</RoutableNavItem>
|
||||||
|
|
||||||
<RoutableNavItem href={HOMIES}>
|
<RoutableNavItem href={HOMIES}>
|
||||||
Homies
|
Homies
|
||||||
</RoutableNavItem>
|
</RoutableNavItem>
|
||||||
@@ -97,7 +129,7 @@ const App = (props) => {
|
|||||||
|
|
||||||
<div className="autoscrolling">
|
<div className="autoscrolling">
|
||||||
{ loading && preloaderCircle }
|
{ loading && preloaderCircle }
|
||||||
{ !loading && !onboarded() && <ChipSelection /> }
|
{ !loading && !onboarded() && <GangOnboarding gang={selectedGang} /> }
|
||||||
{ !loading && onboarded() && routes }
|
{ !loading && onboarded() && routes }
|
||||||
</div>
|
</div>
|
||||||
</Router>
|
</Router>
|
||||||
|
|||||||
@@ -3,3 +3,4 @@ export const HOMIES = '/homies';
|
|||||||
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 GANGS = '/gangs';
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ import M from 'materialize-css';
|
|||||||
|
|
||||||
const Cash = (props) => {
|
const Cash = (props) => {
|
||||||
const [homiesCash, setHomiesCash] = useState([]);
|
const [homiesCash, setHomiesCash] = useState([]);
|
||||||
const originalGangsta = props.originalGangsta;
|
const gang = props.gang;
|
||||||
|
|
||||||
useEffect( () => {
|
useEffect( () => {
|
||||||
const getCashForHomies = async () => {
|
const getCashForHomies = async () => {
|
||||||
try {
|
try {
|
||||||
const cash = await axios.get(`/api/homies/info`);
|
const cash = await axios.get(`/api/gangs/${gang.id}/homies/info`);
|
||||||
setHomiesCash(cash.data);
|
setHomiesCash(cash.data);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log("Error fetching", e);
|
console.log("Error fetching", e);
|
||||||
@@ -27,7 +27,7 @@ const Cash = (props) => {
|
|||||||
|
|
||||||
const settleFlowForHomie = async (id, amountToSettle) => {
|
const settleFlowForHomie = async (id, amountToSettle) => {
|
||||||
try {
|
try {
|
||||||
const response = await axios.post(`/api/homies/${id}/settle`, { amount: amountToSettle });
|
const response = await axios.post(`/api/gangs/${gang.id}/homies/${id}/settle`, { amount: amountToSettle });
|
||||||
if (response.status === 200 && response.data) {
|
if (response.status === 200 && response.data) {
|
||||||
M.toast({ html: 'Settled' });
|
M.toast({ html: 'Settled' });
|
||||||
setHomiesCash(response.data);
|
setHomiesCash(response.data);
|
||||||
@@ -49,7 +49,7 @@ const Cash = (props) => {
|
|||||||
{ formatTime(homieLine.work) }
|
{ formatTime(homieLine.work) }
|
||||||
</td>
|
</td>
|
||||||
<td className="cash-cell-right">
|
<td className="cash-cell-right">
|
||||||
{ formatMoney(homieLine.amount, originalGangsta) }
|
{ formatMoney(homieLine.amount, gang) }
|
||||||
</td>
|
</td>
|
||||||
<td className="cash-cell-left">
|
<td className="cash-cell-left">
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import './Cash.css';
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
const MakeMoneyMove = (props) => {
|
const MakeMoneyMove = (props) => {
|
||||||
|
|
||||||
const [selectedFrom, setSelectedFrom] = useState("");
|
const [selectedFrom, setSelectedFrom] = useState("");
|
||||||
const [selectedTo, setSelectedTo] = useState("-1");
|
const [selectedTo, setSelectedTo] = useState("-1");
|
||||||
const [homiesCash, setHomiesCash] = useState([]);
|
const [homiesCash, setHomiesCash] = useState([]);
|
||||||
@@ -13,10 +12,12 @@ const MakeMoneyMove = (props) => {
|
|||||||
const [moveDescription, setMoveDescription] = useState("");
|
const [moveDescription, setMoveDescription] = useState("");
|
||||||
const [submitInProgress, setSubmitInProgress] = useState(false);
|
const [submitInProgress, setSubmitInProgress] = useState(false);
|
||||||
|
|
||||||
|
const gang = props.gang;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const getCashForHomies = async () => {
|
const getCashForHomies = async () => {
|
||||||
try {
|
try {
|
||||||
const cash = await axios.get(`/api/homies/info`);
|
const cash = await axios.get(`/api/gangs/${gang.id}/homies/info`);
|
||||||
setHomiesCash(cash.data);
|
setHomiesCash(cash.data);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log("Error fetching", e);
|
console.log("Error fetching", e);
|
||||||
|
|||||||
@@ -12,10 +12,12 @@ const PutInWork = (props) => {
|
|||||||
const [workDescription, setWorkDescription] = useState('');
|
const [workDescription, setWorkDescription] = useState('');
|
||||||
const [submitInProgress, setSubmitInProgress] = useState(false);
|
const [submitInProgress, setSubmitInProgress] = useState(false);
|
||||||
|
|
||||||
|
const gang = props.gang;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
try {
|
try {
|
||||||
const response = await axios.get('/api/homies');
|
const response = await axios.get(`/api/gangs/${gang.id}/homies`);
|
||||||
if (response.status === 200 && response.data){
|
if (response.status === 200 && response.data){
|
||||||
setHomies(response.data);
|
setHomies(response.data);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { errorToast } from "../common/errorHelpers";
|
import { errorToast } from "../common/errorHelpers";
|
||||||
import {Button, Select, TextInput} from "react-materialize";
|
import {Button, Select} from "react-materialize";
|
||||||
|
|
||||||
const ChipSelection = (props) => {
|
const GangOnboarding = (props) => {
|
||||||
const [chips, setChips] = useState([]);
|
const [chips, setChips] = useState([]);
|
||||||
const [selectedChip, setSelectedChip] = useState('1');
|
const [selectedChip, setSelectedChip] = useState('1');
|
||||||
|
const [gangName, setGangName] = useState('');
|
||||||
|
|
||||||
|
const gang = props.gang;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async() => {
|
(async() => {
|
||||||
@@ -25,22 +28,23 @@ const ChipSelection = (props) => {
|
|||||||
const chipsToOptions = chips.map( (chip, index) => <option key={index} value={chip.id}>{`${chip.code} • ${chip.name}`}</option>);
|
const chipsToOptions = chips.map( (chip, index) => <option key={index} value={chip.id}>{`${chip.code} • ${chip.name}`}</option>);
|
||||||
|
|
||||||
const disableSubmit = () => {
|
const disableSubmit = () => {
|
||||||
return !(parseInt(selectedChip) > 0);
|
return parseInt(selectedChip) === 0 || gangName.length === 0 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleSubmit = async () => {
|
const handleSubmit = async () => {
|
||||||
const chipData = chips.find(chip => chip.id === parseInt(selectedChip));
|
const chipData = chips.find(chip => chip.id === parseInt(selectedChip));
|
||||||
if (chipData){
|
if (chipData){
|
||||||
const originalGangsta = {
|
const updatedGang = {
|
||||||
chip_name: chipData.name,
|
chip_name: chipData.name,
|
||||||
chip_code: chipData.code,
|
chip_code: chipData.code,
|
||||||
chip_symbol: chipData.symbol,
|
chip_symbol: chipData.symbol,
|
||||||
chip_prefixed: chipData.prefixed,
|
chip_prefixed: chipData.prefixed,
|
||||||
chip_scale: chipData.scale
|
chip_scale: chipData.scale,
|
||||||
|
name: gangName
|
||||||
}
|
}
|
||||||
|
|
||||||
try{
|
try{
|
||||||
const response = await axios.put('/api/original_gangstas/0', { 'original_gangsta': originalGangsta });
|
const response = await axios.put(`/api/gangs/${gang.id}`, { 'gang': updatedGang });
|
||||||
if (response.status === 200 && response.data && response.data.onboarded) {
|
if (response.status === 200 && response.data && response.data.onboarded) {
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
}else{
|
}else{
|
||||||
@@ -56,6 +60,12 @@ const ChipSelection = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='container'>
|
<div className='container'>
|
||||||
|
|
||||||
|
<div className="input-field col s12">
|
||||||
|
<input id="gang-name" type="text" className="validate" required="required" value={gangName} onChange={(e) => setGangName(e.target.value)} />
|
||||||
|
<label className="required" htmlFor="gang-name">Gang name</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Select value={selectedChip} onChange={(e) => setSelectedChip(e.target.value)} name="selected-chip">
|
<Select value={selectedChip} onChange={(e) => setSelectedChip(e.target.value)} name="selected-chip">
|
||||||
{ chipsToOptions }
|
{ chipsToOptions }
|
||||||
</Select>
|
</Select>
|
||||||
@@ -67,4 +77,4 @@ const ChipSelection = (props) => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ChipSelection;
|
export default GangOnboarding;
|
||||||
59
client/src/gangs/Gangs.js
Normal file
59
client/src/gangs/Gangs.js
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
import React, { useEffect, useState } from 'react';
|
||||||
|
import NewGangForm from "./NewGangForm";
|
||||||
|
import axios from "axios";
|
||||||
|
import {errorToast} from "../common/errorHelpers";
|
||||||
|
import YesNoModal from "../common/YesNoModal";
|
||||||
|
import {Button} from "react-materialize";
|
||||||
|
import M from "materialize-css";
|
||||||
|
|
||||||
|
const Gangs = (props) => {
|
||||||
|
const gangs = props.gangs;
|
||||||
|
const setGangs = props.gangsSetter;
|
||||||
|
|
||||||
|
const deleteGang = async (id) => {
|
||||||
|
try {
|
||||||
|
const response = await axios.delete(`/api/gangs/${id}`);
|
||||||
|
if (response.status === 200 && response.data){
|
||||||
|
setGangs(response.data);
|
||||||
|
M.toast({ html: "See y'a on the other side" });
|
||||||
|
}else{
|
||||||
|
errorToast();
|
||||||
|
}
|
||||||
|
}catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
errorToast();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const gangsData = gangs.map((gang, index) => {
|
||||||
|
return (
|
||||||
|
<li key={index}>
|
||||||
|
<div className="collapsible-header">
|
||||||
|
<div className="flex-row opposite-sides-content">
|
||||||
|
<div className="flex-col">
|
||||||
|
<div>{ gang.name }</div>
|
||||||
|
<div className="grey-text">{ `${gang.about || '[no about]'} • ${gang.chip_name} (${gang.chip_code})`}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<YesNoModal
|
||||||
|
body={"Maan, y'a sure about this?"}
|
||||||
|
yesAction={() => deleteGang(gang.id)}
|
||||||
|
triggerNode={<Button disabled flat node="button" icon="delete" />} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="container">
|
||||||
|
<NewGangForm newGangsSetter={setGangs} />
|
||||||
|
|
||||||
|
<ul className="collapsible">
|
||||||
|
{ gangsData }
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Gangs;
|
||||||
110
client/src/gangs/NewGangForm.js
Normal file
110
client/src/gangs/NewGangForm.js
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import React, { useEffect, useState } from 'react';
|
||||||
|
import { Button, Collapsible, CollapsibleItem, Select, TextInput } from 'react-materialize';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { errorToast } from "../common/errorHelpers";
|
||||||
|
import M from 'materialize-css';
|
||||||
|
|
||||||
|
const NewGangForm = (props) => {
|
||||||
|
const [gangName, setGangName] = useState("");
|
||||||
|
const [aboutGang, setAboutGang] = useState("");
|
||||||
|
const [chips, setChips] = useState([]);
|
||||||
|
const [selectedChip, setSelectedChip] = useState('1');
|
||||||
|
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 chipsToOptions = chips.map( (chip, index) => <option key={index} value={chip.id}>{`${chip.code} • ${chip.name}`}</option>);
|
||||||
|
|
||||||
|
const disableAddButton = () => {
|
||||||
|
return gangName.length === 0 || busy;
|
||||||
|
}
|
||||||
|
|
||||||
|
const clearForm = () => {
|
||||||
|
setGangName("");
|
||||||
|
setAboutGang("");
|
||||||
|
|
||||||
|
const collapsible = document.getElementById('new-gang-form-container');
|
||||||
|
const collapsibleInstance = M.Collapsible.getInstance(collapsible);
|
||||||
|
|
||||||
|
collapsibleInstance.close(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
const addNewGang = async () => {
|
||||||
|
const chipData = chips.find(chip => chip.id === parseInt(selectedChip));
|
||||||
|
if (chipData) {
|
||||||
|
setBusy(true);
|
||||||
|
const newGang = {
|
||||||
|
chip_name: chipData.name,
|
||||||
|
chip_code: chipData.code,
|
||||||
|
chip_symbol: chipData.symbol,
|
||||||
|
chip_prefixed: chipData.prefixed,
|
||||||
|
chip_scale: chipData.scale,
|
||||||
|
name: gangName,
|
||||||
|
about: aboutGang
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await axios.post('/api/gangs', {gang: newGang});
|
||||||
|
if (response.status === 200 && response.data) {
|
||||||
|
props.newGangsSetter(response.data);
|
||||||
|
M.toast({html: 'Welcome to the Hood'});
|
||||||
|
clearForm();
|
||||||
|
} else {
|
||||||
|
errorToast();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e.message);
|
||||||
|
errorToast();
|
||||||
|
}
|
||||||
|
|
||||||
|
setBusy(false);
|
||||||
|
}else{
|
||||||
|
errorToast();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Collapsible id="new-gang-form-container">
|
||||||
|
<CollapsibleItem header={<strong>{`Introduce new gang to the Hood`}</strong>}>
|
||||||
|
<div className="input-field col s12">
|
||||||
|
<input id="gang-name" type="text" className="validate" required="required" value={gangName} onChange={(e) => setGangName(e.target.value)} />
|
||||||
|
<label className="required" htmlFor="gang-name">Gang name</label>
|
||||||
|
<span className="helper-text" data-error="Yo! Introduce us the new Gang" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<TextInput
|
||||||
|
id="about-gang"
|
||||||
|
label="About"
|
||||||
|
value={aboutGang}
|
||||||
|
onChange={(e) => setAboutGang(e.target.value)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select value={selectedChip} onChange={(e) => setSelectedChip(e.target.value)} name="selected-chip">
|
||||||
|
{ chipsToOptions }
|
||||||
|
</Select>
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
|
||||||
|
<Button disabled={disableAddButton()} onClick={addNewGang}>Add to the hood</Button>
|
||||||
|
|
||||||
|
</CollapsibleItem>
|
||||||
|
</Collapsible>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default NewGangForm;
|
||||||
@@ -7,7 +7,7 @@ import {errorToast} from "../common/errorHelpers";
|
|||||||
|
|
||||||
const CashFlow = (props) => {
|
const CashFlow = (props) => {
|
||||||
const { homie_id } = useParams();
|
const { homie_id } = useParams();
|
||||||
const originalGangsta = props.originalGangsta;
|
const gang = props.gang;
|
||||||
|
|
||||||
const [cashFlow, setCashFlow] = useState([]);
|
const [cashFlow, setCashFlow] = useState([]);
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ const CashFlow = (props) => {
|
|||||||
<div>{ dateBlock(singleFlowData['created_at']) }</div>
|
<div>{ dateBlock(singleFlowData['created_at']) }</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, originalGangsta) }</div>
|
<div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, gang) }</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@@ -58,7 +58,7 @@ const CashFlow = (props) => {
|
|||||||
<strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
|
<strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="col s6 right-align">
|
<div className="col s6 right-align">
|
||||||
<span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow, originalGangsta)}</strong>
|
<span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow, gang)}</strong>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import WorkFlow from "./WorkFlow";
|
|||||||
|
|
||||||
const Flow = (props) => {
|
const Flow = (props) => {
|
||||||
const [flowType, setFlowType] = useState('cash');
|
const [flowType, setFlowType] = useState('cash');
|
||||||
const originalGangsta = props.originalGangsta;
|
const gang = props.gang;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container">
|
<div className="container">
|
||||||
@@ -19,7 +19,7 @@ const Flow = (props) => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{ flowType === 'cash' && <CashFlow originalGangsta={originalGangsta} /> }
|
{ flowType === 'cash' && <CashFlow gang={gang} /> }
|
||||||
{ flowType === 'work' && <WorkFlow /> }
|
{ flowType === 'work' && <WorkFlow /> }
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,10 +10,12 @@ import YesNoModal from "../common/YesNoModal";
|
|||||||
const Homies = (props) => {
|
const Homies = (props) => {
|
||||||
const [homies, setHomies] = useState([]);
|
const [homies, setHomies] = useState([]);
|
||||||
|
|
||||||
|
const gang = props.gang;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async() => {
|
(async() => {
|
||||||
try {
|
try {
|
||||||
const response = await axios.get(`/api/homies`);
|
const response = await axios.get(`/api/gangs/${gang.id}/homies`);
|
||||||
if (response.status === 200 && response.data){
|
if (response.status === 200 && response.data){
|
||||||
setHomies(response.data);
|
setHomies(response.data);
|
||||||
}else{
|
}else{
|
||||||
@@ -27,7 +29,7 @@ const Homies = (props) => {
|
|||||||
|
|
||||||
const deleteHomie = async (id) => {
|
const deleteHomie = async (id) => {
|
||||||
try {
|
try {
|
||||||
const response = await axios.delete(`/api/homies/${id}`);
|
const response = await axios.delete(`/api/gangs/${gang.id}/homies/${id}`);
|
||||||
if (response.status === 200 && response.data){
|
if (response.status === 200 && response.data){
|
||||||
setHomies(response.data);
|
setHomies(response.data);
|
||||||
M.toast({ html: "See y'a on the other side Homie" });
|
M.toast({ html: "See y'a on the other side Homie" });
|
||||||
@@ -62,7 +64,7 @@ const Homies = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container">
|
<div className="container">
|
||||||
<NewHomieForm newHomiesSetter={setHomies} />
|
<NewHomieForm newHomiesSetter={setHomies} gang={props.gang} />
|
||||||
|
|
||||||
<ul className="collapsible">
|
<ul className="collapsible">
|
||||||
{ homiesData }
|
{ homiesData }
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ const NewHomieForm = (props) => {
|
|||||||
const [homieImportance, setHomieImportance] = useState("");
|
const [homieImportance, setHomieImportance] = useState("");
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
|
const gang = props.gang;
|
||||||
|
|
||||||
const disableAddButton = () => {
|
const disableAddButton = () => {
|
||||||
return homieName.length === 0 ||
|
return homieName.length === 0 ||
|
||||||
homieImportance === "" ||
|
homieImportance === "" ||
|
||||||
@@ -33,15 +35,16 @@ const NewHomieForm = (props) => {
|
|||||||
homie: {
|
homie: {
|
||||||
name: homieName,
|
name: homieName,
|
||||||
about: aboutHomie,
|
about: aboutHomie,
|
||||||
importance: parseInt(homieImportance)
|
importance: parseInt(homieImportance),
|
||||||
|
gang_id: gang.id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try{
|
try{
|
||||||
const response = await axios.post('/api/homies', newHomie);
|
const response = await axios.post(`/api/gangs/${gang.id}/homies`, newHomie);
|
||||||
if (response.status === 200 && response.data) {
|
if (response.status === 200 && response.data) {
|
||||||
props.newHomiesSetter(response.data);
|
props.newHomiesSetter(response.data);
|
||||||
M.toast({ html: 'Welcome to the hood' });
|
M.toast({ html: 'Welcome to the Gang' });
|
||||||
clearForm();
|
clearForm();
|
||||||
}else{
|
}else{
|
||||||
errorToast();
|
errorToast();
|
||||||
@@ -57,7 +60,7 @@ const NewHomieForm = (props) => {
|
|||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Collapsible id="new-homie-form-container">
|
<Collapsible id="new-homie-form-container">
|
||||||
<CollapsibleItem header={<strong>Introduce new homie to the Hood</strong>}>
|
<CollapsibleItem header={<strong>{`Introduce new homie to the ${gang.name} gang`}</strong>}>
|
||||||
<div className="input-field col s12">
|
<div className="input-field col s12">
|
||||||
<input id="homie-name" type="text" className="validate" required="required" value={homieName} onChange={(e) => setHomieName(e.target.value)} />
|
<input id="homie-name" type="text" className="validate" required="required" value={homieName} onChange={(e) => setHomieName(e.target.value)} />
|
||||||
<label className="required" htmlFor="homie-name">Homie name</label>
|
<label className="required" htmlFor="homie-name">Homie name</label>
|
||||||
@@ -83,7 +86,7 @@ const NewHomieForm = (props) => {
|
|||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
<Button disabled={disableAddButton()} onClick={addNewHomie}>Add to the hood</Button>
|
<Button disabled={disableAddButton()} onClick={addNewHomie}>Add to the Gang</Button>
|
||||||
|
|
||||||
</CollapsibleItem>
|
</CollapsibleItem>
|
||||||
</Collapsible>
|
</Collapsible>
|
||||||
|
|||||||
@@ -17,5 +17,4 @@
|
|||||||
|
|
||||||
ActiveSupport::Inflector.inflections do |inflect|
|
ActiveSupport::Inflector.inflections do |inflect|
|
||||||
inflect.irregular 'work', 'work'
|
inflect.irregular 'work', 'work'
|
||||||
inflect.irregular 'gangsta', 'gangstas'
|
|
||||||
end
|
end
|
||||||
@@ -1,19 +1,20 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
constraints format: :json do
|
constraints format: :json do
|
||||||
scope :api do
|
scope :api do
|
||||||
resources :original_gangstas, only: [:show, :update]
|
resources :gangs, only: [:index, :create, :update] do
|
||||||
|
resources :homies, param: :homie_id do
|
||||||
|
collection do
|
||||||
|
get 'info'
|
||||||
|
end
|
||||||
|
member do
|
||||||
|
post 'settle'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
resources :money_moves
|
resources :money_moves
|
||||||
resources :work
|
resources :work
|
||||||
resources :chips, only: %i[index create destroy]
|
resources :chips, only: %i[index create destroy]
|
||||||
resources :chip_values, only: %i[create update destroy]
|
resources :chip_values, only: %i[create update destroy]
|
||||||
resources :homies, param: :homie_id do
|
|
||||||
collection do
|
|
||||||
get 'info'
|
|
||||||
end
|
|
||||||
member do
|
|
||||||
post 'settle'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class RenameOriginalGangstasToGangs < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
rename_table :original_gangstas, :gangs
|
||||||
|
end
|
||||||
|
end
|
||||||
6
db/migrate/20201007182916_add_name_to_gangs.rb
Normal file
6
db/migrate/20201007182916_add_name_to_gangs.rb
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
class AddNameToGangs < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
add_column :gangs, :name, :text
|
||||||
|
add_column :gangs, :about, :text
|
||||||
|
end
|
||||||
|
end
|
||||||
5
db/migrate/20201007183139_add_gang_relation_to_homies.rb
Normal file
5
db/migrate/20201007183139_add_gang_relation_to_homies.rb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
class AddGangRelationToHomies < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
add_reference :homies, :gang
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
class AddInitialGangAndConnectToHomies < ActiveRecord::Migration[5.2]
|
||||||
|
def up
|
||||||
|
if Gang.count.zero?
|
||||||
|
Gang.create(name: 'Default').save
|
||||||
|
elsif Gang.count == 1
|
||||||
|
Gang.update name: 'Default'
|
||||||
|
end
|
||||||
|
gang = Gang.first
|
||||||
|
|
||||||
|
Homie.all.update(gang: gang)
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
Homie.all.update(gang: nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
26
db/schema.rb
26
db/schema.rb
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2020_10_06_120951) do
|
ActiveRecord::Schema.define(version: 2020_10_07_213411) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@@ -35,12 +35,26 @@ ActiveRecord::Schema.define(version: 2020_10_06_120951) do
|
|||||||
t.index ["name"], name: "index_chips_on_name", unique: true
|
t.index ["name"], name: "index_chips_on_name", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "gangs", force: :cascade do |t|
|
||||||
|
t.text "chip_name"
|
||||||
|
t.text "chip_code"
|
||||||
|
t.text "chip_symbol"
|
||||||
|
t.boolean "chip_prefixed"
|
||||||
|
t.integer "chip_scale"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
t.text "name"
|
||||||
|
t.text "about"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "homies", force: :cascade do |t|
|
create_table "homies", force: :cascade do |t|
|
||||||
t.text "name", null: false
|
t.text "name", null: false
|
||||||
t.integer "importance", default: 100, null: false
|
t.integer "importance", default: 100, null: false
|
||||||
t.text "about"
|
t.text "about"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
|
t.bigint "gang_id"
|
||||||
|
t.index ["gang_id"], name: "index_homies_on_gang_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "money_moves", force: :cascade do |t|
|
create_table "money_moves", force: :cascade do |t|
|
||||||
@@ -51,16 +65,6 @@ ActiveRecord::Schema.define(version: 2020_10_06_120951) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "original_gangstas", force: :cascade do |t|
|
|
||||||
t.text "chip_name"
|
|
||||||
t.text "chip_code"
|
|
||||||
t.text "chip_symbol"
|
|
||||||
t.boolean "chip_prefixed"
|
|
||||||
t.integer "chip_scale"
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "work", force: :cascade do |t|
|
create_table "work", force: :cascade do |t|
|
||||||
t.text "description"
|
t.text "description"
|
||||||
t.integer "amount"
|
t.integer "amount"
|
||||||
|
|||||||
Reference in New Issue
Block a user