14 Commits

Author SHA1 Message Date
67d7e34baa Adding: help file translation to PTB
The help file is now translated into PTB
2018-09-28 02:09:00 -03:00
b7002e1d05 Adding translation of product page
The news/product/*.blade.php files are translated into PTB.
2018-09-28 01:54:51 -03:00
f6ab437889 Added PTB Translation of emails and some pages
Now the main page, item page and e-mails are translated
into Brazilian Portuguese
2018-09-27 20:13:14 -03:00
9a66b65f38 Starting to add localization into PTB 2018-09-26 23:06:38 -03:00
b49ec06062 Creating a readme.md file
The first readme.md was just some annotations to myself.
Now I created a first draft of a readme.md.
2018-09-22 16:07:49 -03:00
4764b74415 Removing start_vagrant.sh from git 2018-09-22 15:50:50 -03:00
a3e9abbd4c Improving email contents
On email body, it usually appeared as the button to the website
would take directly an action, so the text was changed to make
sure the user will understand he is only going to access
the website.
2018-09-22 15:47:24 -03:00
0cd807169e Groups HOME itesm by Product 2018-09-21 00:45:06 -03:00
d87d4ba4bf Fixing home alignment when person name is too big 2018-09-21 00:05:57 -03:00
61b54ecdd8 Changing home layout from FLOAT to GRID 2018-09-20 20:37:21 -03:00
b99f6a5b68 Including FlashMessage Model 2018-09-20 00:18:30 -03:00
1f23753f70 Invalid product now redirect to Products.index page 2018-09-19 21:12:48 -03:00
1fd78fe94a Including messages on registering and invalid product 2018-09-19 21:07:40 -03:00
0bcefb43e6 Product/index view is now only allowed to Verified users 2018-09-19 20:41:36 -03:00
51 changed files with 899 additions and 228 deletions

1
.gitignore vendored
View File

@@ -14,4 +14,5 @@ yarn-error.log
.phpunit.result.cache
mergeAndDeploy.sh
start_vagrant.sh
stop_vagrant.sh
ssh_homestead.sh

11
app/FlashMessage.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class FlashMessage extends Model
{
const PRIMARY = 'primary';
const DANGER = 'danger';
}

View File

@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
use App\FlashMessage;
class RegisterController extends Controller
{
@@ -72,6 +73,8 @@ class RegisterController extends Controller
\Mail::to($user)->send(new Welcome($user));
session()->flash(FlashMessage::PRIMARY, __('Thanks for registering. Please, do not forget to validate your e-mail address.'));
return $user;
}
}

View File

@@ -25,7 +25,7 @@ class VerificationController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/';
/**
* Create a new controller instance.

View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use \App\User;
use Illuminate\Http\Request;
class HomeController extends Controller
{
@@ -19,10 +18,10 @@ class HomeController extends Controller
/**
* Get a name from a specific id in a array
*
*
* @param array $array The array of objects with ID and Names
* @param int $id The ID of the user
*
*
* @return string The username of the specified id
*/
protected function findName($array, $id)
@@ -34,6 +33,19 @@ class HomeController extends Controller
}
}
/**
* Check if the user_id alreay exists on $users array.
*
* @param array $users The array with users
* @param int $user_id The user_id to try to find on array
*
* @return boolean
*/
public function isNewUser($users, $user_id)
{
return ($user_id && !isset($users[$user_id]));
}
/**
* Show the application dashboard.
*
@@ -45,14 +57,16 @@ class HomeController extends Controller
$items = User::loggedIn()->items()->with('users')->get();
foreach ($items as $item) {
if ($item->used_by && !isset($users[$item->used_by])) {
if ($this->isNewUser($users, $item->used_by)) {
$users[$item->used_by] = $this->findName($item->users, $item->used_by);
}
if ($item->waiting_user_id && !isset($users[$item->waiting_user_id])) {
if ($this->isNewUser($users, $item->waiting_user_id)) {
$users[$item->waiting_user_id] = $this->findName($item->users, $item->waiting_user_id);
}
}
return view('home', compact('items', 'users'));
$products = $items->sortBy('product.name', SORT_NATURAL | SORT_FLAG_CASE)->groupBy('product.name');
return view('home', compact('products', 'users'));
}
}

View File

@@ -5,13 +5,21 @@ namespace App\Http\Controllers;
use \App\Item;
use \App\User;
use Illuminate\Http\Request;
use App\FlashMessage as flash;
class ItemController extends Controller
{
public function show($id)
{
$item = Item::find($id);
if (!$item || $item->product->user_id != \Auth::id()) return back();
if (!$item || $item->product->user_id != \Auth::id()) {
session()->flash(flash::DANGER,
\Lang::getFromJson(
"The item doesn't exist."
)
);
return back();
}
$users = $item->users()->get();
$otherItems = Item::where([['product_id', $item->product_id], ['id', '!=', $id]])->get();
@@ -28,7 +36,7 @@ class ItemController extends Controller
* Stores the included item into database
* As the items are included on the Product view,
* it must return to there after inclusion
*
*
* @return (view) The product view
*/
public function store(Request $request)
@@ -43,7 +51,7 @@ class ItemController extends Controller
$authUser = User::loggedIn();
$authUser->items()->create(['name' => request('item'), 'product_id' => request('product_id')]);
return redirect('product/'.request('product_id'));
return redirect('product/' . request('product_id'));
}
public function patch(Request $request)
@@ -52,7 +60,7 @@ class ItemController extends Controller
$item = User::loggedIn()->items()->find(request('item'));
$item->name = request('name');
$item->save();
return redirect('item/'.request('item'));
return redirect('item/' . request('item'));
}
public function delete(Request $request)
@@ -65,4 +73,4 @@ class ItemController extends Controller
Item::deleteAndDetach($item);
return redirect('product/' . $product);
}
}
}

View File

