From 32095bf509e140b362b49d708dc35a164a0c2310 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 29 Dec 2019 15:22:08 +0100 Subject: [PATCH] Remove V2 layout and references to it. --- .env.example | 1 - config/view.php | 4 +- resources/views/v2/auth/login.twig | 89 - resources/views/v2/auth/passwords/email.twig | 62 - resources/views/v2/auth/passwords/reset.twig | 105 -- resources/views/v2/auth/register.twig | 78 - .../v2/emails/access-token-created-html.twig | 13 - .../v2/emails/access-token-created-text.twig | 7 - .../views/v2/emails/admin-test-html.twig | 5 - .../views/v2/emails/admin-test-text.twig | 3 - .../views/v2/emails/confirm-account-html.twig | 20 - .../views/v2/emails/confirm-account-text.twig | 11 - .../v2/emails/confirm-email-change-html.twig | 18 - .../v2/emails/confirm-email-change-text.twig | 9 - resources/views/v2/emails/error-html.twig | 47 - resources/views/v2/emails/error-text.twig | 31 - resources/views/v2/emails/footer-html.twig | 13 - resources/views/v2/emails/footer-text.twig | 6 - resources/views/v2/emails/header-html.twig | 10 - resources/views/v2/emails/header-text.twig | 2 - .../v2/emails/oauth-client-created-html.twig | 14 - .../v2/emails/oauth-client-created-text.twig | 9 - resources/views/v2/emails/password-html.twig | 13 - resources/views/v2/emails/password-text.twig | 7 - .../views/v2/emails/registered-html.twig | 18 - .../views/v2/emails/registered-text.twig | 20 - .../v2/emails/report-new-journals-html.twig | 34 - .../v2/emails/report-new-journals-text.twig | 25 - .../v2/emails/undo-email-change-html.twig | 18 - .../v2/emails/undo-email-change-text.twig | 12 - resources/views/v2/error.twig | 35 - resources/views/v2/index.twig | 1592 ----------------- resources/views/v2/layout/auth.twig | 29 - resources/views/v2/layout/default.twig | 145 -- resources/views/v2/partials/favicons.twig | 16 - resources/views/v2/partials/index_boxes.twig | 0 .../views/v2/partials/password_modal.twig | 35 - resources/views/v2/partials/top_bar.twig | 88 - resources/views/v2/partials/top_menu.twig | 48 - 39 files changed, 2 insertions(+), 2690 deletions(-) delete mode 100644 resources/views/v2/auth/login.twig delete mode 100644 resources/views/v2/auth/passwords/email.twig delete mode 100644 resources/views/v2/auth/passwords/reset.twig delete mode 100644 resources/views/v2/auth/register.twig delete mode 100644 resources/views/v2/emails/access-token-created-html.twig delete mode 100644 resources/views/v2/emails/access-token-created-text.twig delete mode 100644 resources/views/v2/emails/admin-test-html.twig delete mode 100644 resources/views/v2/emails/admin-test-text.twig delete mode 100644 resources/views/v2/emails/confirm-account-html.twig delete mode 100644 resources/views/v2/emails/confirm-account-text.twig delete mode 100644 resources/views/v2/emails/confirm-email-change-html.twig delete mode 100644 resources/views/v2/emails/confirm-email-change-text.twig delete mode 100644 resources/views/v2/emails/error-html.twig delete mode 100644 resources/views/v2/emails/error-text.twig delete mode 100644 resources/views/v2/emails/footer-html.twig delete mode 100644 resources/views/v2/emails/footer-text.twig delete mode 100644 resources/views/v2/emails/header-html.twig delete mode 100644 resources/views/v2/emails/header-text.twig delete mode 100644 resources/views/v2/emails/oauth-client-created-html.twig delete mode 100644 resources/views/v2/emails/oauth-client-created-text.twig delete mode 100644 resources/views/v2/emails/password-html.twig delete mode 100644 resources/views/v2/emails/password-text.twig delete mode 100644 resources/views/v2/emails/registered-html.twig delete mode 100644 resources/views/v2/emails/registered-text.twig delete mode 100644 resources/views/v2/emails/report-new-journals-html.twig delete mode 100644 resources/views/v2/emails/report-new-journals-text.twig delete mode 100644 resources/views/v2/emails/undo-email-change-html.twig delete mode 100644 resources/views/v2/emails/undo-email-change-text.twig delete mode 100644 resources/views/v2/error.twig delete mode 100644 resources/views/v2/index.twig delete mode 100644 resources/views/v2/layout/auth.twig delete mode 100644 resources/views/v2/layout/default.twig delete mode 100644 resources/views/v2/partials/favicons.twig delete mode 100644 resources/views/v2/partials/index_boxes.twig delete mode 100644 resources/views/v2/partials/password_modal.twig delete mode 100644 resources/views/v2/partials/top_bar.twig delete mode 100644 resources/views/v2/partials/top_menu.twig diff --git a/.env.example b/.env.example index 85d6221b3c..d962b83bb1 100644 --- a/.env.example +++ b/.env.example @@ -207,4 +207,3 @@ IS_SANDSTORM=false IS_DOCKER=false IS_HEROKU=false BUNQ_USE_SANDBOX=false -FFIII_LAYOUT=v1 diff --git a/config/view.php b/config/view.php index 38fcab4c2c..274d8fd000 100644 --- a/config/view.php +++ b/config/view.php @@ -36,7 +36,7 @@ return [ */ 'paths' => [ - realpath(base_path(sprintf('resources/views/%s', env('FFIII_LAYOUT', 'v1')))), + realpath(base_path('resources/views/v1')), ], /* @@ -50,6 +50,6 @@ return [ | */ - 'compiled' => realpath(storage_path(sprintf('framework/views/%s', env('FFIII_LAYOUT', 'v1')))), + 'compiled' => realpath(storage_path('framework/views/v1')), ]; diff --git a/resources/views/v2/auth/login.twig b/resources/views/v2/auth/login.twig deleted file mode 100644 index 323514766f..0000000000 --- a/resources/views/v2/auth/login.twig +++ /dev/null @@ -1,89 +0,0 @@ -{% extends "./layout/auth" %} -{% block content %} -
-
-
- -
-
-
-{% endblock %} diff --git a/resources/views/v2/auth/passwords/email.twig b/resources/views/v2/auth/passwords/email.twig deleted file mode 100644 index 3d096e7acf..0000000000 --- a/resources/views/v2/auth/passwords/email.twig +++ /dev/null @@ -1,62 +0,0 @@ -{% extends "./layout/auth" %} -{% block content %} -
-
-
- -
-
-
-{% endblock %} diff --git a/resources/views/v2/auth/passwords/reset.twig b/resources/views/v2/auth/passwords/reset.twig deleted file mode 100644 index 0b872c52fa..0000000000 --- a/resources/views/v2/auth/passwords/reset.twig +++ /dev/null @@ -1,105 +0,0 @@ -{% extends "./layout/auth" %} -{% block content %} -
-
-
- -
-
-
- - - - {# modal #} - - -{% endblock %} diff --git a/resources/views/v2/auth/register.twig b/resources/views/v2/auth/register.twig deleted file mode 100644 index 0e60dfac3f..0000000000 --- a/resources/views/v2/auth/register.twig +++ /dev/null @@ -1,78 +0,0 @@ -{% extends "./layout/auth" %} -{% block content %} -
-
-
- -
-
-
-{% endblock %} diff --git a/resources/views/v2/emails/access-token-created-html.twig b/resources/views/v2/emails/access-token-created-html.twig deleted file mode 100644 index 1c88099a1d..0000000000 --- a/resources/views/v2/emails/access-token-created-html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% include 'emails.header-html' %} -

- Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. -

- -

- With this token, they can access all of your financial records through the Firefly III API. -

- -

- If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/access-token-created-text.twig b/resources/views/v2/emails/access-token-created-text.twig deleted file mode 100644 index 5ea41eb0fe..0000000000 --- a/resources/views/v2/emails/access-token-created-text.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% include 'emails.header-text' %} -Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. - -With this token, they can access all of your financial records through the Firefly III API. - -If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/admin-test-html.twig b/resources/views/v2/emails/admin-test-html.twig deleted file mode 100644 index 0862786993..0000000000 --- a/resources/views/v2/emails/admin-test-html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-html' %} -

- This is a test message from your Firefly III instance. It was sent to {{ email }}. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/admin-test-text.twig b/resources/views/v2/emails/admin-test-text.twig deleted file mode 100644 index 23c246e694..0000000000 --- a/resources/views/v2/emails/admin-test-text.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% include 'emails.header-text' %} - This is a test message from your Firefly III instance. It was sent to {{ email }}. -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/confirm-account-html.twig b/resources/views/v2/emails/confirm-account-html.twig deleted file mode 100644 index 9dacd4e6a5..0000000000 --- a/resources/views/v2/emails/confirm-account-html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% include 'emails.header-html' %} -

- To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is - valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! -

- -

