Skip to content

Commit

Permalink
acomodando sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
@gibmyx
gibmyx committed Mar 22, 2020
1 parent 3331e4e commit 4884393
Show file tree
Hide file tree
Showing 15 changed files with 109 additions and 177 deletions.
78 changes: 6 additions & 72 deletions app/Http/Controllers/proyectosController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,15 @@

class proyectosController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()

public function ver_proyecto($id)
{
if(Auth::check()){
return view('ver_proyecto');
}else{
return redirect('/');
}
return view('ver_proyecto', compact('id'));
}

public function miembros()
public function miembros($id)
{
if(Auth::check()){
return view('miembros');
}else{
return redirect('/');
}
return view('miembros', compact('id'));
}


Expand Down Expand Up @@ -62,23 +50,14 @@ public function ajax_get_proyecto(Request $request)
return response()->json($response, 200);
}

/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create(Request $request)
{
//..
}

/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function ajax_crear_proyecto(Request $request)
{
$user = Auth::user();
$params = $request->post();
Expand All @@ -94,49 +73,4 @@ public function store(Request $request)
];
return response()->json($response, 200);
}

/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}

/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}
8 changes: 4 additions & 4 deletions resources/js/modulos/correo/components/sidebar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
<div class="profile-element profile">
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'hombre'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-hombre-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'mujer'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-mujer-default.jpg"/>
<a data-toggle="dropdown" class="dropdown-toggle" :href="'dashboard?user_id='+data.user_id">
<a data-toggle="dropdown" class="dropdown-toggle" :href="'/dashboard/'+data.user_id">
<span class="block m-t-xs font-bold">{{data.nombre}} {{data.apellido}}</span>
<span class="text-muted text-xs block">Programador BackEnd</span>
</a>
</div>
</li>

<li>
<a href="home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
<a href="/home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
</li>

<li>
<a :href="'dashboard?user_id='+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
<a :href="'/dashboard/'+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
</li>

<li class="active">
<a href="correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
<a href="/correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
</li>
<li>
<a href="#"><i class="fa fa-flask"></i> <span class="nav-label">Widgets</span></a>
Expand Down
26 changes: 13 additions & 13 deletions resources/js/modulos/dashboard/components/contenedor.vue
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div>
<div class="row border-bottom white-bg dashboard-header">

<div class="col-md-4">
<h2>Dashboard</h2>
</div>
Expand Down Expand Up @@ -67,7 +67,7 @@
<div class="col-md-6">