@@ -6,6 +6,7 @@ use \App\Item;
use \App\User;
use \App\Product;
use Illuminate\Http\Request;
use App\FlashMessage as flash;
class ProductController extends Controller
{
@@ -17,7 +18,7 @@ class ProductController extends Controller
/**
* Stores the included product into database
*
*
* @return (view) The product view
*/
public function store(Request $request)
@@ -29,7 +30,7 @@ class ProductController extends Controller
/**
* Delete a specified Product
*
*
* @param (int) $id The product id
*/
public function delete(Request $request)
@@ -55,14 +56,14 @@ class ProductController extends Controller
$product->name = request('name');
$product->url = request('url');
$product->save();
return redirect('product/'.request('product'));
return redirect('product/' . request('product'));
}
/**
* Show a specified Product
*
*
* @param (int) $id The product id
*
*
* @return \Illuminate\Http\Response
*/
public function show($id)
@@ -70,8 +71,13 @@ class ProductController extends Controller
$product = Product::fromAuthUser()->find($id);
if (!$product) {
return back();
session()->flash(
flash::DANGER,
\Lang::getFromJson(
"The product doesn't exist or doesn't belongs to you."
)
);
return redirect('/product');
}
return view('product.show', compact('product'));
}

View File

@@ -13,7 +13,11 @@ class TakeController extends Controller
{
$item = User::loggedIn()->items()->find(request('item'));
if ($item->used_by) {
return back()->withErrors("This item is already taken");
return back()->withErrors(
\Lang::getFromJson(
"This item is already taken"
)
);
}
$item->used_by = \Auth::id();
$item->save();

View File

@@ -42,14 +42,22 @@ class UserController extends Controller
$userArray = User::where('email', request('email'))->get();
if (count($userArray) == 0) {
return back()->withErrors("The e-mail address is not registered yet.");
return back()->withErrors(
\Lang::getFromJson("The e-mail address is not registered yet.")
);
}
$item = Item::findOrFail(request('item_id'));
if ($item->product->user_id == \Auth::id()) {
User::findOrFail($userArray[0]->id)->items()->syncWithoutDetaching([request('item_id')]);
User::findOrFail($userArray[0]->id)
->items()
->syncWithoutDetaching([request('item_id')]);
} else {
return back()->withErrors("You cannot add a user to a product that is not yourse.");
return back()->withErrors(
\Lang::getFromJson(
"You cannot add a user to a product that is not yourse."
)
);
}
return back();
}
@@ -67,12 +75,20 @@ class UserController extends Controller
$item = Item::findOrFail(request('item_id'));
if ($item->product->user_id == \Auth::id()) {
$returnItem = User::findOrFail(request('user_id'))->items()->findOrFail(request('item_id'));
$returnItem = User::findOrFail(request('user_id'))
->items()
->findOrFail(request('item_id'));
$returnItem->used_by = null;
$returnItem->save();
User::findOrFail(request('user_id'))->items()->detach([request('item_id')]);
User::findOrFail(request('user_id'))
->items()
->detach([request('item_id')]);
} else {
return back()->withErrors("You cannot remove a user from a product that is not yourse.");
return back()->withErrors(
\Lang::getFromJson(
"You cannot remove a user from a product that is not yourse."
)
);
}
return back();
}

View File

@@ -35,6 +35,7 @@ class Kernel extends HttpKernel
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\Locale::class,
],
'api' => [

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Http\Middleware;
use Closure;
class Locale
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
\App::setLocale(session('lang'));
return $next($request);
}
}

View File

@@ -32,7 +32,11 @@ class ItemAvailable extends Mailable
*/
public function build()
{
return $this->subject($this->item->name . ' is available!')
->markdown('emails.itemAvailable');
return $this->subject(
\Lang::getFromJson(
':itemname is available!',
['itemname' => $this->item->name]
)
)->markdown('emails.itemAvailable');
}
}

View File

@@ -34,7 +34,14 @@ class UserWaiting extends Mailable
*/
public function build()
{
return $this->subject($this->waitingUser . ' wants to use ' . $this->item->name)
->markdown('emails.userWaiting');
return $this->subject(
\Lang::getFromJson(
':waitinguser wants to use :itemname',
[
'waitinguser' => $this->waitingUser,
'itemname' => $this->item->name
]
)
)->markdown('emails.userWaiting');
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Mail;
use \Lang;
use \App\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
@@ -30,6 +31,6 @@ class Welcome extends Mailable
*/
public function build()
{
return $this->markdown('emails.welcome');
return $this->subject(Lang::getFromJson('Welcome'))->markdown('emails.welcome');
}
}

View File