- To active your account please follow the link below. -

-

- PLEASE verify that this activation link goes to the Firefly III installation you expect it to be: -

-

- {{ route }} -

- -

- You should be redirected to the index page right away. The link expires in about four hours. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/confirm-account-text.twig b/resources/views/v2/emails/confirm-account-text.twig deleted file mode 100644 index ca8f3a1e1b..0000000000 --- a/resources/views/v2/emails/confirm-account-text.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% include 'emails.header-text' %} -To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! - -To active your account please follow the link below. - -PLEASE verify that this activation link goes to the Firefly III installation you expect it to be: - -{{ route }} - -You should be redirected to the index page right away. The link expires in about four hours. -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/confirm-email-change-html.twig b/resources/views/v2/emails/confirm-email-change-html.twig deleted file mode 100644 index aa946b88ea..0000000000 --- a/resources/views/v2/emails/confirm-email-change-html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% include 'emails.header-html' %} -

- You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it. -

-

- The old email addres was: {{ oldEmail }} -

-

- The new email address is: {{ newEmail }} -

-

- You cannot use Firefly III until you confirm this change. Please follow the link below to do so. -

- -

- {{ uri }} -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/confirm-email-change-text.twig b/resources/views/v2/emails/confirm-email-change-text.twig deleted file mode 100644 index cea4fd7c08..0000000000 --- a/resources/views/v2/emails/confirm-email-change-text.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% include 'emails.header-text' %} -You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it. - -The old email addres was: {{ oldEmail }} - -The new email address is: {{ newEmail }} - -You cannot use Firefly III until you confirm this change. Please follow the link to do so: {{ uri }} -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/error-html.twig b/resources/views/v2/emails/error-html.twig deleted file mode 100644 index 0e0f2004f0..0000000000 --- a/resources/views/v2/emails/error-html.twig +++ /dev/null @@ -1,47 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III v{{ version }} ran into an error: {{ errorMessage }} -

- -

- The error was of type "{{ class }}". -

- -

- The error occured on/at: {{ time }}. -

- -

- This error occured in file {{ file }} on line {{ line }} with code {{ code }}. -

- -

- {% if loggedIn %} - The error was encountered by user #{{ user.id }}, {{ user.email }}. - {% else %} - There was no user logged in for this error or no user was detected. - {% endif %} -

- -

- The IP address related to this error is: {{ ip }}
- URL is: {{ url }}
- User agent: {{ userAgent }} -

- -

- The full stacktrace is below. If you think this is a bug in Firefly III, you - can forward this message to - thegrumpydictator@gmail.com. - This can help fix the bug you just encountered. -

-

- If you prefer, you can also open a new issue on GitHub. -

- -

- The full stacktrace is below:

-

