nathalie
/
pedi2
3
3
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Compare commits

merge into: nathalie:master
Branches Tags
nathalie:master
nathalie:refactor/totales
nathalie:funcion/pedido-ollas
nathalie:funcion/faltantes-y-sobrantes
nathalie:backup-90
...
pull from: nathalie:funcion/pedido-ollas
Branches Tags
nathalie:master
nathalie:refactor/totales
nathalie:funcion/pedido-ollas
nathalie:funcion/faltantes-y-sobrantes
nathalie:backup-90

4 Commits
master ... funcion/pe

Author SHA1 Message Date
Alejandro Tasistro aeb5cba607 Agregada pantalla de login de ollas con ruta + prop color en boton login 2025-02-10 23:10:20 -03:00
Alejandro Tasistro 2c24c1f815 Agregado boton login para ollas 2025-02-10 22:53:23 -03:00
Alejandro Tasistro 91afeddc3d Generalizado boton login 2025-02-10 22:37:02 -03:00
Alejandro Tasistro e9d33a6735 Agregado boton para volver a pedidos 2025-02-10 22:26:16 -03:00
7 changed files with 122 additions and 13 deletions
Show Stats Expand all files Collapse all files

13
app/Http/Controllers/OllasController.php Normal file
View File

@ -0,0 +1,13 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class OllasController extends Controller
{
public function show()
{
return view('auth/ollas_login');
}
}

12
resources/js/components/admin/BotonLogin.vue
View File

@ -1,12 +0,0 @@
<template>
<div class="buttons is-right">
<a class="button is-danger is-light is-small" href="/admin">
<span class="icon">
<i class="fa fa-solid fa-user-check"></i>
</span>
<span>
Admin
</span>
</a>
</div>
</template>

36
resources/js/components/comunes/BotonLogin.vue Normal file
View File

@ -0,0 +1,36 @@
<template>
<a class="button is-light is-small fixed-width" :class="color" :href="href">
<span class="icon">
<i class="fa fa-solid fa-user-check"></i>
</span>
<span>
{{ nombre }}
</span>
</a>
</template>
<script>
export default {
props: {
nombre: {
type: String,
required: true
},
href: {
type: String,
required: true
},
color: {
type: String,
required: true
},
},
}
</script>
<style>
.fixed-width {
min-width: 6rem;
}
</style>

12
resources/views/auth/admin_login.blade.php
View File

@ -10,6 +10,18 @@
<body>
<section class="section">
<div id="root" class="container">
<div class="buttons is-right">
<comunes-boton-login
href="/"
nombre="Pedidos"
color="is-warning"
></comunes-boton-login>
<comunes-boton-login
href="/ollas"
nombre="Ollas"
color="is-warning"
></comunes-boton-login>
</div>
<h1 class="title has-text-white">
Administración de Pedidos MPS
</h1>

13
resources/views/auth/login.blade.php
View File

@ -11,7 +11,18 @@
<body>
<section class="section">
<div id="root" class="container">
<admin-boton-login></admin-boton-login>
<div class="buttons is-right">
<comunes-boton-login
href="/admin"
nombre="Admin"
color="is-danger"
></comunes-boton-login>
<comunes-boton-login
href="/ollas"
nombre="Ollas"
color="is-danger"
></comunes-boton-login>
</div>
<h1 class="title">
Pedidos MPS
</h1>

47
resources/views/auth/ollas_login.blade.php Normal file
View File

@ -0,0 +1,47 @@
<!DOCTYPE html>
<html class="has-background-info" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ config('app.name', 'Pedidos del MPS') }}</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css">
<link rel="stylesheet" href="{{ mix('css/app.css') }}">
<script src="https://kit.fontawesome.com/9235d1c676.js" crossorigin="anonymous"></script>
</head>
<body>
<section class="section">
<div id="root" class="container">
<div class="buttons is-right">
<comunes-boton-login
href="/"
nombre="Pedidos"
color="is-warning"
></comunes-boton-login>
<comunes-boton-login
href="/admin"
nombre="Admin"
color="is-warning"
></comunes-boton-login>
</div>
<h1 class="title">
Pedidos MPS
</h1>
<p class="subtitle">
Bienvenidx a la sección de pedidos de ollas de la aplicación del <strong>Mercado Popular de Subsistencia</strong>
</p>
@error('name')
<div class="notification is-danger">
Contraseña incorrecta, intentalo nuevamente.
</div>
@enderror
<comunes-region-select></comunes-region-select>
<form method="post" action="login">
@csrf
<comunes-barrio-select></comunes-barrio-select>
<pedidos-login></pedidos-login>
</form>
</div>
</section>
<script src="{{ mix('js/app.js') }}" defer></script>
</body>
</html>

2
routes/web.php
View File

@ -25,6 +25,8 @@ Route::get('/productos', 'ProductoController@index')->name('productos.index');
Route::get('/admin', 'AdminController@show')->name('admin_login.show');
Route::get('/ollas', 'OllasController@show')->name('ollas_login.show');
Route::get('/admin/obtener_sesion', function() {
$sesion = [
'gdc' => session("admin_gdc")