From e0c5f60c68b2dc81839b36d40e7b9f2e75fd54f6 Mon Sep 17 00:00:00 2001 From: Bilal Date: Wed, 7 Oct 2020 18:26:59 +0300 Subject: [PATCH] rename original gangsta to gang --- app/controllers/gangs_controller.rb | 28 +++++++++++++++++++ .../original_gangstas_controller.rb | 28 ------------------- app/models/gang.rb | 3 ++ app/models/original_gangsta.rb | 3 -- client/src/App.js | 20 ++++++------- client/src/cash/Cash.js | 4 +-- .../ChipSelection.js | 4 +-- client/src/homies/CashFlow.js | 6 ++-- client/src/homies/Flow.js | 4 +-- config/initializers/inflections.rb | 1 - config/routes.rb | 2 +- ...80902_rename_original_gangstas_to_gangs.rb | 5 ++++ db/schema.rb | 22 +++++++-------- 13 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 app/controllers/gangs_controller.rb delete mode 100644 app/controllers/original_gangstas_controller.rb create mode 100644 app/models/gang.rb delete mode 100644 app/models/original_gangsta.rb rename client/src/{originalGangstaOnboarding => gangOnboarding}/ChipSelection.js (92%) create mode 100644 db/migrate/20201007180902_rename_original_gangstas_to_gangs.rb diff --git a/app/controllers/gangs_controller.rb b/app/controllers/gangs_controller.rb new file mode 100644 index 0000000..958b243 --- /dev/null +++ b/app/controllers/gangs_controller.rb @@ -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 diff --git a/app/controllers/original_gangstas_controller.rb b/app/controllers/original_gangstas_controller.rb deleted file mode 100644 index 2d5debe..0000000 --- a/app/controllers/original_gangstas_controller.rb +++ /dev/null @@ -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 diff --git a/app/models/gang.rb b/app/models/gang.rb new file mode 100644 index 0000000..e2d3d62 --- /dev/null +++ b/app/models/gang.rb @@ -0,0 +1,3 @@ +class Gang < ApplicationRecord + +end \ No newline at end of file diff --git a/app/models/original_gangsta.rb b/app/models/original_gangsta.rb deleted file mode 100644 index a579514..0000000 --- a/app/models/original_gangsta.rb +++ /dev/null @@ -1,3 +0,0 @@ -class OriginalGangsta < ApplicationRecord - -end \ No newline at end of file diff --git a/client/src/App.js b/client/src/App.js index 2c8d82b..0ae860a 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -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 = ([ - } />, - } />, - } />, - } />, - } /> + } />, + } />, + } />, + } />, + } /> ] ); - const onboarded = () => originalGangsta.chip_name && originalGangsta.chip_name.length > 0; + const onboarded = () => gang.chip_name && gang.chip_name.length > 0; const preloaderCircle = (
diff --git a/client/src/cash/Cash.js b/client/src/cash/Cash.js index 331591e..22f53ca 100644 --- a/client/src/cash/Cash.js +++ b/client/src/cash/Cash.js @@ -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) } - { formatMoney(homieLine.amount, originalGangsta) } + { formatMoney(homieLine.amount, gang) } [ diff --git a/client/src/originalGangstaOnboarding/ChipSelection.js b/client/src/gangOnboarding/ChipSelection.js similarity index 92% rename from client/src/originalGangstaOnboarding/ChipSelection.js rename to client/src/gangOnboarding/ChipSelection.js index 1bd167c..af7ee9a 100644 --- a/client/src/originalGangstaOnboarding/ChipSelection.js +++ b/client/src/gangOnboarding/ChipSelection.js @@ -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{ diff --git a/client/src/homies/CashFlow.js b/client/src/homies/CashFlow.js index 4694011..c71a229 100644 --- a/client/src/homies/CashFlow.js +++ b/client/src/homies/CashFlow.js @@ -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) => {
{ dateBlock(singleFlowData['created_at']) }
-
0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, originalGangsta) }
+
0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, gang) }
@@ -58,7 +58,7 @@ const CashFlow = (props) => { {`${totalCount} Records`}{` • ${fromDate} - ${toDate}`}
- Total cash flow: {formatMoney(totalFlow, originalGangsta)} + Total cash flow: {formatMoney(totalFlow, gang)}
diff --git a/client/src/homies/Flow.js b/client/src/homies/Flow.js index 78eb8f5..c2b2d9f 100644 --- a/client/src/homies/Flow.js +++ b/client/src/homies/Flow.js @@ -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 (
@@ -19,7 +19,7 @@ const Flow = (props) => { />
- { flowType === 'cash' && } + { flowType === 'cash' && } { flowType === 'work' && } diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9f8e25d..ab4f265 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -17,5 +17,4 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.irregular 'work', 'work' - inflect.irregular 'gangsta', 'gangstas' end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6ebc143..fa4ec00 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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] diff --git a/db/migrate/20201007180902_rename_original_gangstas_to_gangs.rb b/db/migrate/20201007180902_rename_original_gangstas_to_gangs.rb new file mode 100644 index 0000000..68ccbc1 --- /dev/null +++ b/db/migrate/20201007180902_rename_original_gangstas_to_gangs.rb @@ -0,0 +1,5 @@ +class RenameOriginalGangstasToGangs < ActiveRecord::Migration[5.2] + def change + rename_table :original_gangstas, :gangs + end +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index e1a270a..28977bc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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"