Skip to content

Commit 56201c6

Browse files
szdytomszdytom
committed
[refactory message] stop pass this everywhere
1 parent 852e5b0 commit 56201c6

File tree

17 files changed

+88
-78
lines changed

17 files changed

+88
-78
lines changed

‎src/components/account/ChangePassword.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ export default {
9999
})
100100
.then(() => {
101101
this.buttonLoading = false;
102-
this.$SegmentMessage.success(this, 'Changed successfully');
102+
this.$info.success('Changed successfully');
103103
})
104104
.catch(err => {
105105
if (err.request.status === 401) {
106-
this.$SegmentMessage.error(this, 'Please login first');
106+
this.$info.error('Please login first');
107107
this.$store.state.user.showlogin = true;
108108
}
109109
if (err.request.status === 403) {
110-
this.$SegmentMessage.error(this, 'Please enter your old password');
110+
this.$info.error('Please enter your old password');
111111
this.old_password_required = true;
112112
}
113113
this.buttonLoading = false;

‎src/components/account/content.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ export default {
5757
})
5858
.catch(err => {
5959
if(err.request.status === 404) {
60-
this.$SegmentMessage.error(this, 'User does not exist');
60+
this.$info.error('User does not exist');
6161
} else {
62-
this.$SegmentMessage.error(this, 'Unknown error');
62+
this.$info.error('Unknown error');
6363
}
6464
this.userLoading = false;
6565
});

‎src/components/account/edit.vue‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ export default {
100100
})
101101
.catch(err => {
102102
if (err.request.status === 404) {
103-
this.$SegmentMessage.error(this, 'User not found');
103+
this.$info.error('User not found');
104104
} else if (err.request.status === 403) {
105-
this.$SegmentMessage.error(this, 'Permission denied');
105+
this.$info.error('Permission denied');
106106
} else {
107-
this.$SegmentMessage.error(this, 'Unknown error');
107+
this.$info.error('Unknown error');
108108
}
109109
});
110110
this.$axios
@@ -115,9 +115,9 @@ export default {
115115
})
116116
.catch(err => {
117117
if(err.request.status === 404) {
118-
this.$SegmentMessage.error(this, 'User does not exist');
118+
this.$info.error('User does not exist');
119119
} else {
120-
this.$SegmentMessage.error(this, 'Unknown error');
120+
this.$info.error('Unknown error');
121121
}
122122
this.userLoading = false;
123123
});
@@ -134,7 +134,7 @@ export default {
134134
})
135135
.then(() => {
136136
this.buttonLoading = false;
137-
this.$SegmentMessage.success(this, 'Your changes have been submitted');
137+
this.$info.success('Your changes have been submitted');
138138
if (this.isMine) {
139139
this.$store.commit('userStaffChange', {
140140
isStaff: this.isStaff,
@@ -153,21 +153,21 @@ export default {
153153
})
154154
.catch(err => {
155155
if(err.request.status === 404) {
156-
this.$SegmentMessage.error(this, 'User does not exist');
156+
this.$info.error('User does not exist');
157157
} else {
158-
this.$SegmentMessage.error(this, 'Unknown error');
158+
this.$info.error('Unknown error');
159159
}
160160
this.userLoading = false;
161161
});
162162
})
163163
.catch(err => {
164164
this.buttonLoading = false;
165165
if (err.request.status === 404) {
166-
this.$SegmentMessage.error(this, 'User not found');
166+
this.$info.error('User not found');
167167
} else if (err.request.status === 403) {
168-
this.$SegmentMessage.error(this, 'Permission denied');
168+
this.$info.error('Permission denied');
169169
} else {
170-
this.$SegmentMessage.error(this, 'Unknown error');
170+
this.$info.error('Unknown error');
171171
}
172172
});
173173
}

‎src/components/account/information.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,18 +179,18 @@ export default {
179179
})
180180
.catch(err => {
181181
if(err.request.status === 404) {
182-
this.$SegmentMessage.error(this, 'User does not exist');
182+
this.$info.error('User does not exist');
183183
} else {
184-
this.$SegmentMessage.error(this, 'Unknown error');
184+
this.$info.error('Unknown error');
185185
}
186186
});
187187
this.userLoading = false;
188188
})
189189
.catch(err => {
190190
if(err.request.status === 404) {
191-
this.$SegmentMessage.error(this, 'User does not exist');
191+
this.$info.error('User does not exist');
192192
} else {
193-
this.$SegmentMessage.error(this, 'Unknown error');
193+
this.$info.error('Unknown error');
194194
}
195195
this.userLoading = false;
196196
});

