diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.env.example b/.env.example index c647079d..01a2c3bc 100644 --- a/.env.example +++ b/.env.example @@ -2,9 +2,9 @@ APP_NAME=Laravel APP_ENV=local APP_KEY= APP_DEBUG=true -APP_URL=http://localhost +APP_URL=https://dev.customerpay.me -API_URL=https://dev.customerpay.me +API_URL=https://dev.api.customerpay.me LOG_CHANNEL=stack diff --git a/.gitattributes b/.gitattributes old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.styleci.yml b/.styleci.yml old mode 100755 new mode 100644 diff --git a/Procfile b/Procfile old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php old mode 100755 new mode 100644 diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/ActivateController.php b/app/Http/Controllers/ActivateController.php index 253768b2..c9a38f2e 100644 --- a/app/Http/Controllers/ActivateController.php +++ b/app/Http/Controllers/ActivateController.php @@ -11,12 +11,14 @@ class ActivateController extends Controller public function index() { - if (Cookie::get('is_active') == true) { - return redirect()->route('dashboard'); - } + return redirect()->route('dashboard'); - $api_token = Cookie::get('api_token'); - $phone_number = Cookie::get('phone_number'); - return view("backend.activate.activate")->withApiToken($api_token)->withPhoneNumber($phone_number); + // if (Cookie::get('is_active') == true) { + // return redirect()->route('dashboard'); + // } + + // $api_token = Cookie::get('api_token'); + // $phone_number = Cookie::get('phone_number'); + // return view("backend.activate.activate")->withApiToken($api_token)->withPhoneNumber($phone_number); } } diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php old mode 100755 new mode 100644 index d5e56ef1..64ee208b --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -48,7 +48,7 @@ public function __construct() public function index() { - if (Cookie::get('api_token')){ + if (Cookie::get('api_token')) { return redirect()->route('dashboard'); } return view('backend.login'); @@ -56,8 +56,8 @@ public function index() public function authenticate(Request $request) { - $validation = Validator::make(request()->all(),[ - 'phone_number' => 'required|numeric|digits_between:1,16', + $validation = Validator::make(request()->all(), [ + 'phone_number' => 'required|min:6|max:16', 'password' => 'required|regex:/[a-zA-Z0-9]{6,20}$/' ]); @@ -77,48 +77,49 @@ public function authenticate(Request $request) ]); if ($response->getStatusCode() == 200) { + $response = json_decode($response->getBody()); - if($response->status) { + if (isset($response->success) && $response->success) { + + $data = $response->data->user->local; + // store data to cookie - Cookie::queue('api_token', $response->api_token); - Cookie::queue('is_active', $response->user->is_active); - Cookie::queue('phone_number', $response->user->phone_number); - Cookie::queue('user_id', $response->user->_id); + Cookie::queue('api_token', $data->api_token); + Cookie::queue('is_active', $data->is_active); + Cookie::queue('phone_number', $data->phone_number); + Cookie::queue('user_id', $response->data->user->_id); + Cookie::queue('expires', strtotime('+ 1 day')); $request->session()->flash('alert-class', 'alert-success'); $request->session()->flash('message', $response->message); //check if active - if ($response->user->is_active == false) { + if ($data->is_active == false) { return redirect()->route('activate.user'); } - // store other data to cookie - Cookie::queue('first_name', $response->user->first_name); - Cookie::queue('last_name', $response->user->last_name); - Cookie::queue('email', $response->user->email); - return redirect()->route('dashboard'); } else { - $request->session()->flash('message', $response->message); + $message = isset($response->Message) ? $response->Message : $response->message; + $request->session()->flash('message', $message); return redirect()->route('login'); } } - if ($response->getStatusCode() == 500) { - return view('errors.500'); - } + $message = isset($response->Message) ? $response->Message : $response->message; + $request->session()->flash('message', $message); + return redirect()->route('login'); } catch (\Exception $e) { - // log $e->getMessage() when error loggin is setup - if($e->getCode() == 400) { - $request->session()->flash('message', 'Invalid Phone number or password'); + + if ($e->getCode() == 400) { + $request->session()->flash('message', 'Invalid Phone number or password. Ensure Your phone number uses internations format.e.g +234'); $request->session()->flash('alert-class', 'alert-danger'); return redirect()->route('login'); } - Log::error("catch error: LoginController - ".$e->getMessage()); - $request->session()->flash('message', 'something went wrong try again in a few minutes'); + Log::error("catch error: LoginController - " . $e->getMessage()); + $request->session()->flash('message', 'Something bad happened, please try again'); return redirect()->route('login'); } return redirect()->route('login'); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php old mode 100755 new mode 100644 index b001b9eb..167bc38c --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -41,26 +41,13 @@ class RegisterController extends Controller public function __construct() { $this->middleware('guest'); + $this->host = env('API_URL', 'https://api.customerpay.me/'); } - /** - * Get a validator for an incoming registration request. - * - * @param array $data - * @return \Illuminate\Contracts\Validation\Validator - */ - protected function validator(array $data) - { - return Validator::make($data, [ - 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - 'password' => ['required', 'string', 'min:8', 'confirmed'], - ]); - } public function index() { - if (Cookie::get('api_token')){ + if (Cookie::get('api_token')) { return redirect()->route('dashboard'); } return view('backend.register.signup'); @@ -75,50 +62,66 @@ public function index() // Controller action to register a new user. public function register(Request $request) { + + $request->validate([ + 'phone_number' => 'required|min:6|max:17', + 'password' => 'required|regex:/[a-zA-Z0-9]{6,20}$/', + ]); + try { - // check if all fields are available + if ($request->all()) { - // make an api call to register the user - $client = new Client(); - $response = $client->post(env('API_URL') . '/register/user', [ + + $client = new Client(); + $response = $client->post($this->host . '/register/user', [ 'form_params' => [ - 'first_name' => $request->input('first_name'), - 'last_name' => $request->input('last_name'), - 'email' => $request->input('email'), 'phone_number' => $request->input('phone_number'), 'password' => $request->input('password') ] ]); + if ($response->getStatusCode() == 201) { + $res = json_decode($response->getBody()); - // get the api_token and phone_number from the response - $api_token = $res->User->api_token; - $phone_number = $res->User->phone_number; - $user_id = $res->User->_id; - // set api_token and phone number cookie - Cookie::queue('api_token', $api_token); - Cookie::queue('phone_number', $phone_number); - Cookie::queue('user_id', $user_id); + if ($res->success) { - return redirect()->route('activate.user'); - } + $data = $res->data->user->local; - if ($response->getStatusCode() == 200) { - $res = json_decode($response->getBody()); - $request->session()->flash('alert', $res->Message); - $request->session()->flash('alert-class', 'alert-danger'); + // store data to cookie + Cookie::queue('api_token', $data->api_token); + Cookie::queue('is_active', $data->is_active); + Cookie::queue('phone_number', $data->phone_number); + Cookie::queue('user_id', $res->data->user->_id); + Cookie::queue('expires', strtotime('+ 1 day')); - return redirect()->route('signup'); + return redirect()->route('activate.user'); + } } - } else { - return redirect()->route('signup'); + if($response->getStatusCode() == 200) { + $_response = json_decode($response->getBody(), true); + + if (count($_response) == 1) { + $request->session()->flash('message', $_response['Message']); + $request->session()->flash('alert-class', 'alert-danger'); + return redirect()->route('signup'); + } + } } + + $res = json_decode($response->getBody()); + $request->session()->flash('message', $res->Message); + $request->session()->flash('alert-class', 'alert-danger'); + + return redirect()->route('signup'); } catch (\Exception $e) { + //log error Log::error('Catch error: RegisterController - ' . $e->getMessage()); - $request->session()->flash('alert', 'Something went wrong, please try again.'); + + $request->session()->flash('alert-class', 'alert-danger'); + $request->session()->flash('message', 'Something bad happened, please try again'); return redirect()->route('signup'); } } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index cd432691..04d4825d 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -9,30 +9,34 @@ class SettingsController extends Controller { + // Defining headers + public $headers; + public $user_id; + // Controller action to display settings page. public function index() { + + // Setting header + $this->headers = [ 'headers' => ['x-access-token' => Cookie::get('api_token')] ]; + + // Setting User_id + $this->user_id = Cookie::get('user_id'); + try{ - // This is the logged user_id - $user_id = Cookie::get('user_id'); - // api call to get the user info + $url = env('API_URL', 'https://api.customerpay.me'). '/user/' . $this->user_id ; $client = new Client(); - $response = $client->get(env('API_URL') . '/user/' . $user_id, [ - 'form_params' => [ - 'api_token' => Cookie::get('api_token') - ] - ]); + $user_detail_process = $client->request('GET', $url, $this->headers); - if ($response->getStatusCode() == 200) { - $res = json_decode($response->getBody(), true); + if ( $user_detail_process->getStatusCode() == 200 ) { + $res = json_decode($user_detail_process->getBody(), true); return view('backend.settings.settings')->with('user_details', $res); } + if ($user_detail_process->getStatusCode() == 500) { - if ($response->getStatusCode() == 500) { return view('errors.500'); } - } catch(\Exception $e) { return view('errors.500'); } @@ -40,80 +44,82 @@ public function index() { // Controller action to update user details. public function update(Request $request) { + + // Setting header + $this->headers = [ 'headers' => ['x-access-token' => Cookie::get('api_token')] ]; + + // Setting User_id + $this->user_id = Cookie::get('user_id'); + try{ - // This is the logged user_id - $user_id = Cookie::get('user_id'); - - // API NOT WORKING ONLINE YET: NODE - // ============================================== - // check if all fields are available - // if($request->all()) { - - // $control = $request->input('control', ''); - - // if ($control == 'profile_update') { - - // // make an api call to update the user_details - // $client = new Client(); - // $response = $client->put(env('API_URL') . '/user/update/' . $user_id, [ - // 'form_params' => [ - // 'api_token' => Cookie::get('api_token'), - // 'name' => $request->input('first_name'), - // 'lastname' => $request->input('last_name'), - // 'email' => $request->input('email') - // ] - // ]); - - // } elseif ($control == 'password_change') { - - // // make an api call to update the user_password_details - // $client = new Client(); - // $response = $client->post(env('API_URL') . '/reset-password', [ - // 'form_params' => [ - // 'api_token' => Cookie::get('api_token'), - // 'current_password' => $request->input('current_password'), - // 'new_password' => $request->input('new_password') - // ] - // ]); - - // } else { - - // return view('errors.500'); - // } - - // // api call to get the updated user info - // $client = new Client(); - // $user_detail = $client->get(env('API_URL') . '/user/' . $user_id); - // $user_detail_res = json_decode($user_detail->getBody(), true); - - // if ($response->getStatusCode() == 201) { - - // $res = json_decode($response->getBody(), true); - - // return view('backend.settings.settings')->with([ - // 'user_details' => $res, - // 'form_response' => $user_detail_res - // ]); - // } - - // if ($response->getStatusCode() == 400) { - - // $res = json_decode($response->getBody(), true); - - // return view('backend.settings.settings')->with([ - // 'user_details' => $res, - // 'form_response' => $user_detail_res - // ]); - // } - - // if ($response->getStatusCode() == 500) { - // return view('errors.500'); - // } - // } else { - // return redirect()->route('settings'); - // } - // ============================================== + // check if all fields are available + if($request->all()) { + + $control = $request->input('control', ''); + + if ($control == 'profile_update') { + + $url = env('API_URL', 'https://api.customerpay.me'). '/user/update/' . $this->user_id ; + $client = new Client(); + $data = [ + // "content" => [ + "first_name" => $request->input('first_name'), + "last_name" => $request->input('last_name'), + "email" => $request->input('email') + // ] + ]; + // make an api call to update the user_details + $form_response_process = $client->request('PUT', $url, $this->headers, $data); + + } elseif ($control == 'password_change') { + + // $url = env('API_URL', 'https://api.customerpay.me'). '/reset-password'; + $url = env('API_URL', 'https://api.customerpay.me'). '/user/update/' . $this->user_id ; + $client = new Client(); + $data = [ + // "content" => [ + // 'current_password' => $request->input('current_password'), + "new_password" => $request->input('new_password') + // ] + ]; + // make an api call to update the user_details + $form_response_process = $client->request('PUT', $url, $this->headers, $data); + + } else { + + return view('errors.404'); + } + + $url = env('API_URL', 'https://api.customerpay.me'). '/user/' . $this->user_id ; + $client = new Client(); + $user_detail_res_pocess = $client->request('GET', $url, $this->headers); + + if ( $user_detail_res_pocess->getStatusCode() == 200 ) { + + $user_detail_res = json_decode($user_detail_res_pocess->getBody(), true); + $form_response = json_decode($form_response_process->getBody(), true); + return view('backend.settings.settings')->with([ + 'user_details' => $user_detail_res, + 'form_response' => $form_response + ]); + } + if ($user_detail_res_pocess->getStatusCode() == 500) { + + return view('errors.500'); + } + if ($user_detail_res_pocess->getStatusCode() == 400) { + + $user_detail_res = json_decode($user_detail_res_pocess->getBody(), true); + $form_response = json_decode($form_response->getBody(), true); + return view('backend.settings.settings')->with([ + 'user_details' => $user_detail_res, + 'form_response' => $form_response + ]); + } + } else { + return redirect()->route('settings'); + } } catch(\Exception $e) { return view('errors.500'); } diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php new file mode 100644 index 00000000..371ef72f --- /dev/null +++ b/app/Http/Controllers/StoreController.php @@ -0,0 +1,102 @@ + ['x-access-token' => Cookie::get('api_token')]]; + $response = $client->request("GET", $url, $payload); + $statusCode = $response->getStatusCode(); + $body = $response->getBody()->getContents(); + $Stores = json_decode($body); + if ($statusCode == 200) { + return view('backend.stores.store_list')->with('response', $Stores); + } + } catch (\Exception $e) { + view('errors.500'); + } + + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php new file mode 100644 index 00000000..3e19f4c7 --- /dev/null +++ b/app/Http/Controllers/TransactionController.php @@ -0,0 +1,38 @@ + ['x-access-token' => Cookie::get('api_token')]]; + $response = $client->request('GET', $url, $headers); + $statusCode = $response->getStatusCode(); + if ($statusCode == 200) { + $body = $response->getBody()->getContents(); + $transaction = json_decode($body); + return view('backend.transactions.index')->with('response', $transaction); + } + if ($statusCode == 500) { + return view('errors.500'); + } + if ($statusCode == 401) { + return view('backend')->with('error', "Unauthoized token"); + } + if ($statusCode == 404) { + return view('backend')->with('error', "could not access transaction page"); + } + } catch (\Exception $e) { + // return view('errors.500'); + return view('backend')->with('error', "Unable to connect to server"); + } + } +} diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 28ca6cfc..47665b0c 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -18,15 +18,16 @@ class UsersController extends Controller */ public function index(Request $request) { - $url = env('API_URL', 'https://api.customerpay.me/'). '/user/all'; try { + + $url = env('API_URL', 'https://api.customerpay.me/'). '/user/all' ; $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(); - $users = json_decode($body); + $user_response = $client->request('GET', $url, $headers); + + if ( $user_response->getStatusCode() == 200 ) { + + $users = json_decode($user_response->getBody(), true); $perPage = 10; $page = $request->get('page', 1); @@ -36,13 +37,14 @@ public function index(Request $request) $offset = ($page * $perPage) - $perPage; $articles = array_slice($users, $offset, $perPage); $datas = new Paginator($articles, count($users), $perPage); + return view('backend.users_list.index')->with('response', $datas->withPath('/'.$request->path())); } + if ($user_response->getStatusCode() == 500) { - if ($statusCode == 500) { return view('errors.500'); } - } catch (\Exception $e) { + } catch(\Exception $e) { return view('errors.500'); } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/BackendAuth.php b/app/Http/Middleware/BackendAuth.php index c5860117..12bb55ae 100644 --- a/app/Http/Middleware/BackendAuth.php +++ b/app/Http/Middleware/BackendAuth.php @@ -15,7 +15,11 @@ class BackendAuth */ public function handle($request, Closure $next) { - if ($request->cookie('api_token')) { + + $expires = $request->cookie('expires'); + $expires = intval($expires); + + if ($request->cookie('api_token') && ($expires != 0) && ($expires > time())) { // Uncomment below when sms verification is working // if (!$request->cookie('is_active') && $request->path() != 'backend/activate') { @@ -24,6 +28,6 @@ public function handle($request, Closure $next) return $next($request); } - return redirect()->route('login')->with('message', 'Permission Denied!!! You need to login first.'); + return redirect()->route('logout')->with('message', 'Permission Denied!!! You need to login first.'); } } diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php old mode 100755 new mode 100644 diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php old mode 100755 new mode 100644 index ee8ca5bc..d4165bf8 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,8 @@ namespace App\Providers; +use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\URL; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -24,5 +26,8 @@ public function register() public function boot() { // + if (App::environment('production')) { + URL::forceScheme('https'); + } } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/User.php b/app/User.php old mode 100755 new mode 100644 diff --git a/artisan b/artisan old mode 100755 new mode 100644 diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100755 new mode 100644 diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 index 64f52153..30c060a7 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2", "fideloper/proxy": "^4.0", - "guzzlehttp/guzzle": "^6.5", + "guzzlehttp/guzzle": "^7.0", "laravel/framework": "^6.2", "laravel/tinker": "^2.0" }, diff --git a/composer.lock b/composer.lock index 27ad253d..056878f6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "92b9c753a241f3c38b85bda87fd21f4f", + "content-hash": "e8e4c0ed1ea30dd378d154b2f8473fe9", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -346,37 +346,44 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.5", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" + "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2", + "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "php": "^7.2.5", + "psr/http-client": "^1.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "ergebnis/composer-normalize": "^2.0", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "php-http/client-integration-tests": "dev-phpunit8", + "phpunit/phpunit": "^8.5.5", "psr/log": "^1.1" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -396,6 +403,11 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "Guzzle is a PHP HTTP client library", @@ -406,10 +418,12 @@ "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], - "time": "2020-06-16T21:01:06+00:00" + "time": "2020-06-27T10:33:25+00:00" }, { "name": "guzzlehttp/promises", @@ -535,16 +549,16 @@ }, { "name": "laravel/framework", - "version": "v6.18.22", + "version": "v6.18.23", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "95f33151375bb2e4747b871854c8becc23502901" + "reference": "c914a3ec0706c6973a39183f8bc45f3d9a099d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/95f33151375bb2e4747b871854c8becc23502901", - "reference": "95f33151375bb2e4747b871854c8becc23502901", + "url": "https://api.github.com/repos/laravel/framework/zipball/c914a3ec0706c6973a39183f8bc45f3d9a099d90", + "reference": "c914a3ec0706c6973a39183f8bc45f3d9a099d90", "shasum": "" }, "require": { @@ -679,7 +693,7 @@ "framework", "laravel" ], - "time": "2020-06-24T13:08:51+00:00" + "time": "2020-06-30T13:52:04+00:00" }, { "name": "laravel/tinker", @@ -981,16 +995,16 @@ }, { "name": "nesbot/carbon", - "version": "2.35.0", + "version": "2.36.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4b9bd835261ef23d36397a46a76b496a458305e5" + "reference": "d0b65958d9942fd1b501fdb0800c67e8323aa08d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4b9bd835261ef23d36397a46a76b496a458305e5", - "reference": "4b9bd835261ef23d36397a46a76b496a458305e5", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d0b65958d9942fd1b501fdb0800c67e8323aa08d", + "reference": "d0b65958d9942fd1b501fdb0800c67e8323aa08d", "shasum": "" }, "require": { @@ -1002,9 +1016,10 @@ "require-dev": { "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", - "kylekatarnls/multi-tester": "^1.1", + "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.8", - "phpstan/phpstan": "^0.11", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12.30", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -1021,6 +1036,11 @@ "providers": [ "Carbon\\Laravel\\ServiceProvider" ] + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -1050,7 +1070,7 @@ "datetime", "time" ], - "time": "2020-05-24T18:27:52+00:00" + "time": "2020-06-25T20:20:01+00:00" }, { "name": "nikic/php-parser", @@ -1314,6 +1334,55 @@ ], "time": "2017-02-14T16:28:37+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", diff --git a/config/app.php b/config/app.php old mode 100755 new mode 100644 diff --git a/config/auth.php b/config/auth.php old mode 100755 new mode 100644 diff --git a/config/broadcasting.php b/config/broadcasting.php old mode 100755 new mode 100644 diff --git a/config/cache.php b/config/cache.php old mode 100755 new mode 100644 diff --git a/config/database.php b/config/database.php old mode 100755 new mode 100644 diff --git a/config/filesystems.php b/config/filesystems.php old mode 100755 new mode 100644 diff --git a/config/hashing.php b/config/hashing.php old mode 100755 new mode 100644 diff --git a/config/logging.php b/config/logging.php old mode 100755 new mode 100644 diff --git a/config/mail.php b/config/mail.php old mode 100755 new mode 100644 diff --git a/config/queue.php b/config/queue.php old mode 100755 new mode 100644 diff --git a/config/services.php b/config/services.php old mode 100755 new mode 100644 diff --git a/config/session.php b/config/session.php old mode 100755 new mode 100644 diff --git a/config/view.php b/config/view.php old mode 100755 new mode 100644 diff --git a/database/.gitignore b/database/.gitignore old mode 100755 new mode 100644 diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php old mode 100755 new mode 100644 diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php old mode 100755 new mode 100644 diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php old mode 100755 new mode 100644 diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php old mode 100755 new mode 100644 diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php old mode 100755 new mode 100644 diff --git a/package-lock.json b/package-lock.json old mode 100755 new mode 100644 diff --git a/package.json b/package.json old mode 100755 new mode 100644 diff --git a/phpunit.xml b/phpunit.xml old mode 100755 new mode 100644 diff --git a/public/.htaccess b/public/.htaccess old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/css/all_users.css b/public/backend/assets/build/css/all_users.css old mode 100755 new mode 100644 index ed944559..36557a80 --- a/public/backend/assets/build/css/all_users.css +++ b/public/backend/assets/build/css/all_users.css @@ -23,4 +23,4 @@ .float:hover { background: #fff; -} +} \ No newline at end of file diff --git a/public/backend/assets/build/css/demo.css b/public/backend/assets/build/css/demo.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/css/intlTelInput.css b/public/backend/assets/build/css/intlTelInput.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/css/intlTelInput.min.css b/public/backend/assets/build/css/intlTelInput.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/img/flags.png b/public/backend/assets/build/img/flags.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/img/flags@2x.png b/public/backend/assets/build/img/flags@2x.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/data.js b/public/backend/assets/build/js/data.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/data.min.js b/public/backend/assets/build/js/data.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/intlTelInput-jquery.js b/public/backend/assets/build/js/intlTelInput-jquery.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/intlTelInput-jquery.min.js b/public/backend/assets/build/js/intlTelInput-jquery.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/intlTelInput.js b/public/backend/assets/build/js/intlTelInput.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/intlTelInput.min.js b/public/backend/assets/build/js/intlTelInput.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/build/js/utils.js b/public/backend/assets/build/js/utils.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/app-dark.min.css b/public/backend/assets/css/app-dark.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/app-rtl.min.css b/public/backend/assets/css/app-rtl.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/app.min.css b/public/backend/assets/css/app.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/bootstrap-dark.min.css b/public/backend/assets/css/bootstrap-dark.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/bootstrap.min.css b/public/backend/assets/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/broadcasts.css b/public/backend/assets/css/broadcasts.css index f1867f26..25821606 100644 --- a/public/backend/assets/css/broadcasts.css +++ b/public/backend/assets/css/broadcasts.css @@ -131,16 +131,16 @@ input{ .contacts { - width: 100%; - margin: 3% 0; - background-color: #ffffff; - height: 50%; + width: 100%; + margin: 3% 0; + background-color: #ffffff; } /* start of buttons */ .button-container { + margin-top: 10%; display: flex; flex-direction: column; align-items: center; @@ -149,16 +149,20 @@ input{ .buttons{ width: 40%; height: 50px; + line-height: 50px; border: none; border: 1px solid #FF8C5F; font-size: 1.2rem; font-weight: bold; + text-align: center; border-radius: 5px; background-color: #FF8C5F; color: #ffffff; } .buttons:hover{ + text-decoration: none; + color: white; background-color: #be4d20; } @@ -170,6 +174,7 @@ input{ .inverted:hover{ border: none; + color:#FF8C5F;; background: transparent; } /* start of buttons */ @@ -177,6 +182,7 @@ input{ /* start of media queries */ + @media screen and (max-width: 767px) { .heading-container{ margin: 0; @@ -202,35 +208,46 @@ input{ .message-card-text > p { font-size: 0.7rem; } - + .search{ margin-bottom: 6%; } - + h4{ font-size: 0.9rem; } - + .text2{ margin-top: 0; } - + form { margin: 1% auto; } - + .button-container { - margin: 5%; + margin: 15% 5% 5% 5%; } - + .search, .buttons { width: 80%; } } +@media screen and (max-width: 880){ + .button-container{ + margin-top: 15%; + } +} + @media screen and (max-width: 570px) { .search, .buttons { width: 90%; } } -/* end of media queries */ \ No newline at end of file +/* end of media queries */ + +.indexing { + display: flex; + justify-content: center; +} \ No newline at end of file diff --git a/public/backend/assets/css/complaintlog.css b/public/backend/assets/css/complaintlog.css index 0ba35e35..29f95af2 100644 --- a/public/backend/assets/css/complaintlog.css +++ b/public/backend/assets/css/complaintlog.css @@ -1,3 +1,7 @@ +.content-page { + background-color: rgb(247, 247, 247); +} + .complaintlog-table { font-family: 'Inter', sans-serif; margin-top: 1rem; @@ -5,8 +9,9 @@ .complaintlog-table th, .complaintlog-table td { - border: 1px solid #ddd; + border-bottom: 1px solid #ddd; padding: .5rem; + font-size: 0.80rem; } .complaintlog-table thead th { @@ -16,6 +21,6 @@ @media screen and (max-width: 767px) { .complaintlog-table th, .complaintlog-table td { - font-size: .75rem; + font-size: 0.70rem; } } \ No newline at end of file diff --git a/public/backend/assets/css/compose.css b/public/backend/assets/css/compose.css new file mode 100644 index 00000000..8b348755 --- /dev/null +++ b/public/backend/assets/css/compose.css @@ -0,0 +1,10 @@ +.header { + font-weight: bolder; +} + +.button{ + width: 40%; + margin: 3% auto; + margin-left: 30%; + text-align: center; +} \ No newline at end of file diff --git a/public/backend/assets/css/icons.min.css b/public/backend/assets/css/icons.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/materialize.min.css b/public/backend/assets/css/materialize.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/recoverPassword.css b/public/backend/assets/css/recoverPassword.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/single_user.css b/public/backend/assets/css/single_user.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/css/store_list.css b/public/backend/assets/css/store_list.css index d41875f8..4172ee13 100644 --- a/public/backend/assets/css/store_list.css +++ b/public/backend/assets/css/store_list.css @@ -31,3 +31,13 @@ .float:hover { background: #fff; } + +.card { + height: 100%; +} + +.padup { + padding-top: 50px; + padding-bottom: 50px; + height: 100%; +} diff --git a/public/backend/assets/fonts/unicons7374.eot b/public/backend/assets/fonts/unicons7374.eot old mode 100755 new mode 100644 diff --git a/public/backend/assets/fonts/unicons7374.svg b/public/backend/assets/fonts/unicons7374.svg old mode 100755 new mode 100644 diff --git a/public/backend/assets/fonts/unicons7374.ttf b/public/backend/assets/fonts/unicons7374.ttf old mode 100755 new mode 100644 diff --git a/public/backend/assets/fonts/unicons7374.woff b/public/backend/assets/fonts/unicons7374.woff old mode 100755 new mode 100644 diff --git a/public/backend/assets/fonts/unicons7374.woff2 b/public/backend/assets/fonts/unicons7374.woff2 old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/attached-files/img-1.jpg b/public/backend/assets/images/attached-files/img-1.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/attached-files/img-2.jpg b/public/backend/assets/images/attached-files/img-2.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/attached-files/img-3.jpg b/public/backend/assets/images/attached-files/img-3.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/auth-bg.jpg b/public/backend/assets/images/auth-bg.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/avatar2.png b/public/backend/assets/images/avatar2.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/cal.png b/public/backend/assets/images/cal.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/covers/2.jpg b/public/backend/assets/images/covers/2.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/favicon.ico b/public/backend/assets/images/favicon.ico old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/flags/germany.jpg b/public/backend/assets/images/flags/germany.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/flags/italy.jpg b/public/backend/assets/images/flags/italy.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/flags/russia.jpg b/public/backend/assets/images/flags/russia.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/flags/spain.jpg b/public/backend/assets/images/flags/spain.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/layouts/boxed.jpg b/public/backend/assets/images/layouts/boxed.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/layouts/horizontal.jpg b/public/backend/assets/images/layouts/horizontal.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/layouts/vertical-condensed.jpg b/public/backend/assets/images/layouts/vertical-condensed.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/layouts/vertical-dark-sidebar.jpg b/public/backend/assets/images/layouts/vertical-dark-sidebar.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/layouts/vertical.jpg b/public/backend/assets/images/layouts/vertical.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/login.svg b/public/backend/assets/images/login.svg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/logo.png b/public/backend/assets/images/logo.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/logo.svg b/public/backend/assets/images/logo.svg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/maintenance.svg b/public/backend/assets/images/maintenance.svg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/not-found.png b/public/backend/assets/images/not-found.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/projects/project-1.jpg b/public/backend/assets/images/projects/project-1.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/projects/project-2.jpg b/public/backend/assets/images/projects/project-2.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/server-down.png b/public/backend/assets/images/server-down.png old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-1.jpg b/public/backend/assets/images/small/img-1.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-2.jpg b/public/backend/assets/images/small/img-2.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-3.jpg b/public/backend/assets/images/small/img-3.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-4.jpg b/public/backend/assets/images/small/img-4.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-5.jpg b/public/backend/assets/images/small/img-5.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-6.jpg b/public/backend/assets/images/small/img-6.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/small/img-7.jpg b/public/backend/assets/images/small/img-7.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-1.jpg b/public/backend/assets/images/users/avatar-1.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-10.jpg b/public/backend/assets/images/users/avatar-10.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-2.jpg b/public/backend/assets/images/users/avatar-2.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-3.jpg b/public/backend/assets/images/users/avatar-3.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-4.jpg b/public/backend/assets/images/users/avatar-4.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-5.jpg b/public/backend/assets/images/users/avatar-5.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-6.jpg b/public/backend/assets/images/users/avatar-6.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-7.jpg b/public/backend/assets/images/users/avatar-7.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/images/users/avatar-9.jpg b/public/backend/assets/images/users/avatar-9.jpg old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/app.min.js b/public/backend/assets/js/app.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/materialize.min.js b/public/backend/assets/js/materialize.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/apexcharts.init.js b/public/backend/assets/js/pages/apexcharts.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/calendar.init.js b/public/backend/assets/js/pages/calendar.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/dashboard.init.js b/public/backend/assets/js/pages/dashboard.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/datatables.init.js b/public/backend/assets/js/pages/datatables.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/email-inbox.init.js b/public/backend/assets/js/pages/email-inbox.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/form-advanced.init.js b/public/backend/assets/js/pages/form-advanced.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/form-editor.init.js b/public/backend/assets/js/pages/form-editor.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/form-validation.init.js b/public/backend/assets/js/pages/form-validation.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/form-wizard.init.js b/public/backend/assets/js/pages/form-wizard.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/kanban.init.js b/public/backend/assets/js/pages/kanban.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/pages/widgets.init.js b/public/backend/assets/js/pages/widgets.init.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/js/vendor.min.js b/public/backend/assets/js/vendor.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/apexcharts/apexcharts.min.js b/public/backend/assets/libs/apexcharts/apexcharts.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-colorpicker/bootstrap-colorpicker.min.css b/public/backend/assets/libs/bootstrap-colorpicker/bootstrap-colorpicker.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-colorpicker/bootstrap-colorpicker.min.js b/public/backend/assets/libs/bootstrap-colorpicker/bootstrap-colorpicker.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-tagsinput/bootstrap-tagsinput.css b/public/backend/assets/libs/bootstrap-tagsinput/bootstrap-tagsinput.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/public/backend/assets/libs/bootstrap-tagsinput/bootstrap-tagsinput.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-touchspin/jquery.bootstrap-touchspin.css b/public/backend/assets/libs/bootstrap-touchspin/jquery.bootstrap-touchspin.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/bootstrap-touchspin/jquery.bootstrap-touchspin.min.js b/public/backend/assets/libs/bootstrap-touchspin/jquery.bootstrap-touchspin.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/buttons.bootstrap4.min.css b/public/backend/assets/libs/datatables/buttons.bootstrap4.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/buttons.bootstrap4.min.js b/public/backend/assets/libs/datatables/buttons.bootstrap4.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/buttons.flash.min.js b/public/backend/assets/libs/datatables/buttons.flash.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/buttons.html5.min.js b/public/backend/assets/libs/datatables/buttons.html5.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/buttons.print.min.js b/public/backend/assets/libs/datatables/buttons.print.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.bootstrap4.min.css b/public/backend/assets/libs/datatables/dataTables.bootstrap4.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.bootstrap4.min.js b/public/backend/assets/libs/datatables/dataTables.bootstrap4.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.buttons.min.js b/public/backend/assets/libs/datatables/dataTables.buttons.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.keyTable.min.js b/public/backend/assets/libs/datatables/dataTables.keyTable.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.responsive.min.js b/public/backend/assets/libs/datatables/dataTables.responsive.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/dataTables.select.min.js b/public/backend/assets/libs/datatables/dataTables.select.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/jquery.dataTables.min.js b/public/backend/assets/libs/datatables/jquery.dataTables.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/responsive.bootstrap4.min.css b/public/backend/assets/libs/datatables/responsive.bootstrap4.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/responsive.bootstrap4.min.js b/public/backend/assets/libs/datatables/responsive.bootstrap4.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/datatables/select.bootstrap4.min.css b/public/backend/assets/libs/datatables/select.bootstrap4.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/dropzone/dropzone.min.css b/public/backend/assets/libs/dropzone/dropzone.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/dropzone/dropzone.min.js b/public/backend/assets/libs/dropzone/dropzone.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/flatpickr/flatpickr.min.css b/public/backend/assets/libs/flatpickr/flatpickr.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/flatpickr/flatpickr.min.js b/public/backend/assets/libs/flatpickr/flatpickr.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-bootstrap/main.min.css b/public/backend/assets/libs/fullcalendar-bootstrap/main.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-bootstrap/main.min.js b/public/backend/assets/libs/fullcalendar-bootstrap/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-core/main.min.css b/public/backend/assets/libs/fullcalendar-core/main.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-core/main.min.js b/public/backend/assets/libs/fullcalendar-core/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-daygrid/main.min.css b/public/backend/assets/libs/fullcalendar-daygrid/main.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-daygrid/main.min.js b/public/backend/assets/libs/fullcalendar-daygrid/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-interaction/main.min.js b/public/backend/assets/libs/fullcalendar-interaction/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-list/main.min.css b/public/backend/assets/libs/fullcalendar-list/main.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-list/main.min.js b/public/backend/assets/libs/fullcalendar-list/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-timegrid/main.min.css b/public/backend/assets/libs/fullcalendar-timegrid/main.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/fullcalendar-timegrid/main.min.js b/public/backend/assets/libs/fullcalendar-timegrid/main.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/img/switch.html b/public/backend/assets/libs/img/switch.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/moment/moment.min.js b/public/backend/assets/libs/moment/moment.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/multiselect/jquery.multi-select.js b/public/backend/assets/libs/multiselect/jquery.multi-select.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/multiselect/multi-select.css b/public/backend/assets/libs/multiselect/multi-select.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/parsleyjs/parsley.min.js b/public/backend/assets/libs/parsleyjs/parsley.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/select2/select2.min.css b/public/backend/assets/libs/select2/select2.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/select2/select2.min.js b/public/backend/assets/libs/select2/select2.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/smartwizard/jquery.smartWizard.min.js b/public/backend/assets/libs/smartwizard/jquery.smartWizard.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/smartwizard/smart_wizard.min.css b/public/backend/assets/libs/smartwizard/smart_wizard.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/smartwizard/smart_wizard_theme_arrows.min.css b/public/backend/assets/libs/smartwizard/smart_wizard_theme_arrows.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/smartwizard/smart_wizard_theme_circles.min.css b/public/backend/assets/libs/smartwizard/smart_wizard_theme_circles.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/smartwizard/smart_wizard_theme_dots.min.css b/public/backend/assets/libs/smartwizard/smart_wizard_theme_dots.min.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/sortablejs/Sortable.min.js b/public/backend/assets/libs/sortablejs/Sortable.min.js old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/apps-calendar.html b/public/backend/assets/libs/summernote/font/apps-calendar.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/css/app.min.html b/public/backend/assets/libs/summernote/font/assets/css/app.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/css/bootstrap.min.html b/public/backend/assets/libs/summernote/font/assets/css/bootstrap.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/css/icons.min.html b/public/backend/assets/libs/summernote/font/assets/css/icons.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/favicon.html b/public/backend/assets/libs/summernote/font/assets/images/favicon.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/flags/germany.html b/public/backend/assets/libs/summernote/font/assets/images/flags/germany.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/flags/italy.html b/public/backend/assets/libs/summernote/font/assets/images/flags/italy.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/flags/russia.html b/public/backend/assets/libs/summernote/font/assets/images/flags/russia.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/flags/spain.html b/public/backend/assets/libs/summernote/font/assets/images/flags/spain.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/layouts/boxed.html b/public/backend/assets/libs/summernote/font/assets/images/layouts/boxed.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/layouts/horizontal.html b/public/backend/assets/libs/summernote/font/assets/images/layouts/horizontal.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical-condensed.html b/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical-condensed.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical-dark-sidebar.html b/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical-dark-sidebar.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical.html b/public/backend/assets/libs/summernote/font/assets/images/layouts/vertical.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/logo.html b/public/backend/assets/libs/summernote/font/assets/images/logo.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-1.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-1.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-2.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-2.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-4.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-4.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-5.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-5.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-7.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-7.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/images/users/avatar-9.html b/public/backend/assets/libs/summernote/font/assets/images/users/avatar-9.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/js/app.min.html b/public/backend/assets/libs/summernote/font/assets/js/app.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/js/pages/dashboard.init.html b/public/backend/assets/libs/summernote/font/assets/js/pages/dashboard.init.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/js/vendor.min.html b/public/backend/assets/libs/summernote/font/assets/js/vendor.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/libs/apexcharts/apexcharts.min.html b/public/backend/assets/libs/summernote/font/assets/libs/apexcharts/apexcharts.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/libs/flatpickr/flatpickr.min-2.html b/public/backend/assets/libs/summernote/font/assets/libs/flatpickr/flatpickr.min-2.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/libs/flatpickr/flatpickr.min.html b/public/backend/assets/libs/summernote/font/assets/libs/flatpickr/flatpickr.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/assets/libs/moment/moment.min.html b/public/backend/assets/libs/summernote/font/assets/libs/moment/moment.min.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/charts-apex.html b/public/backend/assets/libs/summernote/font/charts-apex.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/components-bootstrap.html b/public/backend/assets/libs/summernote/font/components-bootstrap.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/email-compose.html b/public/backend/assets/libs/summernote/font/email-compose.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/email-inbox.html b/public/backend/assets/libs/summernote/font/email-inbox.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/email-read.html b/public/backend/assets/libs/summernote/font/email-read.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-advanced.html b/public/backend/assets/libs/summernote/font/forms-advanced.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-basic.html b/public/backend/assets/libs/summernote/font/forms-basic.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-editor.html b/public/backend/assets/libs/summernote/font/forms-editor.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-file-uploads.html b/public/backend/assets/libs/summernote/font/forms-file-uploads.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-validation.html b/public/backend/assets/libs/summernote/font/forms-validation.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/forms-wizard.html b/public/backend/assets/libs/summernote/font/forms-wizard.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/icons-feather.html b/public/backend/assets/libs/summernote/font/icons-feather.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/icons-unicons.html b/public/backend/assets/libs/summernote/font/icons-unicons.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/index.html b/public/backend/assets/libs/summernote/font/index.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-boxed.html b/public/backend/assets/libs/summernote/font/layouts-boxed.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-condensed.html b/public/backend/assets/libs/summernote/font/layouts-condensed.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-dark-sidebar.html b/public/backend/assets/libs/summernote/font/layouts-dark-sidebar.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-dark.html b/public/backend/assets/libs/summernote/font/layouts-dark.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-horizontal.html b/public/backend/assets/libs/summernote/font/layouts-horizontal.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-preloader.html b/public/backend/assets/libs/summernote/font/layouts-preloader.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-rtl.html b/public/backend/assets/libs/summernote/font/layouts-rtl.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/layouts-scrollable.html b/public/backend/assets/libs/summernote/font/layouts-scrollable.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-404.html b/public/backend/assets/libs/summernote/font/pages-404.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-500.html b/public/backend/assets/libs/summernote/font/pages-500.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-activity.html b/public/backend/assets/libs/summernote/font/pages-activity.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-confirm-mail.html b/public/backend/assets/libs/summernote/font/pages-confirm-mail.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-invoice.html b/public/backend/assets/libs/summernote/font/pages-invoice.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-lock-screen.html b/public/backend/assets/libs/summernote/font/pages-lock-screen.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-login.html b/public/backend/assets/libs/summernote/font/pages-login.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-maintenance.html b/public/backend/assets/libs/summernote/font/pages-maintenance.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-pricing.html b/public/backend/assets/libs/summernote/font/pages-pricing.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-profile.html b/public/backend/assets/libs/summernote/font/pages-profile.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-recoverpw.html b/public/backend/assets/libs/summernote/font/pages-recoverpw.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-register.html b/public/backend/assets/libs/summernote/font/pages-register.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/pages-starter.html b/public/backend/assets/libs/summernote/font/pages-starter.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/project-detail.html b/public/backend/assets/libs/summernote/font/project-detail.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/project-list.html b/public/backend/assets/libs/summernote/font/project-list.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/summernote64fe-2.html b/public/backend/assets/libs/summernote/font/summernote64fe-2.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/summernote64fe-3.html b/public/backend/assets/libs/summernote/font/summernote64fe-3.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/summernote64fe.html b/public/backend/assets/libs/summernote/font/summernote64fe.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/tables-basic.html b/public/backend/assets/libs/summernote/font/tables-basic.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/tables-datatables.html b/public/backend/assets/libs/summernote/font/tables-datatables.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/task-board.html b/public/backend/assets/libs/summernote/font/task-board.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/task-list.html b/public/backend/assets/libs/summernote/font/task-list.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/font/widgets.html b/public/backend/assets/libs/summernote/font/widgets.html old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/summernote-bs4.css b/public/backend/assets/libs/summernote/summernote-bs4.css old mode 100755 new mode 100644 diff --git a/public/backend/assets/libs/summernote/summernote-bs4.min.js b/public/backend/assets/libs/summernote/summernote-bs4.min.js old mode 100755 new mode 100644 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/about.css b/public/frontend/assets/css/about.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/animate.css b/public/frontend/assets/css/animate.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/bootstrap.min.css b/public/frontend/assets/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/change-loc.css b/public/frontend/assets/css/change-loc.css index ace15511..a380106e 100644 --- a/public/frontend/assets/css/change-loc.css +++ b/public/frontend/assets/css/change-loc.css @@ -24,7 +24,7 @@ } .card-body>img { - width:70px;" + width:70px; } .img-text { diff --git a/public/frontend/assets/css/contact-us.css b/public/frontend/assets/css/contact-us.css old mode 100755 new mode 100644 index 44bb6dde..9e7fbe41 --- a/public/frontend/assets/css/contact-us.css +++ b/public/frontend/assets/css/contact-us.css @@ -47,7 +47,7 @@ input, width: 100%; padding: 12px 5px; margin: 8px 0; - max-width: 370px; + /* max-width: 370px; */ display: inline-block; border: none; outline: none; @@ -61,7 +61,7 @@ input, .custom-select { position: relative; - border: none; + /* border: none; */ padding: 0; margin-bottom: 5%; } @@ -153,7 +153,7 @@ textarea { width: 100%; padding: 12px 20px; margin: 8px 0; - max-width: 431px; + /* max-width: 431px; */ display: inline-block; border: 0; outline: none; @@ -216,32 +216,33 @@ input:focus, color: rgb(68, 66, 66); } .map-area { - max-width: 306px; + /* max-width: 306px; */ margin-bottom: 10px; } .map-iframe { - max-width: 306px; + /* max-width: 306px; */ + width: 100%; } /* Responsivenesss */ -@media (min-width: 768px) and (max-width: 1024px) { +/* @media (min-width: 768px) and (max-width: 1024px) { .map-iframe { max-width: 270px; } -} +} */ @media (min-width: 375px) and (max-width: 480px) { - .map-iframe { + /* .map-iframe { max-width: 270px; - } + } */ .contact-extra { margin-top: 10%; } } @media (max-width: 320px) { - .map-iframe { + /* .map-iframe { max-width: 230px; - } + } */ .contact-extra { margin-top: 10%; diff --git a/public/frontend/assets/css/debt_reminder.css b/public/frontend/assets/css/debt_reminder.css new file mode 100644 index 00000000..639ac816 --- /dev/null +++ b/public/frontend/assets/css/debt_reminder.css @@ -0,0 +1,267 @@ +@font-face { + font-family: "gilroybold"; + src: url("../fonts/gilroy-bold.woff") format("woff"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "gilroy-medium"; + src: url("../fonts/gilroy-medium.ttf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "gilroysemibold"; + src: url("../fonts/gilroy-semibold.woff") format("woff"); + font-weight: normal; + font-style: normal; +} +/* Top section */ +.faq-top { + background: #f3f3f3; + height: auto; + padding-top: 0px; +} + +.faq-top__content { + padding: 100px 0; + font-size: 15px; +} + +/* faq top title */ +.faq-top__title { + font-weight: normal; + font-size: 30px; + color: #00098a; + margin-bottom: 30px; + font-family: "gilroybold"; + line-height: 64px; +} + +/* faq search input */ +#search-faq { + max-width: 671px; + width: 100%; + padding: 16px 0px 16px 34px; + margin: 0 auto 45px; + height: auto; + font-size: 14px; + border: none; +} + +#search-faq:hover, +#search-faq:focus, +#search-faq:active { + box-shadow: 0 0 0 0.1rem #ff8c5f; +} + +/* faq search button */ +.faq-top__btn { + border: 1px solid #ff8c5f; + box-sizing: border-box; + border-radius: 10px; + color: #ff8c5f; + padding: 12px 60px; + transition: all 0.2s ease; + -webkit-transition: all 0.2s ease; +} + +.faq-top__btn:hover, +.faq-top__btn:focus, +.faq-top__btn:active { + background-color: #ff8c5f; + color: #fff; + transform: translateY(3px); + -webkit-transform: translateY(3px); +} + +/* background vector containers with bounce animation */ +.faq-bg__left { + position: absolute; + left: 0px; + top: 210px; + -webkit-animation-delay: 1s; + animation-delay: 1s; + -webkit-animation-name: bounce_effect; + animation-name: bounce_effect; + -webkit-animation-duration: 3s; + animation-duration: 3s; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -webkit-animation-direction: normal; + animation-direction: normal; +} + +.faq-bg__right { + position: absolute; + right: 0px; + top: 24px; + -webkit-animation-delay: 1s; + animation-delay: 1s; + -webkit-animation-name: bounce_effect; + animation-name: bounce_effect; + -webkit-animation-duration: 3s; + animation-duration: 3s; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -webkit-animation-direction: normal; + animation-direction: normal; +} + +/* set height of background vectors */ +.faq-bg__blue-cutout, +.faq-bg__orange-triangle-cutout { + display: block; + height: 180px; +} + +.faq-bg__orange-triangle-cutout, +.faq-bg__yellow-cutout { + margin-top: -1px; +} + +.faq-bg__orange-cutout, +.faq-bg__yellow-cutout { + display: block; + height: 100px; + width: 80px; +} + +/* bounce animation keyframes */ +@keyframes bounce_effect { + 0% { + -webkit-transform: translateY(0); + transform: translateY(0); + } + + 50% { + -webkit-transform: translateY(32px); + transform: translateY(32px); + } + + 100% { + -webkit-transform: translateY(0); + transform: translateY(0); + } +} + +.table-borderless > tbody > tr > td, +.table-borderless > tbody > tr > th, +.table-borderless > tfoot > tr > td, +.table-borderless > tfoot > tr > th, +.table-borderless > thead > tr > td, +.table-borderless > thead > tr > th { + border: none; +} + +.due, .late, .upcoming { + margin: 4rem 0 2rem 0; + border-bottom: 1px solid grey; +} + +.y-bullet{ + color: #FFD43C; +} + +.r-bullet{ + color: #FF5C5C; +} + +.w-bullet{ + color: grey; +} + +.last { + margin-bottom: 4rem; +} + +@media screen and (max-width: 768px) { + + .faq-bg__left { + top: 310px; + } + + .faq-bg__right { + top: 60px; + } + + + .faq-bg__blue-cutout, + .faq-bg__orange-triangle-cutout { + height: 110px; + } + + .faq-bg__orange-cutout, + .faq-bg__yellow-cutout { + height: 80px; + width: 70px; + } +} + +@media screen and (max-width: 425px) { + .faq-top__title { + font-size: 26px; + line-height: 30px; + } + + #search-faq { + padding: 12px 0px 12px 24px; + margin: 0 auto 34px; + } + .faq-top__btn { + padding: 10px 40px; + } + .faq__title { + font-size: 18px; + } + .faq__content { + font-size: 14px; + } + + .faq-bg__blue-cutout, + .faq-bg__orange-triangle-cutout { + height: 60px; + } + + .faq-bg__orange-cutout, + .faq-bg__yellow-cutout { + height: 60px; + width: 50px; + } + + .fa-angle-up { + font-size: 18px; + } +} + +@media screen and (max-width: 375px) { + .faq-top__title { + font-size: 24px; + } + .fa-angle-up { + font-size: 15px; + } + .faq__title { + font-size: 16px; + } + .faq__content { + font-size: 13px; + } +} + +@media screen and (max-width: 340px) { + .faq-top__title { + font-size: 22px; + } + .fa-angle-up { + font-size: 12px; + } + .faq__title { + font-size: 14px; + } + .faq__content { + font-size: 11px; + } +} diff --git a/public/frontend/assets/css/faq.css b/public/frontend/assets/css/faq.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/flaticon.css b/public/frontend/assets/css/flaticon.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/font-awesome.min.css b/public/frontend/assets/css/font-awesome.min.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/header-footer.css b/public/frontend/assets/css/header-footer.css old mode 100755 new mode 100644 index d139fec6..32a8f68b --- a/public/frontend/assets/css/header-footer.css +++ b/public/frontend/assets/css/header-footer.css @@ -178,18 +178,62 @@ nav { .hamburger-container { display: none; } +/*MOBILE CSS */ + .mobile-menu { display: none; + background-image: linear-gradient(120deg, #f8e093 0%, #fda085 100%);} +.mobile__menu__list> li{ + margin-left: -40vw; + margin-top: -2vh; +} +.mobile__menu__list__item{ + padding-top: 3vh; +} +.mobile__menu__list_link_diff{ + margin-left: 10vw; +} +.mobile__menu__list_link_diff1{ + margin-left: -2vw; +} +a.mobile__menu__list__link { + color: black !important; +} +hr.hr-mobile { + height: 2px; + width: 400px; + background-color: black; + overflow: hidden; + +} +.close-mobile-menu i { + color: #333CC1; +} +h1.mobile__nav__h1{ + margin-left: 10vw; +} +a.mobile__menu__list__link > img{ + width: 20px; } +.h1-group-vertical{ + margin-left: 20px; +} +a.mobile__nav__h1__link{ + font-size: 20px; + color: black !important; +} +a.mobile__nav__h1__link > img{ + width:20px; +} /* FOOTER CSS */ footer { height: auto; background-color: var(--primary-dark); - padding: 15% 0; + padding: 5% 0; } .footer_left { @@ -334,6 +378,7 @@ footer { display: flex; justify-content: center; align-items: center; + overflow: hidden; } .mobile__menu__list { @@ -393,7 +438,6 @@ footer { .mobile__nav__button__link:focus { outline: none; } - } @media (max-width: 574px) { @@ -468,3 +512,182 @@ footer { } } +/* media query for mobile view*/ + /*MOBILE CSS */ + + + @media (max-width: 360px) and (min-width: 321px){ + .mobile__nav__menu > img{ + margin-left: 10vw; + } + .mobile__menu__list{ + margin-top: 15vh; + margin-left: -10vw; + + } + .mobile__menu__list> li{ + margin-left: -25vw; + } + .mobile__menu__container{ + margin-top: -100px; + + } + .mobile__menu__list__item{ + padding-top: 3vh; + } + .mobile__menu__list_link_diff1{ + margin-left: -5vw; + } + a.mobile__menu__list__link { + color: black !important; + } + hr.hr-mobile { + height: 2px; + width: 400px; + background-color: black; + overflow: hidden; + margin-top: -20px; + + } + .close-mobile-menu i { + color: #333CC1; + } + h1.mobile__nav__h1{ + margin-left: 10vw; + } + a.mobile__menu__list__link > img{ + width: 20px; + } + .h1-group-vertical{ + margin-left: -5px; + } + a.mobile__nav__h1__link{ + font-size: 20px; + color: black !important; + margin-left: 20vw; + + } + a.mobile__nav__h1__link > img{ + width:20px; + } + + + } +/*iphone 320px*/ +@media (max-width: 320px){ + /*MOBILE CSS */ +.mobile__nav__menu > img{ + margin-left: 10vw; +} +.mobile__menu__list{ + margin-top: 15vh; + margin-left: -10vw; + +} +.mobile__menu__list> li{ + margin-left: -25vw; +} +.mobile__menu__container{ + margin-top: -100px; + +} +.mobile__menu__list__item{ + padding-top: 3vh; +} +.mobile__menu__list_link_diff1{ + margin-left: -5vw; +} +a.mobile__menu__list__link { + color: black !important; +} +hr.hr-mobile { + height: 2px; + width: 400px; + background-color: black; + overflow: hidden; + margin-top: -20px; + +} +.close-mobile-menu i { + color: #333CC1; +} +h1.mobile__nav__h1{ + margin-left: 10vw; +} +a.mobile__menu__list__link > img{ + width: 20px; +} +.h1-group-vertical{ + margin-left: -5px; +} +a.mobile__nav__h1__link{ + font-size: 20px; + color: black !important; + margin-left: 25vw; + +} +a.mobile__nav__h1__link > img{ + width:20px; +} + + +} +/*iPhone 6,7,8*/ +@media (max-width: 375px) and (min-width: 321px){ + /*MOBILE CSS */ +.mobile__nav__menu > img{ + margin-left: 10vw; +} +.mobile__menu__list{ + margin-top: 15vh; + margin-left: -10vw; + +} +.mobile__menu__list> li{ + margin-left: -25vw; +} +.mobile__menu__container{ + margin-top: -100px; + +} +.mobile__menu__list__item{ + padding-top: 3vh; +} +.mobile__menu__list_link_diff1{ + margin-left: -5vw; +} +a.mobile__menu__list__link { + color: black !important; +} +hr.hr-mobile { + height: 2px; + width: 400px; + background-color: black; + overflow: hidden; + margin-top: -20px; + +} +.close-mobile-menu i { + color: #333CC1; +} +h1.mobile__nav__h1{ + margin-left: 10vw; +} +a.mobile__menu__list__link > img{ + width: 20px; +} +.h1-group-vertical{ + margin-left: -5px; +} +a.mobile__nav__h1__link{ + font-size: 20px; + color: black !important; + margin-left: 19vw; + +} +a.mobile__nav__h1__link > img{ + width:20px; +} + + +} \ No newline at end of file diff --git a/public/frontend/assets/css/index.css b/public/frontend/assets/css/index.css old mode 100755 new mode 100644 index b43dca53..b8a23136 --- a/public/frontend/assets/css/index.css +++ b/public/frontend/assets/css/index.css @@ -327,6 +327,8 @@ h1,h2,h3,h4,h5,h6 { .testimonial-img { width: 80px !important; + height: auto; border-radius: 50%; } + diff --git a/public/frontend/assets/css/magnific-popup.css b/public/frontend/assets/css/magnific-popup.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/owl.carousel.min.css b/public/frontend/assets/css/owl.carousel.min.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/owl.video.play.html b/public/frontend/assets/css/owl.video.play.html old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/privacy.css b/public/frontend/assets/css/privacy.css new file mode 100644 index 00000000..28efc0af --- /dev/null +++ b/public/frontend/assets/css/privacy.css @@ -0,0 +1,41 @@ +.container-fluid { + margin-top: -1em; + height: 95vh; + background-color: #333bc0; +} + +#contain { + border-radius: 5px; + background-color: #333bc0; +} + +.lead { + color: #fff !important; +} + +h1, h4 { + color: #FF8C5F; +} + +.text-center { + font-size: 1.2rem; +} + +.mg { + margin: 0px 50px; +} + + +@media only screen and (max-width: 576px) { + p.text-center { + font-size: .8rem; + } + + .mgr-5 { + margin-right: 2em !important; + } + + .mgl-5 { + margin-left: 2em !important; + } +} \ No newline at end of file diff --git a/public/frontend/assets/css/reset.css b/public/frontend/assets/css/reset.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/slick.css b/public/frontend/assets/css/slick.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/slicknav.css b/public/frontend/assets/css/slicknav.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/style.css b/public/frontend/assets/css/style.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/css/themify-icons.css b/public/frontend/assets/css/themify-icons.css old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticon.eot b/public/frontend/assets/fonts/Flaticon.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticon.svg b/public/frontend/assets/fonts/Flaticon.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticon.ttf b/public/frontend/assets/fonts/Flaticon.ttf old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticon.woff b/public/frontend/assets/fonts/Flaticon.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticon.woff2 b/public/frontend/assets/fonts/Flaticon.woff2 old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/Flaticond41d.eot b/public/frontend/assets/fonts/Flaticond41d.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/classy-fontscb9b.eot b/public/frontend/assets/fonts/classy-fontscb9b.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/classy-fontscb9b.svg b/public/frontend/assets/fonts/classy-fontscb9b.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/classy-fontscb9b.ttf b/public/frontend/assets/fonts/classy-fontscb9b.ttf old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/classy-fontscb9b.woff b/public/frontend/assets/fonts/classy-fontscb9b.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfont3e6e.eot b/public/frontend/assets/fonts/fontawesome-webfont3e6e.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfont3e6e.svg b/public/frontend/assets/fonts/fontawesome-webfont3e6e.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfont3e6e.ttf b/public/frontend/assets/fonts/fontawesome-webfont3e6e.ttf old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfont3e6e.woff b/public/frontend/assets/fonts/fontawesome-webfont3e6e.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfont3e6e.woff2 b/public/frontend/assets/fonts/fontawesome-webfont3e6e.woff2 old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/fontawesome-webfontd41d.eot b/public/frontend/assets/fonts/fontawesome-webfontd41d.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/gilroy-bold.woff b/public/frontend/assets/fonts/gilroy-bold.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/gilroy-light.woff b/public/frontend/assets/fonts/gilroy-light.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/gilroy-medium.ttf b/public/frontend/assets/fonts/gilroy-medium.ttf old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/gilroy-medium.woff b/public/frontend/assets/fonts/gilroy-medium.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/gilroy-semibold.woff b/public/frontend/assets/fonts/gilroy-semibold.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/themify9f24.eot b/public/frontend/assets/fonts/themify9f24.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/themify9f24.svg b/public/frontend/assets/fonts/themify9f24.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/themify9f24.ttf b/public/frontend/assets/fonts/themify9f24.ttf old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/themify9f24.woff b/public/frontend/assets/fonts/themify9f24.woff old mode 100755 new mode 100644 diff --git a/public/frontend/assets/fonts/themifyd41d.eot b/public/frontend/assets/fonts/themifyd41d.eot old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/Ellipse 2.png b/public/frontend/assets/images/Ellipse 2.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/Group of Black Men and Women in Office Setting.svg b/public/frontend/assets/images/Group of Black Men and Women in Office Setting.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/Happy-Market-Woman 1.png b/public/frontend/assets/images/Happy-Market-Woman 1.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/Vector 3.png b/public/frontend/assets/images/Vector 3.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/Vector 5.png b/public/frontend/assets/images/Vector 5.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/background.svg b/public/frontend/assets/images/background.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/bg_vector_1.svg b/public/frontend/assets/images/bg_vector_1.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/bg_vector_2.svg b/public/frontend/assets/images/bg_vector_2.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/bg_vector_3.svg b/public/frontend/assets/images/bg_vector_3.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/bg_vector_4.svg b/public/frontend/assets/images/bg_vector_4.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_1.svg b/public/frontend/assets/images/collage_1.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_2.svg b/public/frontend/assets/images/collage_2.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_3.svg b/public/frontend/assets/images/collage_3.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_4.svg b/public/frontend/assets/images/collage_4.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_5.svg b/public/frontend/assets/images/collage_5.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/collage_6.svg b/public/frontend/assets/images/collage_6.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/fulllogo.png b/public/frontend/assets/images/fulllogo.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/kadet pic.jpeg b/public/frontend/assets/images/kadet pic.jpeg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/our_company.svg b/public/frontend/assets/images/our_company.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/screen two.png b/public/frontend/assets/images/screen two.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/screen.png b/public/frontend/assets/images/screen.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/images/shade.png b/public/frontend/assets/images/shade.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/10.jpg b/public/frontend/assets/img/bg-img/10.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/11.jpg b/public/frontend/assets/img/bg-img/11.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/12.jpg b/public/frontend/assets/img/bg-img/12.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/13.jpg b/public/frontend/assets/img/bg-img/13.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/14.jpg b/public/frontend/assets/img/bg-img/14.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/15.jpg b/public/frontend/assets/img/bg-img/15.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/16.jpg b/public/frontend/assets/img/bg-img/16.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/18.png b/public/frontend/assets/img/bg-img/18.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/19.png b/public/frontend/assets/img/bg-img/19.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/21.png b/public/frontend/assets/img/bg-img/21.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/22.png b/public/frontend/assets/img/bg-img/22.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/23.png b/public/frontend/assets/img/bg-img/23.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/33.png b/public/frontend/assets/img/bg-img/33.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/40.jpg b/public/frontend/assets/img/bg-img/40.jpg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/7.png b/public/frontend/assets/img/bg-img/7.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/bg-patter.png b/public/frontend/assets/img/bg-img/bg-patter.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/bt-1.png b/public/frontend/assets/img/bg-img/bt-1.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/bt-2.png b/public/frontend/assets/img/bg-img/bt-2.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/illustration-23.png b/public/frontend/assets/img/bg-img/illustration-23.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/bg-img/subscribe-2.png b/public/frontend/assets/img/bg-img/subscribe-2.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/faq-bg/blue-cutout.png b/public/frontend/assets/img/faq-bg/blue-cutout.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/faq-bg/orange-cutout.png b/public/frontend/assets/img/faq-bg/orange-cutout.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/faq-bg/orange-triangle-cutout.png b/public/frontend/assets/img/faq-bg/orange-triangle-cutout.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/faq-bg/yellow-cutout.png b/public/frontend/assets/img/faq-bg/yellow-cutout.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/favicon.png b/public/frontend/assets/img/favicon.png old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/4.svg b/public/frontend/assets/img/icon-img/4.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/5.svg b/public/frontend/assets/img/icon-img/5.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/6.svg b/public/frontend/assets/img/icon-img/6.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/7.svg b/public/frontend/assets/img/icon-img/7.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/8.svg b/public/frontend/assets/img/icon-img/8.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/9.svg b/public/frontend/assets/img/icon-img/9.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/img/icon-img/send.svg b/public/frontend/assets/img/icon-img/send.svg old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/bootstrap.min.js b/public/frontend/assets/js/bootstrap.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/bundle.js b/public/frontend/assets/js/bundle.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/header-footer.js b/public/frontend/assets/js/header-footer.js old mode 100755 new mode 100644 index 37a025cb..c4d4f8c8 --- a/public/frontend/assets/js/header-footer.js +++ b/public/frontend/assets/js/header-footer.js @@ -3,8 +3,10 @@ document.querySelector('.close-mobile-menu').addEventListener('click', closeMobi function showMobileMenu(params) { document.querySelector('#mobile-menu').classList.add('mobile-menu-active') + window.onscroll = function () { window.scrollTo(0, 0); }; } function closeMobileMenu(params) { document.querySelector('#mobile-menu').classList.remove('mobile-menu-active') + window.onscroll=function(){}; } \ No newline at end of file diff --git a/public/frontend/assets/js/imagesloaded.pkgd.min.js b/public/frontend/assets/js/imagesloaded.pkgd.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/index.js b/public/frontend/assets/js/index.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/isotope.pkgd.min.js b/public/frontend/assets/js/isotope.pkgd.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/jquery.animatedheadline.min.js b/public/frontend/assets/js/jquery.animatedheadline.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/jquery.easing.min.js b/public/frontend/assets/js/jquery.easing.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/jquery.magnific-popup.min.js b/public/frontend/assets/js/jquery.magnific-popup.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/jquery.slicknav.min.js b/public/frontend/assets/js/jquery.slicknav.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/main.js b/public/frontend/assets/js/main.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/owl.carousel.min.js b/public/frontend/assets/js/owl.carousel.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/popper.min.js b/public/frontend/assets/js/popper.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/slick.min.js b/public/frontend/assets/js/slick.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/vendor/jquery-1.12.4.min.js b/public/frontend/assets/js/vendor/jquery-1.12.4.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/vendor/modernizr-3.5.0.min.js b/public/frontend/assets/js/vendor/modernizr-3.5.0.min.js old mode 100755 new mode 100644 diff --git a/public/frontend/assets/js/wow.min.js b/public/frontend/assets/js/wow.min.js old mode 100755 new mode 100644 diff --git a/public/index.php b/public/index.php old mode 100755 new mode 100644 diff --git a/public/robots.txt b/public/robots.txt old mode 100755 new mode 100644 diff --git a/public/web.config b/public/web.config old mode 100755 new mode 100644 diff --git a/resources/js/app.js b/resources/js/app.js old mode 100755 new mode 100644 diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js old mode 100755 new mode 100644 diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php old mode 100755 new mode 100644 diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php old mode 100755 new mode 100644 diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php old mode 100755 new mode 100644 diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php old mode 100755 new mode 100644 diff --git a/resources/sass/app.scss b/resources/sass/app.scss old mode 100755 new mode 100644 diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/activate/activate.blade.php b/resources/views/backend/activate/activate.blade.php old mode 100755 new mode 100644 index 139f51c5..0af609f8 --- a/resources/views/backend/activate/activate.blade.php +++ b/resources/views/backend/activate/activate.blade.php @@ -77,7 +77,7 @@ class="float-right text-muted text-unline-dashed ml-1"
-