- {{ stackTrace|nl2br }} -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/error-text.twig b/resources/views/v2/emails/error-text.twig deleted file mode 100644 index 6cc100d81a..0000000000 --- a/resources/views/v2/emails/error-text.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III v{{ version }} ran into an error: {{ errorMessage }}. - -The error was of type "{{ class }}". - -The error occured on/at: {{ time }}. - -This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}. - -{% if loggedIn %} - The error was encountered by user #{{ user.id }}, {{ user.email }}. -{% else %} - There was no user logged in for this error or no user was detected. -{% endif %} - -The IP address related to this error is: {{ ip }} -URL is: {{ url }} -User agent: {{ userAgent }} - -The full stacktrace is below. If you think this is a bug in Firefly III, you -can forward this message to thegrumpydictator@gmail.com. This can help fix -the bug you just encountered. - -If you prefer, you can also open a new issue here: - -https://github.com/firefly-iii/firefly-iii/issues - -The full stacktrace is below: - -{{ stackTrace }} -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/footer-html.twig b/resources/views/v2/emails/footer-html.twig deleted file mode 100644 index 6e2ca37007..0000000000 --- a/resources/views/v2/emails/footer-html.twig +++ /dev/null @@ -1,13 +0,0 @@ -

- Beep boop, -

-

- The Firefly III Mail Robot -

- -

- PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. -

- - - diff --git a/resources/views/v2/emails/footer-text.twig b/resources/views/v2/emails/footer-text.twig deleted file mode 100644 index e2ec3ff9d4..0000000000 --- a/resources/views/v2/emails/footer-text.twig +++ /dev/null @@ -1,6 +0,0 @@ - -Beep boop, - -The Firefly III Mail Robot - -PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. diff --git a/resources/views/v2/emails/header-html.twig b/resources/views/v2/emails/header-html.twig deleted file mode 100644 index f3a4e8edc7..0000000000 --- a/resources/views/v2/emails/header-html.twig +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - -

- Hi there, -

diff --git a/resources/views/v2/emails/header-text.twig b/resources/views/v2/emails/header-text.twig deleted file mode 100644 index e60df7e024..0000000000 --- a/resources/views/v2/emails/header-text.twig +++ /dev/null @@ -1,2 +0,0 @@ -Hi there, - diff --git a/resources/views/v2/emails/oauth-client-created-html.twig b/resources/views/v2/emails/oauth-client-created-html.twig deleted file mode 100644 index f49cd54b34..0000000000 --- a/resources/views/v2/emails/oauth-client-created-html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% include 'emails.header-html' %} -

- Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" - and has callback URL {{ client.redirect }}. -

- -

- With this client, they can access all of your financial records through the Firefly III API. -

- -

- If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/oauth-client-created-text.twig b/resources/views/v2/emails/oauth-client-created-text.twig deleted file mode 100644 index d74222d0f4..0000000000 --- a/resources/views/v2/emails/oauth-client-created-text.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% include 'emails.header-text' %} -Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL: - -{{ client.redirect }} - -With this client, they can access all of your financial records through the Firefly III API. - -If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/password-html.twig b/resources/views/v2/emails/password-html.twig deleted file mode 100644 index 2b15f16191..0000000000 --- a/resources/views/v2/emails/password-html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% include 'emails.header-html' %} -

- Somebody tried to reset your password. If it was you, please follow the link below to do so. -

- -

- PLEASE verify that the link actually goes to the Firefly III you expect it to go! -

- -

- {{ url }} -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/password-text.twig b/resources/views/v2/emails/password-text.twig deleted file mode 100644 index 0e67dd735b..0000000000 --- a/resources/views/v2/emails/password-text.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% include 'emails.header-text' %} -Somebody tried to reset your password. If it was you, please follow the link below to do so. - -PLEASE verify that the link actually goes to the Firefly III you expect it to go! - -{{ url }} -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/registered-html.twig b/resources/views/v2/emails/registered-html.twig deleted file mode 100644 index 5274b801b7..0000000000 --- a/resources/views/v2/emails/registered-html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% include 'emails.header-html' %} -

- Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! -

- - -{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/registered-text.twig b/resources/views/v2/emails/registered-text.twig deleted file mode 100644 index c750538f65..0000000000 --- a/resources/views/v2/emails/registered-text.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% include 'emails.header-text' %} -Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! - -* If you have forgotten your password already, please reset it using the password reset tool. -* There is a help-icon in the top right corner of each page. If you need help, click it! -* If you haven't already, please read the first use guide and the full description. - -Enjoy! - -Firefly III: -{{ address }} - -Password reset: -{{ address }}/password/reset - -Documentation: -https://github.com/firefly-iii/firefly-iii -https://firefly-iii.org/ - -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/report-new-journals-html.twig b/resources/views/v2/emails/report-new-journals-html.twig deleted file mode 100644 index 648a72baf4..0000000000 --- a/resources/views/v2/emails/report-new-journals-html.twig +++ /dev/null @@ -1,34 +0,0 @@ -{% include 'emails.header-html' %} -