@@ -1,16 +1,7 @@
# Share It
Cada usuário, identificado por e-mail, pode ter outros amigos
Just a simple tool to share items with friends.
## DB
It is my first try with Laravel, so I am just learning it. :)
[x] usuário(nome, email)
[x] product[site/software](nome, admin)
[ ] usersPerItem(productID, userID)
[x] item[licença](nome, productID, used_by, usedSince)
[ ] waiting(userID, itemID, waitingSince)
## VIEWS
- Product (administration)
- Item (view itens, other itens from the same product if this one is occupied)
More information about **Share It** [here](https://shareit.brunofontes.net/help).

View File

@@ -0,0 +1,67 @@
<?php
/**
* Strings from the Help page
* They are separeted by help group
*/
return [
'helpTitle' => 'Help...',
/**
* What is it?
*/
'whatIsIt' => 'What is it?',
'siteHelpOthers' => '<p><strong>Share&nbsp;It!</strong> is a site dedicated to help you sharing items with others.</p>
<p>But before sharing anything, you just need to understand 2 basic ideas:</p>',
'product_item' => '<li><strong>Product</strong> - The category that has some similar items</li>
<li><strong>Item</strong> - The item that will be shared. Every item belongs to a <strong>Product</strong></li>',
'examples' => "<strong><em>Examples:</em></strong> You can create the following Categories/Items</p>
<p>
<ul>
<li>Books -> Don Quixote, The Hitchhiker's Guide to the Galaxy</li>
<li>Matrix Movies -> Matrix 1, Matrix 2, Matrix 3</li>
<li>Website Y -> <em>YourAccount</em>*</li>
</ul>
<p><em>* Please note that many websites does not allow sharing your account. Read the site EULA before include it here.</em></p>",
/**
* Step-by-step
*/
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
/**
* Screens
*/
'' => '',
/**
* Home
*/
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
/**
* Products
*/
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
];

View File

@@ -0,0 +1,12 @@
<?php
// /resources/views/home.blade.php
return [
'no_messages' => 'There are no items shared with you yet.',
'share_item' => 'Share an item!',
'return' => 'Return It',
'cancel_alert' => 'Cancel Alert',
'alert_me' => 'Alert me',
'take' => 'Take It'
];

View File

@@ -0,0 +1,40 @@
<?php
return [
/**
* Strings from Item Delete button menu
*/
'confirmation' => 'Confirmation...',
'confirmDeletion' => 'Would you like to delete the item <strong>:itemname</strong>?',
'notAbleRestore' => 'You will not be able to restore it after deletion.',
'close' => 'Close',
'delete' => 'Delete',
/**
* Strings from Item Edit button menu
*/
'edit' => 'Edit',
'edititem' => 'Edit item',
'newname' => 'New name:',
/**
* Strings from the Users box on Item page
*/
'users' => 'Users:',
'noItems' => 'There are no items yet. Include one with the form above.',
'addUser' => 'Add user',
'email' => 'E-mail: ',
'nameDomain' => 'name@domain.com',
'insert' => 'Insert',
/**
* String from otherItems.blade.php - Other items box from item page
*/
'otherItems' => 'Other items from the same product',
/**
* String from item.blade.php
*/
'back' => 'BACK',
];

View File

@@ -0,0 +1,63 @@
<?php
/**
* Strings from the product pages
* They are separeted by the file that calls them.
* Sometimes, a string is used on another file,
* so it will stay at the common segment.
*/
return [
/**
* COMMON
*/
'insert' => 'Insert',
'close' => 'Close',
'' => '',
'' => '',
/**
* addItemForm.blade.php
*/
'item' => 'Item:',
'100yearsSolitude' => 'One Hundred Years of Solitude',
/**
* addProductForm.blade.php
*/
'name' => 'Name:',
'book' => 'Book',
'url' => 'URL:',
'optionalUrlExample' => '(Optional) http://bookwebsite.com',
/**
* deleteButton.blade.php
*/
'delete' => 'Delete',
'confirmation' => 'Confirmation...',
'wannaDelete' => "Would you like to delete the product <strong>:productname</strong> and it's items?",
'notAbleRestore' => 'You will not be able to restore it after deletion.',
/**
* editButton.blade.php
*/
'edit' => 'Edit',
'editProduct' => 'Edit product',
'newName' => 'New name:',
'newUrl' => 'New url:',
/**
* index.blade.php
*/
'products' => 'Products',
'noProductsYet' => 'There are no products yet. Include one with the form above.',
'addProduct' => 'Add product',
'yourItems' => 'Your items',
/**
* show.blade.php
*/
'items' => 'Items:',
'noItemsYet' => 'There are no items yet. Include one with the form above.',
'addItem' => 'Add item',
'back' => 'BACK',
];

View File

@@ -0,0 +1,10 @@
<?php
return [
'Home' => 'Home',
'Login' => 'Login',
'Register' => 'Register',
'Products' => 'Products',
'Help' => 'Help',
'copyright' => '© 2018 Bruno Fontes All Rights Reserved',
'byAuthor' => 'By Bruno Fontes',
];

50
resources/lang/pt-br.json Normal file
View File

@@ -0,0 +1,50 @@
{
"Reset Password": "Redefinir senha",
"E-Mail Address" : "E-mail",
"Send Password Reset Link" : "Redefinir senha",
"Password" : "Senha",
"Confirm Password" : "Confirmar senha",
"Login" : "Entrar",
"Remember Me" : "Manter conectado",
"Forgot Your Password?" : "Esqueceu sua senha?",
"Register" : "Cadastrar",
"Name" : "Nome",
"Logout" : "Desconectar",
"Verify Your Email Address" : "Confirme seu e-mail",
"A fresh verification link has been sent to your email address." : "Enviamos outro link de confirmação para o seu e-mail.",
"Before proceeding, please check your email for a verification link." : "Antes de continuar, use o link de confirmação que enviamos para o seu e-mail.",
"If you did not receive the email" : "Se você não recebeu o e-mail",
"click here to request another" : "clique aqui para enviar novamente",
"Thanks for registering. Please, do not forget to validate your e-mail address." : "Obrigado por se cadastrar. Não esqueça de validar seu e-mail.",
"Welcome": "Bem-vindo!",
"Welcome, :username,": "Bem-vindo, :username,",
"Thank's for registering at **Share It!**" : "Obrigado por se registrar no **Share It!**",
"Your account was created, but you still need to activate it. We've sent you another e-mail and we are ready to go!" : "Sua conta foi criada, mas você ainda precisa confirmar o seu e-mail para usá-la. Enviamos um outro e-mail com a confirmação.",
"And you? Are you ready to Share It with your friends?" : "E você? Está pronto para compartilhar?",
":waitinguser wants to use :itemname": ":waitinguser quer usar :itemname",
"Hello!": "Olá!",
"Verify Email Address" : "Confirme o seu e-mail",
"Please click the button below to verify your email address." : "Clique no botão abaixo para confirmar o seu e-mail.",
"If you did not create an account, no further action is required." : "Se você não criou uma conta, basta ignorar este e-mail.",
"Regards": "Obrigado",
":itemname is available!": ":itemname está disponível!",
"Hi, :username,": "Olá, :username,",
"Good news: :itemname is available!": "Uma boa notícia: :itemname está disponível!",
"The item <em>:itemname (:productname)</em> is now available on **Share&nbsp;It**.": "O item <em>:itemname (:productname)</em> já está disponível no **Share&nbsp;It**.",
"**Take It** before anyone else at the website:": "Entre no nosso site para usar o item antes de todo mundo.",
"Are you still using :itemname?": "Você ainda está usando o item :itemname?",
"We just want to let you know that :waitinguser asked us to be alerted when this item were available.": "A gente apenas queria dizer que :waitinguser nos pediu para avisar quando esse item estivesse disponível.",
"So, if you are not using it anymore, please **Return It** at the website:": "Então, se você não estiver mais usando, por favor, **Devolva** no nosso site:",
"The e-mail address is not registered yet.": "Esse usuário ainda não está cadastrado.",
"You cannot add a user to a product that is not yourse.": "Você não pode adicionar um usuário a um produto que não é seu.",
"You cannot remove a user from a product that is not yourse.": "Você não pode remover um usuário de um produto que não é seu.",
"The item doesn't exist.": "O item não existe.",
"The product doesn't exist or doesn't belongs to you.": "O produto não existe ou não é seu.",
"This item is already taken": "Esse item já está sendo usado"
}

View File

@@ -0,0 +1,19 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Authentication Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used during authentication for various
| messages that we need to display to the user. You are free to modify
| these language lines according to your application's requirements.
|
*/
'failed' => 'Login ou senha inválidos.',
'throttle' => 'Limite tentativas excedido. Você pode tentar novamente após :seconds segundos.',
];

