From 40411008a206decd956fea897f934d780ff76d67 Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Mon, 30 Mar 2020 13:09:05 -0400 Subject: [PATCH] Adding the Farm section. --- covid-19-support/src/App.vue | 2 +- covid-19-support/src/components/Highlights.vue | 10 +++++++++- covid-19-support/src/components/ResourceMap.vue | 4 ++++ covid-19-support/src/components/SearchFilter.vue | 1 + covid-19-support/src/locales/en.json | 5 ++++- covid-19-support/src/main.js | 4 ++-- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/covid-19-support/src/App.vue b/covid-19-support/src/App.vue index 82138854..735c2ceb 100644 --- a/covid-19-support/src/App.vue +++ b/covid-19-support/src/App.vue @@ -13,7 +13,7 @@ />
- +
diff --git a/covid-19-support/src/components/Highlights.vue b/covid-19-support/src/components/Highlights.vue index 0190eeaa..299924eb 100644 --- a/covid-19-support/src/components/Highlights.vue +++ b/covid-19-support/src/components/Highlights.vue @@ -83,11 +83,17 @@ export default { return this.buildBoxValue('orderonline', 'fa-mouse', this.countOrderOnline) }, curbsidePickupValueBox() { - return this.buildBoxValue('curbsidepickup', 'fa-mouse', this.countPickup + this.countDriveUp, true) + return this.buildBoxValue('curbsidepickup', 'fa-car', this.countPickup + this.countDriveUp, true) }, deliveryValueBox() { return this.buildBoxValue('delivery', 'fa-shipping-fast', this.countDelivery) }, + onFarmPickupValueBox() { + return this.buildBoxValue('onfarmpickup', 'fa-tractor', this.countPickup + this.countDriveUp, true) + }, + farmersMarketValueBox() { + return this.buildBoxValue('farmersmarket', 'fa-store', this.countPickup + this.countDriveUp, true) + }, seniorShoppingValueBox() { return this.buildBoxValue('seniorshopping', 'fa-history', this.countSenior) }, @@ -114,6 +120,8 @@ export default { return [this.orderOnlineValueBox, this.curbsidePickupValueBox, this.medicalDiscountsValueBox, this.deliveryValueBox] case 'family': // Family Meal Kits return [this.orderOnlineValueBox, this.curbsidePickupValueBox, this.deliveryValueBox, this.medicalDiscountsValueBox] + case 'farm': // Farms + return [this.curbsidePickupValueBox, this.onFarmPickupValueBox, this.farmersMarketValueBox, this.orderOnlineValueBox] case 'meal': // Free Meals return [this.openToPublicValueBox, this.freeStudentMealsValueBox, this.freeProduceValueBox, this.freeGroceryValueBox] case 'pharmacy': diff --git a/covid-19-support/src/components/ResourceMap.vue b/covid-19-support/src/components/ResourceMap.vue index 85faab14..10f4d555 100644 --- a/covid-19-support/src/components/ResourceMap.vue +++ b/covid-19-support/src/components/ResourceMap.vue @@ -119,4 +119,8 @@ export default { height: calc(100% - 116px); } } + +.noselection.bv-example-row { + height: 100%; +} diff --git a/covid-19-support/src/components/SearchFilter.vue b/covid-19-support/src/components/SearchFilter.vue index 8c530cee..23d1a478 100644 --- a/covid-19-support/src/components/SearchFilter.vue +++ b/covid-19-support/src/components/SearchFilter.vue @@ -40,6 +40,7 @@ export default { { value: 'none', text: this.$tc('label.selectacategory', 1) }, { value: 'restaurant', text: this.$tc('category.restaurant', 2) }, { value: 'meal', text: this.$tc('category.meal', 2) }, + { value: 'farm', text: this.$tc('category.farm', 2) }, { value: 'grocery', text: this.$tc('category.grocery', 2) }, { value: 'pharmacy', text: this.$tc('category.pharmacy', 1) }, { value: 'pet', text: this.$tc('category.petsupplies', 2) } diff --git a/covid-19-support/src/locales/en.json b/covid-19-support/src/locales/en.json index 5aa704d3..e90b3106 100644 --- a/covid-19-support/src/locales/en.json +++ b/covid-19-support/src/locales/en.json @@ -2,6 +2,7 @@ "category": { "childcare": "Child care", "grocery": "Grocery|Groceries", + "farm": "Farm|Farms", "meal": "Free meal|Free meals", "petsupplies": "Pet Supplies", "pharmacy": "Pharmacy|Pharmacies", @@ -32,7 +33,9 @@ "orderonline": "Order & pay online", "phone": "Phone", "seniorshopping": "Senior shopping hours", - "selectacategory": "Select a category..." + "selectacategory": "Select a category...", + "farmersmarket": "Farmers Market|Farmers Markets", + "onfarmpickup": "On-farm pick-up" }, "sidebar": { "what-do-you-need": "What do you need?", diff --git a/covid-19-support/src/main.js b/covid-19-support/src/main.js index 0a75f6ca..e5623a93 100644 --- a/covid-19-support/src/main.js +++ b/covid-19-support/src/main.js @@ -2,7 +2,7 @@ import Vue from 'vue' import App from './App.vue' import i18n from './i18n' -import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' +import { BootstrapVue } from 'bootstrap-vue' // IconsPlugin import 'bootstrap/dist/css/bootstrap.css' import 'bootstrap-vue/dist/bootstrap-vue.css' @@ -11,7 +11,7 @@ import 'leaflet/dist/leaflet.css' // Install BootstrapVue Vue.use(BootstrapVue) // Optionally install the BootstrapVue icon components plugin -Vue.use(IconsPlugin) +// Vue.use(IconsPlugin) Vue.config.productionTip = true