Skip to content

Commit

Permalink
Adding the Farm section.
Browse files Browse the repository at this point in the history
  • Loading branch information
readingdancer committed Mar 30, 2020
1 parent 18f2480 commit 4041100
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion covid-19-support/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/>
<div id="page-content-wrapper">
<highlights :need="need" :class="{ toggled: isFilterOpen }" :filteredMarkers="filteredMarkers" />
<resource-map :filteredMarkers="filteredMarkers" />
<resource-map :filteredMarkers="filteredMarkers" :class="{ noselection: need == 'none' }" />
</div>
</div>
</div>
Expand Down
10 changes: 9 additions & 1 deletion covid-19-support/src/components/Highlights.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Expand All @@ -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':
Expand Down
4 changes: 4 additions & 0 deletions covid-19-support/src/components/ResourceMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,8 @@ export default {
height: calc(100% - 116px);
}
}
.noselection.bv-example-row {
height: 100%;
}
</style>
1 change: 1 addition & 0 deletions covid-19-support/src/components/SearchFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
5 changes: 4 additions & 1 deletion covid-19-support/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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?",
Expand Down
4 changes: 2 additions & 2 deletions covid-19-support/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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

Expand Down

0 comments on commit 4041100

Please sign in to comment.