‎src/components/account/login.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ export default {
9999
username: this.ldata.username,
100100
userid: res.data.res.id
101101
});
102-
this.$SegmentMessage.success(this, 'Logged in');
102+
this.$info.success('Logged in');
103103
this.$store.state.user.showlogin = false;
104104
this.buttonLoading = false;
105105
})
106106
.catch(err => {
107107
if (err.request.status === 403) {
108-
this.$SegmentMessage.error(this, 'Username or password incorrect');
108+
this.$info.error('Username or password incorrect');
109109
} else if (err.request.status === 429) {
110110
// HTTP 429 Too Many Requests
111-
this.$SegmentMessage.error(this, 'Requesting too frequently');
111+
this.$info.error('Requesting too frequently');
112112
} else {
113113
// Unknown error
114-
this.$SegmentMessage.error(this, 'Unknown error');
114+
this.$info.error('Unknown error');
115115
}
116116
this.buttonLoading = false;
117117
});

‎src/components/account/logout.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ export default {
1313
.delete(apiurl('/account/session'))
1414
.then(() => {
1515
this.$store.commit('userLogout');
16-
this.$SegmentMessage.success(this, 'Logged out');
16+
this.$info.success('Logged out');
1717
this.$router.push('/');
1818
})
1919
.catch(err => {
2020
if (err.request.status === 401) {
21-
this.$SegmentMessage.error(this, 'Not logged in');
21+
this.$info.error('Not logged in');
2222
this.$store.commit('userLogout');
2323
} else if (err.request.status === 429) {
2424
// HTTP 429 Too Many Requests
25-
this.$SegmentMessage.error(this, 'Requesting too frequently');
25+
this.$info.error('Requesting too frequently');
2626
} else {
2727
// Unknown error
28-
this.$SegmentMessage.error(this, 'Unknown error');
28+
this.$info.error('Unknown error');
2929
}
3030
this.$store.commit('userLogout');
3131
});

‎src/components/account/register.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,25 +148,25 @@ export default {
148148
this.$store.state.user.showregister = false;
149149
this.$store.state.user.showlogin = true;
150150
// Successed
151-
this.$SegmentMessage.success(this, 'Your acount has been registered successfully');
151+
this.$info.success('Your acount has been registered successfully');
152152
this.buttonLoading = false;
153153
})
154154
.catch(err => {
155155
if (err.request.status === 400) {
156156
// HTTP 400 Bad Request
157-
this.$SegmentMessage.error(this, JSON.parse(err.request.response).detail);
157+
this.$info.error(JSON.parse(err.request.response).detail);
158158
} else if (err.request.status === 406){
159159
// HTTP 406 Not Acceptable
160-
this.$SegmentMessage.error(this, JSON.parse(err.request.response).detail);
160+
this.$info.error(JSON.parse(err.request.response).detail);
161161
} else if (err.request.status === 409) {
162162
// HTTP 409 Conflict
163-
this.$SegmentMessage.error(this, 'Username has been taken');
163+
this.$info.error('Username has been taken');
164164
} else if (err.request.status === 429) {
165165
// HTTP 429 Too Many Requests
166-
this.$SegmentMessage.error(this, 'Requesting too frequently');
166+
this.$info.error('Requesting too frequently');
167167
} else {
168168
// Unknown error
169-
this.$SegmentMessage.error(this, 'Unknown error');
169+
this.$info.error('Unknown error');
170170
}
171171
this.refresh_captcha();
172172
this.buttonLoading = false;

‎src/components/lib/AjaxTable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default {
7777
}
7878
})
7979
.catch(err => {
80-
this.$SegmentMessage.error(this, '[Ajax Table] Request Failed');
80+
this.$info.error('[Ajax Table] Request Failed');
8181
console.log(err);
8282
});
8383
}

‎src/components/lib/SelectTag.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
}
3131
})
3232
.catch(() => {
33-
this.$SegmentMessage.error(this, 'Get tags failed');
33+
this.$info.error('Get tags failed');
3434
});
3535
return arr;
3636
},
@@ -45,7 +45,7 @@ export default {
4545
}
4646
})
4747
.catch(() => {
48-
this.$SegmentMessage.error(this, 'Get tags failed');
48+
this.$info.error('Get tags failed');
4949
});
5050
return arr;
5151
},

‎src/components/problem/EditTag.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ export default {
4141
})
4242
.catch(err => {
4343
if (err.request.status === 404) {
44-
this.$SegmentMessage.error(this, 'Problem not found');
44+
this.$info.error('Problem not found');
4545
} else if (err.request.status === 403) {
46-
this.$SegmentMessage.error(this, 'Permission denied');
46+
this.$info.error('Permission denied');
4747
} else {
48-
this.$SegmentMessage.error(this, 'Unknown error');
48+
this.$info.error('Unknown error');
4949
}
5050
});
5151
}

0 commit comments

Comments
 (0)