Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.5.7 #138

Merged
merged 4 commits into from
Feb 7, 2021
Merged

0.5.7 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51b3ed1
version + dep bump
WDaan Jan 31, 2021
019e7e6
remove % for availab. #135
WDaan Jan 31, 2021
bf12600
remove context menu select + torrent select on card click when select…
WDaan Jan 31, 2021
83e0da7
speedchart tooltip formatting #140
WDaan Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@babel/polyfill": "^7.12.1",
"apexcharts": "^3.23.1",
"apexcharts": "^3.24.0",
"axios": "^0.21.1",
"core-js": "^3.8.3",
"dayjs": "^1.10.4",
Expand Down Expand Up @@ -43,7 +43,7 @@
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "^1.0.3",
"babel-eslint": "^10.1.0",
"eslint": "^7.18.0",
"eslint": "^7.19.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^7.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modals/TorrentDetailModal/Tabs/Info.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
Availability
</td>
<td>
{{ torrent.availability }}%
{{ torrent.availability }}
</td>
</tr>
</tbody>
Expand Down
7 changes: 7 additions & 0 deletions src/components/Navbar/SpeedGraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<script>
import VueApexCharts from 'vue-apexcharts'
import { mapGetters } from 'vuex'
import { getDataUnit, getDataValue } from '@/filters'

export default {
name: 'SpeedGraph',
components: {
Expand Down Expand Up @@ -60,6 +62,11 @@ export default {

return val + ' seconds ago'
}
},
y: {
formatter: value => {
return `${getDataValue(value, 0)} ${getDataUnit(value)}`
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Torrent/DashboardItems/Availability.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default {
computed: {
availability() {
if (this.torrent.availability !== -1) {
return `${this.torrent.availability}%`
return this.torrent.availability
}

return 'N/A'
Expand Down
3 changes: 2 additions & 1 deletion src/components/Torrent/Torrent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
flat
class="pointer noselect"
:class="{ selected: isSelected}"
@click.native.prevent="selectMode && selectTorrent(torrent.hash)"
@dblclick.prevent="showInfo(torrent.hash)"
@click.ctrl.exact.prevent="selectTorrent(torrent.hash)"
@click.shift.exact.prevent="selectUntil(torrent.hash, index)"
Expand All @@ -29,7 +30,7 @@ export default {
torrent: Object
},
computed: {
...mapState(['selected_torrents']),
...mapState(['selected_torrents', 'selectMode']),
isSelected() {
return this.selected_torrents.includes(this.torrent.hash)
}
Expand Down
8 changes: 0 additions & 8 deletions src/components/Torrent/TorrentRightClickMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,6 @@
Show Info
</v-list-item-title>
</v-list-item>
<v-list-item v-if="!multiple" link @click="selectTorrent(hash)">
<v-icon>{{ mdiSelect }}</v-icon>
<v-list-item-title
class="ml-2"
>
Select
</v-list-item-title>
</v-list-item>
</v-list>
</template>

Expand Down
4 changes: 2 additions & 2 deletions src/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function networkSize(size) {

Vue.filter('networkSize', networkSize)

function getDataUnit(a, b) {
export function getDataUnit(a, b) {
if (a === -1) return null
if (!a) return 'B'
const c = 1024
Expand All @@ -96,7 +96,7 @@ function getDataUnit(a, b) {

Vue.filter('getDataUnit', getDataUnit)

function getDataValue(a, b) {
export function getDataValue(a, b) {
if (a === -1) return 'None'
if (!a) return '0'
const c = 1024
Expand Down
2 changes: 1 addition & 1 deletion src/models/Status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export default class Status {
return 0
}

return Math.round(value / 1000)
return Math.round(value)
}
}