Skip to content

Commit

Permalink
Merge pull request #287 from glitchedmob/consistent-component-usage
Browse files Browse the repository at this point in the history
Consistent component usage
  • Loading branch information
readingdancer authored Sep 25, 2020
2 parents ea83ccd + c194ace commit 92f9201
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions covid-19-support/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
},
rules: {
'vue/max-attributes-per-line': 0,
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
'prettier/prettier': [
'error',
{
Expand Down
12 changes: 6 additions & 6 deletions covid-19-support/src/components/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@
<div class="sidebar-top">
<search-filters class="search-filters" :need="need" @need-selected="(opt) => $emit('need-selected', opt)" />

<InfoPanel :infotype="'note'" :icon="'fa-info-circle'" v-if="location.currentBusiness == null || showList">
<info-panel :infotype="'note'" :icon="'fa-info-circle'" v-if="location.currentBusiness == null || showList">
{{ $t('sidebar.info-about-us') }} <a href="#" @click="$bvModal.show('about-us')">{{ $t('sidebar.info-link-text') }}</a
>{{ $t('sidebar.info-end-text') }}
</InfoPanel>
</info-panel>

<InfoPanel :infotype="'handwash'" :icon="'fa-hands-wash'" v-if="filteredMarkers.length == 0">
<info-panel :infotype="'handwash'" :icon="'fa-hands-wash'" v-if="filteredMarkers.length == 0">
<b class="themeFont">{{ $t('sidebar.shopsafe') }}</b>
<br />
(1) {{ $t('sidebar.stayhome') }}<br />
(2) {{ $t('sidebar.sixfeet') }}<br />
(3) {{ $t('sidebar.washhands') }}<br />
</InfoPanel>
</info-panel>
</div>

<BusinessDetails
<business-details
:infotype="'green'"
:icon="'fa-tractor'"
:business="location.currentBusiness"
v-if="location.currentBusiness != null && showList !== true"
@close-details="$emit('close-details')"
></BusinessDetails>
></business-details>
</div>

<results-list
Expand Down

0 comments on commit 92f9201

Please sign in to comment.