View File

@@ -0,0 +1,12 @@
<?php
// /resources/views/home.blade.php
return [
'no_messages' => 'Ainda não há itens compartilhados com você.',
'share_item' => 'Compartilhe um item!',
'return' => 'Devolver',
'cancel_alert' => 'Cancelar alerta',
'alert_me' => 'Alertar',
'take' => 'Usar'
];

View File

@@ -0,0 +1,39 @@
<?php
return [
/**
* Strings from Item Delete button menu
*/
'confirmation' => 'Confirmação...',
'confirmDeletion' => 'Você gostaria de apagar o item <strong>:itemname</strong>?',
'notAbleRestore' => 'Não será possível restaurá-lo posteriormente.',
'close' => 'Fechar',
'delete' => 'Apagar',
/**
* Strings from Item Edit button menu
*/
'edit' => 'Editar',
'edititem' => 'Editar item',
'newname' => 'Novo nome:',
/**
* Strings from the Users box on Item page
*/
'users' => 'Usuários:',
'noItems' => 'Não há itens cadastrados. Adicione um no formulário acima.',
'addUser' => 'Adicionar usuário',
'email' => 'E-mail: ',
'nameDomain' => 'nome@dominio.com.br',
'insert' => 'Inserir',
/**
* String from otherItems.blade.php - Other items box from item page
*/
'otherItems' => 'Outros items do mesmo produto',
/**
* String from item.blade.php
*/
'back' => 'VOLTAR',
];

View File

@@ -0,0 +1,19 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Pagination Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used by the paginator library to build
| the simple pagination links. You are free to change them to anything
| you want to customize your views to better match your application.
|
*/
'previous' => '« Anterior',
'next' => 'Próxima »',
];

View File

@@ -0,0 +1,22 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Password Reset Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are the default lines which match reasons
| that are given by the password broker for a password update attempt
| has failed, such as for an invalid token or invalid new password.
|
*/
'password' => 'As senhas precisam ter pelo menos 6 caracteres e serem iguais a confirmação.',
'reset' => 'Sua senha foi redefinida!',
'sent' => 'O link para redefinir sua senha foi enviado por e-mail!',
'token' => 'O token de redefinição de senha é inválido.',
'user' => "Não foi possível encontrar um usuário com o e-mail digitado.",
];

View File

@@ -0,0 +1,61 @@
<?php
/**
* Strings from the product pages
* They are separeted by the file that calls them.
* Sometimes, a string is used on another file,
* so it will stay at the common segment.
*/
return [
/**
* COMMON
*/
'insert' => 'Inserir',
'close' => 'Fechar',
/**
* addItemForm.blade.php
*/
'item' => 'Item:',
'100yearsSolitude' => 'Cem anos de solidão',
/**
* addProductForm.blade.php
*/
'name' => 'Nome:',
'book' => 'Livro',
'url' => 'URL:',
'optionalUrlExample' => '(Opcional) http://sitedolivro.com.br',
/**
* deleteButton.blade.php
*/
'delete' => 'Apagar',
'confirmation' => 'Confirmação...',
'wannaDelete' => "Você gostaria de apagar o produto <strong>:productname</strong> e seus items?",
'notAbleRestore' => 'Não será possível recuperá-los depois.',
/**
* editButton.blade.php
*/
'edit' => 'Editar',
'editProduct' => 'Editar produto',
'newName' => 'Novo nome:',
'newUrl' => 'Nova url:',
/**
* index.blade.php
*/
'products' => 'Produtos',
'noProductsYet' => 'Ainda não há produtos cadastrados. Inclua um no formulário acima.',
'addProduct' => 'Incluir produto',
'yourItems' => 'Seus items',
/**
* show.blade.php
*/
'items' => 'Items:',
'noItemsYet' => 'Ainda não há itens cadastrados. Inclua um no formulário acima.',
'addItem' => 'Incluir item',
'back' => 'VOLTAR',
];

View File