- {% if journals.count == 1 %} - Firefly III has created a transaction for you. - {% endif %} - {% if journals.count > 1 %} - Firefly III has created {{ journals.count }} transactions for you. - {% endif %} -

- - -{% if journals.count == 1 %} -

- You can find it in your Firefly III installation:
- {% for journal in journals %} - {{ journal.description }} (TODO) - {% endfor %} -

-{% endif %} - -{% if journals.count > 1 %} -

- You can find them in your Firefly III installation: -

- -{% endif %} - -{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/report-new-journals-text.twig b/resources/views/v2/emails/report-new-journals-text.twig deleted file mode 100644 index 46cd920bfb..0000000000 --- a/resources/views/v2/emails/report-new-journals-text.twig +++ /dev/null @@ -1,25 +0,0 @@ -{% include 'emails.header-text' %} -{% if journals.count == 1 %} -Firefly III has created a transaction for you. - -{% endif %} -{% if journals.count > 1 %} -Firefly III has created {{ journals.count }} transactions for you. -{% endif %} -{% if journals.count == 1 %} -You can find in in your Firefly III installation: - -{% for journal in journals %} -{{ journal.description }}: {{ route('transactions.show', journal.id) }} (TODO) -{% endfor %} -{% endif %} - -{% if journals.count > 1 %} -You can find them in your Firefly III installation: - -{% for journal in journals %} -- {{ journal.description }}: {{ route('transactions.show', journal.id) }} (TODO) -{% endfor %} -{% endif %} - -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/undo-email-change-html.twig b/resources/views/v2/emails/undo-email-change-html.twig deleted file mode 100644 index 8d6021ee64..0000000000 --- a/resources/views/v2/emails/undo-email-change-html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% include 'emails.header-html' %} -

- You or somebody with access to your Firefly III account has changed your email address. - If you did not expect this to happen, you must follow the "undo"-link below to protect your account! -

-

- If you initiated this change, you may safely ignore this message. -

-

- The old email addres was: {{ oldEmail }} -

-

- The new email address is: {{ newEmail }} -

-

- To undo the change, follow this link: {{ uri }} -

-{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/undo-email-change-text.twig b/resources/views/v2/emails/undo-email-change-text.twig deleted file mode 100644 index 8bf398ca95..0000000000 --- a/resources/views/v2/emails/undo-email-change-text.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% include 'emails.header-text' %} -You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, -you must follow the "undo"-link below to protect your account! - -If you initiated this change, you may safely ignore this message. - -The old email addres was: {{ oldEmail }} - -The new email address is: {{ newEmail }} - -To undo the change, follow this link: {{ uri }} -{% include 'emails.footer-text' %} diff --git a/resources/views/v2/error.twig b/resources/views/v2/error.twig deleted file mode 100644 index 5333c8b8a0..0000000000 --- a/resources/views/v2/error.twig +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - - - 500 - - - - - -
-
-
-
Firefly III error
-

{{ message |default('General unknown errror')|raw }}

-

- If you do not know how to handle this error, please open an issue on - GitHub - or send me a message.

