Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
ed06e92
add mobile screen mode for edit problem
ZTL-UwU Aug 5, 2020
a72e070
improve mobile mode for user content
ZTL-UwU Aug 5, 2020
2730985
improve style
ZTL-UwU Aug 5, 2020
094f21f
add info button under problem content in mobile
ZTL-UwU Aug 5, 2020
317193c
lint
ZTL-UwU Aug 5, 2020
b441ed7
fix small bug
ZTL-UwU Aug 5, 2020
9dfb672
add allow_html in problem edit
ZTL-UwU Aug 5, 2020
2db18b7
fix bug
ZTL-UwU Aug 5, 2020
63e44aa
make edit enalbe if user is not a staff
ZTL-UwU Aug 5, 2020
90b1bdb
user disable in problem edit instead of enable
ZTL-UwU Aug 5, 2020
118d05f
hide Edit button if user is not a staff rather than disabling it
ZTL-UwU Aug 6, 2020
7fa8115
fix ajax table pager bug
ZTL-UwU Aug 6, 2020
b75002d
improve style
ZTL-UwU Aug 6, 2020
16609b3
remade submit page
ZTL-UwU Aug 6, 2020
d56a4d2
add small screen mode for submit page
ZTL-UwU Aug 6, 2020
27875ee
move lang table to sfconfig
ZTL-UwU Aug 6, 2020
c402c60
user can now change their lang
ZTL-UwU Aug 6, 2020
688afa8
commit lang to local storage when lang changed
ZTL-UwU Aug 6, 2020
b45bc56
move to correct place
ZTL-UwU Aug 6, 2020
056fcfe
fix warnig
ZTL-UwU Aug 6, 2020
7e2f1fa
fix chrome endline bug
ZTL-UwU Aug 7, 2020
90470bc
set table limmit to 50
ZTL-UwU Aug 7, 2020
93304da
fix table width
ZTL-UwU Aug 7, 2020
59b8895
add tag in problem list
ZTL-UwU Aug 7, 2020
f629692
improved tag syle
ZTL-UwU Aug 7, 2020
8ca0424
improve tag style
ZTL-UwU Aug 7, 2020
9df0b8d
improve tag style
ZTL-UwU Aug 7, 2020
52163eb
add column slider
ZTL-UwU Aug 7, 2020
4ed4569
add tag display switch
ZTL-UwU Aug 7, 2020
e452c57
add jump to
ZTL-UwU Aug 7, 2020
537ea6a
add jump to in home page
ZTL-UwU Aug 8, 2020
89eef39
add code mirror
ZTL-UwU Aug 9, 2020
35d4358
run lint
ZTL-UwU Aug 9, 2020
96421d3
fix zindex problem
ZTL-UwU Aug 9, 2020
809f1fe
jumpTo -> jumpToProblem
ZTL-UwU Aug 9, 2020
54f3810
jumpToProblem -> JumpToProblem
ZTL-UwU Aug 9, 2020
fe32046
add comment
ZTL-UwU Aug 9, 2020
bc7c390
add entrance to editor
ZTL-UwU Aug 9, 2020
15e9424
fix tag line height bug
ZTL-UwU Aug 10, 2020
70173d5
fix zindex bug
ZTL-UwU Aug 10, 2020
d03a270
fix tag loads in page change
szdytom Aug 10, 2020
5569482
fix codemirror bug
szdytom Aug 10, 2020
b9daf67
fix tag style
ZTL-UwU Aug 10, 2020
3bae710
reverse code mirror
ZTL-UwU Aug 10, 2020
5392b0a
put delet into edit
ZTL-UwU Aug 10, 2020
892b88e
remove useless XHR
ZTL-UwU Aug 10, 2020
c5cd9d3
fix font bug
ZTL-UwU Aug 10, 2020
a4b14f7
add delete button outline
ZTL-UwU Aug 10, 2020
b9e2622
add confirm
ZTL-UwU Aug 10, 2020
f6ae697
fix tag
ZTL-UwU Aug 10, 2020
559b8ec
add delete problem
ZTL-UwU Aug 10, 2020
1df1fde
change warning message
szdytom Aug 10, 2020
bec90d8
fix style
ZTL-UwU Aug 11, 2020
095ae6c
Merge branch 'improve-mobile-UX-ztl' of https://github.com/segment-oj…
ZTL-UwU Aug 11, 2020
8c82f54
fix captchaKeyMax problem
ZTL-UwU Aug 11, 2020
39afe1d
change sfconfig
szdytom Aug 11, 2020
d526834
solve merge conflicts
szdytom Aug 11, 2020
6d85006
fix CM style
ZTL-UwU Aug 12, 2020
749e976
solve comflict
ZTL-UwU Aug 12, 2020
c4eb6dc
improved editor style
ZTL-UwU Aug 12, 2020
ab6046c
improved code mirror style
ZTL-UwU Aug 12, 2020
efa7d3e
update sfconfig
szdytom Aug 12, 2020
6b0c518
Merge branch 'improve-mobile-UX-ztl' of https://github.com/segment-oj…
szdytom Aug 12, 2020
e136f32
run lint
ZTL-UwU Aug 12, 2020
f5b8e7d
Merge branch 'improve-mobile-UX-ztl' of https://github.com/segment-oj…
ZTL-UwU Aug 12, 2020
7eab964
improve CM style
ZTL-UwU Aug 12, 2020
d7015af
spelling
gzezFISHER Aug 12, 2020
7a1258d
fix Columns
gzezFISHER Aug 12, 2020
a38f740
run lint
gzezFISHER Aug 12, 2020
09bbae4
improve CM style
ZTL-UwU Aug 12, 2020
02faf8b
improve style
ZTL-UwU Aug 12, 2020
210051a
Merge branch 'improve-mobile-UX-ztl' of https://github.com/segment-oj…
ZTL-UwU Aug 12, 2020
d6974af
fix column bug
ZTL-UwU Aug 12, 2020
d9168ba
improve CM
ZTL-UwU Aug 12, 2020
4f7b64c
improved CM
ZTL-UwU Aug 12, 2020
a096497
improved CM style
ZTL-UwU Aug 12, 2020
0046093
improved CM style
ZTL-UwU Aug 12, 2020
1c8f3d2
improved CM
ZTL-UwU Aug 12, 2020
7a0adc0
run lint
ZTL-UwU Aug 12, 2020
7a574cc
add name
ZTL-UwU Aug 12, 2020
4d970ee
improved 404 page
ZTL-UwU Aug 12, 2020
04b1660
fix format
ZTL-UwU Aug 12, 2020
7196846
fix confirm delete
ZTL-UwU Aug 13, 2020
630091f
delete debug code
szdytom Aug 13, 2020
badcf01
Update src/components/lib/tag.vue
szdytom Aug 13, 2020
dae739e
Update src/components/lib/tag.vue
szdytom Aug 13, 2020
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"dependencies": {
"axios": "^0.19.2",
"codemirror": "^5.56.0",
"core-js": "^3.6.5",
"dompurify": "^2.0.12",
"element-ui": "^2.13.2",
Expand Down
160 changes: 160 additions & 0 deletions src/assets/code_mirror/tomorrow.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
.CodeMirror {
height: 600px !important;
background-color: #fcfcfc;
color: #4d4d4c;
}

.CodeMirror-cursor {
opacity: 0.7;
border-left: 2px solid #4d4d4c;
}

.cm-qualifier {
color: #c82829;
}

.cm-property {
color: #eab700;
}

.cm-meta,
.cm-number,
.cm-atom {
color: #f5871f;
}

.cm-comment {
color: #8e908c !important;
}

.cm-keyword,
.cm-type,
.cm-tag {
color: #8959a8;
}

.cm-def {
color: #4271ae;
}

.cm-string {
color: #718c00 !important;
}

.CodeMirror-linebackground,
.CodeMirror-activeline-background {
background-color: #efefef !important;
}

.cm-operator {
color: #3e999f !important;
}

.CodeMirror-selected {
background-color: #d6d6d6 !important;
}

.CodeMirror-gutters {
background: #f9f9f9;
border-right: none;
}

.CodeMirror-linenumber {
color: #909399;
font-size: 15px;
}

.CodeMirror-matchingbracket {
color: #4d4d4c !important;
outline: 1px solid #d6d6d6;
-moz-outline-radius: 3px;
}

.CodeMirror-nonmatchingbracket {
color: #c82829 !important;
outline: 1px solid #c82829;
-moz-outline-radius: 3px;
}

.CodeMirror-foldmarker {
text-shadow: none !important;
color: #8e908c !important;
font-family: "Fira Sans" !important;
outline: 1px solid #d6d6d6;
-moz-outline-radius: 3px;
}

.CodeMirror span[role="presentation"] {
font-size: 14px;
}

.CodeMirror-hints {
max-height: 200px !important;
box-shadow: none !important;
border-color: #dcdfe6 !important;
background-color: #fefefe !important;
font-family: "Fira Code" !important;
padding: 5px !important;
}

.CodeMirror-hint {
line-height: 20px;
color: #444444 !important;
}

li.CodeMirror-hint-active {
background-color: #efefef !important;
color: #444444 !important;
font-weight: 500;
}

.CodeMirror-dialog {
background-color: #fefefe !important;
}

.cm-searching {
background-color: #d6d6d6;
}

.CodeMirror-search-label {
line-height: 24px;
font-weight: 500;
}

.CodeMirror-search-field {
line-height: 20px;
border: 1px solid #dcdfe6 !important;
width: 50em !important;
}

.CodeMirror-search-hint {
line-height: 25px;
float: right;
}

.cm-matchhighlight {
outline: 1px solid #d6d6d6;
-moz-outline-radius: 3px;
}

.CodeMirror-selection-highlight-scrollbar {
margin-right: 2.5px;
width: 5px !important;
background-color: #8e908c;
opacity: 0.6;
}

.CodeMirror-simplescroll-horizontal div,
.CodeMirror-simplescroll-vertical div {
background: #b3b3b3 !important;
border: none !important;
border-radius: 0 !important;
}

.CodeMirror-simplescroll-vertical {
width: 10px !important;
}

.CodeMirror-simplescroll-horizontal {
height: 10px !important;
}
41 changes: 34 additions & 7 deletions src/assets/css/basic.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
::-webkit-scrollbar {
width: 10px;
height: 10px;
background-color: #cccccc;
background-color: #eeeeee;
}

::-webkit-scrollbar-track {
background-color: #cccccc;
background-color: #eeeeee;
}

::-webkit-scrollbar-thumb {
background-color: #b3b3b3;
transition: all 0.5s;
}

::-webkit-scrollbar-thumb:hover {
background-color: #808080;
}

*::selection {
background-color: #b9d7ff;
opacity: 0.2;
Expand Down Expand Up @@ -45,6 +41,21 @@ h5 {
color: #303133;
}

a {
text-decoration: none;
}

.markdown-container a {
color: #409eff;
text-decoration: none;
transition: 0.2s;
}

.markdown-container a:hover {
color: #66b1ff;
text-decoration: underline;
}

.markdown-container pre {
white-space: pre-wrap;
white-space: -moz-pre-wrap;
Expand Down Expand Up @@ -148,10 +159,26 @@ h3::before {
border: none;
}

.highzindex {
.bottom-zindex {
z-index: 10 !important;
}

.low-zindex {
z-index: 100 !important;
}

.mid-zindex {
z-index: 1000 !important;
}

.high-zindex {
z-index: 10000 !important;
}

.top-zindex {
z-index: 100000 !important;
}

.no-margin {
margin: 0;
}
Expand Down
10 changes: 0 additions & 10 deletions src/assets/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@
background-color: #409eff;
}

a {
color: #409eff;
text-decoration: none;
transition: 0.2s;
}

a:hover {
color: #66b1ff;
}

.CodeMirror .CodeMirror-code .cm-comment {
background-color: #ffffff00 !important;
font-family: "Fira Code";
Expand Down
2 changes: 1 addition & 1 deletion src/assets/element/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2470,7 +2470,7 @@
position: absolute;
top: 1px;
left: 1px;
border-radius: 100%;
border-radius: 0;
-webkit-transition: all 0.3s;
transition: all 0.3s;
width: 16px;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/fonts/fonts.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pre,
code {
font-family: "Fira Code", "Cascadia Code", "Noto Sans SC", "Source Code Pro", Consolas, "微软雅黑", monospace;
font-family: "Fira Code", "Cascadia Code", "Noto Sans SC", "Source Code Pro", Consolas, "微软雅黑", monospace !important;
}

body {
Expand Down
25 changes: 17 additions & 8 deletions src/components/404.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<template>
<div class="box">
<div class="logo">
404
</div>
<div class="message">
Page Not Found
</div>
<div>
<el-card style="height: 700px;">
<div slot="header" class="clearfix">
<i class="el-icon-warning" />
Error
</div>
<div class="box">
<div class="logo">
404
</div>
<el-divider />
<div class="message">
Page Not Found
</div>
</div>
</el-card>
</div>
</template>

Expand All @@ -17,7 +26,7 @@ export default {

<style scoped>
.logo {
font-size: 5em;
font-size: 8em;
}

.message {
Expand Down
27 changes: 27 additions & 0 deletions src/components/app/editor.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<template>
<div>
<el-card>
<div slot="header" class="clearfix">
<i class="el-icon-document" />
Code Editor
</div>
<codeMirror />
</el-card>
</div>
</template>

<script>
import codeMirror from './../lib/editor.vue';

export default {
name: 'CodeEditorContainer',
data() {
return {
source: null
};
},
components: {
codeMirror
}
};
</script>
8 changes: 5 additions & 3 deletions src/components/home/carousel.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<template>
<el-carousel trigger="click" :interval="5000" arrow="none" id="carousel">
<el-carousel-item v-for="item in 4" :key="item"></el-carousel-item>
</el-carousel>
<div>
<el-carousel trigger="click" :interval="5000" arrow="none" id="carousel">
<el-carousel-item v-for="item in 4" :key="item"></el-carousel-item>
</el-carousel>
</div>
</template>

<script>
Expand Down
15 changes: 13 additions & 2 deletions src/components/home/page.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
<template>
<carousel/>
<div>
<carousel/>
<JumpToProblem class="item" />
</div>
</template>

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

export default {
name: 'Home',
components: {
Carousel
Carousel,
JumpToProblem
}
};
</script>

<style scoped>
.item {
margin-top: 20px;
}
</style>
Loading