Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Show page on account confirmation (#3720)

Browse Source
This commit is contained in:
Benjamin Beganović 2020-05-19 14:59:44 +02:00 committed by GitHub
parent ac0d63b0b2
commit aedb5b6cd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Traits/VerifiesUserEmail.php
View File

@ -1,4 +1,5 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com)
*
@ -34,9 +35,15 @@ trait VerifiesUserEmail
$user->confirmation_code = null;
$user->save();
return response()->json(['message' => ctrans('texts.security_confirmation')]);
return $this->render('auth.confirmed', [
'root' => 'themes',
'message' => ctrans('texts.security_confirmation'),
]);
}
return response()->json(['message' => ctrans('texts.wrong_confirmation')]);
return $this->render('auth.confirmed', [
'root' => 'themes',
'message' => ctrans('texts.wrong_confirmation'),
]);
}
}

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=49b0ee243139f6e72bd9",
"/css/app.css": "/css/app.css?id=a3fd9c5e427e994923f9",
"/css/app.css": "/css/app.css?id=1eeeaa187be823b49020",
"/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=3e58537817b968346c9f",
"/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=af49e24958be5fc00c92",
"/js/clients/payment_methods/authorize-stripe-card.js": "/js/clients/payment_methods/authorize-stripe-card.js?id=f4c45f0da9868d840799",

14
resources/views/themes/ninja2020/auth/confirmed.blade.php Normal file
View File

@ -0,0 +1,14 @@
@extends('portal.ninja2020.layout.clean')
@section('meta_title', ctrans('texts.confirmation'))
@section('body')
<div class="flex h-screen">
<div class="m-auto md:w-1/3 lg:w-1/5">
<div class="flex flex-col items-center">
<h1 class="text-center text-3xl">{{ ctrans('texts.confirmation') }}</h1>
<p class="text-center opacity-75">{{ $message }}</p>
<a class="button button-primary text-center mt-8" href="{{ url('/') }}">{{ ctrans('texts.return_to_login') }}</a>
</div>
</div>
</div>
@endsection

1
tailwind.config.js vendored
View File

@ -4,6 +4,7 @@ module.exports = {
purge: [
'./resources/views/portal/ninja2020/**/*.blade.php',
'./resources/views/email/**/*.blade.php',
'./resources/views/themes/ninja2020/**/*.blade.php',
],
theme: {
extend: {