@@ -0,0 +1,148 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.',
],
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'Os campos :attribute e confirmar :attribute são diferentes.',
'date' => 'The :attribute is not a valid date.',
'date_format' => 'The :attribute does not match the format :format.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
'gt' => [
'numeric' => 'The :attribute must be greater than :value.',
'file' => 'The :attribute must be greater than :value kilobytes.',
'string' => 'The :attribute must be greater than :value characters.',
'array' => 'The :attribute must have more than :value items.',
],
'gte' => [
'numeric' => 'The :attribute must be greater than or equal :value.',
'file' => 'The :attribute must be greater than or equal :value kilobytes.',
'string' => 'The :attribute must be greater than or equal :value characters.',
'array' => 'The :attribute must have :value items or more.',
],
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.',
'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.',
'lt' => [
'numeric' => 'The :attribute must be less than :value.',
'file' => 'The :attribute must be less than :value kilobytes.',
'string' => 'The :attribute must be less than :value characters.',
'array' => 'The :attribute must have less than :value items.',
],
'lte' => [
'numeric' => 'The :attribute must be less than or equal :value.',
'file' => 'The :attribute must be less than or equal :value kilobytes.',
'string' => 'The :attribute must be less than or equal :value characters.',
'array' => 'The :attribute must not have more than :value items.',
],
'max' => [
'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.',
],
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
'numeric' => 'O campo :attribute precisa ter pelo menos :min.',
'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'O campo :attribute precisa ter pelo menos :min caracteres.',
'array' => 'The :attribute must have at least :min items.',
],
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.',
'size' => [
'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
],
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute.rule" to name the lines. This makes it quick to
| specify a specific custom language line for a given attribute rule.
|
*/
'custom' => [
'attribute-name' => [
'rule-name' => 'custom-message',
],
],
/*
|--------------------------------------------------------------------------
| Custom Validation Attributes
|--------------------------------------------------------------------------
|
| The following language lines are used to swap attribute place-holders
| with something more reader friendly such as E-Mail Address instead
| of "email". This simply helps us make messages a little cleaner.
|
*/
'attributes' => [
'password' => 'senha'
],
];

View File

@@ -0,0 +1,10 @@
<?php
return [
'Home' => 'Início',
'Login' => 'Login',
'Register' => 'Cadastrar',
'Products' => 'Produtos',
'Help' => 'Ajuda',
'copyright' => '© 2018 Bruno Fontes Todos os direitos reservados',
'byAuthor' => 'Por Bruno Fontes',
];

View File

@@ -1,12 +1,18 @@
@component('mail::message')
Hi, {{$username}},
&nbsp;<br>
&nbsp;<br>
#Good news: {{$item->name}} is available!
&nbsp;<br>
The item <em>{{$item->name}} ({{$item->product->name}})</em> is now available on **Share&nbsp;It**.
&nbsp;<br>
&nbsp;<br>
<a href="https://shareit.brunofontes.net/home">Take it</a> before anyone else.
{!! __('Hi, :username,', ['username' => $username]) !!}
#{!! __('Good news: :itemname is available!', ['itemname' => $item->name]) !!}
{!! __('The item <em>:itemname (:productname)</em> is now available on **Share&nbsp;It**.', ['itemname' => $item->name, 'productname' => $item->product->name]) !!}
{!! __('**Take It** before anyone else at the website:') !!}
@component('mail::button', ['url' => 'https://shareit.brunofontes.net/home'])
{{ config('app.name') }}
@endcomponent
@endcomponent

View File

@@ -1,16 +1,20 @@
@component('mail::message')
Hello, {{$userWithItem}},
{!! __('Hi, :username,', ['username' => $userWithItem]) !!}
Are you still using {{$item->name}}?
We just want to let you know that {{$waitingUser}} asked us to be alerted when this item were available.
{!! __('Are you still using :itemname?', ['itemname' => $item->name]) !!}
{!! __('We just want to let you know that :waitinguser asked us to be alerted when this item were available.', ['waitinguser' => $waitingUser]) !!}
{!! __('So, if you are not using it anymore, please **Return It** at the website:') !!}
So, if you are not using it anymore, please go to our site and...
@component('mail::button', ['url' => 'https://shareit.brunofontes.net/home'])
Return it!
Share It!
@endcomponent
Thanks,<br>
{{ config('app.name') }}
@endcomponent
@endcomponent

View File

@@ -1,14 +1,17 @@
@component('mail::message')
# Welcome, {{$user->name}},
# @lang('Welcome, :username,', ['username' => $user->name])
Thank's for registering at **Share&nbsp;It!**
Your account was created and it is active. And you? Are you ready to Share It with your friends? :)
@lang("Thank's for registering at **Share It!**")
@lang("Your account was created, but you still need to activate it. We've sent you another e-mail and we are ready to go!")
@lang("And you? Are you ready to Share It with your friends?")
@component('mail::button', ['url' => 'https://shareit.brunofontes.net'])
Share it!
@endcomponent
Thanks,<br>
{{ config('app.name') }}
@endcomponent
@endcomponent

View File

@@ -4,26 +4,16 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="row"><h1>Help...</h1></div>
<div class="row"><h1>{!! __('help.helpTitle') !!}</h1></div>
<div class="card">
<div class="card-header"><strong>What is it?</strong></div>
<div class="card-header"><strong>{!! __('help.whatIsIt') !!}</strong></div>
<div class="card-body">
<p>
<strong>Share&nbsp;It!</strong> is a site dedicated to help you sharing items with others.
</p>
<p>But before sharing anything, you just need to understand 2 basic ideas:</p>
{!! __('help.siteHelpOthers') !!}
<p class="my-4"><ul>
<li><strong>Product</strong> - The category that has some similar items</li>
<li><strong>Item</strong> - The item that will be shared. Every item belongs to a <strong>Product</strong></li>
{!! __('help.product_item') !!}
</ul></p>
<p class="my-4"><strong><em>Examples:</em></strong> You can create the following Categories/Items</p>
<p>
<ul>
<li>Books -> Don Quixote, The Hitchhiker's Guide to the Galaxy</li>
<li>Matrix Movies -> Matrix 1, Matrix 2, Matrix 3</li>
<li>Website Y -> <em>YourAccount</em>*</li>
</ul>
<p><em>* Please note that many websites does not allow sharing your account. Read the site EULA before include it here.</em></p>
<p class="my-4">
{!! __('help.examples') !!}
</p>
</div>
</div>

View File

