Commit 53e2823d authored by Ruslan's avatar Ruslan

Added feedback on Frontend page

parent 64761c35
This diff is collapsed.
<?php
/**
* Created by PhpStorm.
* User: RSkaldin
* Date: 6/10/2019
* Time: 7:39 PM
*/
namespace App\Http\Controllers;
use App\Models\Feedback;
use Illuminate\Http\Request;
class FeedbackController extends Controller
{
/**
* Соз
* @param Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function addGuest(Request $request)
{
try {
$feedback = new Feedback();
$feedback->name = $request->input('name').' '.$request->input('last-name');
$feedback->email = $request->input('email');
$feedback->phone = $request->input('phone');
$feedback->body = $request->input('message');
$feedback->title = 'Гость: '.$feedback->name;
$feedback->ip = $request->ip();
$feedback->save();
} catch (\Exception $ex) {
return redirect()->back()->with('flash_error', 'Ошибка отправки сообщения.');
}
return redirect()->back()->with('flash_success', 'Сообщение отправлено успешно.');
}
}
\ No newline at end of file
...@@ -224,4 +224,11 @@ class PackagesController extends Controller ...@@ -224,4 +224,11 @@ class PackagesController extends Controller
{ {
return view('addpackage'); return view('addpackage');
} }
public function index()
{
$units = Package::where('user_id', '=', Auth::user()->id);
return view('pages.parcels.index', compact('units'));
}
} }
...@@ -264,6 +264,14 @@ class ProfileController extends Controller ...@@ -264,6 +264,14 @@ class ProfileController extends Controller
} }
public function profile() public function profile()
{ {
return view('profile');
return view('pages.profile.user');
}
public function save(Request $request)
{
$user = User::find(Auth::user()->id);
$user->update($request->all());
return redirect()->back();
} }
} }
\ No newline at end of file
...@@ -18,7 +18,7 @@ class RedirectIfAuthenticated ...@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null) public function handle($request, Closure $next, $guard = null)
{ {
if (Auth::guard($guard)->check()) { if (Auth::guard($guard)->check()) {
return redirect('/home'); return redirect('/profile');
} }
return $next($request); return $next($request);
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<div class="preview-item-content d-flex align-items-start flex-column justify-content-center"> <div class="preview-item-content d-flex align-items-start flex-column justify-content-center">
<h6 class="preview-subject ellipsis mb-1 font-weight-normal">{{ $item->title }}</h6> <h6 class="preview-subject ellipsis mb-1 font-weight-normal">{{ $item->title }}</h6>
<p class="text-gray mb-0"> <p class="text-gray mb-0">
{{ $item->created_at }} {{ $item->created_at->diffForHumans() }}
</p> </p>
</div> </div>
</a> </a>
...@@ -92,8 +92,7 @@ ...@@ -92,8 +92,7 @@
</div> </div>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link count-indicator dropdown-toggle" id="notificationDropdown" href="#" <a class="nav-link count-indicator dropdown-toggle" id="notificationDropdown" href="#" data-toggle="dropdown">
data-toggle="dropdown">
<i class="mdi mdi-bell-outline"></i> <i class="mdi mdi-bell-outline"></i>
<span class="count-symbol bg-danger"></span> <span class="count-symbol bg-danger"></span>
</a> </a>
......
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
<div class="rd-navbar-inner"> <div class="rd-navbar-inner">
<button class="rd-navbar-collapse-toggle" data-rd-navbar-toggle=".list-inline" type="submit"><span></span></button><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#4b68"><span class="__cf_email__" data-cfemail="533a3d353c1337363e3c3f3a3d387d3c2134">[email&#160;protected]</span></a><a class="fa-mobile-phone preffix-2" href="callto:#">1-800-1234-567</a> <button class="rd-navbar-collapse-toggle" data-rd-navbar-toggle=".list-inline" type="submit"><span></span></button><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#4b68"><span class="__cf_email__" data-cfemail="533a3d353c1337363e3c3f3a3d387d3c2134">[email&#160;protected]</span></a><a class="fa-mobile-phone preffix-2" href="callto:#">1-800-1234-567</a>
<ul class="list-inline pull-right"> <ul class="list-inline pull-right">
<li><a class="fa-facebook" href="header-minimal.html#"></a></li> <li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="header-minimal.html#"></a></li> <li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="header-minimal.html#"></a></li> <li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="header-minimal.html#"></a></li> <li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google-plus" href="header-minimal.html#"></a></li> <li><a class="fa-google-plus" href="#"></a></li>
<li><a class="fa-rss" href="header-minimal.html#"></a></li> <li><a class="fa-rss" href="#"></a></li>
<li class="text-left"><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#d1f2"><span class="__cf_email__" data-cfemail="20494e464f6044454d4f4c494e4b0e4f5247">[email&#160;protected]</span></a></li> <li class="text-left"><a class="fa-envelope-o" href="../cdn-cgi/l/email-protection.html#d1f2"><span class="__cf_email__" data-cfemail="20494e464f6044454d4f4c494e4b0e4f5247">[email&#160;protected]</span></a></li>
<li class="text-left"><a class="fa-mobile-phone" href="callto:#">1-800-1234-567</a></li> <li class="text-left"><a class="fa-mobile-phone" href="callto:#">1-800-1234-567</a></li>
</ul> </ul>
...@@ -66,17 +66,17 @@ ...@@ -66,17 +66,17 @@
<button class="rd-navbar-search-form-submit fa-shopping-cart" type="submit"></button> <button class="rd-navbar-search-form-submit fa-shopping-cart" type="submit"></button>
</form><span class="rd-navbar-live-search-results"></span> </form><span class="rd-navbar-live-search-results"></span>
<button class="rd-navbar-search-toggle" data-rd-navbar-toggle=".rd-navbar-search, .rd-navbar-live-search-results" type="submit"></button> <button class="rd-navbar-search-toggle" data-rd-navbar-toggle=".rd-navbar-search, .rd-navbar-live-search-results" type="submit"></button>
</div><a class="fa-shopping-cart" href="shop-cart.html"><span>10</span></a> </div><a class="fa-shopping-cart" href=""><span>10</span></a>
<!-- RD Navbar Nav--> <!-- RD Navbar Nav-->
<ul class="rd-navbar-nav"> <ul class="rd-navbar-nav">
<li><a href="index.html">На главную</a></li> <li><a href="/">На главную</a></li>
<li><a href="header-minimal.html#">Посылки</a> <li><a href="{{ route('package') }}">Посылки</a>
</li> </li>
<li class="active"><a href="header-minimal.html#">Адреса</a> <li class="active"><a href="{{ route('address') }}">Адреса</a>
</li> </li>
<li><a href="header-minimal.html#">Профиль</a> <li><a href="/profile">Профиль</a>
</li> </li>
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
<div class="rd-navbar-brand pull-lg-left"><a class="brand-name" href="index.html"><img src="/assets/img/icon/logo.png" <div class="rd-navbar-brand pull-lg-left"><a class="brand-name" href="index.html"><img src="/assets/img/icon/logo.png"
class="logo_main" alt=""><span>Fazoshop</span></a></div> class="logo_main" alt=""><span>Fazoshop</span></a></div>
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right"> <ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="index.html">На главную</a></li> <li><a href="/">На главную</a></li>
<li><a href="header-minimal.html#">Посылки</a> <li><a href="{{ route('package') }}">Посылки</a>
</li> </li>
<li ><a href="header-minimal.html#">Адреса</a> <li ><a href="{{ route('address') }}">Адреса</a>
</li> </li>
<li><a href="header-minimal.html#">Профиль</a> <li><a href="/profile">Профиль</a>
</li> </li>
</ul> </ul>
...@@ -113,14 +113,14 @@ ...@@ -113,14 +113,14 @@
</section> </section>
<section class="copyright bg-darkest well5"> <section class="copyright bg-darkest well5">
<div class="container"> <div class="container">
<p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a href="terms.html">Terms of Use and Privacy Policy</a></p> <p class="pull-sm-left">&#169; <span id="copyright-year"></span> All Rights Reserved <a href="">Terms of Use and Privacy Policy</a></p>
<ul class="list-inline pull-sm-right offset-3"> <ul class="list-inline pull-sm-right offset-3">
<li><a class="fa-facebook" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-google" href="#"></a></li>
<li><a class="fa-rss" href="footer-minimal-dark.html#"></a></li> <li><a class="fa-rss" href="#"></a></li>
</ul> </ul>
</div> </div>
</section> </section>
......
...@@ -65,9 +65,8 @@ ...@@ -65,9 +65,8 @@
<button class="rd-navbar-toggle" data-rd-navbar-toggle=".rd-navbar-nav-wrap" type="submit"> <button class="rd-navbar-toggle" data-rd-navbar-toggle=".rd-navbar-nav-wrap" type="submit">
<span></span></button> <span></span></button>
<!-- RD Navbar Brand--> <!-- RD Navbar Brand-->
<div class="rd-navbar-brand"><a class="brand-name" href="/"><img src="/assets/img/icon/logo.png" <div class="rd-navbar-brand">
class="logo_main" alt=""> <a class="brand-name" href="/"><img src="/assets/img/icon/logo.png" class="logo_main" alt=""></a>
</a>
</div> </div>
</div> </div>
<div class="rd-navbar-nav-wrap"> <div class="rd-navbar-nav-wrap">
...@@ -370,43 +369,37 @@ ...@@ -370,43 +369,37 @@
<div class="col-xs-12 col-md-9 col-lg-6 col-md-offset-2 col-lg-offset-3"> <div class="col-xs-12 col-md-9 col-lg-6 col-md-offset-2 col-lg-offset-3">
<!--p.fw-l.h5.text-transform-none Enter your email address to receive all company news, special offers and other discount information.--> <!--p.fw-l.h5.text-transform-none Enter your email address to receive all company news, special offers and other discount information.-->
<!-- RD Mailform--> <!-- RD Mailform-->
<form class="rd-mailform text-left" data-form-output="form-output-global" <form class="rd-mailform text-left" data-form-output="form-output-global" data-form-type="forms" method="post" action="{{ url('/feedback/add') }}">
data-form-type="forms" method="post" @csrf
action="https://livedemo00.template-help.com/wt_58899_v2/bat/rd-mailform.php">
<div class="row row-10"> <div class="row row-10">
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-name">Ваше имя...</label> <label class="form-label" for="forms-name">Ваше имя...</label>
<input class="form-input" id="forms-name" type="text" name="name" <input class="form-input" id="forms-name" type="text" name="name" data-constraints="@Required">
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-last-name">Ваша фамилия...</label> <label class="form-label" for="forms-last-name">Ваша фамилия...</label>
<input class="form-input" id="forms-last-name" type="text" name="last-name" <input class="form-input" id="forms-last-name" type="text" name="last-name" data-constraints="@Required">
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-email">Ваш e-mail...</label> <label class="form-label" for="forms-email">Ваш e-mail...</label>
<input class="form-input" id="forms-email" type="email" name="email" <input class="form-input" id="forms-email" type="email" name="email" data-constraints="@Email @Required">
data-constraints="@Email @Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-phone">Ваш номер...</label> <label class="form-label" for="forms-phone">Ваш номер...</label>
<input class="form-input" id="forms-phone" type="text" name="phone" <input class="form-input" id="forms-phone" type="text" name="phone" data-constraints="@Numeric @Required">
data-constraints="@Numeric @Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12"> <div class="col-xs-12 col-sm-12">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-message">Сообщение:</label> <label class="form-label" for="forms-message">Сообщение:</label>
<textarea class="form-input" id="forms-message" name="message" <textarea class="form-input" id="forms-message" name="message" data-constraints="@Required"></textarea>
data-constraints="@Required"></textarea>
</div> </div>
</div> </div>
<div class="col-xs-12 text-center"> <div class="col-xs-12 text-center">
......
@extends('layouts.user')
@section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
</ol>
</section>
<section class="section section-inset-1">
<div class="container">
<div class="row">
<div class="col-xs-12 section-inset-1">
<div class="table-responsive">
<table class="table table-hover text-left">
<thead>
<tr class="bg-dark">
<th>Tracking ID</th>
<th>Name</th>
<th>Status</th>
<th>Parcel weight</th>
<th>Total Items</th>
<th>Total Price</th>
<th>Manage</th>
</tr>
</thead>
<tbody>
@foreach($units as $unit)
<tr>
<td>{{ $unit->tracking_number }}</td>
<td><a href="#">{{ $unit->name }}</a></td>
<td><p class="font-secondary h6">{{ $unit->status }}</p>
</td>
<td>{{ $unit->weight }}</td>
<td>
<label>
{{--{{ $unit->items->count() }}--}}
</label>
</form>
</td>
<td>${{ $unit->price }}</td>
<td>
@if($unit->status == 1)
<i class="fa fa-money"></i>
@endif
<i class="fa fa-pencil"></i>
<i class="fa fa-times-circle"></i>
</td>
</tr>
@endforeach
</tr>
</tbody>
</table>
</div>
<!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary btn-sm pull-sm-right" >Add Order</a>
</div>
</div>
</div>
</section>
@endsection
@extends('layouts.app') @extends('layouts.user')
@section('page-title', 'Мои посылки')
@section('content') @section('content')
<div class="py-5 text-center"> <section class="bg-light section-lg">
<img class="d-block mx-auto mb-4" src="{{ url('images/ship/man.png') }}" alt="" width="72" height="72"> <ol class="breadcrumb">
<h2>Мой профиль</h2> <li><a href="{{ route('home') }}">Home</a></li>
<p class="lead">Хотите узнать <a href="#" class="link-tag">адреса складов в США</a>, <a href="#" class="link-tag"> пополнить баланс</a>, <a href="#" class="link-tag">редактировать инфо профиля</a>, <a href="#" class="link-tag">посмотреть историю транзакций</a>? Тогда, вам сюда :)</p> <li>Profile
</div> </li>
<li class="active">Info</li>
</ol>
</section>
<section class="grid">
<section class="section section-inset-1">
<div class="container">
<h5 class="text-center">Profile</h5>
<hr>
<div class="row offset-5">
<div class="col-xs-4">
<div class="well4 bg-light">
<h5>{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5>
<p class="text-sm-left">97 Quentin Road,</p>
<p class="text-sm-left">ID {{ Auth::user()->id }}-FZ</p>
<p class="text-sm-left">Brooklyn, NY 11234</p>
<p class="text-sm-left">(347) 547-9797</p>
</div>
</div>
<div class="col-xs-6">
<form action="{{ route('profile.save') }}" method="post" >
<div class="row"> <div class="row row-10">
<div class="col-md-7 mb-4"> <div class="col-xs-12 col-sm-6 right-col">
<h4 class="d-flex justify-content-between align-items-center mb-3"> <div class="form-wrap">
<span class="text-muted">Ваши адреса складов в США</span> <label class="form-label" for="forms-check-country1">Firstname...</label>
</h4> <input class="form-input" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required">
<div class="card shadow address-envelope" style="background: #f8f9fa"> </div>
<div class="card-body bg-white"> </div>
{{--<h5 class="card-title" style="color: #004085">New Hampshire</h5>--}} <div class="col-xs-12 col-sm-6 left-col">
<p class="card-text">Наш склад находится в <span class="text-success">безналоговом</span> штате, покупая в магазинах США вы платите <span class="text-success">0%</span> налога.</p> <div class="form-wrap">
</div> <label class="form-label" for="forms-check-country1">Lastname...</label>
<ul class="list-group list-group-flush" style="color: #004085"> <input class="form-input" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required">
<li class="list-group-item"><strong>{{ $user->firstname }} {{ $user->lastname }}</strong></li> </div>
<li class="list-group-item">
<strong>
Fazo Cargo LLC<br />
97 Quentin Rd, 1st floor,<br />
Brooklyn, NY 11223
</strong>
</li>
<li class="list-group-item" style="background: #f8f9fa"><strong>1 (302)11111111</strong></li>
</ul>
</div>
</div>
<div class="col-md-5 mb-4">
<h4 class="d-flex justify-content-between align-items-center mb-3">
<span class="text-muted">Информация профиля</span>
</h4>
<div class="card border-info" style="">
<div class="card-body">
<h5 class="card-title" style="color: #004085">Пополнение счета</h5>
<p class="card-text">
<div class="input-group input-group-sm">
<div class="input-group-prepend input-group-sm">
<span class="input-group-text">$</span>
</div> </div>
<input type="number" class="form-control form-control-sm" id="username" placeholder="Username" value="0"> <div class="col-xs-12 col-sm-6 right-col">
<div class="input-group-append input-group-sm"> <div class="form-wrap">
<input type="submit" class="btn btn-success" value="Пополнить" /> <label class="form-label" for="forms-check-postcode1">Email...</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Phone...</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required">
</div>
</div> </div>
</div> </div>
</p> <button class="btn btn-primary btn-xs" >Save</button>
</div> </form>
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center h4" style="background: #eee">Ваш счет: <span class="text-success"><strong>$10</strong></span></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Имя <strong>{{ $user->firstname }} {{ $user->lastname }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">E-mail <strong>{{ $user->email }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Телефон <strong>+998{{ $user->phone }}</strong></li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<a href="{{ url('/profile/edit/') }}" class="btn btn-success mr-2">Редактировать профиль</a>
<a href="{{ url('/profile/password/') }}" class="btn btn-outline-secondary">Изменить пароль</a>
</li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Адреса для доставки</a>
</li>
<li class="nav-item">
<a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">История платежей</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div class="mt-5">
<a href="{{ url('/profile/address/add') }}" class="btn btn-success mb-3">Добавить новый адрес</a>
{!! view('pages.profile.addresses', ['addresses' => $addresses]) !!}
</div>
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<div class="mt-5">
{!! view('pages.profile.transactions') !!}
</div> </div>
</div> </div>
</div> </div>
</div> </section>
</div> </section>
@endsection @endsection
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
*/ */
Route::get('/', function () { Route::get('/', function () {
return view('welcome'); return view('main');
}); });
// //
//Auth::routes(); //Auth::routes();
...@@ -35,11 +35,15 @@ Route::get('/about', function () { ...@@ -35,11 +35,15 @@ Route::get('/about', function () {
Route::get('/contacts', function () { Route::get('/contacts', function () {
return view('contacts'); return view('contacts');
}); });
Route::post('/feedback/add', 'FeedbackController@addGuest');
Route::get('/packages/pay', 'PackagesController@pay'); Route::get('/packages/pay', 'PackagesController@pay');
Route::get('/packages/addr', 'PackagesController@addr'); Route::get('/packages/addr', 'PackagesController@addr');
Route::get('/profile/address', 'ProfileController@address'); Route::get('/packages', 'PackagesController@index')->name('package');
Route::get('/profile/address', 'ProfileController@address')->name('address');
Route::get('/profile/addaddress', 'ProfileController@addaddress'); Route::get('/profile/addaddress', 'ProfileController@addaddress');
Route::get('/profile', 'ProfileController@profile'); Route::get('/profile', 'ProfileController@profile');
Route::post('/profile/save', 'ProfileController@save')->name('profile.save');
Route::get('/packages/list', 'PackagesController@pending_packages'); Route::get('/packages/list', 'PackagesController@pending_packages');
Route::get('/packages/pending', 'PackagesController@pending_packages'); Route::get('/packages/pending', 'PackagesController@pending_packages');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment