App Bar Rewrite (#347)

* Dummy Commit

* consolidate sidebar and app bar

* fix image error

* consolidate sidebar

* new icon for user menu

* fixes #329

* fix double click on mobile

* swap to computed properties

* fix open/close bug

* rewrite search for mobile

* fix ingredient checkbox

* cleanup console.logs

* set default lang + bump version

* draft changelog

* reword

* update env variables

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden
2021-04-25 13:47:08 -08:00
committed by GitHub
parent 7e6f3c9310
commit d5a340bde1
26 changed files with 384 additions and 370 deletions

View File

@@ -4,19 +4,12 @@
<v-slide-x-transition hide-on-leave>
<router-view></router-view>
</v-slide-x-transition>
<AdminSidebar />
</v-container>
</div>
</template>
<script>
import AdminSidebar from "@/components/Admin/AdminSidebar";
export default {
components: {
AdminSidebar,
},
};
export default {};
</script>
<style>

View File

@@ -1,6 +1,6 @@
<template>
<v-container>
<CategorySidebar />
<CardSection
v-if="siteSettings.showRecent"
:title="$t('page.recent')"
@@ -23,11 +23,10 @@
<script>
import { api } from "@/api";
import CardSection from "../components/UI/CardSection";
import CategorySidebar from "../components/UI/CategorySidebar";
export default {
components: {
CardSection,
CategorySidebar,
},
data() {
return {

View File

@@ -39,7 +39,7 @@
color="primary"
class="headline font-weight-light white--text"
>
<v-img :src="getImage(meal.image)"></v-img>
<v-img :src="getImage(meal.slug)"></v-img>
</v-list-item-avatar>
<v-list-item-content>
<v-list-item-title v-text="meal.name"></v-list-item-title>

View File

@@ -40,7 +40,7 @@
</v-col>
<v-col order-sm="0" :order-md="getOrder(index)" md="6" sm="12">
<v-card flat>
<v-img :src="getImage(meal.image)" max-height="300"> </v-img>
<v-img :src="getImage(meal.slug)" max-height="300"> </v-img>
</v-card>
</v-col>
</v-row>

View File

@@ -1,6 +1,5 @@
<template>
<v-container>
<CategorySidebar />
<CardSection
:sortable="true"
:title="$t('page.all-recipes')"
@@ -13,11 +12,10 @@
<script>
import CardSection from "@/components/UI/CardSection";
import CategorySidebar from "@/components/UI/CategorySidebar";
export default {
components: {
CardSection,
CategorySidebar,
},
data() {
return {};

View File

@@ -1,6 +1,5 @@
<template>
<v-container>
<CategorySidebar />
<CardSection
:sortable="true"
:title="title"
@@ -15,11 +14,9 @@
<script>
import { api } from "@/api";
import CardSection from "@/components/UI/CardSection";
import CategorySidebar from "@/components/UI/CategorySidebar";
export default {
components: {
CardSection,
CategorySidebar,
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<v-container>
<CategorySidebar />
<v-card flat height="100%">
<v-app-bar flat>
<v-spacer></v-spacer>
@@ -32,13 +31,11 @@
<script>
import CardSection from "@/components/UI/CardSection";
import CategorySidebar from "@/components/UI/CategorySidebar";
import { api } from "@/api";
export default {
components: {
CardSection,
CategorySidebar,
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<v-container>
<CategorySidebar />
<CardSection
:sortable="true"
:title="title"
@@ -15,11 +14,9 @@
<script>
import { api } from "@/api";
import CardSection from "@/components/UI/CardSection";
import CategorySidebar from "@/components/UI/CategorySidebar";
export default {
components: {
CardSection,
CategorySidebar,
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<v-container>
<CategorySidebar />
<v-card flat>
<v-row dense>
<v-col>
@@ -79,14 +78,12 @@
<script>
import Fuse from "fuse.js";
import RecipeCard from "@/components/Recipe/RecipeCard";
import CategorySidebar from "@/components/UI/CategorySidebar";
import CategoryTagSelector from "@/components/FormHelpers/CategoryTagSelector";
import FilterSelector from "./FilterSelector.vue";
export default {
components: {
RecipeCard,
CategorySidebar,
CategoryTagSelector,
FilterSelector,
},