@@ -4,41 +4,41 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">Your items</div>
@forelse ($products as $items)
<div class="card mb-4">
<div class="card-header">{{$items->first()->product->name}}</div>
<div class="card-body">
@if (session('status'))
<div class="alert alert-success" role="alert">
{{ session('status') }}
</div>
@forelse ($items->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE) as $item)
@if (!$loop->first)
<hr class="m-3">
@endif
@forelse ($items as $item)
@if (!$loop->first)
<hr class="m-3">
@endif
<div class="my-4 p-2">
<div class="row align-items-center p-2">
<div class="col col-xs-auto">
@if ($item->product->url)
<a href="{{$item->product->url}}" class="link-unstyled" target="_blank" rel="noopener noreferrer">
@endif
<a href="{{$item->product->url}}" class="link-unstyled" target="_blank" rel="noopener noreferrer">
@endif
<strong>{{$item->name}}</strong> ({{$item->product->name}})
<strong>{{$item->name}}</strong>
@if ($item->product->url)
</a>
@endif
@if ($item->used_by)
@include('home.usedItem')
@else
@include('home.unusedItem')
@if ($item->product->url)
</a>
@endif
</div>
<div class="ml-auto align-self-end text-right">
@if ($item->used_by)
@include('home.usedItem')
@else
@include('home.unusedItem')
@endif
</div>
</div>
@empty
<p>There are no items shared with you yet. <a href="/product">Share an item!</a></p>
<p>@lang('home.no_messages')<a href="/product">@lang('home.share_item')</a></p>
@endforelse
</div>
</div>
@empty
@endforelse
</div>
</div>
</div>

View File

@@ -1,7 +1,5 @@
<span class="float-right">
<form action="/take" method="POST">
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn btn-sm btn-success">Take It</button>
</form>
</span>
<form action="/take" method="POST">
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn btn-sm btn-success">@lang('home.take')</button>
</form>

View File