Back to Back to Login

@@ -132,7 +132,7 @@ class="text-primary font-weight-bold ml-1">Login window.location = "{{url('/admin/dashboard')}}"; }).fail((e) => { e = JSON.parse(e.responseText); - error_message.text(e.message.errors[0].description); + error_message.text(e.message); error.show(); $(this).show(); verifying.hide(); @@ -153,7 +153,7 @@ class="text-primary font-weight-bold ml-1">Login start_timer(); }).fail((e) => { e = JSON.parse(e.responseText); - error_message.text(e.message.errors[0].description); + error_message.text(e.message); error.show(); }); } else { diff --git a/resources/views/backend/analytics/analytics.blade.php b/resources/views/backend/analytics/analytics.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/broadcasts/compose_broadcast.blade.php b/resources/views/backend/broadcasts/compose_broadcast.blade.php new file mode 100644 index 00000000..8fb387dd --- /dev/null +++ b/resources/views/backend/broadcasts/compose_broadcast.blade.php @@ -0,0 +1,33 @@ +@extends('layout.base') +@section ('custom_css') + +@stop + @section('content') +
+
+
+
+

Send a Message

+
+
+
+
+
+
+
+
+

Message Body

+ + +
+ +
+
+
+
+
+ + @endsection + @section('javascript') + + @stop diff --git a/resources/views/backend/broadcasts/send_broadcast.blade.php b/resources/views/backend/broadcasts/send_broadcast.blade.php index 987c88f1..4e6fbc74 100644 --- a/resources/views/backend/broadcasts/send_broadcast.blade.php +++ b/resources/views/backend/broadcasts/send_broadcast.blade.php @@ -55,14 +55,90 @@
- +
+ + + + + + + + {{-- + --}} + + + + + + + + + + {{-- + --}} + + + + + + + + + {{-- + --}} + + + + +
IDAvatarNameTelDebtBalanceActions
1ShreyuJohn Doe
+ Has debt + 		+234 90 000 000 00
+ 		+ ₦ 6 000
+ Paid: 3 500 + 		+ ₦ 2 500 + +
+ +
+ View Profile + View Transaction + Send Reminder +
+
+
2ShreyuMary Doe
+ Has Debt + 		+44 0000 123456
+ 		+ ₦ 10 000
+ Paid: 9 000 + 		+ ₦ 1 000 + +
+ +
+ View Profile + View Transaction + Send Reminder +
+
+
+
-
+
diff --git a/resources/views/backend/complaintform/route.txt b/resources/views/backend/complaintform/route.txt deleted file mode 100755 index fb321442..00000000 --- a/resources/views/backend/complaintform/route.txt +++ /dev/null @@ -1,3 +0,0 @@ -Route::get('/backend/complaintform', function () { - return view('backend.complaintform.complaintform'); -}); \ No newline at end of file diff --git a/resources/views/backend/complaintlog/route.txt b/resources/views/backend/complaintlog/route.txt deleted file mode 100755 index 63d9bc39..00000000 --- a/resources/views/backend/complaintlog/route.txt +++ /dev/null @@ -1,3 +0,0 @@ -Route::get('/backend/complaintlog', function () { - return view('backend.complaintlog.complaintlog'); -}); \ No newline at end of file diff --git a/resources/views/backend/complaintform/complaintform.blade.php b/resources/views/backend/complaints/complaintform.blade.php old mode 100755 new mode 100644 similarity index 98% rename from resources/views/backend/complaintform/complaintform.blade.php rename to resources/views/backend/complaints/complaintform.blade.php index 585b7a1c..cf73592a --- a/resources/views/backend/complaintform/complaintform.blade.php +++ b/resources/views/backend/complaints/complaintform.blade.php @@ -12,7 +12,7 @@
-
+
{{--

Complaint Form

--}} diff --git a/resources/views/backend/complaintlog/complaintlog.blade.php b/resources/views/backend/complaints/complaintlog.blade.php old mode 100755 new mode 100644 similarity index 100% rename from resources/views/backend/complaintlog/complaintlog.blade.php rename to resources/views/backend/complaints/complaintlog.blade.php diff --git a/resources/views/backend/complaints/route.txt b/resources/views/backend/complaints/route.txt new file mode 100644 index 00000000..e4e12436 --- /dev/null +++ b/resources/views/backend/complaints/route.txt @@ -0,0 +1,7 @@ +Route::get('/backend/complaintform', function () { + return view('backend.complaintform.complaintform'); +}); + +Route::get('/backend/complaintlog', function () { + return view('backend.complaintlog.complaintlog'); +}); \ No newline at end of file diff --git a/resources/views/backend/customers/edit_customer.blade.php b/resources/views/backend/customers/edit_customer.blade.php new file mode 100644 index 00000000..4dfa073b --- /dev/null +++ b/resources/views/backend/customers/edit_customer.blade.php @@ -0,0 +1,137 @@ +{{-- inherits base markup --}} +{{-- got my page working im so excited --}} +@extends('layout.base') +{{-- add in the basic styling : check the contents of these stylesheets later --}} +@section("custom_css") + +@stop + + +{{-- yield body content --}} + +@section('content') +
+ +
+ {{-- start of page title --}} +
+
+

Edit Profile Page

+ + Go Back {{--   --}} + +
+
+ {{-- end of page title --}} + + {{-- start of content section --}} +
+ {{--start of person profile--}} +
+
+
+ Customer 1 +

John Doe

+
johndoe@doetech.com
+ this is a very very large junk of rubbush that i am just foing to type in the hopes that it casue seomth + ing dofferent to hppen to my file ebvery single godammmn time. +
+
+
House Address
+

1975, Boring Lane, San
Francisco, California, United
States - 94108

+
+
+
+ {{--end of person profile--}} +
+ {{-- start of card --}} +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+ + + +
+
+
+ + {{--customer basic info end--}} +
+
+ +
+ {{--End of person profile--}} +
+ + + + {{--end of column--}} +
+
+ +@endsection diff --git a/resources/views/backend/customers/index.blade.php b/resources/views/backend/customers/index.blade.php index b1d13c85..0563166b 100644 --- a/resources/views/backend/customers/index.blade.php +++ b/resources/views/backend/customers/index.blade.php @@ -140,8 +140,8 @@ Actions
- View Profile + Edit Customer + View Profile View Transaction Send Reminder
diff --git a/resources/views/backend/customers/singleCustomer.blade.php b/resources/views/backend/customers/singleCustomer.blade.php index 77fe2257..b17e4843 100644 --- a/resources/views/backend/customers/singleCustomer.blade.php +++ b/resources/views/backend/customers/singleCustomer.blade.php @@ -17,9 +17,12 @@

Profile

- + Go Back {{--   --}} + + Edit Customer {{--   --}} +
{{-- end of page title --}} diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/debt_reminder/index.blade.php b/resources/views/backend/debt_reminder/index.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/debt_reminder/route.txt b/resources/views/backend/debt_reminder/route.txt old mode 100755 new mode 100644 diff --git a/resources/views/backend/debtors/add.blade.php b/resources/views/backend/debtors/add.blade.php new file mode 100644 index 00000000..084988a4 --- /dev/null +++ b/resources/views/backend/debtors/add.blade.php @@ -0,0 +1,228 @@ + +@extends('layout.base') +@section("custom_css") + + + +@stop + @section('content') +
+ +
+
+
+
+

Add Debtor

+
+ +
+
+
+
+
+
+ +
+
+ + + +
+ +
+
+
+
+
+ +
+
+ + + +
+ +
+
+
+
+
+ +
+
+ + @ + +
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+ +
+
+
+
+
+
+
+
+ +
+ Due Date + Added Date + Assignee +
+
+
+
+
+
Add Creditor from Contacts
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
John Doe    Has debt
+ 09072837921 + 		Add
Mary Doe    Has debt
+ 09072837921 + 		Add
Chris Kelvin
+ 09072837921 + 		Add
Luke Brown
+ 09072837921 + 		Add
Lynda Doe    Has credit
+ 09072837921 + 		Add
Alvin Chris
+ 09072837921 + 		Add
Henry Doe    Has credit
+ 09072837921 + 		Add
+
+ +
+
+
+
+
+ + @endsection + + + @section("javascript") + + + @stop diff --git a/resources/views/backend/location/change_loc.blade.php b/resources/views/backend/location/change_loc.blade.php index 411ce202..3605c8ea 100644 --- a/resources/views/backend/location/change_loc.blade.php +++ b/resources/views/backend/location/change_loc.blade.php @@ -13,7 +13,7 @@
-

Change Location

+

Change Store Location

diff --git a/resources/views/backend/login.blade.php b/resources/views/backend/login.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/notifications/user_notification.blade.php b/resources/views/backend/notifications/user_notification.blade.php new file mode 100644 index 00000000..08771f9a --- /dev/null +++ b/resources/views/backend/notifications/user_notification.blade.php @@ -0,0 +1,335 @@ +@extends('layout.base') +@section("custom_css") + + {{-- custom style --}} + +@stop +@section('content') +
+
+ {{-- page title --}} +
+
+

Notifications

+
+
+ +
+
+
+
+
+
+ Total Notifications +

283

+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + New notifications +

15

+
+
+ + + +
+
+
+
+
+ + + + +
+
+
+
+
+ {{--

Basic Data Table

--}} +

+ 15 new notifications + +
+

+ + {{-- Table designing --}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{-- new table row --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Unread

+ 		+

3 mins ago

+ 		+ +
2 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Unread

+ 		+

10 mins ago

+ 		+ +
3 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Read

+ 		+

2 days ago

+ 		+ +
4 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Read

+ 		+

1 week ago

+ 		+ +
5 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Read

+ 		+

1 week ago

+ 		+ +
6 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Read

+ 		+

1 week ago

+ 		+ +
7 + + +

Seyi onifade

+ 		+

Notifications from my-customers would appear here

+ 		+

Read

+ 		+

6 months ago

+ 		+ +
+
+
+
+
+
+ +
+
+ +@endsection + + +@section("javascript") + + +@stop diff --git a/resources/views/backend/recoverPassword/recoverPassword.blade.php b/resources/views/backend/recoverPassword/recoverPassword.blade.php old mode 100755 new mode 100644 diff --git a/resources/views/backend/register/signup.blade.php b/resources/views/backend/register/signup.blade.php old mode 100755 new mode 100644 index c10224a0..9757ee16 --- a/resources/views/backend/register/signup.blade.php +++ b/resources/views/backend/register/signup.blade.php @@ -23,39 +23,48 @@
- - @if(Session::has('alert') || $errors->any()) -

{{ Session::get('alert') }}

+

Register

+

+ @if(Session::has('message')) +

{{ Session::get('message') }}

@endif -
Register
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif
@csrf
- + {{--
- +
- +
- -
- -
- -
- + +
--}} +
+ +
+ +
diff --git a/resources/views/backend/settings/settings.blade.php b/resources/views/backend/settings/settings.blade.php old mode 100755 new mode 100644 index c5af3261..6979c4fe --- a/resources/views/backend/settings/settings.blade.php +++ b/resources/views/backend/settings/settings.blade.php @@ -34,13 +34,13 @@
-

{{ $user_details['first_name'] }} {{ $user_details['last_name'] }}

+

{{ $user_details['local']['first_name'] }} {{ $user_details['local']['last_name'] }}

@if ( isset($form_response) ) @endif
@@ -50,7 +50,7 @@
  • Details
    • -
  • Timeline
    • + {{--
  • Timeline
    • --}}
  • Profile
  • Password
    • {{--
  • Staff Assistant
    • --}} @@ -66,10 +66,10 @@

    Details

    - +
    -

    {{ $user_details['first_name'] }} {{ $user_details['last_name'] }}

    +

    {{ $user_details['local']['first_name'] }} {{ $user_details['local']['last_name'] }}

    @@ -77,7 +77,7 @@
    -

    {{ $user_details['email'] }}

    +

    {{ $user_details['local']['email'] }}

@@ -85,7 +85,7 @@
- @if ( $user_details['is_active'] ) + @if ( $user_details['local']['is_active'] ) Active @else Not Active @@ -94,97 +94,101 @@
- @php - function time_relative_to_time($ts) { - if(!ctype_digit($ts)) - $ts = strtotime($ts); - $diff = time() - $ts; - if($diff == 0) - return 'now'; - elseif($diff > 0) - { - $day_diff = floor($diff / 86400); - if($day_diff == 0) + {{-- Removed by Eni4sure because Node is no longer giving CreatedAt and UpdatedAt --}} + {{-- @php + function time_relative_to_time($ts) { + if(!ctype_digit($ts)) + $ts = strtotime($ts); + + $diff = time() - $ts; + if($diff == 0) + return 'now'; + elseif($diff > 0) { - if($diff < 60) return 'just now'; - if($diff < 120) return '1 minute ago'; - if($diff < 3600) return floor($diff / 60) . ' minutes ago'; - if($diff < 7200) return '1 hour ago'; - if($diff < 86400) return floor($diff / 3600) . ' hours ago'; + $day_diff = floor($diff / 86400); + if($day_diff == 0) + { + if($diff < 60) return 'just now'; + if($diff < 120) return '1 minute ago'; + if($diff < 3600) return floor($diff / 60) . ' minutes ago'; + if($diff < 7200) return '1 hour ago'; + if($diff < 86400) return floor($diff / 3600) . ' hours ago'; + } + if($day_diff == 1) return 'Yesterday'; + if($day_diff < 7) return $day_diff . ' days ago'; + if($day_diff < 31) return ceil($day_diff / 7) . ' weeks ago'; + if($day_diff < 60) return 'last month'; + return date('F Y', $ts); } - if($day_diff == 1) return 'Yesterday'; - if($day_diff < 7) return $day_diff . ' days ago'; - if($day_diff < 31) return ceil($day_diff / 7) . ' weeks ago'; - if($day_diff < 60) return 'last month'; - return date('F Y', $ts); - } - else - { - $diff = abs($diff); - $day_diff = floor($diff / 86400); - if($day_diff == 0) + else { - if($diff < 120) return 'in a minute'; - if($diff < 3600) return 'in ' . floor($diff / 60) . ' minutes'; - if($diff < 7200) return 'in an hour'; - if($diff < 86400) return 'in ' . floor($diff / 3600) . ' hours'; + $diff = abs($diff); + $day_diff = floor($diff / 86400); + if($day_diff == 0) + { + if($diff < 120) return 'in a minute'; + if($diff < 3600) return 'in ' . floor($diff / 60) . ' minutes'; + if($diff < 7200) return 'in an hour'; + if($diff < 86400) return 'in ' . floor($diff / 3600) . ' hours'; + } + if($day_diff == 1) return 'Tomorrow'; + if($day_diff < 4) return date('l', $ts); + if($day_diff < 7 + (7 - date('w'))) return 'next week'; + if(ceil($day_diff / 7) < 4) return 'in ' . ceil($day_diff / 7) . ' weeks'; + if(date('n', $ts) == date('n') + 1) return 'next month'; + return date('F Y', $ts); } - if($day_diff == 1) return 'Tomorrow'; - if($day_diff < 4) return date('l', $ts); - if($day_diff < 7 + (7 - date('w'))) return 'next week'; - if(ceil($day_diff / 7) < 4) return 'in ' . ceil($day_diff / 7) . ' weeks'; - if(date('n', $ts) == date('n') + 1) return 'next month'; - return date('F Y', $ts); } - } - @endphp -
-