<div class="profile-image">
<img src="img/a4.jpg" class="rounded-circle circle-border m-b-md" alt="profile">
<img src="/img/a4.jpg" class="rounded-circle circle-border m-b-md" alt="profile">
</div>
<div class="profile-info">
<div class="">
Expand Down Expand Up @@ -124,16 +124,16 @@
anything embarrassing
</p>
<div class="user-friends">
<a href="#"><img alt="image" class="rounded-circle" src="img/a3.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a1.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a2.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a4.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a5.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a6.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a7.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a8.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a2.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="img/a1.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a3.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a1.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a2.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a4.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a5.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a6.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a7.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a8.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a2.jpg"></a>
<a href="#"><img alt="image" class="rounded-circle" src="/img/a1.jpg"></a>
</div>
</div>
</div>
Expand Down Expand Up @@ -272,4 +272,4 @@ export default {
</script>
<style>
</style>
</style>
12 changes: 6 additions & 6 deletions resources/js/modulos/dashboard/components/sidebar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<ul class="nav metismenu" id="side-menu">
<li class="nav-header">
<div class="profile-element profile">
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'hombre'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-hombre-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'mujer'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-mujer-default.jpg"/>
<a data-toggle="dropdown" class="dropdown-toggle" :href="'dashboard?user_id='+data.user_id">
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'hombre'" height="60px" width="60px" alt="image" class="rounded-circle" src="/img/profile/perfil-hombre-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'mujer'" height="60px" width="60px" alt="image" class="rounded-circle" src="/img/profile/perfil-mujer-default.jpg"/>
<a data-toggle="dropdown" class="dropdown-toggle" :href="'/dashboard/'+data.user_id">
<span class="block m-t-xs font-bold">{{data.nombre}} {{data.apellido}}</span>
<span class="text-muted text-xs block">Programador BackEnd</span>
</a>
</div>
</li>

<li>
<a href="home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
<a href="/home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
</li>

<li class="active">
<a :href="'dashboard?user_id='+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
<a :href="'/dashboard/'+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
</li>

<li>
<a href="correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
<a href="/correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
</li>
<li>
<a href="#"><i class="fa fa-flask"></i> <span class="nav-label">Widgets</span></a>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/modulos/home/components/proyecto.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span class="label label-primary">{{o.estado}}</span>
</td>
<td class="project-title">
<a :href="'/proyecto?proyecto_id='+this.o.id">{{o.nombre}}</a>
<a :href="'/proyecto/'+this.o.id">{{o.nombre}}</a>
<br/>
<small>{{o.fecha}}</small>
</td>
Expand All @@ -21,7 +21,7 @@
</div>
</td>
<td class="project-people">
<a :href="'/proyecto?id='+this.o.id" class="btn btn-white btn-sm"><i class="fa fa-folder"></i> View </a>
<a :href="'/proyecto/'+this.o.id" class="btn btn-white btn-sm"><i class="fa fa-folder"></i> View </a>
</td>
<td class="project-actions dropdownAutomovilEspc" v-if="o.user_id == data.user_id" >
<a href="#" @click.prevent="DespDropCreador" class="btn btn-white btn-sm dropdown-toggle btn-default btn-block"><i class="fa fa-pencil"></i> Edit </a>
Expand Down
10 changes: 5 additions & 5 deletions resources/js/modulos/home/components/sidebar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<ul class="nav metismenu" id="side-menu">
<li class="nav-header">
<div class="profile-element profile">
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'hombre'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-hombre-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'mujer'" height="60px" width="60px" alt="image" class="rounded-circle" src="img/profile/perfil-mujer-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'hombre'" height="60px" width="60px" alt="image" class="rounded-circle" src="/img/profile/perfil-hombre-default.jpg"/>
<img v-show="data.profile =='defaultProfile.jpg' && data.sex == 'mujer'" height="60px" width="60px" alt="image" class="rounded-circle" src="/img/profile/perfil-mujer-default.jpg"/>
<a data-toggle="dropdown" class="dropdown-toggle" :href="'dashboard?user_id='+data.user_id">
<span class="block m-t-xs font-bold">{{data.nombre}} {{data.apellido}}</span>
<span class="text-muted text-xs block">Programador BackEnd</span>
Expand All @@ -14,15 +14,15 @@
</li>

<li class="active">
<a href="home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
<a href="/home"><i class="fa fa-diamond"></i> <span class="nav-label">Proyectos</span></a>
</li>

<li>
<a :href="'dashboard?user_id='+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
<a :href="'/dashboard/'+data.user_id"><i class="fa fa-diamond"></i> <span class="nav-label">Perfil</span></a>
</li>

<li>
<a href="correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
<a href="/correo"><i class="fa fa-pie-chart"></i> <span class="nav-label">Correo</span> </a>
</li>
<li>
<a href="#"><i class="fa fa-flask"></i> <span class="nav-label">Widgets</span></a>
Expand Down
6 changes: 3 additions & 3 deletions resources/js/modulos/home/modal/nuevoproyecto.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ import toastr from 'toastr';
guardar() {
return new Promise((resolve) => {
let formData = new FormData();
formData.append("nombre", this.nombre);
formData.append("descripcion", this.descripcion);
formData.append("cantidad_personas", this.cantidad_personas)
this.hide();
axios.post('proyecto/store',formData ).then((response) => {
axios.post('proyecto/ajax_crear_proyecto',formData ).then((response) => {
toastr.success("Se a creado el proyecto");
this.nombre = '';
this.cantidad_personas = '';
Expand All @@ -112,4 +112,4 @@ import toastr from 'toastr';
.select2-container--open {
z-index: 999999 !important;
}
</style>
</style>
5 changes: 3 additions & 2 deletions resources/js/modulos/miembros/components/home.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div id="wrapper">
<sidebar :data="data"></sidebar>
<sidebar :data="data" :proyecto_id="proyecto_id"></sidebar>
<div id="page-wrapper" class="gray-bg dashbard-1">
<navbar></navbar>
<contenedor></contenedor>
Expand All @@ -14,7 +14,8 @@
import contenedor from "./contenedor";
export default {
data:function(){
props: ['proyecto_id'],
data(){
return {
data: {
nombre: '',
Expand Down
Loading

0 comments on commit 4884393

Please sign in to comment.