0.0.1.0

Primera Alfa . Sistema de Registro, Blinter Profile y CRUD de Proyectos

.gitattributes

@@ -1,2 +1,4 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+* text=auto
+*.css linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored

ChangeLog.md

@@ -31,6 +31,14 @@ Todos los cambios notables de este proyecto estan documentadas en este archivo.
 ### Added
 ### Removed
 
+## [0.0.1.0] - 2017-11-19
+### Changed
+- Optimizacion del Proyecto Merge con Larapami Testing Source
+
+### Fixed
+### Added
+### Removed
+
 ## [0.0.0.10] - 2017-11-18
 ### Changed
 - Datos personalizacion separados del Blinter Profile
@@ -51,14 +59,11 @@ Todos los cambios notables de este proyecto estan documentadas en este archivo.
 	DNI
 -- Tercera Fase: Asignacion de 1 punto de atributo a todos los Skills
 
-### Fixed
 ### Added
 - BlinterProfileController: Controlador encargado de asignar las variables blinter profile y completar datos del usuario
 - ProjectsController: Sistema para Crear, Leer, Actualizar, Eliminar - "CRUD"
 - Tabla Projects: Almacena y gestiona informacion de los proyectos
 
-### Removed
-
 ## [0.0.0.9] - 2017-11-16
 ### Fixed
 - Formulario de Registro

README.md

@@ -8,17 +8,17 @@
 <h4 align="center">Plataforma de Administracion de Medios Inteligentes</h4>
 <p align="center">
   <a href="https://github.com/ViElectronicEntertainment/PAMI/releases">
-    <img src="https://img.shields.io/badge/Version-0.0.0.9-yellow.svg?style=for-the-badge" alt="Version"></a>
-    <a href="https://github.com/ViElectronicEntertainment/PAMI/issues">
-    <img src="https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/bt345.svg?style=for-the-badge" alt="build status"></a>
-    <a href="https://facebook.com/BlinterUniverse/">
-    <img src="https://img.shields.io/badge/Facebook-Like-blue.svg?style=for-the-badge" alt="last deployed"></a>
-    <a href="https://discord.gg/34DYauN">
-      <img src="https://img.shields.io/badge/Discord-Chat-blue.svg?style=for-the-badge" alt="Chatea con nosotros!"></a>
-    <a href="https://twitter.com/BlinterUniverse">
-      <img src="https://img.shields.io/badge/Twitter-Seguir-blue.svg?style=for-the-badge" alt="Siguenos en Twitter"></a>
-      <a href="https://www.youtube.com/channel/UCji0rxIuB2g9P6c1xCF9FZQ">
-        <img src="https://img.shields.io/badge/YouTube-Ver-red.svg?style=for-the-badge" alt="Miranos en Youtube"></a>
+  <img src="https://img.shields.io/badge/Version-0.0.0.9-yellow.svg?style=for-the-badge" alt="Version"></a>
+  <a href="https://github.com/ViElectronicEntertainment/PAMI/issues">
+  <img src="https://img.shields.io/badge/buildstatus-production-yellow.svg?style=for-the-badge" alt="build status"></a>
+  <a href="https://facebook.com/BlinterUniverse/">
+  <img src="https://img.shields.io/badge/Facebook-Like-blue.svg?style=for-the-badge" alt="last deployed"></a>
+  <a href="https://discord.gg/34DYauN">
+  <img src="https://img.shields.io/badge/Discord-Chat-blue.svg?style=for-the-badge" alt="Chatea con nosotros!"></a>
+  <a href="https://twitter.com/BlinterUniverse">
+  <img src="https://img.shields.io/badge/Twitter-Seguir-blue.svg?style=for-the-badge" alt="Siguenos en Twitter"></a>
+  <a href="https://www.youtube.com/channel/UCji0rxIuB2g9P6c1xCF9FZQ">
+  <img src="https://img.shields.io/badge/YouTube-Ver-red.svg?style=for-the-badge" alt="Miranos en Youtube"></a>
 </p>
 
 ---

app/Console/Kernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console;
+namespace pami\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Exceptions/Handler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exceptions;
+namespace pami\Exceptions;
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace pami\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use pami\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 class ForgotPasswordController extends Controller

app/Http/Controllers/Auth/LoginController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace pami\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use pami\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller

app/Http/Controllers/Auth/RegisterController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace pami\Http\Controllers\Auth;
 
-use App\User;
-use App\Http\Controllers\Controller;
+use pami\User;
+use pami\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
@@ -19,7 +19,9 @@ class RegisterController extends Controller
     | provide this functionality without requiring any additional code.
     |
     */
+
     use RegistersUsers;
+
     /**
      * Where to redirect users after registration.
      *
@@ -46,21 +48,24 @@ public function __construct()
     protected function validator(array $data)
     {
         return Validator::make($data, [
+            'name' => 'required|string|max:255',
             'email' => 'required|string|email|max:255|unique:users',
             'password' => 'required|string|min:6|confirmed',
         ]);
     }
+
     /**
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \pami\User
      */
     protected function create(array $data)
     {
         return User::create([
+            'name' => $data['name'],
             'email' => $data['email'],
             'password' => bcrypt($data['password']),
         ]);
     }
-}
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace pami\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use pami\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller

app/Http/Controllers/Controller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace pami\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;

app/Http/Controllers/HomeController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace pami\Http\Controllers;
 
 use Illuminate\Http\Request;
 

app/Http/Controllers/ProductController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace pami\Http\Controllers;
+use pami\Product;
+use Illuminate\Http\Request;
+
+class ProductController extends Controller
+{
+    public function index(){
+    	$products = Product::orderBy('id', 'ASC')->paginate();
+    	return view ('products.index', compact('products'));
+    }
+
+    public function create(){
+        return view ('products.create');
+    }
+
+    public function edit($id){
+        $product = Product::find($id);
+        return view('products.edit', compact('product'));
+    }
+
+    public function show($id){
+    	$product = Product::find($id);
+    	return view('products.show', compact('product'));
+    }
+
+    public function destroy($id){
+    	$product = Product::find($id);
+    	$product ->delete();
+    	return back()->with('info','El producto fue eliminado');
+    }
+}

app/Http/Kernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http;
+namespace pami\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -16,9 +16,9 @@ class Kernel extends HttpKernel
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        \pami\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
+        \pami\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -28,12 +28,12 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \pami\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            \pami\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -55,7 +55,7 @@ class Kernel extends HttpKernel
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => \pami\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
     ];
 }

app/Http/Middleware/EncryptCookies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace pami\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace pami\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Http/Middleware/TrimStrings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace pami\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
 

app/Http/Middleware/TrustProxies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace pami\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace pami\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
 

app/Product.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace pami;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Product extends Model
+{
+    protected $fillable = [
+        'name', 'short', 'body',
+    ];
+}

app/Providers/AppServiceProvider.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Providers;
+namespace pami\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
+
 class AppServiceProvider extends ServiceProvider
 {
     /**

app/Providers/AuthServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace pami\Providers;
 
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        'pami\Model' => 'pami\Policies\ModelPolicy',
     ];
 
     /**

app/Providers/BroadcastServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace pami\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;

app/Providers/EventServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace pami\Providers;
 
 use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        'pami\Events\Event' => [
+            'pami\Listeners\EventListener',
         ],
     ];
 

app/Providers/RouteServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace pami\Providers;
 
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -14,7 +14,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $namespace = 'App\Http\Controllers';
+    protected $namespace = 'pami\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.