Merge branch 'fix-bug-with-refresh' into 'master'
Fix bug with refresh See merge request saburly/gangsta/roraccounting!7
This commit was merged in pull request #7.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -23,3 +23,5 @@
|
||||
/config/master.key
|
||||
|
||||
node_modules/
|
||||
|
||||
protected_public/
|
||||
@@ -13,5 +13,7 @@ class StaticController < ActionController::API
|
||||
def frontend_static
|
||||
full_path = "protected_public/#{params[:path]}.#{params[:format]}"
|
||||
send_file full_path
|
||||
rescue ActionController::MissingFile
|
||||
render file: 'protected_public/index.html'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,7 +12,7 @@ const Cash = (props) => {
|
||||
useEffect( () => {
|
||||
const getCashForHomies = async () => {
|
||||
try {
|
||||
const cash = await axios.get(`/homies/cash`);
|
||||
const cash = await axios.get(`/api/homies/cash`);
|
||||
setHomiesCash(cash.data);
|
||||
} catch (e) {
|
||||
console.log("Error fetching", e);
|
||||
|
||||
@@ -16,7 +16,7 @@ const MakeMoneyMove = (props) => {
|
||||
useEffect(() => {
|
||||
const getCashForHomies = async () => {
|
||||
try {
|
||||
const cash = await axios.get(`/homies/cash`);
|
||||
const cash = await axios.get(`/api/homies/cash`);
|
||||
setHomiesCash(cash.data);
|
||||
} catch (e) {
|
||||
console.log("Error fetching", e);
|
||||
@@ -72,7 +72,7 @@ const MakeMoneyMove = (props) => {
|
||||
}
|
||||
}
|
||||
|
||||
const submitResponse = await axios.post('/money_moves', moneyMoveRequest);
|
||||
const submitResponse = await axios.post('/api/money_moves', moneyMoveRequest);
|
||||
|
||||
if (submitResponse && submitResponse.status === 200 && submitResponse.data === true) {
|
||||
M.toast({html: "Money lounde...moved"});
|
||||
|
||||
@@ -43,7 +43,7 @@ const AddChip = (props) => {
|
||||
}
|
||||
|
||||
try{
|
||||
const submitResponse = await axios.post('/chips', chipRequest);
|
||||
const submitResponse = await axios.post('/api/chips', chipRequest);
|
||||
|
||||
if (submitResponse && submitResponse.status === 200 && submitResponse.data) {
|
||||
M.toast({ html: "Chipped In" });
|
||||
|
||||
@@ -14,7 +14,7 @@ const ListChips = (props) => {
|
||||
const reloadChipsListEffect = () => {
|
||||
(async() => {
|
||||
try {
|
||||
const chipsResponse = await axios.get(`/chips`);
|
||||
const chipsResponse = await axios.get(`/api/chips`);
|
||||
|
||||
if (chipsResponse && chipsResponse.status === 200 && Array.isArray(chipsResponse.data)) {
|
||||
setChipsList(chipsResponse.data);
|
||||
@@ -45,7 +45,7 @@ const ListChips = (props) => {
|
||||
|
||||
const deleteChip = async (chipId) => {
|
||||
try {
|
||||
const chipsResponse = await axios.delete(`/chips/${chipId}`);
|
||||
const chipsResponse = await axios.delete(`/api/chips/${chipId}`);
|
||||
|
||||
if (chipsResponse && chipsResponse.status === 200 && Array.isArray(chipsResponse.data)){
|
||||
setChipsList(chipsResponse.data);
|
||||
@@ -66,7 +66,7 @@ const ListChips = (props) => {
|
||||
value: editingChipValue
|
||||
}
|
||||
}
|
||||
const chipsResponse = await axios.post(`/chip_values`, newChipValueObject);
|
||||
const chipsResponse = await axios.post(`/api/chip_values`, newChipValueObject);
|
||||
|
||||
if (chipsResponse && chipsResponse.status === 200){
|
||||
setChipsList(chipsResponse.data);
|
||||
@@ -88,7 +88,7 @@ const ListChips = (props) => {
|
||||
value: editingChipValue
|
||||
}
|
||||
}
|
||||
const chipsResponse = await axios.put(`/chip_values/${chipValueId}`, updatedChipValue);
|
||||
const chipsResponse = await axios.put(`/api/chip_values/${chipValueId}`, updatedChipValue);
|
||||
|
||||
if (chipsResponse && chipsResponse.status === 200){
|
||||
setChipsList(chipsResponse.data);
|
||||
@@ -102,7 +102,7 @@ const ListChips = (props) => {
|
||||
|
||||
const deleteChipValue = async (chipValueId) => {
|
||||
try {
|
||||
const chipsResponse = await axios.delete(`/chip_values/${chipValueId}`);
|
||||
const chipsResponse = await axios.delete(`/api/chip_values/${chipValueId}`);
|
||||
|
||||
if (chipsResponse && chipsResponse.status === 200){
|
||||
setChipsList(chipsResponse.data);
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
Rails.application.routes.draw do
|
||||
constraints format: :json do
|
||||
resources :money_moves
|
||||
resources :chips, only: %i[index create destroy]
|
||||
resources :chip_values, only: %i[create update destroy]
|
||||
resources :homies do
|
||||
collection do
|
||||
get 'cash'
|
||||
scope :api do
|
||||
resources :money_moves
|
||||
resources :chips, only: %i[index create destroy]
|
||||
resources :chip_values, only: %i[create update destroy]
|
||||
resources :homies do
|
||||
collection do
|
||||
get 'cash'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user