Skip to content

Commit f6bbe46

Browse files
monkeyWiemonkeyWie
committed
2 parents da045b6 + d4f48f3 commit f6bbe46

File tree

20 files changed

+457
-216
lines changed

20 files changed

+457
-216
lines changed

‎front/public/team_header/Black-Hole.png‎

10.7 KB
Loading

‎front/public/team_header/NISAL.png‎

41 KB
Loading

‎front/public/team_header/monkeyWie.png‎

11.1 KB
Loading

‎front/src/App.vue‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,52 @@
66
@on-select="forward">
77
<i-menu-item name="tasks">
88
<Icon type="ios-download-outline"></Icon>
9-
{{$t("nav.tasks")}}
9+
{{ $t("nav.tasks") }}
1010
</i-menu-item>
1111
<i-menu-item name="extension">
1212
<Icon type="social-windows"></Icon>
13-
{{$t("nav.extension")}}
13+
{{ $t("nav.extension") }}
1414
</i-menu-item>
1515
<i-menu-item name="setting">
1616
<Icon type="settings"></Icon>
17-
{{$t("nav.setting")}}
17+
{{ $t("nav.setting") }}
1818
</i-menu-item>
1919
<i-menu-item name="about">
2020
<Icon type="information-circled"></Icon>
21-
{{$t("nav.about")}}
21+
{{ $t("nav.about") }}
2222
</i-menu-item>
2323
<i-menu-item name="support">
2424
<Icon type="social-usd"></Icon>
25-
{{$t("nav.support")}}
25+
{{ $t("nav.support") }}
2626
</i-menu-item>
2727
</i-menu>
28+
2829
<Modal v-model="hasUpdate"
2930
:title="$t('update.checkNew')">
30-
<b>{{$t('update.version')}}：</b>
31-
<span>{{versionInfo.version}}</span>
31+
<b>{{ $t('update.version') }}：</b>
32+
<span>{{ versionInfo.version }}</span>
3233
<br>
3334
<br>
34-
<b>{{$t('update.changeLog')}}：</b>
35+
<b>{{ $t('update.changeLog') }}：</b>
3536
<div style="padding-top:10px;"
3637
v-html="versionInfo.description"></div>
3738
<span slot="footer">
38-
<Button @click="hasUpdate = false">{{$t('tip.cancel')}}</Button>
39+
<Button @click="hasUpdate = false">{{ $t('tip.cancel') }}</Button>
3940
<Button type="primary"
40-
@click="doUpdate()">{{$t('update.update')}}</Button>
41+
@click="doUpdate()">{{ $t('update.update') }}</Button>
4142
</span>
4243
</Modal>
44+
4345
<Modal v-model="restatModel"
4446
:title="$t('update.done')">
45-
<h3>{{$t('update.restart')}}</h3>
47+
<h3>{{ $t('update.restart') }}</h3>
4648
<span slot="footer">
47-
<Button @click="restatModel = false">{{$t('tip.cancel')}}</Button>
49+
<Button @click="restatModel = false">{{ $t('tip.cancel') }}</Button>
4850
<Button type="primary"
49-
@click="doRestart()">{{$t('tip.ok')}}</Button>
51+
@click="doRestart()">{{ $t('tip.ok') }}</Button>
5052
</span>
5153
</Modal>
54+
5255
<div style="padding: 1.25rem 1.25rem">
5356
<router-view/>
5457
</div>
@@ -59,9 +62,10 @@
5962
import { doUpdate, doRestart } from './common/native.js'
6063
export default {
6164
methods: {
62-
forward(a) {
63-
this.$router.push(a)
65+
forward(route) {
66+
this.$router.push(route)
6467
},
68+
6569
doUpdate() {
6670
doUpdate(this.versionInfo.path)
6771
.then(() => {
@@ -74,19 +78,22 @@ export default {
7478
this.$Message.error(this.$t('update.error'))
7579
})
7680
},
81+
7782
doRestart() {
7883
doRestart().then((this.restatModel = false))
7984
}
8085
},
86+
8187
data() {
8288
return {
8389
hasUpdate: false,
8490
versionInfo: {},
8591
restatModel: false
8692
}
8793
},
94+
8895
created() {
89-
//检查更新
96+
// Check Update
9097
if (this.$config.needCheckUpdate) {
9198
this.$noSpinHttp
9299
.get(this.$config.adminServer + 'version/checkUpdate')

‎front/src/common/native.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const toggleExtension = data => {
122122
}
123123

124124
const openUrl = url => {
125-
if (window.navigator.userAgent.indexOf('JavaFX') != -1) {
125+
if (window.navigator.userAgent.indexOf('JavaFX') !== -1) {
126126
clientNoSpin.post('/native/openUrl', { url: encodeURIComponent(url) })
127127
} else {
128128
window.open(url)

‎front/src/components/FileChoose/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Button type="primary"
88
class="file-choose-button"
99
:disabled="disabled||chooserWait"
10-
@click="showChooser">{{$t('tip.choose')}}</Button>
10+
@click="showChooser">{{ $t('tip.choose') }}</Button>
1111
</div>
1212
</template>
1313

‎front/src/components/Table/index.vue‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<Checkbox v-model="all"
1010
@on-change="setAll"></Checkbox>
1111
</div>
12-
<div class="th">{{ $t("tasks.fileName") }}</div>
13-
<div class="th">{{ $t("tasks.fileSize") }}</div>
14-
<div class="th">{{ $t("tasks.taskProgress") }}</div>
15-
<div class="th">{{ $t("tasks.downloadSpeed") }}</div>
16-
<div class="th">{{ $t("tasks.status") }}</div>
17-
<div class="th">{{ $t("tasks.operate") }}</div>
12+
<div class="th">{{ $t("tasks.fileName") }}</div>
13+
<div class="th">{{ $t("tasks.fileSize") }}</div>
14+
<div class="th">{{ $t("tasks.taskProgress") }}</div>
15+
<div class="th">{{ $t("tasks.downloadSpeed") }}</div>
16+
<div class="th">{{ $t("tasks.status") }}</div>
17+
<div class="th">{{ $t("tasks.operate") }}</div>
1818
</div>
1919
</div>
2020
</div>
@@ -36,21 +36,21 @@
3636
<div class="td">{{ $numeral(task.info.speed).format('0.00b') }}/S</div>
3737
<div class="td">{{ calcStatus(task) }}</div>
3838
<div class="td">
39-
<Icon v-if="task.info.status==1"
39+
<Icon v-if="task.info.status === 1"
4040
class="action-icon"
4141
type="ios-pause"
42-
@click="$emit('on-pause',task)"></Icon>
43-
<Icon v-else-if="task.info.status==4"
42+
@click="$emit('on-pause', task)"></Icon>
43+
<Icon v-else-if="task.info.status === 4"
4444
class="action-icon"
4545
type="ios-folder"
46-
@click="$emit('on-open',task)"></Icon>
46+
@click="$emit('on-open', task)"></Icon>
4747
<Icon v-else
4848
class="action-icon"
4949
type="ios-play"
50-
@click="$emit('on-resume',task)"></Icon>
50+
@click="$emit('on-resume', task)"></Icon>
5151
<Icon type="ios-trash"
5252
class="action-icon"
53-
@click="$emit('on-delete',task)"></Icon>
53+
@click="$emit('on-delete', task)"></Icon>
5454
<Poptip placement="right-end"
5555
:title="$t('tasks.detail')"
5656
width="400"
@@ -61,36 +61,36 @@
6161
<div class="file-detail"
6262
slot="content">
6363
<p>
64-
<b>{{$t('tasks.url')}}：</b>
65-
<span>{{task.request.url}}</span>
64+
<b>{{ $t('tasks.url') }}：</b>
65+
<span>{{ task.request.url }}</span>
6666
</p>
6767
<p>
68-
<b>{{$t('tasks.fileName')}}：</b>
69-
<span>{{task.response.fileName}}</span>
68+
<b>{{ $t('tasks.fileName') }}：</b>
69+
<span>{{ task.response.fileName }}</span>
7070
</p>
7171
<p>
72-
<b>{{$t('tasks.filePath')}}：</b>
73-
<span>{{task.config.filePath}}</span>
72+
<b>{{ $t('tasks.filePath') }}：</b>
73+
<span>{{ task.config.filePath }}</span>
7474
</p>
7575
<p>
76-
<b>{{$t('tasks.fileSize')}}：</b>
77-
<span>{{$numeral(task.response.totalSize).format('0.00b')}}</span>
76+
<b>{{ $t('tasks.fileSize') }}：</b>
77+
<span>{{ $numeral(task.response.totalSize).format('0.00b') }}</span>
7878
</p>
7979
<p>
80-
<b>{{$t('tasks.connections')}}：</b>
81-
<span>{{task.config.connections}}</span>
80+
<b>{{ $t('tasks.connections') }}：</b>
81+
<span>{{ task.config.connections }}</span>
8282
</p>
8383
<p>
84-
<b>{{$t('tasks.downloadSpeed')}}：</b>
85-
<span>{{$numeral(task.info.speed).format('0.00b')}}/S</span>
84+
<b>{{ $t('tasks.downloadSpeed') }}：</b>
85+
<span>{{ $numeral(task.info.speed).format('0.00b') }}/S</span>
8686
</p>
8787
<p>
88-
<b>{{$t('tasks.status')}}：</b>
89-
<span>{{calcStatus(task)}}</span>
88+
<b>{{ $t('tasks.status') }}：</b>
89+
<span>{{ calcStatus(task) }}</span>
9090
</p>
9191
<p>
92-
<b>{{ $t("tasks.createTime") }}：</b>
93-
<span>{{new Date(task.info.startTime).format('yyyy-MM-dd hh:mm:ss')}}</span>
92+
<b>{{ $t("tasks.createTime") }}：</b>
93+
<span>{{ new Date(task.info.startTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
9494
</p>
9595
</div>
9696
</Poptip>
@@ -122,7 +122,7 @@ export default {
122122
123123
watch: {
124124
taskList() {
125-
if (this.taskList.length == 0) {
125+
if (this.taskList.length === 0) {
126126
this.checkedMap = {}
127127
this.all = false
128128
}
@@ -140,6 +140,7 @@ export default {
140140
}
141141
}
142142
},
143+
143144
toggleAll(checked) {
144145
if (checked) {
145146
for (let key in this.checkedMap) {
@@ -152,13 +153,15 @@ export default {
152153
this.all = false
153154
}
154155
},
156+
155157
calcProgress(task) {
156158
return (
157159
this.$numeral(task.info.downSize / task.response.totalSize).format(
158160
'0.00%'
159161
) || '0%'
160162
)
161163
},
164+
162165
calcStatus(task) {
163166
switch (task.info.status) {
164167
case 0:
@@ -179,10 +182,11 @@ export default {
179182
return this.$t('tasks.statusDone')
180183
}
181184
},
185+
182186
getCheckedTasks() {
183187
return this.taskList.filter(task => {
184188
for (let key in this.checkedMap) {
185-
if (key == task.id && this.checkedMap[key] === true) {
189+
if (this.checkedMap.hasOwnProperty(key) && this.checkedMap[key] && key === task.id) {
186190
return true
187191
}
188192
}

‎front/src/components/Task/Create.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
prop="response.fileName">
1515
<Input v-model="form.response.fileName" />
1616
</FormItem>
17-
<FormItem :label="$t('tasks.fileSize')">{{$numeral(form.response.totalSize).format('0.00b')}}</FormItem>
17+
<FormItem :label="$t('tasks.fileSize')">{{ $numeral(form.response.totalSize).format('0.00b') }}</FormItem>
1818
<FormItem :label="$t('tasks.connections')"
1919
prop="config.connections">
2020
<Slider v-if="response.supportRange"
@@ -35,8 +35,8 @@
3535
</Form>
3636
<div slot="footer">
3737
<Button type="primary"
38-
@click="onSubmit">{{$t('tip.ok')}}</Button>
39-
<Button @click="closeModal">{{$t('tip.cancel')}}</Button>
38+
@click="onSubmit">{{ $t('tip.ok') }}</Button>
39+
<Button @click="closeModal">{{ $t('tip.cancel') }}</Button>
4040
</div>
4141
<Spin size="large"
4242
fix

‎front/src/components/Task/Resolve.vue‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
<Input v-model="form.url" />
1515
</FormItem>
1616
<FormItem :label="$t('tasks.option')">
17-
<Checkbox v-model="hasHead">{{$t('tasks.head')}}</Checkbox>
18-
<Checkbox v-model="hasBody">{{$t('tasks.body')}}</Checkbox>
17+
<Checkbox v-model="hasHead">{{ $t('tasks.head') }}</Checkbox>
18+
<Checkbox v-model="hasBody">{{ $t('tasks.body') }}</Checkbox>
1919
</FormItem>
2020
<FormItem v-show="hasHead"
2121
:label="$t('tasks.head')"
2222
prop="heads">
2323
<div v-for="(head, index) in form.heads"
2424
:key="index"
25-
:class="index==0?null:'head-margin'">
25+
:class="index === 0 ? null : 'head-margin' ">
2626
<Input class="head-input"
2727
v-model="head.key"
2828
placeholder="key" />
2929
<Input class="head-input"
3030
v-model="head.value"
3131
placeholder="value" />
32-
<Icon v-if="index!=0"
32+
<Icon v-if="index !== 0"
3333
type="minus-circled"
3434
@click="delHead(index)"></Icon>
35-
<Icon v-if="index==form.heads.length-1"
35+
<Icon v-if="index === form.heads.length - 1"
3636
type="plus-circled"
3737
@click="addHead"></Icon>
3838
</div>
@@ -47,8 +47,8 @@
4747
</Form>
4848
<div slot="footer">
4949
<Button type="primary"
50-
@click="onSubmit">{{$t('tip.ok')}}</Button>
51-
<Button @click="$emit('input', false);">{{$t('tip.cancel')}}</Button>
50+
@click="onSubmit">{{ $t('tip.ok') }}</Button>
51+
<Button @click="$emit('input', false)">{{ $t('tip.cancel') }}</Button>
5252
</div>
5353
<Spin size="large"
5454
fix
@@ -84,7 +84,7 @@ export default {
8484
},
8585
watch: {
8686
hasHead(val) {
87-
if (val && this.form.heads.length == 0) {
87+
if (val && this.form.heads.length === 0) {
8888
this.addHead()
8989
}
9090
}

‎front/src/i18n/en-US.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default {
1515
save: 'Save'
1616
},
1717
tasks: {
18-
createTasks: 'Create Task',
18+
createTask: 'Create Task',
1919
continueDownloading: 'Continue Downloading',
2020
pauseDownloads: 'Pause Downloads',
2121
deleteTask: 'Delete Task',
@@ -88,6 +88,22 @@ export default {
8888
checkUpdateStartup: 'Every time startup',
8989
checkUpdateNever: 'Never'
9090
},
91+
about: {
92+
project: {
93+
title: 'Project',
94+
content: 'Proxyee-Down is an open source, free software based on the software\'s high-speed download kernel and extensions to easily and quickly download the required resources.',
95+
githubAddress: 'Project Homepage: ',
96+
tutorial: 'Use Tutorial: ',
97+
feedback: 'Feedback: ',
98+
currentVersion: 'Current Version: '
99+
},
100+
team: {
101+
title: 'Team',
102+
monkeyWie: 'Java programmer',
103+
blackhole: 'Security oriented front-end developers',
104+
NISAL: 'Front-end developer',
105+
}
106+
},
91107
update: {
92108
checkNew: 'New version',
93109
version: 'version',

0 commit comments

Comments
 (0)