Skip to content

F
fazo
Commit 30604346 authored by Ruslan's avatar Ruslan
Browse files
Options

Changes style

parent 4e1568f5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 328 additions and 315 deletions
.idea/workspace.xml
View file @ 30604346
This diff is collapsed.
resources/views/addpackage.blade.php
View file @ 30604346
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-primary bg-white p-5" novalidate> <div class="row">
<div class="col-12">
{{ csrf_field() }}
<h4 class="mb-5"> <h4 class="mb-5">
<span class="text-muted">Регистрация новой входящей посылки</span> <span class="text-top-title">Регистрация новой входящей посылки</span>
</h4> </h4>
</div>
</div>
<form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-1 bg-white p-5" novalidate>
{{ csrf_field() }}
<div class="row"> <div class="row">
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
...@@ -107,7 +110,8 @@ ...@@ -107,7 +110,8 @@
</div> </div>
</div> </div>
<button class="btn btn-success btn-lg btn-block" type="submit">Зарегистрировать</button> <br /><br />
<button class="btn btn-success btn-lg btn-block mt-4" type="submit">Зарегистрировать</button>
</form> </form>
</div> </div>
</section> </section>
......
resources/views/layouts/user_new.blade.php
View file @ 30604346
...@@ -31,67 +31,110 @@ ...@@ -31,67 +31,110 @@
} }
} }
nav.top-menu > a {
position: relative;
display: inline-block;
padding: 6px 10px 7px;
color: #688cea!important;
font-size: 16px;
font-family: ubuntu,sans-serif;
font-weight: 600;
line-height: 1.2;
border-radius: 4px;
}
nav.top-menu > a:hover {
color: #2c638c!important;
text-decoration: none;
}
footer{
background-color: #fff;
}
.text-top-title { color: #6b8eea!important }
</style> </style>
<!-- Custom styles for this template -->
<link href="pricing.css" rel="stylesheet">
</head> </head>
<body> <body>
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
<h5 class="my-0 mr-md-auto font-weight-normal">Fazoshop</h5> <div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-5 bg-white border-bottom shadow-sm sticky-top">
<nav class="my-2 my-md-0 mr-md-3"> <a class="navbar-brand mr-md-auto" href="#">
<img src="{{ url('/assets/img/icon/logo.png') }}" width="30" height="30" alt="" class="mr-1">
<strong>Fazoshop</strong>
</a>
<nav class="my-2 my-md-0 mr-md-3 top-menu">
<a class="p-2 text-dark" href="#">На главную</a> <a class="p-2 text-dark" href="#">На главную</a>
<a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a> <a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
<a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a> <a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
<a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a> <a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
</nav> </nav>
<a class="btn btn-outline-primary" href="#">Sign up</a>
</div> </div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@yield('content') @if( Session::has( 'success' ))
<div class="alert alert-success alert-dismissible fade show mt-3" role="alert">
<strong>Успешно! </strong>
{{ Session::get( 'success' ) }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@elseif( Session::has( 'error' ))
<div class="alert alert-danger alert-dismissible fade show mt-3" role="alert">
<strong>Ошибка! </strong>
{{ Session::get( 'error' ) }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@endif
@yield('content')
</div>
</div>
</div>
<footer class="pt-4 my-md-5 pt-md-5 border-top"> <footer class="pt-4 mt-5 pt-md-5 pb-5 border-top">
<div class="container">
<div class="row"> <div class="row">
<div class="col-12 col-md"> <div class="col-12 col-md">
<img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24"> <img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2017-2019</small> <small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>Features</h5> <h5>Клиентам</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Cool stuff</a></li> <li><a class="text-muted" href="#">Справка</a></li>
<li><a class="text-muted" href="#">Random feature</a></li> <li><a class="text-muted" href="#">Новости</a></li>
<li><a class="text-muted" href="#">Team feature</a></li> <li><a class="text-muted" href="#">Акции</a></li>
<li><a class="text-muted" href="#">Stuff for developers</a></li>
<li><a class="text-muted" href="#">Another one</a></li>
<li><a class="text-muted" href="#">Last time</a></li>
</ul> </ul>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>Resources</h5> <h5>FazoShop</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Resource</a></li> <li><a class="text-muted" href="#">О компании</a></li>
<li><a class="text-muted" href="#">Resource name</a></li> <li><a class="text-muted" href="#">Вакансии</a></li>
<li><a class="text-muted" href="#">Another resource</a></li> <li><a class="text-muted" href="#">Privacy</a></li>
<li><a class="text-muted" href="#">Final resource</a></li> <li><a class="text-muted" href="#">Обратная связь</a></li>
</ul> </ul>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>About</h5> <h5>Контакты</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Team</a></li> <li><a class="text-muted" href="#">Адреса</a></li>
<li><a class="text-muted" href="#">Locations</a></li> <li><a class="text-muted" href="#">Акции</a></li>
<li><a class="text-muted" href="#">Privacy</a></li>
<li><a class="text-muted" href="#">Terms</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</footer>
</div>
</div>
</div> </div>
</footer>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
@yield('custom_script')
</body> </body>
</html> </html>
resources/views/pages/profile/user.blade.php
View file @ 30604346
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">Home</a></li>
<li>Profile
</li>
<li class="active">Info</li>
</ol>
</section>
<section class="grid">
<section class="section section-inset-1">
<div class="container"> <div class="container">
<h5 class="text-center">Profile</h5> <div class="row">
<hr> <div class="col-12">
<div class="row offset-5"> <h4 class="mb-5">
<div class="col-xs-4"> <span class="text-top-title">Редактирование профиля</span>
<div class="well4 bg-light"> </h4>
<h5>{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5> </div>
<p class="text-sm-left">97 Quentin Road,</p> </div>
<p class="text-sm-left">ID {{ Auth::user()->id }}-FZ</p>
<p class="text-sm-left">Brooklyn, NY 11234</p> <div class="row">
<p class="text-sm-left">(347) 547-9797</p> <div class="col-4">
</div> <div class="card bg-white border-primary mb-3">
</div> <div class="card-body">
<div class="col-xs-6"> <h5 class="card-title">{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5>
<form action="{{ route('profile.save') }}" method="post" > <p class="card-text">
@csrf 97 Quentin Road, <br />
ID {{ Auth::user()->id }}-FZ <br />
Brooklyn, NY 11234
(347) 547-9797
</p>
</div>
</div>
</div>
<div class="col-8">
<form action="{{ route('profile.save') }}" method="post" class="border border-1 bg-white p-5">
@csrf
<div class="row row-10"> <div class="row row-10">
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-country1">Firstname...</label> <label for="forms-check-country1">Имя</label>
<input class="form-input" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required"> <input class="form-control" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-country1">Lastname...</label> <label for="forms-check-country1">Фамилия</label>
<input class="form-input" id="forms-check-country1" <input class="form-control" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required">
value="{{ Auth::user()->lastname }}" type="text" name="lastname"
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Email...</label> <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"> <input class="form-control" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Phone...</label> <label for="forms-check-postcode1">Телефон</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required"> <input class="form-control" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="password">Password...</label> <label for="password">Пароль</label>
<input class="form-input" id="password" type="password" name="password" > <input class="form-control" id="password" type="password" name="password">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="password_confirmation">Password Confirmation...</label> <label for="password_confirmation">Подтверждение пароля</label>
<input class="form-input" id="password_confirmation" type="password" name="password_confirmation" > <input class="form-control" id="password_confirmation" type="password" name="password_confirmation">
</div> </div>
</div> </div>
</div> </div>
<button class="btn btn-primary btn-xs" >Save</button>
<br /><br />
<button class="btn btn-primary btn-xs">Сохранить</button>
</form> </form>
</div> </div>
...@@ -75,6 +75,4 @@ ...@@ -75,6 +75,4 @@
</div> </div>
</div> </div>
</section>
</section>
@endsection @endsection
resources/views/profile.blade.php
View file @ 30604346
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<section class="bg-light section-lg"> <section class="bg-light section-lg">
......
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