senaduka/old-roraccounting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename original gangsta to gang

Browse Source
This commit is contained in:
Bilal
2020-10-07 18:26:59 +03:00
parent b5a70a6e42
commit e0c5f60c68
13 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/controllers/gangs_controller.rb Normal file
View File

@@ -0,0 +1,28 @@
class GangsController < ApplicationController
def show
if Gang.count.zero?
Gang.create.save
end
json_response Gang.first
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 :chip_name,
:chip_code,
:chip_symbol,
:chip_scale,
:chip_prefixed
end
end

28
app/controllers/original_gangstas_controller.rb
View File

@@ -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
View File

@@ -0,0 +1,3 @@
class Gang < ApplicationRecord
end

3
app/models/original_gangsta.rb
View File

@@ -1,3 +0,0 @@
class OriginalGangsta < ApplicationRecord
end

20
client/src/App.js
View File

@@ -16,21 +16,21 @@ import {
PUT_IN_WORK
} from './RouteNames';
import PutInWork from "./cash/PutInWork";
import ChipSelection from "./originalGangstaOnboarding/ChipSelection";
import ChipSelection from "./gangOnboarding/ChipSelection";
import {errorToast} from "./common/errorHelpers";
const App = (props) => {
const [loading, setLoading] = useState(true);
const [originalGangsta, setOriginalGangsta] = useState({});
const [gang, setGang] = useState({});
useEffect(() => {
(async() => {
try {
setLoading(true);
const response = await axios.get(`/api/original_gangstas/0`);
const response = await axios.get(`/api/gangs/0`);
if (response.status === 200 && response.data){
setOriginalGangsta(response.data);
setGang(response.data);
}else{
errorToast();
}
@@ -42,15 +42,15 @@ const App = (props) => {
}, []);
const routes = ([
<Route key='1' exact path={CRIB} component={() => <Cash originalGangsta={originalGangsta} />} />,
<Route key='2' exact path={HOMIES} component={() => <Homies originalGangsta={originalGangsta} />} />,
<Route key='3' path={HOMIE_FLOW} component={() => <Flow originalGangsta={originalGangsta} />} />,
<Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove originalGangsta={originalGangsta} />} />,
<Route key='5' path={PUT_IN_WORK} component={() => <PutInWork originalGangsta={originalGangsta} />} />
<Route key='1' exact path={CRIB} component={() => <Cash gang={gang} />} />,
<Route key='2' exact path={HOMIES} component={() => <Homies />} />,
<Route key='3' path={HOMIE_FLOW} component={() => <Flow gang={gang} />} />,
<Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove />} />,
<Route key='5' path={PUT_IN_WORK} component={() => <PutInWork />} />
]
);
const onboarded = () => originalGangsta.chip_name && originalGangsta.chip_name.length > 0;
const onboarded = () => gang.chip_name && gang.chip_name.length > 0;
const preloaderCircle = (
<div className="container">

4
client/src/cash/Cash.js
View File

@@ -11,7 +11,7 @@ import M from 'materialize-css';
const Cash = (props) => {
const [homiesCash, setHomiesCash] = useState([]);
const originalGangsta = props.originalGangsta;
const gang = props.gang;
useEffect( () => {
const getCashForHomies = async () => {
@@ -49,7 +49,7 @@ const Cash = (props) => {
{ formatTime(homieLine.work) }
</td>
<td className="cash-cell-right">
{ formatMoney(homieLine.amount, originalGangsta) }
{ formatMoney(homieLine.amount, gang) }
</td>
<td className="cash-cell-left">
[

4
client/src/originalGangstaOnboarding/ChipSelection.js → client/src/gangOnboarding/ChipSelection.js
View File

@@ -31,7 +31,7 @@ const ChipSelection = (props) => {
const handleSubmit = async () => {
const chipData = chips.find(chip => chip.id === parseInt(selectedChip));
if (chipData){
const originalGangsta = {
const gang = {
chip_name: chipData.name,
chip_code: chipData.code,
chip_symbol: chipData.symbol,
@@ -40,7 +40,7 @@ const ChipSelection = (props) => {
}
try{
const response = await axios.put('/api/original_gangstas/0', { 'original_gangsta': originalGangsta });
const response = await axios.put('/api/gangs/0', { 'gang': gang });
if (response.status === 200 && response.data && response.data.onboarded) {
window.location.reload();
}else{

6
client/src/homies/CashFlow.js
View File

@@ -7,7 +7,7 @@ import {errorToast} from "../common/errorHelpers";
const CashFlow = (props) => {
const { homie_id } = useParams();
const originalGangsta = props.originalGangsta;
const gang = props.gang;
const [cashFlow, setCashFlow] = useState([]);
@@ -35,7 +35,7 @@ const CashFlow = (props) => {
<div>{ dateBlock(singleFlowData['created_at']) }</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>
</li>
@@ -58,7 +58,7 @@ const CashFlow = (props) => {
<strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
</div>
<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>

4
client/src/homies/Flow.js
View File

@@ -7,7 +7,7 @@ import WorkFlow from "./WorkFlow";
const Flow = (props) => {
const [flowType, setFlowType] = useState('cash');
const originalGangsta = props.originalGangsta;
const gang = props.gang;
return (
<div className="container">
@@ -19,7 +19,7 @@ const Flow = (props) => {
/>
</div>
{ flowType === 'cash' && <CashFlow originalGangsta={originalGangsta} /> }
{ flowType === 'cash' && <CashFlow gang={gang} /> }
{ flowType === 'work' && <WorkFlow /> }
</div>

1
config/initializers/inflections.rb
View File

@@ -17,5 +17,4 @@
ActiveSupport::Inflector.inflections do |inflect|
inflect.irregular 'work', 'work'
inflect.irregular 'gangsta', 'gangstas'
end

2
config/routes.rb
View File

@@ -1,7 +1,7 @@
Rails.application.routes.draw do
constraints format: :json do
scope :api do
resources :original_gangstas, only: [:show, :update]
resources :gangs, only: [:show, :update]
resources :money_moves
resources :work
resources :chips, only: %i[index create destroy]

5
db/migrate/20201007180902_rename_original_gangstas_to_gangs.rb Normal file
View File

@@ -0,0 +1,5 @@
class RenameOriginalGangstasToGangs < ActiveRecord::Migration[5.2]
def change
rename_table :original_gangstas, :gangs
end
end

22
db/schema.rb
View File

@@ -10,7 +10,7 @@
#
# 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_180902) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -35,6 +35,16 @@ ActiveRecord::Schema.define(version: 2020_10_06_120951) do
t.index ["name"], name: "index_chips_on_name", unique: true
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
end
create_table "homies", force: :cascade do |t|
t.text "name", null: false
t.integer "importance", default: 100, null: false
@@ -51,16 +61,6 @@ ActiveRecord::Schema.define(version: 2020_10_06_120951) do
t.datetime "updated_at", null: false
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|
t.text "description"
t.integer "amount"