Skip to content

Commit

Permalink
Merge pull request #1223 from NicoPennec/fix/various
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
NicoPennec authored Oct 20, 2023
2 parents 04168c7 + b69e376 commit d5e3507
Show file tree
Hide file tree
Showing 12 changed files with 90 additions and 123 deletions.
121 changes: 71 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"localStorage": "1.0.4",
"postcss": "8.4.31",
"prettier": "3.0.3",
"sass": "1.69.3",
"vite": "4.4.11",
"sass": "1.69.4",
"vite": "4.5.0",
"vite-plugin-eslint": "1.8.1",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.0.1",
Expand Down
File renamed without changes.
Binary file removed public/fonts/fontawesome-webfont.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ export default {
font-family: Lato;
font-style: normal;
font-weight: 400;
src: url(./assets/fonts/Lato.woff2) format('woff2');
src: url('/fonts/Lato.woff2') format('woff2');
}
html {
Expand Down
4 changes: 0 additions & 4 deletions src/components/lists/AssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -789,10 +789,6 @@ export default {
return this.getEntityLineNumber(this.displayedAssets, i, k)
},
newAssetPath() {
return this.getPath('new-asset')
},
assetPath(assetId) {
return this.getPath('asset', assetId)
},
Expand Down
1 change: 0 additions & 1 deletion src/components/lists/EpisodeStatsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ export default {
data() {
return {
busy: false,
expanded: {},
lastSelection: null,
takeLabelColors: ['#FB8C00', '#EF6C00', '#d35400', '#e74c3c', '#c0392b']
Expand Down
38 changes: 4 additions & 34 deletions src/components/lists/ProductionAssetTypeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@
<img src="../../assets/illustrations/empty_asset.png" />
</p>
<p class="info">{{ $t('assets.empty_list') }}</p>
<button-link
class="level-item big-button"
:text="$t('assets.new_asset')"
:path="newAssetPath"
/>
</div>
<div
class="has-text-centered"
Expand All @@ -125,10 +120,11 @@
</template>

<script>
import { mapGetters, mapActions } from 'vuex'
import { entityListMixin } from '@/components/mixins/entity_list'
import { mapGetters } from 'vuex'
import { getChartColors, getChartData } from '@/lib/stats'
import ButtonLink from '@/components/widgets/ButtonLink'
import { entityListMixin } from '@/components/mixins/entity_list'
import StatsCell from '@/components/cells/StatsCell'
import TableInfo from '@/components/widgets/TableInfo'
Expand Down Expand Up @@ -167,15 +163,7 @@ export default {
}
},
data() {
return {
busy: false,
lastSelection: null
}
},
components: {
ButtonLink,
StatsCell,
TableInfo
},
Expand All @@ -199,28 +187,10 @@ export default {
!this.isError &&
(!this.assetTypeSearchText || this.assetTypeSearchText.length === 0)
)
},
newAssetPath() {
const route = {
name: 'new-asset',
params: {
production_id: this.currentProduction.id
}
}
if (this.isTVShow && this.currentEpisode) {
route.name = 'episode-new-asset'
route.params.episode_id = this.currentEpisode.id
}
return route
}
},
methods: {
...mapActions([]),
chartColors(entryId, columnId) {
return getChartColors(this.assetTypeStats, entryId, columnId)
},
Expand Down
7 changes: 0 additions & 7 deletions src/components/lists/SequenceStatsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,6 @@ export default {
}
},
data() {
return {
busy: false,
lastSelection: null
}
},
computed: {
...mapGetters([
'currentProduction',
Expand Down
Loading

0 comments on commit d5e3507

Please sign in to comment.