atasistro
/
pingcrm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add flash messages

This commit is contained in:
Jonathan Reinink 2019-05-21 19:12:49 -04:00
parent 0dc025a460
commit f61d969aa5
6 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ContactsController.php
View File

@ -64,7 +64,7 @@ class ContactsController extends Controller
])
);
return Redirect::route('contacts');
return Redirect::route('contacts')->with('success', 'Contact created.');
}
public function edit(Contact $contact)
@ -111,20 +111,20 @@ class ContactsController extends Controller
])
);
return Redirect::route('contacts.edit', $contact);
return Redirect::route('contacts.edit', $contact)->with('success', 'Contact updated.');
}
public function destroy(Contact $contact)
{
$contact->delete();
return Redirect::route('contacts.edit', $contact);
return Redirect::route('contacts.edit', $contact)->with('success', 'Contact deleted.');
}
public function restore(Contact $contact)
{
$contact->restore();
return Redirect::route('contacts.edit', $contact);
return Redirect::route('contacts.edit', $contact)->with('success', 'Contact restored.');
}
}

8
app/Http/Controllers/OrganizationsController.php
View File

@ -42,7 +42,7 @@ class OrganizationsController extends Controller
])
);
return Redirect::route('organizations');
return Redirect::route('organizations')->with('success', 'Organization created.');
}
public function edit(Organization $organization)
@ -79,20 +79,20 @@ class OrganizationsController extends Controller
])
);
return Redirect::route('organizations.edit', $organization);
return Redirect::route('organizations.edit', $organization)->with('success', 'Organization updated.');
}
public function destroy(Organization $organization)
{
$organization->delete();
return Redirect::route('organizations.edit', $organization);
return Redirect::route('organizations.edit', $organization)->with('success', 'Organization deleted.');
}
public function restore(Organization $organization)
{
$organization->restore();
return Redirect::route('organizations.edit', $organization);
return Redirect::route('organizations.edit', $organization)->with('success', 'Organization restored.');
}
}

8
app/Http/Controllers/UsersController.php
View File

@ -48,7 +48,7 @@ class UsersController extends Controller
])
);
return Redirect::route('users');
return Redirect::route('users')->with('success', 'User created.');
}
public function edit(User $user)
@ -81,20 +81,20 @@ class UsersController extends Controller
$user->update(['password' => Request::get('password')]);
}
return Redirect::route('users.edit', $user);
return Redirect::route('users.edit', $user)->with('success', 'User updated.');
}
public function destroy(User $user)
{
$user->delete();
return Redirect::route('users.edit', $user);
return Redirect::route('users.edit', $user)->with('success', 'User deleted.');
}
public function restore(User $user)
{
$user->restore();
return Redirect::route('users.edit', $user);
return Redirect::route('users.edit', $user)->with('success', 'User restored.');
}
}

5
app/Providers/AppServiceProvider.php
View File

@ -29,6 +29,11 @@ class AppServiceProvider extends ServiceProvider
return md5_file(public_path('mix-manifest.json'));
});
Inertia::share('app.name', Config::get('app.name'));
Inertia::share('flash', function () {
return [
'success' => Session::get('success'),
];
});
Inertia::share('errors', function () {
return Session::get('errors') ? Session::get('errors')->getBag('default')->getMessages() : (object) [];
});

43
resources/js/Shared/FlashMessages.vue Normal file
View File

@ -0,0 +1,43 @@
<template>
<div>
<div v-if="$page.flash.success && show" class="mb-8 flex items-center justify-between bg-green rounded max-w-lg">
<div class="flex items-center">
<svg class="ml-4 mr-2 flex-no-shrink w-4 h-4 fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><polygon points="0 11 2 9 7 14 18 3 20 5 7 18" /></svg>
<div class="py-4 text-white text-sm font-medium">{{ $page.flash.success }}</div>
</div>
<button type="button" class="group mr-2 p-2" @click="show = false">
<svg class="block w-2 h-2 fill-green-dark group-hover:fill-green-darker" xmlns="http://www.w3.org/2000/svg" width="235.908" height="235.908" viewBox="278.046 126.846 235.908 235.908"><path d="M506.784 134.017c-9.56-9.56-25.06-9.56-34.62 0L396 210.18l-76.164-76.164c-9.56-9.56-25.06-9.56-34.62 0-9.56 9.56-9.56 25.06 0 34.62L361.38 244.8l-76.164 76.165c-9.56 9.56-9.56 25.06 0 34.62 9.56 9.56 25.06 9.56 34.62 0L396 279.42l76.164 76.165c9.56 9.56 25.06 9.56 34.62 0 9.56-9.56 9.56-25.06 0-34.62L430.62 244.8l76.164-76.163c9.56-9.56 9.56-25.06 0-34.62z" /></svg>
</button>
</div>
<div v-if="Object.keys($page.errors).length > 0 && show" class="mb-8 flex items-center justify-between bg-red-light rounded max-w-lg">
<div class="flex items-center">
<svg class="ml-4 mr-2 flex-no-shrink w-4 h-4 fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm1.41-1.41A8 8 0 1 0 15.66 4.34 8 8 0 0 0 4.34 15.66zm9.9-8.49L11.41 10l2.83 2.83-1.41 1.41L10 11.41l-2.83 2.83-1.41-1.41L8.59 10 5.76 7.17l1.41-1.41L10 8.59l2.83-2.83 1.41 1.41z" /></svg>
<div class="py-4 text-white text-sm font-medium">
<span v-if="Object.keys($page.errors).length === 1">There is one form error.</span>
<span v-else>There are {{ Object.keys($page.errors).length }} form errors.</span>
</div>
</div>
<button type="button" class="group mr-2 p-2" @click="show = false">
<svg class="block w-2 h-2 fill-red-dark group-hover:fill-red-darker" xmlns="http://www.w3.org/2000/svg" width="235.908" height="235.908" viewBox="278.046 126.846 235.908 235.908"><path d="M506.784 134.017c-9.56-9.56-25.06-9.56-34.62 0L396 210.18l-76.164-76.164c-9.56-9.56-25.06-9.56-34.62 0-9.56 9.56-9.56 25.06 0 34.62L361.38 244.8l-76.164 76.165c-9.56 9.56-9.56 25.06 0 34.62 9.56 9.56 25.06 9.56 34.62 0L396 279.42l76.164 76.165c9.56 9.56 25.06 9.56 34.62 0 9.56-9.56 9.56-25.06 0-34.62L430.62 244.8l76.164-76.163c9.56-9.56 9.56-25.06 0-34.62z" /></svg>
</button>
</div>
</div>
</template>
<script>
export default {
data() {
return {
show: true,
}
},
watch: {
'$page.flash': {
handler() {
this.show = true
},
deep: true,
},
},
}
</script>

3
resources/js/Shared/Layout.vue
View File

@ -38,6 +38,7 @@
<main-menu />
</div>
<div class="w-full overflow-hidden px-4 py-8 md:p-12">
<flash-messages />
<slot />
</div>
</div>
@ -48,6 +49,7 @@
<script>
import Dropdown from '@/Shared/Dropdown'
import FlashMessages from '@/Shared/FlashMessages'
import Icon from '@/Shared/Icon'
import Logo from '@/Shared/Logo'
import MainMenu from '@/Shared/MainMenu'
@ -55,6 +57,7 @@ import MainMenu from '@/Shared/MainMenu'
export default {
components: {
Dropdown,
FlashMessages,
Icon,
Logo,
MainMenu,