From 6a5fd8e4f8394954ffacd91e3f1ebf86d28a2aa1 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Sat, 26 Feb 2022 14:00:55 -0900
Subject: [PATCH] Style/update mobile styles (#1008)

* update styling for mobile

* remove Coming Soon
---
 .../Domain/Recipe/RecipeTimeCard.vue          | 11 ++++-
 frontend/components/Layout/AppHeader.vue      |  4 +-
 frontend/lang/messages/en-US.json             |  6 +--
 frontend/pages/recipe/_slug/index.vue         | 45 ++++++++++++-------
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/frontend/components/Domain/Recipe/RecipeTimeCard.vue b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
index 6742669183f9..23b768ea07f8 100644
--- a/frontend/components/Domain/Recipe/RecipeTimeCard.vue
+++ b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
@@ -1,6 +1,13 @@
 <template>
   <div>
-    <v-chip v-for="(time, index) in allTimes" :key="index" label color="accent custom-transparent" class="ma-1">
+    <v-chip
+      v-for="(time, index) in allTimes"
+      :key="index"
+      :small="$vuetify.breakpoint.smAndDown"
+      label
+      color="accent custom-transparent"
+      class="ma-1"
+    >
       <v-icon left>
         {{ $globals.icons.clockOutline }}
       </v-icon>
@@ -58,7 +65,7 @@ export default defineComponent({
     return {
       showCards,
       allTimes,
-    }
+    };
   },
 });
 </script>
diff --git a/frontend/components/Layout/AppHeader.vue b/frontend/components/Layout/AppHeader.vue
index fd4fc756daf4..0e8fec6aff6d 100644
--- a/frontend/components/Layout/AppHeader.vue
+++ b/frontend/components/Layout/AppHeader.vue
@@ -36,8 +36,8 @@
         <v-icon> {{ $globals.icons.search }}</v-icon>
       </v-btn>
       <v-btn v-if="$auth.loggedIn" text @click="$auth.logout()">
-        <v-icon left>{{ $globals.icons.logout }}</v-icon>
-        {{ $t("user.logout") }}
+        <v-icon :left="$vuetify.breakpoint.smAndUp">{{ $globals.icons.logout }}</v-icon>
+        {{ $vuetify.breakpoint.smAndUp ? $t("user.logout") : "" }}
       </v-btn>
       <v-btn v-else text nuxt to="/login">
         <v-icon left>{{ $globals.icons.user }}</v-icon>
diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index ab80d081cd06..33e43a867837 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -245,7 +245,7 @@
     "insert-section": "Insert Section",
     "instructions": "Instructions",
     "key-name-required": "Key Name Required",
-    "landscape-view-coming-soon": "Landscape View (Coming Soon)",
+    "landscape-view-coming-soon": "Landscape View",
     "milligrams": "milligrams",
     "new-key-name": "New Key Name",
     "no-white-space-allowed": "No White Space Allowed",
@@ -437,7 +437,7 @@
     "tags": "Tags",
     "untagged-count": "Untagged {count}"
   },