@@ -1,35 +1,31 @@
@if ($item->used_by == \Auth::id())
<span class="float-right">
<form action="/take" method="POST">
{{ csrf_field() }}
@method('DELETE')
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn btn-sm btn-danger">Return It</button>
</form>
</span>
<span class="float-right mr-3"><em>{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em></span>
<form action="/take" method="POST" class="form-inline">
<em class="pr-sm-2 ml-auto">{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em>
<div class="w-100 d-xm-block d-sm-none"></div>
{{ csrf_field() }}
@method('DELETE')
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn btn-sm btn-danger ml-auto">@lang('home.return')</button>
</form>
@else
<span class="float-right">
<form action="/alert" method="POST">
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
@if ($item->waiting_user_id == \Auth::id())
@method('DELETE')
<button type="submit" class="btn btn-sm btn-outline-danger">Cancel Alert</button>
@elseif (!$item->waiting_user_id)
<button type="submit" class="btn btn-sm btn-outline-secondary">Alert me</button>
@endif
</form>
</span>
<span class="float-right mr-3">
<em>
{{str_limit($users[$item->used_by], 15, '...')}}
@if ($item->waiting_user_id && $item->waiting_user_id != \Auth::id())
<strong>> {{str_limit($users[$item->waiting_user_id], 15, '...')}}</strong>
@endif
<small>({{$item->updated_at->diffForHumans()}})</small>
</em>
</span>
<form action="/alert" method="POST" class="form-inline">
<em class="pr-sm-2 ml-auto">
{{str_limit($users[$item->used_by], 15, '...')}}
@if ($item->waiting_user_id && $item->waiting_user_id != \Auth::id())
<strong>> {{str_limit($users[$item->waiting_user_id], 15, '...')}}</strong>
@endif
<small>({{$item->updated_at->diffForHumans()}})</small>
</em>
<div class="w-100 d-xm-block d-sm-none"></div>
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
@if ($item->waiting_user_id == \Auth::id())
@method('DELETE')
<button type="submit" class="btn btn-sm btn-outline-danger ml-auto">@lang('home.cancel_alert')</button>
@elseif (!$item->waiting_user_id)
<button type="submit" class="btn btn-sm btn-outline-secondary ml-auto">@lang('home.alert_me')</button>
@endif
</form>
@endif

View File

@@ -29,7 +29,7 @@
@include ('item.otherItems')
<div class="float-right mt-2"><a class="btn btn-secondary" href="/product/{{ $item->product->id }}">BACK</a></div>
<div class="float-right mt-2"><a class="btn btn-secondary" href="/product/{{ $item->product->id }}">{{ __('item.back') }}</a></div>
</div>
</div>
</div>

View File

@@ -5,22 +5,22 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="deleteModalLabel">Confirmation...</h5>
<h5 class="modal-title" id="deleteModalLabel">{{ __('item.confirmation') }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Would you like to delete the item <strong>{{$item->name}}</strong>?</p>
<p>You will not be able to restore it after deletion.</p>
<p>{!! __('item.confirmDeletion', ['itemname' => $item->name]) !!}</p>
<p>{!! __('item.notAbleRestore') !!}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('item.close') }}</button>
<form action="/item/" method="POST">
@method('DELETE')
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn btn-danger">Delete</button>
<button type="submit" class="btn btn-danger">{{ __('item.delete') }}</button>
</form>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<button type="button" class="btn btn-sm btn-secondary mr-1" data-toggle="modal" data-target="#editModal">Edit</button>
<button type="button" class="btn btn-sm btn-secondary mr-1" data-toggle="modal" data-target="#editModal">{{ __('item.edit') }}</button>
<!-- MODAL - CHANGE WINDOW -->
<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="editModalLabel">Edit item</h5>
<h5 class="modal-title" id="editModalLabel">{{ __('item.edititem') }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
@@ -14,7 +14,7 @@
<form action="/item" method="POST">
<div class="modal-body">
<div class="form-group">
<label for="name" class="col-form-label">New name: </label>
<label for="name" class="col-form-label">{{ __('item.newname') }} </label>
<input type="text" name="name" id="name" class="form-control" value="{{$item->name}}">
</div>
</div>
@@ -22,8 +22,8 @@
@method('PATCH')
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-danger">Edit</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('item.close') }}</button>
<button type="submit" class="btn btn-danger">{{ __('item.edit') }}</button>
</div>
</form>

View File

@@ -1,6 +1,6 @@
<div class="card mt-4">
<div class="card-header">
Other items from the same product
{{ __('item.otherItems') }}
</div>
<div class="card-body">
@@ -10,7 +10,7 @@
<li><a href="/item/{{ $otherItem->id }}">{{ $otherItem->name }}</a></li>
@endif
@empty
<p>There are no items yet. Include one with the form above.</p>
<p>{{ __('item.noItems') }}</p>
@endforelse
</ul>
</div>

View File

@@ -1,4 +1,4 @@
<p><strong>Users:</strong></p>
<p><strong>{{ __('item.users') }}</strong></p>
@forelse ($users as $user)
@if (!$loop->first)
<hr>
@@ -14,27 +14,27 @@
@method('DELETE')
<input type="hidden" name="item_id" id="item_id" value="{{ $item['id'] }}">
<input type="hidden" class="form-control" name="user_id" id="user_id" value="{{$user->id}}">
<button type="submit" class="btn btn-sm btn-danger">Delete</button>
<button type="submit" class="btn btn-sm btn-danger">{{ __('item.delete') }}</button>
</div>
</div>
</div>
</form>
@empty
<p>There are no items yet. Include one with the form above.</p>
<p>{{ __('item.noItems') }}</p>
@endforelse
<!-- ADD USERS -->
<hr class="mt-5">
<p><strong>Add user</strong></p>
<p><strong>{{ __('item.addUser') }}</strong></p>
<form method="POST" action="/user">
<div class="container-fluid">
<div class="form-group row mt-2">
{{ csrf_field() }}
<div class="col-sm-2 col-lg-auto"><label for="name">E-mail: </label></div>
<div class="col-xs-12 col-sm mb-3"><input type="email" class="form-control" name="email" id="email" placeholder="name@domain.com" required></div>
<div class="col-sm-2 col-lg-auto"><label for="name">{{ __('item.email') }}</label></div>
<div class="col-xs-12 col-sm mb-3"><input type="email" class="form-control" name="email" id="email" placeholder="{{ __('item.nameDomain') }}" required></div>
<input type="hidden" name="item_id" id="item_id" value="{{ $item['id'] }}" required>
<div class="col-sm-2 col-lg-1 mr-4"><button type="submit" class="btn btn-primary">Insert</button></div>
<div class="col-sm-2 col-lg-1 mr-4"><button type="submit" class="btn btn-primary">{{ __('item.insert') }}</button></div>
</div>
</div>
</form>

View File

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -19,6 +20,7 @@
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>
<body>
<div id="app">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
@@ -26,7 +28,8 @@
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<span class="navbar-toggler-icon"></span>
</button>
@@ -40,39 +43,47 @@
<ul class="navbar-nav ml-auto">
<!-- Authentication Links -->
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
</ul>
</div>
</div>
</nav>
@if ($flashMsg = session('primary'))
<div class="alert alert-primary text-center" role="alert">{{ $flashMsg }}</div>
@endif
@if ($flashMsg = session('danger'))
<div class="alert alert-danger text-center" role="alert">{{ $flashMsg }}</div>
@endif
<main class="py-4">
@yield('content')
</main>
</div>
</body>
</html>
</html>

View File

@@ -3,10 +3,10 @@
<div class="container-fluid">
<div class="form-group row mt-2">
<div class="col-sm-2 col-lg-1"><label for="product">Item:</label></div>
<div class="col-xs-12 col-sm mb-3"><input type="text" class="form-control" name="item" id="item" placeholder="One Hundred Years of Solitude" required></div>
<div class="col-sm-2 col-lg-1"><label for="product">{{ __('product.item') }}</label></div>
<div class="col-xs-12 col-sm mb-3"><input type="text" class="form-control" name="item" id="item" placeholder="{{ __('product.100yearsSolitude') }}" required></div>
<input type="hidden" name="product_id" id="product_id" value="{{ $product['id'] }}" required>
<div class="col-sm-2 col-lg-1 mr-4"><button type="submit" class="btn btn-primary">Insert</button></div>
<div class="col-sm-2 col-lg-1 mr-4"><button type="submit" class="btn btn-primary">{{ __('product.insert') }}</button></div>
</div>
</div>

View File

@@ -2,16 +2,16 @@
{{ csrf_field() }}
<div class="container-fluid">
<div class="form-group row mt-2">
<div class="col-sm-2 col-lg-1"><label for="product">Name:</label></div>
<div class="col-xs-12 col-sm"><input type="text" class="form-control" name="product" id="product" placeholder="Book" required></div>
<div class="col-sm-2 col-lg-1"><label for="product">{{ __('product.name') }}</label></div>
<div class="col-xs-12 col-sm"><input type="text" class="form-control" name="product" id="product" placeholder="{{ __('product.book') }}" required></div>
</div>
<div class="form-group row mt-2">
<div class="col-sm-2 col-lg-1"><label for="product">URL:</label></div>
<div class="col-xs-12 col-sm"><input type="text" class="form-control" name="url" id="url" placeholder="(Optional) http://bookwebsite.com"></div>
<div class="col-sm-2 col-lg-1"><label for="product">{{ __('product.url') }}</label></div>
<div class="col-xs-12 col-sm"><input type="text" class="form-control" name="url" id="url" placeholder="{{ __('product.optionalUrlExample') }}"></div>
</div>
<div class="form-group row mt-2">
<div class="col-xs-0 col-sm-1 col-md-1 col-lg-1 col-xg-1"></div>
<div class="col col-xs-12"><button type="submit" class="btn btn-primary">Insert</button></div>
<div class="col col-xs-12"><button type="submit" class="btn btn-primary">{{ __('product.insert') }}</button></div>
</div>
</div>
@include ('layouts.errors')

View File

@@ -1,26 +1,26 @@
<button type="button" class="btn btn-sm btn-danger" data-toggle="modal" data-target="#deleteModal">Delete</button>
<button type="button" class="btn btn-sm btn-danger" data-toggle="modal" data-target="#deleteModal">{{ __('product.delete') }}</button>
<!-- MODAL - DELETE CONFIRMATION -->
<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="deleteModalLabel">Confirmation...</h5>
<h5 class="modal-title" id="deleteModalLabel">{{ __('product.confirmation') }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Would you like to delete the product <strong>{{$product->name}}</strong> and it's items?
<p>You will not be able to restore it after deletion.</p>
{!! __('product.wannaDelete', ['productname' => $product->name]) !!}
<p>{{ __('product.notAbleRestore') }}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('product.close') }}</button>
<form action="/product" method="POST">
@method('DELETE')
{{ csrf_field() }}
<input type="hidden" name="product" value="{{$product->id}}">
<button type="submit" class="btn btn-danger">Delete</button>
<button type="submit" class="btn btn-danger">{{ __('product.delete') }}</button>
</form>
</div>
</div>

View File

@@ -1,11 +1,11 @@
<button type="button" class="btn btn-sm btn-secondary mr-1" data-toggle="modal" data-target="#editModal">Edit</button>
<button type="button" class="btn btn-sm btn-secondary mr-1" data-toggle="modal" data-target="#editModal">{{ __('product.edit') }}</button>
<!-- MODAL - CHANGE WINDOW -->
<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="editModalLabel">Edit product</h5>
<h5 class="modal-title" id="editModalLabel">{{ __('product.editProduct') }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
@@ -14,11 +14,11 @@
<form action="/product" method="POST">
<div class="modal-body">
<div class="form-group">
<label for="name" class="col-form-label">New name: </label>
<label for="name" class="col-form-label">{{ __('product.newName') }} </label>
<input type="text" name="name" id="name" class="form-control" value="{{$product->name}}">
</div>
<div class="form-group">
<label for="url" class="col-form-label">New url: </label>
<label for="url" class="col-form-label">{{ __('product.newUrl') }} </label>
<input type="text" name="url" id="url" class="form-control" value="{{$product->url}}">
</div>
</div>
@@ -26,8 +26,8 @@
@method('PATCH')
{{ csrf_field() }}
<input type="hidden" name="product" value="{{$product->id}}">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-danger">Edit</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('product.close') }}</button>
<button type="submit" class="btn btn-danger">{{ __('product.edit') }}</button>
</div>
</form>

View File

@@ -5,7 +5,7 @@
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card mt-4">
<div class="card-header"><strong>Products</strong></div>
<div class="card-header"><strong>{{ __('product.products') }}</strong></div>
<div class="card-body">
@if (session('status'))
@@ -18,17 +18,17 @@
@forelse ($products as $product)
<li><a href="/product/{{$product['id']}}">{{$product['name']}}</a></li>
@empty
<p>There are no products yet. Include one with the form above.</p>
<p>{{ __('product.noProductsYet') }}</p>
@endforelse
</ul>
</div>
</div>
<div class="card mt-4">
<div class="card-header">Add product</div>
<div class="card-header">{{ __('product.addProduct') }}</div>
<div class="card-body">@include('product.addProductForm')</div>
</div>
<div class="float-right mt-2"><a class="btn btn-secondary" href="/home">Your items</a></div>
<div class="float-right mt-2"><a class="btn btn-secondary" href="/home">{{ __('product.yourItems') }}</a></div>
</div>
</div>
</div>

View File

@@ -25,23 +25,23 @@
</div>
@endif
<strong>Items:</strong>
<strong>{{ __('product.items') }}</strong>
<ul>
@forelse ($product->items as $item)
<li><a href="/item/{{ $item->id }}">{{ $item->name }}</a></li>
@empty
<p>There are no items yet. Include one with the form above.</p>
<p>{{ __('product.noItemsYet') }}</p>
@endforelse
</ul>
</div>
</div>
<div class="card mt-4">
<div class="card-header">Add item</div>
<div class="card-header">{{ __('product.addItem') }}</div>
<div class="card-body">@include('product.addItemForm')</div>
</div>
<div class="float-right mt-2"><a class="btn btn-secondary" href="/product">BACK</a></div>
<div class="float-right mt-2"><a class="btn btn-secondary" href="/product">{{ __('product.back') }}</a></div>
</div>
</div>
</div>

View File

@@ -79,10 +79,10 @@
@if (Route::has('login'))
<div class="top-right links">
@auth
<a href="{{ url('/home') }}">Home</a>
<a href="{{ url('/home') }}">@lang('welcome.Home')</a>
@else
<a href="{{ route('login') }}">Login</a>
<a href="{{ route('register') }}">Register</a>
<a href="{{ route('login') }}">@lang('welcome.Login')</a>
<a href="{{ route('register') }}">@lang('welcome.Register')</a>
@endauth
</div>
@endif
@@ -94,20 +94,20 @@
<div class="links">
@auth
<a href="/home">Home</a>
<a href="/product">Products</a>
<a href="/home">@lang('welcome.Home')</a>
<a href="/product">@lang('welcome.Products')</a>
@else
<a href="/register">Register</a>
<a href="/login">Login</a>
<a href="/login">@lang('welcome.Login')</a>
<a href="/register">@lang('welcome.Register')</a>
@endauth
<a href="/help">Help</a>
<a href="/help">@lang('welcome.Help')</a>
</div>
<div>
<br>
</div>
<div class="links footer">
<a href="https://brunofontes.net">By Bruno Fontes</a>
<p>© 2018 Bruno Fontes All Rights Reserved</p>
<a href="https://brunofontes.net">@lang('welcome.byAuthor')</a>
<p>@lang('welcome.copyright')</p>
</div>
</div>
</div>

View File

@@ -15,7 +15,13 @@ Route::get('/', function () {
return view('welcome');
});
Route::get('/product', 'ProductController@index')->middleware('auth');
Route::get('/lang/{locale}', function ($locale) {
session(['lang' => $locale]);
session()->save();
return back();
});
Route::get('/product', 'ProductController@index')->middleware('verified');
Route::get('/product/{product}', 'ProductController@show')->middleware('verified');
Route::post('/product', 'ProductController@store')->middleware('verified');
Route::patch('/product', 'ProductController@patch')->middleware('verified');
@@ -41,4 +47,4 @@ Auth::routes(['verify' => true]);
Route::get('/home', 'HomeController@index')->name('home')->middleware('auth');
Route::get('/help', function () {
return view('help');
});
});

View File

@@ -1,3 +0,0 @@
#source ~/.zshrc
vagrant up
./ssh_homestead.sh