From 80d3b37d1b73bb2c7820215bfc7ac32d4a5da0ea Mon Sep 17 00:00:00 2001
From: virusdefender <qduliyang@outlook.com>
Date: Sat, 20 Aug 2016 23:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86views=E5=92=8Ccomponents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/admin/src/App.vue                     |  4 ++--
 .../admin/src/components/{utils => }/back.vue  |  0
 .../src/components/{utils => }/codeMirror.vue  |  0
 .../admin/src/components/{utils => }/help.vue  |  0
 .../src/components/{utils => }/helpLink.vue    |  0
 .../admin/src/components/{utils => }/pager.vue |  0
 .../components/{utils => }/problemSample.vue   |  0
 .../src/components/{utils => }/simditor.vue    |  0
 .../src/components/{utils => }/tagInput.vue    |  0
 .../components/{utils => }/testCaseMgnt.vue    |  0
 .../src/components/{utils => }/uploader.vue    |  0
 .../{components => views}/account/editUser.vue |  2 +-
 .../{components => views}/account/userList.vue |  2 +-
 .../announcement/announcementList.vue          |  2 +-
 .../announcement/createAnnouncement.vue        |  2 +-
 .../announcement/editAnnouncement.vue          |  4 ++--
 .../utils => views/nav}/leftNav.vue            |  0
 .../{components/utils => views/nav}/topNav.vue |  0
 .../problem/createProblem.vue                  | 18 ++++++++----------
 .../problem/problemList.vue                    |  2 +-
 .../problem/specialJudge.vue                   |  2 +-
 21 files changed, 18 insertions(+), 20 deletions(-)
 rename frontend/admin/src/components/{utils => }/back.vue (100%)
 rename frontend/admin/src/components/{utils => }/codeMirror.vue (100%)
 rename frontend/admin/src/components/{utils => }/help.vue (100%)
 rename frontend/admin/src/components/{utils => }/helpLink.vue (100%)
 rename frontend/admin/src/components/{utils => }/pager.vue (100%)
 rename frontend/admin/src/components/{utils => }/problemSample.vue (100%)
 rename frontend/admin/src/components/{utils => }/simditor.vue (100%)
 rename frontend/admin/src/components/{utils => }/tagInput.vue (100%)
 rename frontend/admin/src/components/{utils => }/testCaseMgnt.vue (100%)
 rename frontend/admin/src/components/{utils => }/uploader.vue (100%)
 rename frontend/admin/src/{components => views}/account/editUser.vue (99%)
 rename frontend/admin/src/{components => views}/account/userList.vue (98%)
 rename frontend/admin/src/{components => views}/announcement/announcementList.vue (97%)
 rename frontend/admin/src/{components => views}/announcement/createAnnouncement.vue (96%)
 rename frontend/admin/src/{components => views}/announcement/editAnnouncement.vue (95%)
 rename frontend/admin/src/{components/utils => views/nav}/leftNav.vue (100%)
 rename frontend/admin/src/{components/utils => views/nav}/topNav.vue (100%)
 rename frontend/admin/src/{components => views}/problem/createProblem.vue (92%)
 rename frontend/admin/src/{components => views}/problem/problemList.vue (98%)
 rename frontend/admin/src/{components => views}/problem/specialJudge.vue (97%)

diff --git a/frontend/admin/src/App.vue b/frontend/admin/src/App.vue
index 17ee4df..c78412c 100644
--- a/frontend/admin/src/App.vue
+++ b/frontend/admin/src/App.vue
@@ -39,8 +39,8 @@
 </style>
 
 <script>