- - Go back - -
-
-
- - diff --git a/resources/views/v2/index.twig b/resources/views/v2/index.twig deleted file mode 100644 index 4ee50999da..0000000000 --- a/resources/views/v2/index.twig +++ /dev/null @@ -1,1592 +0,0 @@ -{% extends "./layout/default-react" %} -{% block content %} - -
-
- - {# Ignore all default stuff #} - {# -
-
-
-
-
- 6% - -
-
43
-
New Tickets
-
-
-
-
-
-
-
- -3% - -
-
17
-
Closed Today
-
-
-
-
-
-
-
- 9% - -
-
7
-
New Replies
-
-
-
-
-
-
-
- 3% - -
-
27.3K
-
Followers
-
-
-
-
-
-
-
- -2% - -
-
$95
-
Daily Earnings
-
-
-
-
-
-
-
- -1% - -
-
621
-
Products
-
-
-
- -
-
-
-

Development Activity

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UserCommitDate
Ronald BradleyInitial commitMay 6, 2018
BMRussell GibsonMain structureApril 22, 2018
Beverly ArmstrongLeft sidebar adjustmentsApril 15, 2018
Bobby KnightTopbar dropdown styleApril 8, 2018
Sharon WellsFixes #625April 9, 2018
-
-
- -
-
-
Are you in trouble? Read our documentation with code samples.
-
-
-
-
-

Chart title

-
-
-
-
-
- -
-
-
-
-

Chart title

-
-
-
-
-
- -
-
-
-
-
New feedback
-
62
-
-
-
-
-
-
-
-
-
-
Today profit
-
$652
-
-
-
-
-
-
-
-
-
-
-
- - - -
-

132 Sales

- 12 waiting payments -
-
-
-
-
-
-
- - - -
-

78 Orders

- 32 shipped -
-
-
-
-
-
-
- - - -
-

1,352 Members

- 163 registered today -
-
-
-
-
-
-
- - - -
-

132 Comments

- 16 waiting -
-
-
-
-
-
-
-
- -
-

And this isn't my nose. This is a false one.

-
Look, my liege! The Knights Who Say Ni demand a sacrifice! …Are you suggesting that coconuts migr...
-
-
-
- Rose Bradley - 3 days ago -
-
- -
-
-
-
-
-
-
- -
-

Well, I didn't vote for you.

-
Well, we did do the nose. Why? Shut up! Will you shut up?! You don't frighten us, English pig-dog...
-
-
-
- Peter Richards - 3 days ago -
-
- -
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UserUsagePaymentActivitySatisfaction
-
- -
- 		-
Elizabeth Martin
-
- Registered: Mar 19, 2018 -
- 		-
-
- 42% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
4 minutes ago
- 		-
-
42%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Michelle Schultz
-
- Registered: Mar 2, 2018 -
- 		-
-
- 0% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
5 minutes ago
- 		-
-
0%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Crystal Austin
-
- Registered: Apr 7, 2018 -
- 		-
-
- 96% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
96%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Douglas Ray
-
- Registered: Jan 15, 2018 -
- 		-
-
- 6% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
6%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Teresa Reyes
-
- Registered: Mar 4, 2018 -
- 		-
-
- 36% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
2 minutes ago
- 		-
-
36%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Emma Wade
-
- Registered: Mar 20, 2018 -
- 		-
-
- 7% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
7%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Carol Henderson
-
- Registered: Feb 22, 2018 -
- 		-
-
- 80% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
9 minutes ago
- 		-
-
80%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Christopher Harvey
-
- Registered: Jan 22, 2018 -
- 		-
-
- 83% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
8 minutes ago
- 		-
-
83%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
-
-
-
-
-
-

Browser Stats

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Google Chrome23%
Mozila Firefox15%
Apple Safari7%
Internet Explorer9%
Opera mini23%
Microsoft edge9%
-
-
-
-
-
-

Projects

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Admin Template - 65% -
Landing Page - Finished -
Backend UI - Rejected -
Personal Blog - 40% -
E-mail Templates - 13% -
Corporate Website - Pending -
-
-
-
-
-
-

Members

-
-
- -
-
-
-
-
-
-
-
-
+5%
-

423

-
Users online
-
-
-
-
-
- -
-
-
-
-
-3%
-

423

-
Users online
-
-
-
-
-
- -
-
-
-
-
-3%
-

423

-
Users online
-
-
-
-
-
- -
-
-
-
-
9%
-

423

-
Users online
-
-
-
-
-
- -
-
-
-
-
-
-

Invoices

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.Invoice SubjectClientVAT No.CreatedStatusPrice
001401Design Works - Carlson Limited - - 87956621 - - 15 Dec 2017 - - Paid - $887 - Manage -
- -
- 		- - - -
001402UX Wireframes - Adobe - - 87956421 - - 12 Apr 2017 - - Pending - $1200 - Manage -
- -
- 		- - - -
001403New Dashboard - Bluewolf - - 87952621 - - 23 Oct 2017 - - Pending - $534 - Manage -
- -
- 		- - - -
001404Landing Page - Salesforce - - 87953421 - - 2 Sep 2017 - - Due in 2 Weeks - $1500 - Manage -
- -
- 		- - - -
001405Marketing Templates - Printic - - 87956621 - - 29 Jan 2018 - - Paid Today - $648 - Manage -
- -
- 		- - - -
001406Sales Presentation - Tabdaq - - 87956621 - - 4 Feb 2018 - - Due in 3 Weeks - $300 - Manage -
- -
- 		- - - -
-
-
-
-
- #} -{% endblock %} -{% block scripts %} -{% endblock %} -{% block styles %} -{% endblock %} diff --git a/resources/views/v2/layout/auth.twig b/resources/views/v2/layout/auth.twig deleted file mode 100644 index 6d3a02e55c..0000000000 --- a/resources/views/v2/layout/auth.twig +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - {{ pageTitle|default('Firefly III') }} (v{{ FF_VERSION }}) - - - - - -
- {% block content %}{% endblock %} - - - - - {# favicons #} - {% include('partials.password_modal') %} -
- - diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig deleted file mode 100644 index 515b018a24..0000000000 --- a/resources/views/v2/layout/default.twig +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - - {% if subTitle %} - {{ subTitle }} » - {% endif %} - {% if title != "Firefly III" %} - {{ title }} » - {% endif %} - - Firefly III - - - - - - - - - - - - - - - - - - -
-
-
-
-
- {# favicons #} - {% include('partials.top_bar') %} -
-
-
-
-
-
-
-
- -
- -
-
-
-
- {# favicons #} - {% include('partials.top_menu') %} -
-
-
-
-
-
-
-

- {{ title }} - {{ subTitle }} -

-
- {% block content %}{% endblock %} -
-
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- Premium and Open Source dashboard template with responsive and high quality UI. For Free! -
-
-
-
- -
- - diff --git a/resources/views/v2/partials/favicons.twig b/resources/views/v2/partials/favicons.twig deleted file mode 100644 index a8553c262f..0000000000 --- a/resources/views/v2/partials/favicons.twig +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/views/v2/partials/index_boxes.twig b/resources/views/v2/partials/index_boxes.twig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/resources/views/v2/partials/password_modal.twig b/resources/views/v2/partials/password_modal.twig deleted file mode 100644 index 893b4a1ad8..0000000000 --- a/resources/views/v2/partials/password_modal.twig +++ /dev/null @@ -1,35 +0,0 @@ -{# modal #} - diff --git a/resources/views/v2/partials/top_bar.twig b/resources/views/v2/partials/top_bar.twig deleted file mode 100644 index 377b5737c4..0000000000 --- a/resources/views/v2/partials/top_bar.twig +++ /dev/null @@ -1,88 +0,0 @@ - - Firefly III - -
- - {# SOURCE CODE LINK #} - {# -
- Source code -
- #} - - {# TOP MENU WITH ALERTS, NOT IN USE #} - {# -
- - - - -
- - -
- Nathan pushed new commit: Fix page load performance issue. -
10 minutes ago
-
- - - -
- Alice started new task: Tabler UI design. -
1 hour ago
-
- - - -
- Rose deployed new version of NodeJS REST Api V3 -
2 hours ago
-
- -
- Mark all as read -
-
- #} -
- - - - - {{ Auth.user.email }} - USER ROLE - - -
- - {{ 'profile'|_ }} - - - {{ 'preferences'|_ }} - - - {{ 'administration'|_ }} - - {# - - 6 - Inbox - - - - Message - - #} -
- - {{ 'need_help'|_ }} - - - {{ 'logout'|_ }} - -
-
-
- - - diff --git a/resources/views/v2/partials/top_menu.twig b/resources/views/v2/partials/top_menu.twig deleted file mode 100644 index 89868f0598..0000000000 --- a/resources/views/v2/partials/top_menu.twig +++ /dev/null @@ -1,48 +0,0 @@ -