From 259fadc433dc7999b51d75ebd24564fbafd7d711 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 15 Nov 2020 14:02:49 +0100
Subject: [PATCH] Expand views in v2

---
 resources/views/v2/auth/login.twig            |  2 +-
 resources/views/v2/auth/mfa.twig              | 56 +++++++++++++++++++
 resources/views/v2/index.twig                 | 11 ++++
 .../views/v2/partials/layout/navbar.twig      |  2 +-
 .../views/v2/partials/layout/sidebar.twig     |  2 +-
 5 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 resources/views/v2/auth/mfa.twig

diff --git a/resources/views/v2/auth/login.twig b/resources/views/v2/auth/login.twig
index d6154e6022..3166caf2ae 100644
--- a/resources/views/v2/auth/login.twig
+++ b/resources/views/v2/auth/login.twig
@@ -32,7 +32,7 @@
         {# demo site info #}
         {% if IS_DEMO_SITE %}
             <div class="callout callout-success">
-                <h5><i class="fas fa-info"></i> Firefly III demonistration website</h5>
+                <h5><i class="fas fa-info"></i> Firefly III demonstration website</h5>
                 To log in, please use email address <code>{{ DEMO_USERNAME }}</code> and password <code>{{ DEMO_PASSWORD }}</code>
             </div>
         {% endif %}
diff --git a/resources/views/v2/auth/mfa.twig b/resources/views/v2/auth/mfa.twig
new file mode 100644
index 0000000000..f1b87eed4c
--- /dev/null
+++ b/resources/views/v2/auth/mfa.twig
@@ -0,0 +1,56 @@
+{% extends "./layout/auth" %}
+{% block content %}
+    {# error when logging in with MFA #}
+    {% if session_has('error') %}
+        <div class="row">
+            <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                <h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5>
+                {{ session('error') }}
+            </div>
+        </div>
+    {% endif %}
+
+
+    {# default header #}
+    <div class="login-box">
+        <div class="login-logo">
+            <img src="v2/images/firefly-iii-logo.png" alt="Firefly III" width="40"/>
+            <a href="{{ route('index') }}"><b>Firefly</b>III</a>
+        </div>
+
+        <!-- /.login-logo -->
+        <div class="card">
+            <div class="card-body login-card-body">
+                <p class="login-box-msg">{{ trans('firefly.two_factor_welcome', {user: user.email}) }}</p>
+                <p class="login-box-msg">{{ 'two_factor_enter_code'|_ }}</p>
+
+                <form action="{{ route('two-factor.submit') }}" method="POST">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+                    <div class="input-group mb-3">
+                        <input type="text" id="oneTimeInput" name="one_time_password" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}"/>
+
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <span class="fas fa-lock"></span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-6">
+                        </div>
+                        <!-- /.col -->
+                        <div class="col-6">
+                            <button type="submit" class="btn btn-primary btn-block">{{ 'authenticate'|_ }}</button>
+                        </div>
+                        <!-- /.col -->
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" nonce="{{ JS_NONCE }}">
+            document.getElementById("oneTimeInput").focus();
+    </script>
+    <!-- /.login-box -->
+{% endblock %}
diff --git a/resources/views/v2/index.twig b/resources/views/v2/index.twig
index 9f15143104..bc51c77476 100644
--- a/resources/views/v2/index.twig
+++ b/resources/views/v2/index.twig
@@ -10,6 +10,17 @@
     <!-- /.row (main row) -->
 {% endblock %}
 
+{% block control %}
+    <div>
+        <div class="p-3 control-sidebar-content">
+            <h5>{{ 'date_range'|_ }}</h5>
+            <hr class="mb-2">
+            <div id="calendar"></div>
+            <hr class="mb-2">
+        </div>
+    </div>
+{% endblock %}
+
 {% block styles %}
 
 {% endblock %}
diff --git a/resources/views/v2/partials/layout/navbar.twig b/resources/views/v2/partials/layout/navbar.twig
index c142a078a8..05aba7d1f1 100644
--- a/resources/views/v2/partials/layout/navbar.twig
+++ b/resources/views/v2/partials/layout/navbar.twig
@@ -104,7 +104,7 @@
         </li>
         <!-- here be dragons -->
         <li class="nav-item">
-            <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+            <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button" title="{{ 'here_be_dragons'|_ }}">
                 <i class="fas fa-dragon"></i>
             </a>
         </li>
diff --git a/resources/views/v2/partials/layout/sidebar.twig b/resources/views/v2/partials/layout/sidebar.twig
index df5f96e4f7..6db528fef7 100644
--- a/resources/views/v2/partials/layout/sidebar.twig
+++ b/resources/views/v2/partials/layout/sidebar.twig
@@ -22,7 +22,7 @@
 
         <!-- Sidebar Menu -->
         <nav class="mt-2">
-            <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
+            <ul class="nav nav-compact nav-child-indent nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
                 <!-- Add icons to the links using the .nav-icon class
                      with font-awesome or any other icon font library -->
                 <li class="nav-item">