-    import topNav from "./components/utils/topNav.vue"
-    import leftNav from "./components/utils/leftNav.vue"
+    import topNav from "./views/nav/topNav.vue"
+    import leftNav from "./views/nav/leftNav.vue"
 
     export default({
         components: {
diff --git a/frontend/admin/src/components/utils/back.vue b/frontend/admin/src/components/back.vue
similarity index 100%
rename from frontend/admin/src/components/utils/back.vue
rename to frontend/admin/src/components/back.vue
diff --git a/frontend/admin/src/components/utils/codeMirror.vue b/frontend/admin/src/components/codeMirror.vue
similarity index 100%
rename from frontend/admin/src/components/utils/codeMirror.vue
rename to frontend/admin/src/components/codeMirror.vue
diff --git a/frontend/admin/src/components/utils/help.vue b/frontend/admin/src/components/help.vue
similarity index 100%
rename from frontend/admin/src/components/utils/help.vue
rename to frontend/admin/src/components/help.vue
diff --git a/frontend/admin/src/components/utils/helpLink.vue b/frontend/admin/src/components/helpLink.vue
similarity index 100%
rename from frontend/admin/src/components/utils/helpLink.vue
rename to frontend/admin/src/components/helpLink.vue
diff --git a/frontend/admin/src/components/utils/pager.vue b/frontend/admin/src/components/pager.vue
similarity index 100%
rename from frontend/admin/src/components/utils/pager.vue
rename to frontend/admin/src/components/pager.vue
diff --git a/frontend/admin/src/components/utils/problemSample.vue b/frontend/admin/src/components/problemSample.vue
similarity index 100%
rename from frontend/admin/src/components/utils/problemSample.vue
rename to frontend/admin/src/components/problemSample.vue
diff --git a/frontend/admin/src/components/utils/simditor.vue b/frontend/admin/src/components/simditor.vue
similarity index 100%
rename from frontend/admin/src/components/utils/simditor.vue
rename to frontend/admin/src/components/simditor.vue
diff --git a/frontend/admin/src/components/utils/tagInput.vue b/frontend/admin/src/components/tagInput.vue
similarity index 100%
rename from frontend/admin/src/components/utils/tagInput.vue
rename to frontend/admin/src/components/tagInput.vue
diff --git a/frontend/admin/src/components/utils/testCaseMgnt.vue b/frontend/admin/src/components/testCaseMgnt.vue
similarity index 100%
rename from frontend/admin/src/components/utils/testCaseMgnt.vue
rename to frontend/admin/src/components/testCaseMgnt.vue
diff --git a/frontend/admin/src/components/utils/uploader.vue b/frontend/admin/src/components/uploader.vue
similarity index 100%
rename from frontend/admin/src/components/utils/uploader.vue
rename to frontend/admin/src/components/uploader.vue
diff --git a/frontend/admin/src/components/account/editUser.vue b/frontend/admin/src/views/account/editUser.vue
similarity index 99%
rename from frontend/admin/src/components/account/editUser.vue
rename to frontend/admin/src/views/account/editUser.vue
index 9a52b82..4103e86 100644
--- a/frontend/admin/src/components/account/editUser.vue
+++ b/frontend/admin/src/views/account/editUser.vue
@@ -77,7 +77,7 @@
     </div>
 </template>
 <script>
-    import back from '../utils/back.vue'
+    import back from '../../components/back.vue'
 
     export default {
         data() {
diff --git a/frontend/admin/src/components/account/userList.vue b/frontend/admin/src/views/account/userList.vue
similarity index 98%
rename from frontend/admin/src/components/account/userList.vue
rename to frontend/admin/src/views/account/userList.vue
index 63bc32c..0abf0c1 100644
--- a/frontend/admin/src/components/account/userList.vue
+++ b/frontend/admin/src/views/account/userList.vue
@@ -46,7 +46,7 @@
 <script>
     import Vue from 'vue'
     import Router from 'vue-router'
-    import pager from '../utils/pager.vue'
+    import pager from '../../components/pager.vue'
 
     export default {
         data: function () {
diff --git a/frontend/admin/src/components/announcement/announcementList.vue b/frontend/admin/src/views/announcement/announcementList.vue
similarity index 97%
rename from frontend/admin/src/components/announcement/announcementList.vue
rename to frontend/admin/src/views/announcement/announcementList.vue
index 43a5152..269f1b2 100644
--- a/frontend/admin/src/components/announcement/announcementList.vue
+++ b/frontend/admin/src/views/announcement/announcementList.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-    import pager from "../utils/pager.vue"
+    import pager from "../../components/pager.vue"
     import createAnnouncement from "./createAnnouncement.vue"
 
     export default({
diff --git a/frontend/admin/src/components/announcement/createAnnouncement.vue b/frontend/admin/src/views/announcement/createAnnouncement.vue
similarity index 96%
rename from frontend/admin/src/components/announcement/createAnnouncement.vue
rename to frontend/admin/src/views/announcement/createAnnouncement.vue
index acdbaab..cd2ed4b 100644
--- a/frontend/admin/src/components/announcement/createAnnouncement.vue
+++ b/frontend/admin/src/views/announcement/createAnnouncement.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-    import simditor from "../utils/simditor.vue"
+    import simditor from "../../components/simditor.vue"
 
     export default({
         data() {
diff --git a/frontend/admin/src/components/announcement/editAnnouncement.vue b/frontend/admin/src/views/announcement/editAnnouncement.vue
similarity index 95%
rename from frontend/admin/src/components/announcement/editAnnouncement.vue
rename to frontend/admin/src/views/announcement/editAnnouncement.vue
index c86b534..21dee57 100644
--- a/frontend/admin/src/components/announcement/editAnnouncement.vue
+++ b/frontend/admin/src/views/announcement/editAnnouncement.vue
@@ -25,8 +25,8 @@
 </template>
 
 <script>
-    import simditor from "../utils/simditor.vue"
-    import back from "../utils/back.vue"
+    import simditor from "../../components/simditor.vue"
+    import back from "../../components/back.vue"
 
     export default({
         data() {
diff --git a/frontend/admin/src/components/utils/leftNav.vue b/frontend/admin/src/views/nav/leftNav.vue
similarity index 100%
rename from frontend/admin/src/components/utils/leftNav.vue
rename to frontend/admin/src/views/nav/leftNav.vue
diff --git a/frontend/admin/src/components/utils/topNav.vue b/frontend/admin/src/views/nav/topNav.vue
similarity index 100%
rename from frontend/admin/src/components/utils/topNav.vue
rename to frontend/admin/src/views/nav/topNav.vue
diff --git a/frontend/admin/src/components/problem/createProblem.vue b/frontend/admin/src/views/problem/createProblem.vue
similarity index 92%
rename from frontend/admin/src/components/problem/createProblem.vue
rename to frontend/admin/src/views/problem/createProblem.vue
index fc4515b..49dac94 100644
--- a/frontend/admin/src/components/problem/createProblem.vue
+++ b/frontend/admin/src/views/problem/createProblem.vue
@@ -75,16 +75,16 @@
 </template>
 
 <script>
-    import testCaseMgnt from "../utils/testCaseMgnt.vue"
-    import problemSample from "../utils/problemSample.vue"
+    import testCaseMgnt from "../../components/testCaseMgnt.vue"
+    import problemSample from "../../components/problemSample.vue"
     import specialJudge from "./specialJudge.vue"
 
-    import back from "../utils/back.vue"
-    import simditor from "../utils/simditor.vue"
-    import tagInput from "../utils/tagInput.vue"
-    import codeMirror from "../utils/codeMirror.vue"
-    import help from "../utils/help.vue"
-    import helpLink from "../utils/helpLink.vue"
+    import back from "../../components/back.vue"
+    import simditor from "../../components/simditor.vue"
+    import tagInput from "../../components/tagInput.vue"
+    import codeMirror from "../../components/codeMirror.vue"
+    import help from "../../components/help.vue"
+    import helpLink from "../../components/helpLink.vue"
 
     export default({
         data() {
@@ -132,8 +132,6 @@
                 if (this.specialJudge && !this.$refs.specialJudgeCode.getCode().trim()) {
 
                 }
-
-
                 var submitData = {
                     title: this.title,
                     description: this.$refs.problemDescription.getContent(),
diff --git a/frontend/admin/src/components/problem/problemList.vue b/frontend/admin/src/views/problem/problemList.vue
similarity index 98%
rename from frontend/admin/src/components/problem/problemList.vue
rename to frontend/admin/src/views/problem/problemList.vue
index acb6c83..5ce3b3e 100644
--- a/frontend/admin/src/components/problem/problemList.vue
+++ b/frontend/admin/src/views/problem/problemList.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-    import pager from "../utils/pager.vue"
+    import pager from "../../components/pager.vue"
 
     export default({
         data() {
diff --git a/frontend/admin/src/components/problem/specialJudge.vue b/frontend/admin/src/views/problem/specialJudge.vue
similarity index 97%
rename from frontend/admin/src/components/problem/specialJudge.vue
rename to frontend/admin/src/views/problem/specialJudge.vue
index d407af2..fb70f8e 100644
--- a/frontend/admin/src/components/problem/specialJudge.vue
+++ b/frontend/admin/src/views/problem/specialJudge.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-    import codeMirror from "../utils/codeMirror.vue"
+    import codeMirror from "../../components/codeMirror.vue"
 
     export default ({
         props: {