Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cp -r dist /tmp/
cd /tmp/dist

# 404 跳转
echo "<script>fetch('index.html').then(d=>document.write(d.text()))</script>" > 404.html
echo "<script>fetch('index.html').then(r=>r.text()).then(d=>document.write(d))</script>" > 404.html

# 部署到自定义域域名
# echo 'www.example.com' > CNAME
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
"vue": "^2.6.11",
"vue-router": "^3.3.4",
"vue-unique-id": "^3.1.0",
"vuex": "^3.5.1"
"vuex": "^3.5.1",
"vue-katex": "^0.4.0",
"katex": "^0.11.1",
"vue-template-compiler": "^2.6.11"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.4.0",
Expand All @@ -30,12 +33,9 @@
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"katex": "^0.11.1",
"stylelint": "^13.6.1",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0",
"vue-katex": "^0.4.0",
"vue-template-compiler": "^2.6.11"
"stylelint-scss": "^3.18.0"
},
"eslintConfig": {
"root": true,
Expand Down
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<script>
import NavBar from './components/page/navbar.vue';
import Footer from './components/page/footer.vue';
import UserLogin from './components/user/login.vue';
import UserRegister from './components/user/register.vue';
import UserLogin from './components/account/login.vue';
import UserRegister from './components/account/register.vue';

export default {
name: 'App',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ export default {
})
.then(() => {
this.buttonLoading = false;
this.$SegmentMessage.success(this, 'Changed successfully');
this.$info.success('Changed successfully');
})
.catch(err => {
if (err.request.status === 401) {
this.$SegmentMessage.error(this, 'Please login first');
this.$info.error('Please login first');
this.$store.state.user.showlogin = true;
}
if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Please enter your old password');
this.$info.error('Please enter your old password');
this.old_password_required = true;
}
this.buttonLoading = false;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ export default {
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'User does not exist');
this.$info.error('User does not exist');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.userLoading = false;
});
Expand Down
22 changes: 11 additions & 11 deletions src/components/user/edit.vue → src/components/account/edit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ export default {
})
.catch(err => {
if (err.request.status === 404) {
this.$SegmentMessage.error(this, 'User not found');
this.$info.error('User not found');
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
this.$info.error('Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
this.$axios
Expand All @@ -115,9 +115,9 @@ export default {
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'User does not exist');
this.$info.error('User does not exist');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.userLoading = false;
});
Expand All @@ -134,7 +134,7 @@ export default {
})
.then(() => {
this.buttonLoading = false;
this.$SegmentMessage.success(this, 'Your changes have been submitted');
this.$info.success('Your changes have been submitted');
if (this.isMine) {
this.$store.commit('userStaffChange', {
isStaff: this.isStaff,
Expand All @@ -153,21 +153,21 @@ export default {
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'User does not exist');
this.$info.error('User does not exist');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.userLoading = false;
});
})
.catch(err => {
this.buttonLoading = false;
if (err.request.status === 404) {
this.$SegmentMessage.error(this, 'User not found');
this.$info.error('User not found');
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
this.$info.error('Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,18 @@ export default {
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'User does not exist');
this.$info.error('User does not exist');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
this.userLoading = false;
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'User does not exist');
this.$info.error('User does not exist');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.userLoading = false;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@ export default {
username: this.ldata.username,
userid: res.data.res.id
});
this.$SegmentMessage.success(this, 'Logged in');
this.$info.success('Logged in');
this.$store.state.user.showlogin = false;
this.buttonLoading = false;
})
.catch(err => {
if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Username or password incorrect');
this.$info.error('Username or password incorrect');
} else if (err.request.status === 429) {
// HTTP 429 Too Many Requests
this.$SegmentMessage.error(this, 'Requesting too frequently');
this.$info.error('Requesting too frequently');
} else {
// Unknown error
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.buttonLoading = false;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ export default {
.delete(apiurl('/account/session'))
.then(() => {
this.$store.commit('userLogout');
this.$SegmentMessage.success(this, 'Logged out');
this.$info.success('Logged out');
this.$router.push('/');
})
.catch(err => {
if (err.request.status === 401) {
this.$SegmentMessage.error(this, 'Not logged in');
this.$info.error('Not logged in');
this.$store.commit('userLogout');
} else if (err.request.status === 429) {
// HTTP 429 Too Many Requests
this.$SegmentMessage.error(this, 'Requesting too frequently');
this.$info.error('Requesting too frequently');
} else {
// Unknown error
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.$store.commit('userLogout');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,25 @@ export default {
this.$store.state.user.showregister = false;
this.$store.state.user.showlogin = true;
// Successed
this.$SegmentMessage.success(this, 'Your acount has been registered successfully');
this.$info.success('Your acount has been registered successfully');
this.buttonLoading = false;
})
.catch(err => {
if (err.request.status === 400) {
// HTTP 400 Bad Request
this.$SegmentMessage.error(this, JSON.parse(err.request.response).detail);
this.$info.error(JSON.parse(err.request.response).detail);
} else if (err.request.status === 406){
// HTTP 406 Not Acceptable
this.$SegmentMessage.error(this, JSON.parse(err.request.response).detail);
this.$info.error(JSON.parse(err.request.response).detail);
} else if (err.request.status === 409) {
// HTTP 409 Conflict
this.$SegmentMessage.error(this, 'Username has been taken');
this.$info.error('Username has been taken');
} else if (err.request.status === 429) {
// HTTP 429 Too Many Requests
this.$SegmentMessage.error(this, 'Requesting too frequently');
this.$info.error('Requesting too frequently');
} else {
// Unknown error
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
this.refresh_captcha();
this.buttonLoading = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>

<script>
import password from './changePassword';
import password from './ChangePassword';

export default {
name: 'UserEdit',
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<script>
import Carousel from './carousel.vue';
import JumpToProblem from './../lib/jumpToProblem.vue';
import JumpToProblem from './../lib/JumpToProblem.vue';

export default {
name: 'Home',
Expand Down
2 changes: 1 addition & 1 deletion src/components/lib/AjaxTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default {
}
})
.catch(err => {
this.$SegmentMessage.error(this, '[Ajax Table] Request Failed');
this.$info.error('[Ajax Table] Request Failed');
console.log(err);
});
}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default {
}
})
.catch(() => {
this.$SegmentMessage.error(this, 'Get tags failed');
this.$info.error('Get tags failed');
});
return arr;
},
Expand All @@ -45,7 +45,7 @@ export default {
}
})
.catch(() => {
this.$SegmentMessage.error(this, 'Get tags failed');
this.$info.error('Get tags failed');
});
return arr;
},
Expand Down
9 changes: 4 additions & 5 deletions src/components/page/navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="nav-content">
<el-menu
id="menu"
:default-active="activeIndex"
:default-active="$route.path"
:router="true"
class="el-menu-demo"
mode="horizontal"
Expand Down Expand Up @@ -57,20 +57,19 @@
</template>

<script>
import UserLogout from './../user/logout.vue';
import UserAvatar from './../user/avatar.vue';
import UserLogout from './../account/logout.vue';
import UserAvatar from './../account/avatar.vue';

export default {
name: 'NavBar',
data() {
return {
activeIndex: '/'
};
},
components: {
UserLogout,
UserAvatar
}
},
};
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<script>
import apiurl from './../../apiurl';
import SelectTag from './../lib/selectTag.vue';
import SelectTag from './../lib/SelectTag.vue';

export default {
name: 'editTag',
Expand All @@ -41,11 +41,11 @@ export default {
})
.catch(err => {
if (err.request.status === 404) {
this.$SegmentMessage.error(this, 'Problem not found');
this.$info.error('Problem not found');
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
this.$info.error('Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</template>

<script>
import ProblemTag from './../lib/problemTag.vue';
import ProblemTag from './../lib/ProblemTag.vue';
import apiurl from './../../apiurl';
import AWaitLock from './../../methods/lock';

Expand Down
8 changes: 4 additions & 4 deletions src/components/problem/content.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
import timeFormat from './../../methods/time';
import apiurl from './../../apiurl';
import MarkdownContainer from './../lib/MarkdownContainer.vue';
import ProblemTag from './../lib/problemTag.vue';
import ProblemTag from './../lib/ProblemTag.vue';

export default {
name: 'ProblemView',
Expand Down Expand Up @@ -161,11 +161,11 @@ export default {
})
.catch(err => {
if(err.request.status === 404) {
this.$SegmentMessage.error(this, 'Problem not found');
this.$info.error('Problem not found');
} else if(err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
this.$info.error('Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/problem/create.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ export default {
})
.catch(err => {
if (err.request.status === 400) {
this.$SegmentMessage.error(this, 'PID or title is empty');
this.$info.error('PID or title is empty');
} else if(err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
this.$info.error('Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unknown error');
this.$info.error('Unknown error');
}
});
}
Expand Down
Loading