Skip to content

Commit bf9689c

Browse files
committed
Merge branch 'release/0.1.0'
2 parents c23aa87 + db0a4fe commit bf9689c

File tree

13 files changed

+626
-23
lines changed

13 files changed

+626
-23
lines changed

build/webpack.base.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module.exports = {
2323
alias: {
2424
'vue$': 'vue/dist/vue.esm.js',
2525
'@': resolve('src'),
26+
'src': path.resolve(__dirname, '../src')
2627
}
2728
},
2829
module: {

config/dev.env.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ var prodEnv = require('./prod.env')
33

44
module.exports = merge(prodEnv, {
55
NODE_ENV: '"development"',
6-
API_ROOT: '"http://localhost:8000/api"'
6+
API_ROOT: '"http://localhost:8000/api/v1"'
77
})

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "onlinejudge-frontend",
3-
"version": "1.0.0",
3+
"version": "0.1.0",
44
"description": "Frontend of OnlineJudge",
55
"author": "ruiming <[email protected]>",
66
"private": true,

src/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ export default {
6767
}
6868
</script>
6969

70-
<style>
70+
<style lang="scss">
7171
body {
72-
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
72+
font-family: var(--font-family-base);
7373
-webkit-font-smoothing: antialiased;
7474
-moz-osx-font-smoothing: grayscale;
7575
color: #333;

src/main.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import ElementUI from 'element-ui'
55
import moment from 'moment'
66
import VueHead from 'vue-head'
77
import VueCodeMirror from 'vue-codemirror'
8-
import App from './App'
9-
import router from './router'
10-
import store from './store'
11-
import './resource'
8+
import App from 'src/App'
9+
import router from 'src/router'
10+
import store from 'src/store'
11+
import 'src/resource'
1212

1313
import 'element-ui/lib/theme-default/index.css'
1414
import 'normalize.css'
15+
import 'src/styles/variables.css'
1516

1617
moment.locale('zh-cn')
1718
Vue.use(ElementUI)

src/pages/Home.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<script>
1616
import { mapState } from 'vuex'
17-
import store from '../store'
17+
import store from 'src/store'
1818
export default {
1919
computed: {
2020
...mapState({

src/pages/Problem/ProblemDetail.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ export default {
5454
}
5555
},
5656
methods: {
57-
// TODO Code type
5857
async submit () {
5958
await this.$store.dispatch('submitUserCode', {
6059
id: this.problem.id,
6160
code: this.code,
62-
type: 'cc'
61+
lang: 'cc'
6362
})
6463
}
6564
},

src/pages/Problem/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<script>
1414
import { mapState } from 'vuex'
15-
import store from '../../store'
15+
import store from 'src/store'
1616
import ProblemDetail from './ProblemDetail'
1717
1818
export default {

src/pages/ProblemSet.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
import { mapState } from 'vuex'
11-
import store from '../store'
11+
import store from 'src/store'
1212
export default {
1313
computed: {
1414
...mapState({

src/resource.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-
// Resource
2-
// 对接后端 Restful API
31
import Vue from 'vue'
42
import VueResource from 'vue-resource'
3+
import { Message } from 'element-ui'
54

65
Vue.use(VueResource)
76
Vue.http.options.root = process.env.API_ROOT
87

98
const Problem = Vue.resource('problems{/id}')
109
const Submission = Vue.resource('submissions{/id}')
1110

11+
Vue.http.interceptors.push((request, next) => {
12+
next(response => {
13+
if (response.status !== 200) {
14+
if (response.data !== null && response.data.message) {
15+
Message.error(response.data.message)
16+
} else {
17+
Message.error(response.data)
18+
}
19+
}
20+
})
21+
})
22+
1223
export {
1324
Problem,
1425
Submission

0 commit comments

Comments
 (0)