Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Http/Controllers/CollaboratorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use App\Collaborator;
use JWTAuth;
use Illuminate\Http\Request;
use Auth;

class CollaboratorController extends Controller
{
Expand Down Expand Up @@ -32,6 +33,8 @@ public function store(Request $request)
{
$user = JWTAuth::parseToken()->toUser();
$collaborator = new Collaborator();
$value = session('id');
var_dump($value);die();
$collaborator->id_user = $user->id;
$collaborator->id_service = $request->input('id_service');
$collaborator->description = $request->input('description');
Expand Down
6 changes: 4 additions & 2 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Mail;
use View;


class UserController extends Controller
{

Expand Down Expand Up @@ -109,10 +110,11 @@ public function login(Request $request)
// 'code'=>422,'message'=>'Verifique su bandeja de correos para activar su cuenta.Su cuenta no esta activa'])],422);
flash('Verifique su bandeja de correos para activar su cuenta.Su cuenta no esta activa' ,'danger');
return view('PaginasWeb.login');
}

}

$this->setSession($request);
$name = 'byron testing view';
$request->session()->put('token',$token);
return redirect('/');
// return response()->json([
// 'token' => $token
Expand Down
15 changes: 13 additions & 2 deletions resources/views/PaginasWeb/busqueda.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<link rel="stylesheet" href="{!! asset('css/paginaPrin.css') !!}">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">



@section('content')


Expand All @@ -19,13 +21,23 @@
</ul>

<ul class="nav navbar-nav navbar-right">

<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="">Page 1 <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{ url('registroServicio') }}">Registrarme un Servicio</a></li>
<li><a href="#">Page 1-2</a></li>
<li><a href="#">Page 1-3</a></li>
</ul>
</li>

<li id="register"><a href="{{ url('registro') }}">
<span class="glyphicon glyphicon-user"></span>{{ isset($name) ? $name : 'Registrarse' }}</a></li>
<span class="glyphicon glyphicon-user"></span> {{ isset($name) ? $name : 'Registrarse' }}</a></li>
<li><a href="{{ url('login') }}"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
</ul>
</div>
</nav>


{{ Form::open(array('url' => 'api/user/login', 'method' => 'POST'), array('role' => 'form')) }}
<div class="row">
<div class="form-group col-md-offset-3 col-md-4 ">
Expand Down Expand Up @@ -124,5 +136,4 @@
</div>



@endsection
54 changes: 54 additions & 0 deletions resources/views/PaginasWeb/registroServicio.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@extends('layouts.app')

@section('title', 'Registrar tu Servicio')

@section('content')

<nav class="navbar navbar-inverse">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="#">TicoService</a>
</div>

<ul class="nav navbar-nav navbar-right">
<li><a href="{{ url('busqueda') }}"><span class="glyphicon glyphicon-home"></span> Inicio</a></li>
<li><a href="{{ url('registro') }}"><span class="glyphicon glyphicon-user"></span> Registarse</a></li>
</ul>
</div>
</nav>

{{ Form::open(array('url' => 'api/collaborator', 'method' => 'POST'), array('role' => 'form')) }}
<div class="row">
<div class="form-group col-md-offset-4 col-md-4 col-md-offset-4">
{{ Form::label('id_service', 'Servicio') }}
{{ Form::text('id_service', null, array('placeholder' => 'Introduce tu Servicio', 'class' => 'form-control')) }}
</div>
</div>

<div class="row">
<div class="form-group col-md-offset-4 col-md-4 col-md-offset-4">
{{ Form::label('description', 'Descripción') }}
{{ Form::textarea('description', null, array('placeholder' => 'Introduce tu Descripción', 'class' => 'form-control')) }}
</div>
</div>

<div class="row">
<div class="form-group col-md-offset-4 col-md-4 col-md-offset-4">
{{ Form::label('availability', 'Disponibilidad') }}
{{ Form::textarea('availability', null, array('placeholder' => 'Introduce tu Disponiblidad', 'class' => 'form-control')) }}
</div>
</div>

<div class="row">
<div class="form-group col-md-offset-4 col-md-4 col-md-offset-4">

@include('flash::message')

{{ Form::button('Publica mi Servicio', array('type' => 'submit', 'class' => 'btn btn-primary')) }}
</div>
</div>
{{ Form::close() }}



@endsection
6 changes: 5 additions & 1 deletion resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">

<!-- {!! Html::style(asset('public/css/paginaPrin.css')) !!} -->
<title>@yield('title')</title>
</head>
<body>

@yield('content')

<!-- <script src="{{ asset('js/app.js') }}"></script> -->

<script src="http://uguru-realestate-us-jun202013.businesscatalyst.com/3d-slider/sliderengine/jquery.js"></script>
<script src="http://uguru-realestate-us-jun202013.businesscatalyst.com/3d-slider/sliderengine/amazingslider.js"></script>
<script src="http://uguru-realestate-us-jun202013.businesscatalyst.com/3d-slider/sliderengine/initslider-1.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>

</body>
</html>
3 changes: 3 additions & 0 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
Route::get('/user/activation/{token}',
'UserController@userActivation');

Route::get('registroServicio', function(){
return view('PaginasWeb.registroServicio', ['token' => session('token')]);
});

Route::get('registro', function(){
return view('PaginasWeb.registro');
Expand Down