Skip to content

Commit

Permalink
Merge pull request #18 from hngi/develop
Browse files Browse the repository at this point in the history 
develop
  • Loading branch information
@TokyoTG
TokyoTG committed Jul 7, 2020
2 parents ef1414f + 9003510 commit 4db755c
Show file tree
Hide file tree
Showing 18 changed files with 473 additions and 164 deletions.
23 changes: 23 additions & 0 deletions app/Http/Controllers/ActivateController.php
View file
@@ -0,0 +1,23 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Support\Facades\Cookie;
use Illuminate\Http\Request;

class ActivateController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
return view('backend.user.activate')->with([
'apiToken' => Cookie::get('api_token'),
'phoneNumber' => Cookie::get('phone_number')
]);
}

}
33 changes: 28 additions & 5 deletions app/Http/Controllers/AssistantController.php
View file
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Cookie;
use Illuminate\Pagination\LengthAwarePaginator as Paginator;

class AssistantController extends Controller
{
Expand All @@ -22,10 +23,32 @@ class AssistantController extends Controller
public function index(Request $request)
{
//
if ($request->isMethod('post')) {
return $this->store();
} else {
return redirect()->route('assistant.create');
try {
$user_id = Cookie::get('user_id');
$url = env('API_URL', 'https://api.customerpay.me/') . '/user/all/' . $user_id;
//$url = "http://localhost:3000/user/all/" . $user_id;
$client = new Client();
$headers = ['headers' => ['x-access-token' => Cookie::get('api_token')]];
$user_response = $client->request('GET', $url, $headers);
if ($user_response->getStatusCode() == 200) {
$response = json_decode($user_response->getBody(), true);
$assistants = $response['data']['assistants'];
$perPage = 10;
$page = $request->get('page', 1);
if ($page > count($assistants) or $page < 1) {
$page = 1;
}
$offset = ($page * $perPage) - $perPage;
$articles = array_slice($assistants, $offset, $perPage);
$datas = new Paginator($articles, count($assistants), $perPage);
return view('backend.assistant.index')->with('response', $datas->withPath('/' . $request->path()));
}
if ($user_response->getStatusCode() == 500) {
return view('errors.500');
}
} catch (\Exception $e) {
$request->session()->flash('message', 'Sorry could not get assistants, please check your connection');
return view('backend.assistant.index');
}
}

Expand Down Expand Up @@ -98,7 +121,7 @@ public function store(Request $request)
return redirect()->route('assistant.create');
} catch (Exception $e) {
// dd( $e->getMessage());
Log::error( $e->getMessage());
Log::error($e->getMessage());
return view('errors.500');
}
}
Expand Down
35 changes: 13 additions & 22 deletions app/Http/Controllers/Auth/LoginController.php
View file
Expand Up @@ -4,10 +4,10 @@

use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use GuzzleHttp\Client;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Cookie;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Log;
use GuzzleHttp\Exception\RequestException;

Expand Down Expand Up @@ -56,19 +56,13 @@ public function index()