-  "tool":{
+  "tool": {
     "tools": "Tools"
   },
   "user": {
@@ -495,4 +495,4 @@
     "you-are-not-allowed-to-create-a-user": "You are not allowed to create a user",
     "you-are-not-allowed-to-delete-this-user": "You are not allowed to delete this user"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/pages/recipe/_slug/index.vue b/frontend/pages/recipe/_slug/index.vue
index 1e5ddd4a94f8..ab0ac7c01247 100644
--- a/frontend/pages/recipe/_slug/index.vue
+++ b/frontend/pages/recipe/_slug/index.vue
@@ -7,7 +7,7 @@
     <v-card v-if="skeleton" :color="`white ${false ? 'darken-2' : 'lighten-4'}`" class="pa-3">
       <v-skeleton-loader class="mx-auto" height="700px" type="card"></v-skeleton-loader>
     </v-card>
-    <v-card v-else-if="recipe" :flat="$vuetify.breakpoint.mobile" class="d-print-none">
+    <v-card v-else-if="recipe" :flat="$vuetify.breakpoint.smAndDown" class="d-print-none">
       <!-- Recipe Header -->
       <div class="d-flex justify-end flex-wrap align-stretch">
         <v-card v-if="!enableLandscape" width="50%" flat class="d-flex flex-column justify-center align-center">
@@ -39,13 +39,6 @@
           class="d-print-none"
           @error="hideImage = true"
         >
-          <RecipeTimeCard
-            v-if="enableLandscape"
-            :class="true ? undefined : 'force-bottom'"
-            :prep-time="recipe.prepTime"
-            :total-time="recipe.totalTime"
-            :perform-time="recipe.performTime"
-          />
         </v-img>
       </div>
       <v-divider></v-divider>
@@ -57,7 +50,7 @@
         :logged-in="$auth.loggedIn"
         :open="form"
         :recipe-id="recipe.id"
-        class="ml-auto"
+        class="ml-auto mt-n8 pb-4"
         @close="closeEditor"
         @json="toggleJson"
         @edit="
@@ -88,10 +81,27 @@
           </div>
           <!-- Recipe Title Section -->
           <template v-if="!form && enableLandscape">
-            <v-card-title class="pa-0 ma-0 headline">
+            <v-card-title class="px-0 py-2 ma-0 headline">
               {{ recipe.name }}
             </v-card-title>
             <VueMarkdown :source="recipe.description"> </VueMarkdown>
+
+            <div class="pb-2 d-flex justify-center flex-wrap">
+              <RecipeTimeCard
+                class="d-flex justify-center flex-wrap"
+                :prep-time="recipe.prepTime"
+                :total-time="recipe.totalTime"
+                :perform-time="recipe.performTime"
+              />
+              <RecipeRating
+                v-if="enableLandscape && $vuetify.breakpoint.smAndDown"
+                :key="recipe.slug"
+                :value="recipe.rating"
+                :name="recipe.name"
+                :slug="recipe.slug"
+              />
+            </div>
+            <v-divider></v-divider>
           </template>
 
           <template v-else-if="form">
@@ -152,7 +162,7 @@
               <BaseButton @click="addIngredient"> {{ $t("general.new") }} </BaseButton>
             </div>
           </div>
-          <div class="d-flex justify-space-between align-center pb-3">
+          <div class="d-flex justify-space-between align-center pt-2 pb-3">
             <v-tooltip v-if="!form" small top color="secondary darken-1">
               <template #activator="{ on, attrs }">
                 <v-btn
@@ -190,7 +200,7 @@
             <v-spacer></v-spacer>
 
             <RecipeRating
-              v-if="enableLandscape"
+              v-if="enableLandscape && $vuetify.breakpoint.smAndUp"
               :key="recipe.slug"
               :value="recipe.rating"
               :name="recipe.name"
@@ -425,9 +435,9 @@
       </v-card>
     </v-card>
     <div
-      v-if="recipe"
+      v-if="recipe && wakeIsSupported"
       class="d-print-none d-flex px-2"
-      :class="$vuetify.breakpoint.mobile ? 'justify-center' : 'justify-end'"
+      :class="$vuetify.breakpoint.smAndDown ? 'justify-center' : 'justify-end'"
     >
       <v-switch v-model="wakeLock" small label="Keep Screen Awake" />
     </div>
@@ -533,7 +543,7 @@ export default defineComponent({
     // ===============================================================
     // Screen Lock
 
-    const { isSupported, isActive, request, release } = useWakeLock();
+    const { isSupported: wakeIsSupported, isActive, request, release } = useWakeLock();
 
     const wakeLock = computed({
       get: () => isActive,
@@ -547,14 +557,14 @@ export default defineComponent({
     });
 
     async function lockScreen() {
-      if (isSupported) {
+      if (wakeIsSupported) {
         console.log("Wake Lock Requested");
         await request("screen");
       }
     }
 
     async function unlockScreen() {
-      if (isSupported || isActive) {
+      if (wakeIsSupported || isActive) {
         console.log("Wake Lock Released");
         await release();
       }
@@ -790,6 +800,7 @@ export default defineComponent({
 
     return {
       // Wake Lock
+      wakeIsSupported,
       isActive,
       lockScreen,
       unlockScreen,