Skip to content

Commit

Permalink
ajustes para entrega
Browse files Browse the repository at this point in the history
  • Loading branch information
@Luizhtanaka
Luizhtanaka committed Sep 27, 2023
1 parent 60db865 commit c03f5d0
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 134 deletions.
14 changes: 14 additions & 0 deletions database/seeders/UserSeeder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ public function run(): void
'email' => '[email protected]',
'password' => Hash::make('123456'),
'created_at' => date("Y-m-d H:i:s")
],
[
'codigo' => 'Paula',
'name' => 'Paula Miranda',
'email' => '[email protected]',
'password' => Hash::make('123456'),
'created_at' => date("Y-m-d H:i:s")
],
[
'codigo' => 'Mih',
'name' => 'Michele',
'email' => '[email protected]',
'password' => Hash::make('123456'),
'created_at' => date("Y-m-d H:i:s")
]
]);
}
Expand Down
28 changes: 7 additions & 21 deletions resources/views/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,45 +27,31 @@
<!-- Outer Row -->
<div class="row justify-content-center">

<div class="col-xl-10 col-lg-12 col-md-9">
<div class="col-xl-6 col-lg-12 col-md-9">

<div class="card o-hidden border-0 shadow-lg my-5">
<div class="card-body p-0">
<!-- Nested Row within Card Body -->
<div class="row">
<div class="col-lg-6 d-none d-lg-block bg-login-image"></div>
<div class="col-lg-6">
<!--<div class="col-lg-6 d-none d-lg-block bg-login-image"></div> -->
<div class="col-lg-12">
<div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4">Welcome Back!</h1>
<h1 class="h4 text-gray-900 mb-4">Login</h1>
</div>
<form action="{{ route('login.custom') }}" method="post" class="user">
@csrf
<div class="form-group">
<input type="email" name="email" class="form-control form-control-user"
id="exampleInputEmail" aria-describedby="emailHelp"
placeholder="Enter Email Address...">
placeholder="Informe seu E-mail">
</div>
<div class="form-group">
<input type="password" name="password" class="form-control form-control-user"
id="exampleInputPassword" placeholder="Password">
id="exampleInputPassword" placeholder="Informe sua Senha">
</div>
<div class="form-group">
<div class="custom-control custom-checkbox small">
<input type="checkbox" class="custom-control-input" id="customCheck">
<label class="custom-control-label" for="customCheck">Remember
Me</label>
</div>
</div>
<input type="submit" class="btn btn-primary btn-user btn-block">
<input type="submit" class="btn btn-primary btn-user btn-block" value="Entrar">
</form>
<hr>
<div class="text-center">
<a class="small" href="forgot-password.html">Forgot Password?</a>
</div>
<div class="text-center">
<a class="small" href="register.html">Create an Account!</a>
</div>
</div>
</div>
</div>
Expand Down
45 changes: 45 additions & 0 deletions resources/views/auth/register.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<div class="container">
<div class="card o-hidden border-0 shadow-lg my-5">
<div class="card-body p-0">
<!-- Nested Row within Card Body -->
<div class="row">
<div class="col-lg-12">
<div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4">Create an Account!</h1>
</div>
<form class="user">
<div class="form-group row">
<div class="col-sm-6 mb-3 mb-sm-0">
<input type="text" class="form-control form-control-user" id="exampleFirstName"
placeholder="First Name">
</div>
<div class="col-sm-6">
<input type="text" class="form-control form-control-user" id="exampleLastName"
placeholder="Last Name">
</div>
</div>
<div class="form-group">
<input type="email" class="form-control form-control-user" id="exampleInputEmail"
placeholder="Email Address">
</div>
<div class="form-group row">
<div class="col-sm-6 mb-3 mb-sm-0">
<input type="password" class="form-control form-control-user"
id="exampleInputPassword" placeholder="Password">
</div>
<div class="col-sm-6">
<input type="password" class="form-control form-control-user"
id="exampleRepeatPassword" placeholder="Repeat Password">
</div>
</div>
<a href="login.html" class="btn btn-primary btn-user btn-block">
Register Account
</a>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions resources/views/site/dashboard.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
@include('site.layout.lista-usuarios')

@include('site.layout.lista-leads')

@include('auth.register')
@endsection
45 changes: 45 additions & 0 deletions resources/views/site/layout/cadastro_parceiro.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<div class="container">
<div class="card o-hidden border-0 shadow-lg my-5">
<div class="card-body p-0">
<!-- Nested Row within Card Body -->
<div class="row">
<div class="col-lg-12">
<div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4">Create an Account!</h1>
</div>
<form class="user">
<div class="form-group row">
<div class="col-sm-6 mb-3 mb-sm-0">
<input type="text" class="form-control form-control-user" id="exampleFirstName"
placeholder="First Name">
</div>
<div class="col-sm-6">
<input type="text" class="form-control form-control-user" id="exampleLastName"
placeholder="Last Name">
</div>
</div>
<div class="form-group">
<input type="email" class="form-control form-control-user" id="exampleInputEmail"
placeholder="Email Address">
</div>
<div class="form-group row">
<div class="col-sm-6 mb-3 mb-sm-0">
<input type="password" class="form-control form-control-user"
id="exampleInputPassword" placeholder="Password">
</div>
<div class="col-sm-6">
<input type="password" class="form-control form-control-user"
id="exampleRepeatPassword" placeholder="Repeat Password">
</div>
</div>
<a href="login.html" class="btn btn-primary btn-user btn-block">
Register Account
</a>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions resources/views/site/layout/lista-usuarios.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<th>Código</th>
<th>Nome</th>
<th>Email</th>
<th>Leads Capturado</th>
<th>Editar</th>
<th>Excluir</th>
</tr>
</thead>
@foreach ($list_user as $user)
Expand All @@ -18,6 +21,9 @@
<td>{{ $user->codigo }}</td>
<td>{{ $user->name }}</td>
<td>{{ $user->email }}</td>
<td>0</td>
<td><a href="#">Editar</a></td>
<td><a href="#">Excluir</a></td>
</tr>
</tbody>
@endforeach
Expand Down
123 changes: 10 additions & 113 deletions resources/views/site/layout/master-dashboard.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<html lang="pt-br">