public function authenticate(Request $request)
{
$validation = Validator::make(request()->all(), [
$request->validate([
'phone_number' => 'required|min:6|max:16',
'password' => 'required|regex:/[a-zA-Z0-9]{6,20}$/'
'password' => 'required|min:6'
]);

if ($validation->fails()) {
$request->session()->flash('message', 'Invalid Phone number or password');
$request->session()->flash('alert-class', 'alert-danger');
return redirect()->route('login');
}

try {
$client = new \GuzzleHttp\Client();
$client = new Client();
$response = $client->post($this->host . '/login/user', [
'form_params' => [
'phone_number' => $request->input('phone_number'),
Expand All @@ -92,14 +86,14 @@ public function authenticate(Request $request)
Cookie::queue('user_id', $response->data->user->_id);
Cookie::queue('expires', strtotime('+ 1 day'));

//show success message
$request->session()->flash('alert-class', 'alert-success');
$request->session()->flash('message', $response->message);

//check if active
if ($data->is_active == false) {
return redirect()->route('activate.user');
}

return redirect()->route('dashboard');
} else {
$message = isset($response->Message) ? $response->Message : $response->message;
Expand All @@ -115,21 +109,18 @@ public function authenticate(Request $request)
//log error;
Log::error('Catch error: LoginController - ' . $e->getMessage());

// check for 500 server error
if ($e->getResponse()->getStatusCode() == 500) {
return view('errors.500');
if ($e->hasResponse()) {
// get response to catch 4xx errors
$response = json_decode($e->getResponse()->getBody());
$request->session()->flash('alert-class', 'alert-danger');
$request->session()->flash('message', $response->error->description);
return redirect()->route('login');
}

// get response to catch 4xx errors
$response = json_decode($e->getResponse()->getBody());

$request->session()->flash('alert-class', 'alert-danger');
$request->session()->flash('message', $response->error->description);
return redirect()->route('login');
// check for 500 server error
return view('errors.500');
} catch (\Exception $e) {
//log error;
Log::error('Catch error: LoginController - ' . $e->getMessage());

return view('errors.500');
}
return redirect()->route('login');
Expand Down
26 changes: 13 additions & 13 deletions app/Http/Controllers/Auth/RegisterController.php
View file
Expand Up @@ -5,7 +5,6 @@
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Cookie;
use GuzzleHttp\Client;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -66,7 +65,7 @@ public function register(Request $request)

$data = $request->validate([
'phone_number' => 'required|min:6|max:16',
'password' => 'required|regex:/[a-zA-Z0-9]{6,20}$/',
'password' => 'required|min:6',
]);

try {
Expand All @@ -87,6 +86,9 @@ public function register(Request $request)

if ($res->success) {

$request->session()->flash('message', 'You have registered Successfully');
$request->session()->flash('alert-class', 'alert-success');

$data = $res->data->user->local;
$api_token = $res->data->user->api_token;
$user_role = $res->data->user->local->user_role;
Expand All @@ -103,7 +105,7 @@ public function register(Request $request)
}
}

if($response->getStatusCode() == 200) {
if ($response->getStatusCode() == 200) {
$res = json_decode($response->getBody());


Expand All @@ -129,21 +131,19 @@ public function register(Request $request)
//log error;
Log::error('Catch error: RegisterController - ' . $e->getMessage());

// check for 500 server error
if ($e->getResponse()->getStatusCode() == 500) {
return view('errors.500');
}

// get response
$response = json_decode($e->getResponse()->getBody());
if ($e->hasResponse()) {
$response = json_decode($e->getResponse()->getBody());
$request->session()->flash('alert-class', 'alert-danger');
$request->session()->flash('message', $response->error->description);
return redirect()->route('signup');
}

$request->session()->flash('alert-class', 'alert-danger');
$request->session()->flash('message', $response->error->description);
return redirect()->route('signup');
// check for 500 server error
return view('errors.500');
} catch (\Exception $e) {
//log error;
Log::error('Catch error: RegisterController - ' . $e->getMessage());

return view('errors.500');
}
}
Expand Down
86 changes: 47 additions & 39 deletions app/Http/Controllers/ComplaintController.php
View file
Expand Up @@ -16,40 +16,26 @@ class ComplaintController extends Controller
*/
public function index()
{
return view('backend.complaints.index');

// $url = env('API_URL', 'https://dev.api.customerpay.me') . '/complaint/all';

// try {
// $client = new Client;
// $payload = ['headers' => ['x-access-token' => Cookie::get('api_token')]];
// $response = $client->request("GET", $url, $payload);
// $statusCode = $response->getStatusCode();
// $body = $response->getBody();
// $complaint = json_decode($body);
// dd($complaint);
// if ($statusCode == 200) {
// return view('backend.stores.index')->with('response', $Stores->data->stores);
// }
// if ($response->getStatusCode() == 401) {
// $data = json_decode($response->getBody());
// Session::flash('message', $data->message);
// return redirect()->route('store.index', ['response' => []]);
// }
// if ($response->getStatusCode() == 400) {
// Log::error((string) $response->getBody());
// return view('errors.400');
// }
// if ($response->getStatusCode() == 500) {
// Log::error((string) $response->getBody());
// return view('errors.500');
// }
// } catch (\Exception $e) {
// $response = $e->getResponse();
// //log error;
// Log::error('Catch error: ComplaintController - ' . $e->getMessage());
// }

$host = env('API_URL', 'https://api.customerpay.me/');
$url = $host."/complaint/all";
try {
$client = new Client();
$headers = ['headers' => ['x-access-token' => Cookie::get('api_token')]];
$response = $client->request('GET', $url, $headers);
$statusCode = $response->getStatusCode();
if ($statusCode == 200) {
$body = $response->getBody()->getContents();
$complaints = json_decode($body);
return view('backend.complaints.index')->with('response', $complaints);
}
if ($statusCode == 500) {
return view('errors.500');
}
} catch (\Exception $e) {
return view('errors.500');

}
// return view('backend.complaints.index');
}

/**
Expand Down Expand Up @@ -108,17 +94,17 @@ public function update(Request $request, $id)

try {
$client = new Client();

$headers = ['headers' => ['x-access-token' => Cookie::get('api_token')]];
$request->validate([
'message' => 'required'
]);

$data = [ "message" => $request->input('message') ];
$req = $client->request('PUT', $url, $headers, $data);

$statusCode = $req->getStatusCode();

if ($statusCode == 200) {
$body = $req->getBody()->getContents();
$response = json_decode($body);
Expand Down Expand Up @@ -156,6 +142,28 @@ public function update(Request $request, $id)
*/
public function destroy($id)
{
//
$host = env('API_URL', 'https://api.customerpay.me/');
$url = $host."complaint/delete/".$id;
try {
$client = new Client();
$request = $client->delete($url);
$statusCode = $request->getStatusCode();
if ($statusCode == 200) {
// return view('backend.complaints.index');
// return view('backend.complaints.index');
return \Redirect::back();
}
if ($statusCode == 500) {
return redirect()->route('backend.complaints.index');
}
} catch (\Exception $e) {
return redirect()->route('complaint');
// return view('backend.transactions.index')->with('error', "Unable to connect to server");
}
// $client = new \GuzzleHttp\Client();

// $response = $request->send();

// dd($response);
}
}
6 changes: 5 additions & 1 deletion app/Http/Controllers/DashboardController.php
View file
Expand Up @@ -15,10 +15,14 @@ public function notification()
{
return view('backend.dashboard.notification');
}


public function creditor()
{
return view('backend.dashboard.creditor');
}

public function analytics()
{
return view('backend.dashboard.analytics');
}
}
4 changes: 1 addition & 3 deletions app/Http/Controllers/StoreController.php
View file
Expand Up @@ -19,10 +19,8 @@ class StoreController extends Controller
*/
public function index()
{
// return view('backend.stores.index');

// API updated
$url = env('API_URL', 'https://dev.api.customerpay.me') . '/store/';
$url = env('API_URL', 'https://dev.api.customerpay.me') . '/store';

try {

Expand Down
6 changes: 0 additions & 6 deletions app/Http/Controllers/UsersController.php
View file
Expand Up @@ -11,12 +11,6 @@
class UsersController extends Controller
{


public function activate(Request $request)
{
return redirect()->route('dashboard');
}

/**
* Display a listing of the resource.
*
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/BackendAuth.php
View file
Expand Up @@ -23,7 +23,7 @@ public function handle($request, Closure $next)


// Uncomment below when sms verification is working
// if (!$request->cookie('is_active') && $request->path() != 'backend/activate') {
// if (!$request->cookie('is_active') && $request->path() != 'admin/activate') {
// return redirect()->route('activate.user');
// }

Expand Down

0 comments on commit 4db755c

Please sign in to comment.