diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 599a9c338..b183365b1 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -50,29 +50,12 @@ - - {% block extra_head %} {% endblock %} - - @@ -93,317 +76,8 @@ aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> - - {% if request.user.userpreference.left_handed %} - {% if not request.user.is_authenticated or request.user.userpreference.nav_show_logo %} - - Logo - - {% endif %} - {% endif %} - - - -{% message_of_the_day request as message_of_the_day %} -{% if message_of_the_day %} -
- {{ message_of_the_day | markdown |safe }} -
-{% endif %} - -{% if HOSTED and request.space.max_recipes == 10 %} -
- {% trans 'You are using the free version of Tandoor' %} {% trans 'Upgrade Now' %} -
-{% endif %} -
diff --git a/cookbook/views/views.py b/cookbook/views/views.py index fbd9fbdc2..f52d331fb 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -34,25 +34,12 @@ from recipes.settings import PLUGINS def index(request): - return HttpResponseRedirect(reverse('vue3')) - with scopes_disabled(): if not request.user.is_authenticated: if User.objects.count() < 1 and 'django.contrib.auth.backends.RemoteUserBackend' not in settings.AUTHENTICATION_BACKENDS: return HttpResponseRedirect(reverse_lazy('view_setup')) - return HttpResponseRedirect(reverse_lazy('view_search')) - try: - page_map = { - UserPreference.SEARCH: reverse_lazy('view_search'), - UserPreference.PLAN: reverse_lazy('view_plan'), - UserPreference.BOOKS: reverse_lazy('view_books'), - UserPreference.SHOPPING: reverse_lazy('view_shopping'), - } - - return HttpResponseRedirect(page_map.get(request.user.userpreference.default_page)) - except UserPreference.DoesNotExist: - return HttpResponseRedirect(reverse('view_search')) + return HttpResponseRedirect(reverse('vue3')) def search(request): diff --git a/vue3/src/apps/tandoor/Tandoor.vue b/vue3/src/apps/tandoor/Tandoor.vue index 90d1ee50d..ccb93a05c 100644 --- a/vue3/src/apps/tandoor/Tandoor.vue +++ b/vue3/src/apps/tandoor/Tandoor.vue @@ -6,6 +6,15 @@ + + + + + {{ $t('Create Recipe') }} + {{ $t('Import Recipe') }} + + + {{ useUserPreferenceStore().userSettings.user.displayName.charAt(0) }} diff --git a/vue3/src/components/display/HorizontalRecipeWindow.vue b/vue3/src/components/display/HorizontalRecipeWindow.vue index 612aa1233..6fbfa98e4 100644 --- a/vue3/src/components/display/HorizontalRecipeWindow.vue +++ b/vue3/src/components/display/HorizontalRecipeWindow.vue @@ -1,71 +1,159 @@