<head>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">


<title>Universo Canopus</title>

Expand Down Expand Up @@ -43,7 +42,7 @@

<!-- Nav Item - Dashboard -->
<li class="nav-item active">
<a class="nav-link" href="index.html">
<a class="nav-link" href="{{ route('site.dashboard') }}">
<i class="fas fa-fw fa-tachometer-alt"></i>
<span>Dashboard</span></a>
</li>
Expand All @@ -52,17 +51,16 @@
<hr class="sidebar-divider">

<!-- Heading -->
<div class="sidebar-heading">
Addons
</div>

<!-- Nav Item - Pages Collapse Menu -->
@can('access')
<li class="nav-item">
<a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsePages"
aria-expanded="true" aria-controls="collapsePages">
<i class="fas fa-fw fa-folder"></i>
<span>Pages</span>
<span>Cadastro</span>
</a>
<!--
<div id="collapsePages" class="collapse" aria-labelledby="headingPages" data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header">Login Screens:</h6>
Expand All @@ -75,15 +73,14 @@
<a class="collapse-item" href="blank.html">Blank Page</a>
</div>
</div>
-->
</li>
@endcan

<!-- Divider -->
<hr class="sidebar-divider d-none d-md-block">
<!--<hr class="sidebar-divider d-none d-md-block"> -->

<!-- Sidebar Toggler (Sidebar) -->
<div class="text-center d-none d-md-inline">
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>

</ul>
<!-- End of Sidebar -->
Expand Down Expand Up @@ -198,111 +195,12 @@
</div>
</div>
</div>

<!-- Earnings (Monthly) Card Example -->
<div class="col-xl-3 col-md-6 mb-4">
<div class="card border-left-success shadow h-100 py-2">
<div class="card-body">
<div class="row no-gutters align-items-center">
<div class="col mr-2">
<div class="text-xs font-weight-bold text-success text-uppercase mb-1">
Earnings (Annual)</div>
<div class="h5 mb-0 font-weight-bold text-gray-800">$215,000</div>
</div>
<div class="col-auto">
<i class="fas fa-dollar-sign fa-2x text-gray-300"></i>
</div>
</div>
</div>
</div>
</div>
</div>
@include('site.layout.lista-usuarios')
<!-- Content Row -->

<div class="row">

<!-- Area Chart -->
<div class="col-xl-8 col-lg-7">
<div class="card shadow mb-4">
<!-- Card Header - Dropdown -->
<div
class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
<h6 class="m-0 font-weight-bold text-primary">Earnings Overview</h6>
<div class="dropdown no-arrow">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
</a>
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in"
aria-labelledby="dropdownMenuLink">
<div class="dropdown-header">Dropdown Header:</div>
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</div>
</div>
<!-- Card Body -->
<div class="card-body">
<div class="chart-area">
<canvas id="myAreaChart"></canvas>
</div>
</div>
</div>
</div>

<!-- Pie Chart -->
<div class="col-xl-4 col-lg-5">
<div class="card shadow mb-4">
<!-- Card Header - Dropdown -->
<div
class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
<h6 class="m-0 font-weight-bold text-primary">Revenue Sources</h6>
<div class="dropdown no-arrow">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
</a>
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in"
aria-labelledby="dropdownMenuLink">
<div class="dropdown-header">Dropdown Header:</div>
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</div>
</div>
<!-- Card Body -->
<div class="card-body">
<div class="chart-pie pt-4 pb-2">
<canvas id="myPieChart"></canvas>
</div>
<div class="mt-4 text-center small">
<span class="mr-2">
<i class="fas fa-circle text-primary"></i> Direct
</span>
<span class="mr-2">
<i class="fas fa-circle text-success"></i> Social
</span>
<span class="mr-2">
<i class="fas fa-circle text-info"></i> Referral
</span>
</div>
</div>
</div>
</div>
</div>
@include('site.layout.cadastro_parceiro')
</div>
@endcan
<!-- Controle de acesso - admin -->
<!-- /.container-fluid -->

</div>
<!-- End of Main Content -->

<!-- Footer -->
<footer class="sticky-footer bg-white">
<div class="container my-auto">
Expand All @@ -314,7 +212,6 @@ class="card-header py-3 d-flex flex-row align-items-center justify-content-betwe
<!-- End of Footer -->

</div>
<!-- End of Content Wrapper -->

</div>
<!-- End of Page Wrapper -->
Expand Down

0 comments on commit c03f5d0

Please sign in to comment.