mirror of
				https://github.com/mealie-recipes/mealie.git
				synced 2025-10-31 10:13:32 -04:00 
			
		
		
		
	Feature/update login UI (#716)
* cleanup signin UI * add timeout Co-authored-by: Hayden <hay-kot@pm.me>
This commit is contained in:
		| @@ -8,7 +8,9 @@ RUN yarn install \ | |||||||
|   --prefer-offline \ |   --prefer-offline \ | ||||||
|   --frozen-lockfile \ |   --frozen-lockfile \ | ||||||
|   --non-interactive \ |   --non-interactive \ | ||||||
|   --production=false |   --production=false \  | ||||||
|  |   # https://github.com/docker/build-push-action/issues/471 | ||||||
|  |   --network-timeout 1000000 | ||||||
|    |    | ||||||
| RUN yarn build | RUN yarn build | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,8 +1,8 @@ | |||||||
| <template> | <template> | ||||||
|   <v-footer color="primary lighten-1" padless app> |   <v-footer color="primary" padless app> | ||||||
|     <v-row justify="center" align="center" dense no-gutters> |     <v-row justify="center" align="center" dense no-gutters> | ||||||
|       <v-col class="primary py-2 text-center white--text" cols="12"> |       <v-col class="py-2 text-center white--text" cols="12"> | ||||||
|         <v-btn dark icon href="https://github.com/hay-kot/mealie" target="_blank"> |         <v-btn color="white" icon href="https://github.com/hay-kot/mealie" target="_blank"> | ||||||
|           <v-icon> |           <v-icon> | ||||||
|             {{ $globals.icons.github }} |             {{ $globals.icons.github }} | ||||||
|           </v-icon> |           </v-icon> | ||||||
| @@ -20,11 +20,6 @@ export default defineComponent({ | |||||||
|   setup() { |   setup() { | ||||||
|     return {}; |     return {}; | ||||||
|   }, |   }, | ||||||
|   data: () => ({ |  | ||||||
|     links: ["Home", "About Us", "Team", "Services", "Blog", "Contact Us"], |  | ||||||
|   }), |  | ||||||
| }); | }); | ||||||
| </script> | </script> | ||||||
|        |        | ||||||
|       <style scoped> |  | ||||||
| </style> |  | ||||||
| @@ -1,8 +1,6 @@ | |||||||
| <template> | <template> | ||||||
|   <v-app dark> |   <v-app dark> | ||||||
|     <TheSnackbar /> |     <TheSnackbar /> | ||||||
|  |  | ||||||
|     <AppHeader :menu="false"> </AppHeader> |  | ||||||
|     <v-main> |     <v-main> | ||||||
|       <v-scroll-x-transition> |       <v-scroll-x-transition> | ||||||
|         <Nuxt /> |         <Nuxt /> | ||||||
| @@ -16,11 +14,10 @@ | |||||||
| <script lang="ts"> | <script lang="ts"> | ||||||
| import { defineComponent } from "@nuxtjs/composition-api"; | import { defineComponent } from "@nuxtjs/composition-api"; | ||||||
| import AppFooter from "@/components/Layout/AppFooter.vue"; | import AppFooter from "@/components/Layout/AppFooter.vue"; | ||||||
| import AppHeader from "@/components/Layout/AppHeader.vue"; |  | ||||||
| import TheSnackbar from "~/components/Layout/TheSnackbar.vue"; | import TheSnackbar from "~/components/Layout/TheSnackbar.vue"; | ||||||
|  |  | ||||||
| export default defineComponent({ | export default defineComponent({ | ||||||
|   components: { AppHeader, AppFooter, TheSnackbar }, |   components: { AppFooter, TheSnackbar }, | ||||||
|   setup() { |   setup() { | ||||||
|     return {}; |     return {}; | ||||||
|   }, |   }, | ||||||
|   | |||||||
| @@ -1,12 +1,13 @@ | |||||||
| <template> | <template> | ||||||
|   <v-container fill-height fluid class="d-flex justify-center align-start"> |   <v-container fill-height fluid class="d-flex justify-center align-center"> | ||||||
|     <v-card color="background d-flex flex-column align-center" flat width="600px"> |     <v-card color="background d-flex flex-column align-center" flat width="600px"> | ||||||
|       <svg |       <svg | ||||||
|         id="bbc88faa-5a3b-49cf-bdbb-6c9ab11be594" |         id="bbc88faa-5a3b-49cf-bdbb-6c9ab11be594" | ||||||
|         data-name="Layer 1" |         data-name="Layer 1" | ||||||
|         xmlns="http://www.w3.org/2000/svg" |         xmlns="http://www.w3.org/2000/svg" | ||||||
|         viewBox="0 0 728 754.88525" |         viewBox="0 0 728 754.88525" | ||||||
|         style="max-height: 300px" |         style="max-height: 200px" | ||||||
|  |         class="mt-2" | ||||||
|       > |       > | ||||||
|         <rect |         <rect | ||||||
|           x="514.67011" |           x="514.67011" | ||||||
| @@ -147,7 +148,7 @@ | |||||||
|         <ellipse cx="659.69176" cy="616.02594" rx="2.00365" ry="1.00183" fill="#e6e6e6" /> |         <ellipse cx="659.69176" cy="616.02594" rx="2.00365" ry="1.00183" fill="#e6e6e6" /> | ||||||
|         <ellipse cx="664.42232" cy="619.57385" rx="2.00365" ry="1.00183" fill="#e6e6e6" /> |         <ellipse cx="664.42232" cy="619.57385" rx="2.00365" ry="1.00183" fill="#e6e6e6" /> | ||||||
|       </svg> |       </svg> | ||||||
|       <v-card-title class="headline justify-center"> Mealie Login </v-card-title> |       <v-card-title class="headline justify-center"> Sign In To Mealie </v-card-title> | ||||||
|       <BaseDivider /> |       <BaseDivider /> | ||||||
|       <v-card-text> |       <v-card-text> | ||||||
|         <v-form @submit.prevent="authenticate()"> |         <v-form @submit.prevent="authenticate()"> | ||||||
| @@ -157,7 +158,6 @@ | |||||||
|             rounded |             rounded | ||||||
|             autofocus |             autofocus | ||||||
|             class="rounded-lg" |             class="rounded-lg" | ||||||
|             prepend-icon="mdi-account" |  | ||||||
|             name="login" |             name="login" | ||||||
|             label="Email or Username" |             label="Email or Username" | ||||||
|             type="text" |             type="text" | ||||||
| @@ -168,17 +168,21 @@ | |||||||
|             filled |             filled | ||||||
|             rounded |             rounded | ||||||
|             class="rounded-lg" |             class="rounded-lg" | ||||||
|             prepend-icon="mdi-lock" |  | ||||||
|             name="password" |             name="password" | ||||||
|             label="Password" |             label="Password" | ||||||
|             type="password" |             type="password" | ||||||
|           /> |           /> | ||||||
|  |           <v-checkbox class="ml-2 mt-n4" label="Remember Me"></v-checkbox> | ||||||
|  |           <v-card-actions class="justify-center"> | ||||||
|  |             <div class="max-button"> | ||||||
|               <v-btn :loading="loggingIn" color="primary" type="submit" large rounded class="rounded-xl" block> |               <v-btn :loading="loggingIn" color="primary" type="submit" large rounded class="rounded-xl" block> | ||||||
|                 {{ $t("user.login") }} |                 {{ $t("user.login") }} | ||||||
|               </v-btn> |               </v-btn> | ||||||
|  |             </div> | ||||||
|  |           </v-card-actions> | ||||||
|         </v-form> |         </v-form> | ||||||
|       </v-card-text> |       </v-card-text> | ||||||
|       <v-btn v-if="allowSignup" class="mx-auto" text to="/register"> {{ $t("user.register") }} </v-btn> |       <v-btn v-if="allowSignup" rounded class="mx-auto" text to="/register"> {{ $t("user.register") }} </v-btn> | ||||||
|       <v-btn v-else class="mx-auto" text disabled> {{ $t("user.invite-only") }} </v-btn> |       <v-btn v-else class="mx-auto" text disabled> {{ $t("user.invite-only") }} </v-btn> | ||||||
|     </v-card> |     </v-card> | ||||||
|   </v-container> |   </v-container> | ||||||
| @@ -221,3 +225,10 @@ export default defineComponent({ | |||||||
|   }, |   }, | ||||||
| }); | }); | ||||||
| </script> | </script> | ||||||
|  |  | ||||||
|  |  | ||||||
|  | <style lang="css"> | ||||||
|  | .max-button { | ||||||
|  |   width: 300px; | ||||||
|  | } | ||||||
|  | </style> | ||||||
		Reference in New Issue
	
	Block a user