Skip to content

Commit

Permalink
fix format date for trading
Browse files Browse the repository at this point in the history 
fix localization for closing positions
add auth middleware for some routes
  • Loading branch information
@BuyOwnEx
BuyOwnEx committed May 16, 2021
1 parent 4535a19 commit e631c89
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 74 deletions.
8 changes: 8 additions & 0 deletions app/Http/Middleware/Authenticate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Middleware;

use Illuminate\Auth\AuthenticationException;
use Illuminate\Auth\Middleware\Authenticate as Middleware;

class Authenticate extends Middleware
Expand All @@ -18,4 +19,11 @@ protected function redirectTo($request)
return route('login');
}
}

protected function unauthenticated($request, array $guards)
{
throw new AuthenticationException(
'Unauthenticated!', $guards, $this->redirectTo($request)
);
}
}
2 changes: 1 addition & 1 deletion resources/js/mixins/format/formatDate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default {

switch (type) {
case 'trading':
const timestamp = date / 10000 - 62136892800000;
const timestamp = date / 10000 - 62135596800000;
return moment
.utc(timestamp)
.tz(moment.tz.guess())
Expand Down
2 changes: 1 addition & 1 deletion resources/js/translations/en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export default {
long_type: 'long',

close_title: 'Closing confirmation',
close_many: 'Are you sure you want to cancel all {type} positions?',
close_many: 'Are you sure you want to close all {type} positions?',
close_description: 'This action will close your position',

deposit_position: 'Deposit funds',
Expand Down
2 changes: 1 addition & 1 deletion resources/js/translations/ru.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export default {
long_type: 'длинные',

close_title: 'Подтверждение закрытия',
close_many: 'Вы уверены, что хотите отменить все {type} позиции?',
close_many: 'Вы уверены, что хотите закрыть все {type} позиции?',
close_description: 'Данное действие приведет к закрытию позиции',

deposit_position: 'Внести средства',
Expand Down
141 changes: 70 additions & 71 deletions routes/web.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,33 @@
Route::get('/', function () {
return redirect('trading/'.env('DEFAULT_MARKET', 'USDT').'/'.env('DEFAULT_CURRENCY', 'BTC'));
});

Route::get('trading/{market}/{currency}', 'TraderController@getTradingView')->name('trading_view');
Route::get('balance', 'TraderController@getBalanceView')->name('balance_view');
Route::get('overview', 'TraderController@getOverviewView')->name('overview_view');
Route::get('transactions', 'TraderController@getTransactionsView')->name('transactions_view');
Route::get('fiat_transactions', 'TraderController@getFiatTransactionsView')->name('fiat_transactions_view');
Route::get('transfers', 'TraderController@getTransfersView')->name('transfers_view');
Route::get('orders', 'TraderController@getOrdersView')->name('orders_view');
Route::get('deals', 'TraderController@getDealsView')->name('deals_view');
Route::get('ref_payments', 'TraderController@getRefPaymentsView')->name('referrals_view');
Route::get('support', 'TraderController@getSupportView')->name('support_view');
Route::get('profile', 'TraderController@getProfileView')->name('profile_view');
Route::get('notifications', 'TraderController@getNotificationsView')->name('notifications_view');

Route::get('policy', 'TraderController@getPolicyView')->name('policy_view');
Route::get('terms', 'TraderController@getTermsView')->name('terms_view');
Route::get('api', 'TraderController@getApiView')->name('api_view');
Route::get('fees', 'TraderController@getFeesView')->name('fees_view');
Route::get('status', 'TraderController@getStatusView')->name('status_view');
Route::get('contacts', 'TraderController@getContactsView')->name('contacts_view');

Route::get('2fa', 'Auth\LoginController@getValidateToken');
Route::post('2fa_validate', ['middleware' => 'throttle:5', 'uses' => 'Auth\LoginController@postValidateToken']);
Route::get('forget_2fa','Google2FAController@forgetTwoFactor');

Route::post('set_locale', 'TraderController@setLocale');

Route::group(['prefix' => 'trader'], function () {
Route::middleware('auth')->group(function () {
Route::get('balance', 'TraderController@getBalanceView')->name('balance_view');
Route::get('transactions', 'TraderController@getTransactionsView')->name('transactions_view');
Route::get('fiat_transactions', 'TraderController@getFiatTransactionsView')->name('fiat_transactions_view');
Route::get('transfers', 'TraderController@getTransfersView')->name('transfers_view');
Route::get('orders', 'TraderController@getOrdersView')->name('orders_view');
Route::get('deals', 'TraderController@getDealsView')->name('deals_view');
Route::get('ref_payments', 'TraderController@getRefPaymentsView')->name('referrals_view');
Route::get('support', 'TraderController@getSupportView')->name('support_view');
Route::get('profile', 'TraderController@getProfileView')->name('profile_view');
Route::get('notifications', 'TraderController@getNotificationsView')->name('notifications_view');
});

Route::group(['prefix' => 'trader'], function () {
Route::post('2fa_enable', ['middleware' => 'throttle:5', 'uses' => 'Google2FAController@enableTwoFactorReady']);
Route::post('2fa_disable', ['middleware' => 'throttle:5', 'uses' => 'Google2FAController@disableTwoFactorReady']);
Route::get('2fa_generate', 'Google2FAController@generateTwoFactor');
Expand All @@ -62,73 +60,74 @@
Route::get('notifications', 'NotificationController@getAllNotifications');

Route::group(['prefix' => 'ext'], function () {
Route::get('token', 'JWTController@getOwnToken')->name('token');
Route::post('private', 'JWTController@getPrivateToken')->name('private');
Route::post('refresh', 'JWTController@refreshOwnToken')->name('refresh');

Route::get('tickers', 'TraderController@getTickers')->name('tickers');
Route::get('market_data', 'TraderController@getMarketData')->name('market_data');
Route::get('depth', 'TraderController@getDepth')->name('depth');
Route::get('history/deals', 'TraderController@HistoryDealList')->name('history_deal_list');
Route::get('graph', 'TraderController@getChart')->name('chart');

Route::get('crypto_currencies', 'TraderController@getCryptoCurrencies')->name('crypto_currencies');
Route::get('fiat_currencies', 'TraderController@getFiatCurrencies')->name('fiat_currencies');
Route::get('all_currencies', 'TraderController@getAllCurrencies')->name('all_currencies');
Route::get('health', 'TraderController@getHealth')->name('health');
Route::get('get_offer_list', 'TraderController@getOfferList')->name('offer_list');

Route::get('balances', 'TraderController@getBalances')->name('balances');
Route::get('orders', 'TraderController@getOrders')->name('orders');
Route::get('deals', 'TraderController@getDeals')->name('deals');
Route::get('positions', 'TraderController@getPositions')->name('positions');

Route::post('order/limit', 'TraderController@makeOrder')->name('limit_order');
Route::post('order/market', 'TraderController@makeOrder')->name('market_order');
Route::post('order/cancel', 'TraderController@cancelOrder')->name('cancel_order');
Route::post('order/cancel_all', 'TraderController@cancelAllOrders')->name('cancel_all_orders');
Route::post('order/cancel_all_sl', 'TraderController@cancelAllSLOrders')->name('cancel_all_sl_orders');
Route::post('order/cancel_all_tp', 'TraderController@cancelAllTPOrders')->name('cancel_all_tp_orders');
Route::post('order/cancel_all_ts', 'TraderController@cancelAllTSOrders')->name('cancel_all_ts_orders');
Route::middleware('auth')->group(function () {
Route::get('token', 'JWTController@getOwnToken')->name('token');
Route::post('private', 'JWTController@getPrivateToken')->name('private');
Route::post('refresh', 'JWTController@refreshOwnToken')->name('refresh');

Route::get('balances', 'TraderController@getBalances')->name('balances');
Route::get('orders', 'TraderController@getOrders')->name('orders');
Route::get('deals', 'TraderController@getDeals')->name('deals');
Route::get('positions', 'TraderController@getPositions')->name('positions');

Route::post('order/limit', 'TraderController@makeOrder')->name('limit_order');
Route::post('order/market', 'TraderController@makeOrder')->name('market_order');
Route::post('order/cancel', 'TraderController@cancelOrder')->name('cancel_order');
Route::post('order/cancel_all', 'TraderController@cancelAllOrders')->name('cancel_all_orders');
Route::post('order/cancel_all_sl', 'TraderController@cancelAllSLOrders')->name('cancel_all_sl_orders');
Route::post('order/cancel_all_tp', 'TraderController@cancelAllTPOrders')->name('cancel_all_tp_orders');
Route::post('order/cancel_all_ts', 'TraderController@cancelAllTSOrders')->name('cancel_all_ts_orders');

Route::post('position/close', 'TraderController@closePosition')->name('close_position');
Route::post('position/close_all', 'TraderController@closeAllPositions')->name('close_all_positions');
Route::post('position/close_all_long', 'TraderController@closeAllLongPositions')->name('close_all_long_positions');
Route::post('position/close_all_short', 'TraderController@closeAllShortPositions')->name('close_all_short_positions');
Route::post('position/deposit', 'TraderController@depositPosition')->name('deposit_position');

Route::get('balance/all-withdrawals', 'TraderController@getWithdrawalList')->name('withdrawal_list');
Route::post('transfer/trade', 'TraderController@transferToTradeWallet')->name('transfer_to_trade');
Route::post('transfer/safe', 'TraderController@transferToSafeWallet')->name('transfer_to_safe');
Route::post('withdraw/crypto/request', 'TraderController@withdrawCryptoRequest')->name('withdraw_crypto_request');
Route::post('withdraw/crypto/confirm', 'TraderController@withdrawCryptoConfirm')->name('withdraw_crypto_confirm');
Route::post('withdraw/crypto/cancel', 'TraderController@withdrawCryptoCancel')->name('withdraw_crypto_cancel');
Route::post('withdraw/fiat/cancel', 'TraderController@withdrawFiatCancel')->name('withdraw_fiat_cancel');

Route::post('message/send', 'TraderController@sendMessage')->name('send_message');

Route::get('all_orders', 'TraderController@getAllOrders')->name('all_orders');
Route::get('all_deals', 'TraderController@getAllDeals')->name('all_deals');
Route::get('all_transactions', 'TraderController@getAllTransactions')->name('all_transactions');
Route::get('all_fiat_transactions', 'TraderController@getAllFiatTransactions')->name('all_fiat_transactions');
Route::get('all_transfers', 'TraderController@getAllTransfers')->name('all_transfers');
Route::get('all_ref_payments', 'TraderController@getAllRefPayments')->name('all_ref_payments');
Route::get('all_followers', 'TraderController@getAllFollowers')->name('all_followers');

Route::get('all_referral_types', 'TraderController@getAllReferralTypes')->name('all_referral_types');
Route::post('set_referral_type', 'TraderController@setReferralType')->name('set_referral_type');

Route::get('get_address', 'TraderController@getAddress')->name('get_address');
Route::post('validate_address', 'TraderController@validateAddress')->name('validate_address');

Route::get('sumsub_token', 'TraderController@getSumSubToken')->name('sumsub_token');

Route::get('api_tokens', 'TraderController@getAPITokens')->name('api_tokens');
Route::post('new_api_token', 'TraderController@newAPIToken')->name('new_api_token');
Route::post('edit_api_token', 'TraderController@editAPIToken')->name('edit_api_token');
Route::post('delete_api_token', 'TraderController@deleteAPIToken')->name('delete_api_token');
Route::post('delete_all_api_tokens', 'TraderController@deleteAllAPITokens')->name('delete_all_api_tokens');
});

Route::get('get_offer_list', 'TraderController@getOfferList')->name('offer_list');
Route::post('position/close', 'TraderController@closePosition')->name('close_position');
Route::post('position/close_all', 'TraderController@closeAllPositions')->name('close_all_positions');
Route::post('position/close_all_long', 'TraderController@closeAllLongPositions')->name('close_all_long_positions');
Route::post('position/close_all_short', 'TraderController@closeAllShortPositions')->name('close_all_short_positions');
Route::post('position/deposit', 'TraderController@depositPosition')->name('deposit_position');

Route::get('balance/all-withdrawals', 'TraderController@getWithdrawalList')->name('withdrawal_list');
Route::post('transfer/trade', 'TraderController@transferToTradeWallet')->name('transfer_to_trade');
Route::post('transfer/safe', 'TraderController@transferToSafeWallet')->name('transfer_to_safe');
Route::post('withdraw/crypto/request', 'TraderController@withdrawCryptoRequest')->name('withdraw_crypto_request');
Route::post('withdraw/crypto/confirm', 'TraderController@withdrawCryptoConfirm')->name('withdraw_crypto_confirm');
Route::post('withdraw/crypto/cancel', 'TraderController@withdrawCryptoCancel')->name('withdraw_crypto_cancel');
Route::post('withdraw/fiat/cancel', 'TraderController@withdrawFiatCancel')->name('withdraw_fiat_cancel');


Route::post('message/send', 'TraderController@sendMessage')->name('send_message');

Route::get('all_orders', 'TraderController@getAllOrders')->name('all_orders');
Route::get('all_deals', 'TraderController@getAllDeals')->name('all_deals');
Route::get('all_transactions', 'TraderController@getAllTransactions')->name('all_transactions');
Route::get('all_fiat_transactions', 'TraderController@getAllFiatTransactions')->name('all_fiat_transactions');
Route::get('all_transfers', 'TraderController@getAllTransfers')->name('all_transfers');
Route::get('all_ref_payments', 'TraderController@getAllRefPayments')->name('all_ref_payments');
Route::get('all_followers', 'TraderController@getAllFollowers')->name('all_followers');

Route::get('all_referral_types', 'TraderController@getAllReferralTypes')->name('all_referral_types');
Route::post('set_referral_type', 'TraderController@setReferralType')->name('set_referral_type');

Route::get('get_address', 'TraderController@getAddress')->name('get_address');
Route::post('validate_address', 'TraderController@validateAddress')->name('validate_address');

Route::get('sumsub_token', 'TraderController@getSumSubToken')->name('sumsub_token');

Route::get('api_tokens', 'TraderController@getAPITokens')->name('api_tokens');
Route::post('new_api_token', 'TraderController@newAPIToken')->name('new_api_token');
Route::post('edit_api_token', 'TraderController@editAPIToken')->name('edit_api_token');
Route::post('delete_api_token', 'TraderController@deleteAPIToken')->name('delete_api_token');
Route::post('delete_all_api_tokens', 'TraderController@deleteAllAPITokens')->name('delete_all_api_tokens');
});
});

Expand Down

0 comments on commit e631c89

Please sign in to comment.