Skip to content

Commit

Permalink
Merge pull request #1208 from NicoPennec/fix/qa
Browse files Browse the repository at this point in the history
Improve Kitsu UI
  • Loading branch information
NicoPennec authored Oct 2, 2023
2 parents 6cc34df + f91ae28 commit e0199ab
Show file tree
Hide file tree
Showing 18 changed files with 91 additions and 103 deletions.
116 changes: 58 additions & 58 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"superagent": "8.1.2",
"textarea-caret": "3.1.0",
"thenby": "1.3.4",
"three": "0.156.1",
"three": "0.157.0",
"uuid": "9.0.1",
"v-autocomplete": "1.8.2",
"vue": "2.7.14",
Expand Down Expand Up @@ -71,12 +71,12 @@
"jsdom": "22.1.0",
"lint-staged": "14.0.1",
"localStorage": "1.0.4",
"postcss": "8.4.30",
"postcss": "8.4.31",
"prettier": "3.0.3",
"sass": "1.68.0",
"vite": "4.4.9",
"vite-plugin-eslint": "1.8.1",
"vitest": "0.34.5",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.0.1",
"vue-template-compiler": "2.7.14"
},
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@ th.validation-cell {
width: 150px;
&.short {
width: 106px;
width: 112px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Breakdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
class="flexrow-item"
icon="grid"
:is-on="isBigMode"
:title="$t('breakdown.big_pictures_mode')"
:title="$t('tasks.big_thumbnails')"
@click="isBigMode = !isBigMode"
/>
<button-simple
Expand Down
4 changes: 1 addition & 3 deletions src/components/pages/EntitySearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,7 @@ export default {
mounted() {
window.addEventListener('keydown', event => {
if (event.ctrlKey && event.altKey && event.keyCode === 70) {
if (this.$refs['search-field']) {
this.$refs['search-field'].focus()
}
this.searchField.focus()
} else if (event.keyCode === 40) {
this.selectNext()
} else if (event.keyCode === 38) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/MainSchedule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</label>
<datepicker
wrapper-class="datepicker"
input-class="date-input input"
input-class="date-input input short"
:language="locale"
:disabled-dates="{ days: [6, 0] }"
:monday-first="true"
Expand All @@ -23,7 +23,7 @@
</label>
<datepicker
wrapper-class="datepicker"
input-class="date-input input"
input-class="date-input input short"
:language="locale"
:disabled-dates="{ days: [6, 0] }"
:monday-first="true"
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/OpenProductions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export default {
},
mounted() {
this.$refs['search-field'].focus()
this.$refs['search-field']?.focus()
this.filteredProductions = this.openProductions
this.productionIndex = buildNameIndex(this.openProductions)
},
Expand Down
10 changes: 5 additions & 5 deletions src/components/pages/TaskType.vue
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,15 @@ const filters = {
},
duepreviousweek(tasks) {
const previousWeek = moment().add('days', -7).isoWeek()
const previousWeek = moment().add(-7, 'days').isoWeek()
return tasks.filter(t => {
const dueDate = parseDate(t.due_date)
return dueDate.isoWeek() === previousWeek
})
},
duenextweek(tasks) {
const nextWeek = moment().add('days', 7).isoWeek()
const nextWeek = moment().add(7, 'days').isoWeek()
return tasks.filter(t => {
const dueDate = parseDate(t.due_date)
return dueDate.isoWeek() === nextWeek
Expand All @@ -339,15 +339,15 @@ const filters = {
},
duepreviousmonth(tasks) {
const previousMonth = moment().add('months', -1).month()
const previousMonth = moment().add(-1, 'months').month()
return tasks.filter(t => {
const dueDate = parseDate(t.due_date)
return dueDate.month() === previousMonth
})
},
duenextmonth(tasks) {
const nextMonth = moment().add('months', 1).month()
const nextMonth = moment().add(1, 'months').month()
return tasks.filter(t => {
const dueDate = parseDate(t.due_date)
return dueDate.month() === nextMonth
Expand Down Expand Up @@ -1377,7 +1377,7 @@ export default {
today.isAfter(moment(this.schedule.taskTypeEndDate))
) {
this.$refs['schedule-widget'].scrollToDate(
moment(this.schedule.taskTypeStartDate).add('days', 20)
moment(this.schedule.taskTypeStartDate).add(20, 'days')
)
} else {
this.$refs['schedule-widget'].scrollToToday()
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/TaskTypes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ export default {
tabs: [
{
name: 'active',
label: 'main.active'
label: this.$t('main.active')
},
{
name: 'archived',
label: 'main.archived'
label: this.$t('main.archived')
}
],
taskTypeToDelete: { color: '#999999' },
Expand Down
Loading

0 comments on commit e0199ab

Please sign in to comment.