Skip to content

L
laravel-test
Commit 9d2e8278 authored by Александр Чаплыгин's avatar Александр Чаплыгин
Browse files
Options

add styles

parent ee512b06
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 64 deletions
src/config/project.php
View file @ 9d2e8278
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
return [ return [
'name' => 'Reblum', 'name' => 'Reblum',
'title' => 'Reblum - portrait retouch app', 'title' => 'Reblum - portrait retouch app',
'minificate_static' => true, 'minificate_static' => false,
'empty_password' => '100', 'empty_password' => '100',
]; ];
src/public/assets/css/common.css 0 → 100644
View file @ 9d2e8278
.b-alerts .alert
{
position: fixed;
margin-top: 30px;
z-index: 9999;
}
.b-header-menu
{
text-align: right;
}
.btn-google
{
color: #545454;
background-color: #ffffff;
box-shadow: 0 1px 2px 1px #ddd;
}
.btn-google:focus
{
outline: 0;
box-shadow: 0 0 0 0.2rem rgba(0,123,255,.25);
}
:not(.btn-check)+.btn-google:active {
border-color: transparent;
}
#sign-in-with-apple
{
display: inline !important;
padding: 10px !important;
border-color: #000 !important;
border-radius: 8px !important;
}
\ No newline at end of file
src/public/assets/css/style.css
View file @ 9d2e8278
...@@ -1939,4 +1939,4 @@ section { ...@@ -1939,4 +1939,4 @@ section {
background: #3194db; background: #3194db;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
} }
\ No newline at end of file
src/public/assets/js/login.js 0 → 100644
View file @ 9d2e8278
(function() {
"use strict";
console.log('AAA login page');
})()
\ No newline at end of file
src/resources/views/layouts/alerts.blade.php
View file @ 9d2e8278
<div class="mt-5"> <div class="b-alerts row justify-content-center">
@if(session('success')) @if(session('success'))
<div class="alert alert-success"> <div class="alert alert-success col-4">
{{ session('success') }} {{ session('success') }}
</div> </div>
@endif @endif
@if(session('error')) @if(session('error'))
<div class="alert alert-danger"> <div class="alert alert-danger col-4">
{{ session('error') }} {{ session('error') }}
</div> </div>
@endif @endif
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger col-4">
<ul> <ul>
@foreach ($errors->all() as $error) @foreach ($errors->all() as $error)
<li>{{ $error }}</li> <li>{{ $error }}</li>
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
</ul> </ul>
</div> </div>
@endif @endif
</div> </div>
\ No newline at end of file
src/resources/views/layouts/layout.blade.php
View file @ 9d2e8278
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
<!-- ======= Header ======= --> <!-- ======= Header ======= -->
<header id="header" class="fixed-top"> <header id="header" class="fixed-top">
<div class="container d-flex align-items-center justify-content-between"> <div class="container d-flex align-items-center justify-content-between">
<h1 class="logo"><a href="{{ route('home') }}">{{ config('project.name') }}</a></h1>
<h1 class="logo col-4"><a href="{{ route('home') }}">{{ config('project.name') }}</a></h1>
<div class="b-header-menu col-4">
@auth @auth
<a class="" href="{{ url('settings') }}">Налаштування</a> <a class="" href="{{ url('settings') }}">Налаштування</a>
<a class="" href="{{ route('logout') }}">Вийти</a> <a class="" href="{{ route('logout') }}">Вийти</a>
...@@ -38,8 +40,10 @@ ...@@ -38,8 +40,10 @@
<a class="" href="{{ route('login.create') }}">Вхiд</a> <a class="" href="{{ route('login.create') }}">Вхiд</a>
<a class="" href="{{ route('register.create') }}">Регiстрацiя</a> <a class="" href="{{ route('register.create') }}">Регiстрацiя</a>
@endguest @endguest
</div>
@yield('head_content') @yield('head_content')
</div> </div>
</header><!-- End Header --> </header><!-- End Header -->
...@@ -58,6 +62,7 @@ ...@@ -58,6 +62,7 @@
<!-- JS Files --> <!-- JS Files -->
@include('layouts.scripts') @include('layouts.scripts')
@yield('page_scripts')
</body> </body>
......
src/resources/views/layouts/styles.blade.php
View file @ 9d2e8278
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<link href="assets/vendor/remixicon/remixicon.css" rel="stylesheet"> <link href="assets/vendor/remixicon/remixicon.css" rel="stylesheet">
<link href="assets/vendor/swiper/swiper-bundle.min.css" rel="stylesheet"> <link href="assets/vendor/swiper/swiper-bundle.min.css" rel="stylesheet">
<link href="assets/css/style.css" rel="stylesheet"> <link href="assets/css/style.css" rel="stylesheet">
<link href="assets/css/common.css" rel="stylesheet">
@endif @endif
......
src/resources/views/user/create.blade.php
View file @ 9d2e8278
...@@ -6,40 +6,45 @@ ...@@ -6,40 +6,45 @@
<section id="register" class="register"> <section id="register" class="register">
<div class='container'> <div class='container'>
<h4>Регiстрацiя</h4>
<form method="post" action="{{ route('register.store') }}"> <div class="row justify-content-center">
<div class="col-4 text-center">
@csrf <h4>Регiстрацiя</h4>
<div class="form-group"> <form method="post" action="{{ route('register.store') }}">
<label for='name'>Ваше имя</label>
<input class="form-control" type="text" id="name" name="name" value="{{ old('name') }}">
</div>
<div class="form-group"> @csrf
<label for='email'>Email address</label>
<input class="form-control" type="email" id="email" name="email" value="{{ old('email') }}"> <div class="form-group">
</div> <label for='name'>Ваше имя</label>
<input class="form-control" type="text" id="name" name="name" value="{{ old('name') }}">
<div class="form-group"> </div>
<label for='password'>Password</label>
<input class="form-control" type="password" id="password" name="password">
</div>
<div class="form-group">
<label for='password_confirmation'>Confirm password</label>
<input class="form-control" type="password" id="password_confirmation" name="password_confirmation">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Send</button>
</div>
</form> <div class="form-group">
<label for='email'>Email address</label>
<input class="form-control" type="email" id="email" name="email" value="{{ old('email') }}">
</div>
<div class="form-group">
<label for='password'>Password</label>
<input class="form-control" type="password" id="password" name="password">
</div>
<div class="form-group">
<label for='password_confirmation'>Confirm password</label>
<input class="form-control" type="password" id="password_confirmation" name="password_confirmation">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Send</button>
</div>
</form>
<a class="" href="{{ route('login.create') }}">Вхiд</a> </div>
</div>
</div> </div>
</section> </section>
......
src/resources/views/user/login.blade.php
View file @ 9d2e8278
...@@ -2,38 +2,51 @@ ...@@ -2,38 +2,51 @@
@section('title')Авторизацiя @endsection @section('title')Авторизацiя @endsection
@section('page_scripts')
@if(!config('project.minificate_static'))
<script src="assets/js/login.js"></script>
@endif
@endsection
@section('content') @section('content')
<section> <section>
<div class='container'> <div class='container'>
<h4>Авторизацiя</h4> <div class="row justify-content-center">
<div class="col-4 text-center">
<form method="post" action="{{ route('login') }}">
@csrf <h4>Авторизацiя</h4>
<form method="post" action="{{ route('login') }}">
@csrf
<div class="form-group">
<label for='email'>Email address</label>
<input class="form-control" type="email" id="email" name="email" value="{{ old('email') }}">
</div>
<div class="form-group">
<label for='password'>Password</label>
<input class="form-control" type="password" id="password" name="password">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Войти</button>
</div>
<a class="btn btn-google" href="{{ route('login.google') }}"><img src="https://img.icons8.com/color/16/000000/google-logo.png"> Sign in with Google</a>
<div>
@signInWithApple("black", true, "sign-in", 10)
</div>
</form>
<div class="form-group">
<label for='email'>Email address</label>
<input class="form-control" type="email" id="email" name="email" value="{{ old('email') }}">
</div>
<div class="form-group">
<label for='password'>Password</label>
<input class="form-control" type="password" id="password" name="password">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Войти</button>
</div> </div>
</div>
<a class="" href="{{ route('login.google') }}">Войти через Google</a><br>
@signInWithApple("black", true, "sign-in", 10)
</form>
<a class="" href="{{ route('register.create') }}">Регiстрацiя</a>
</div> </div>
</section> </section>
......
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