summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2017-01-21 12:24:58 +0800
committerYukai Huang2017-01-21 12:30:55 +0800
commit26d8942852f8d216d03138a6c3c1d350e6bc903e (patch)
tree53b3283c7c05b61ae5d46efbd95e9979edc45ec6
parent4bbe035beb41ad2c9f43434d0d90209850a62f70 (diff)
Revert experimental vue for now
-rw-r--r--.editorconfig4
-rw-r--r--package.json3
-rw-r--r--public/js/components/HelloWorld.vue21
-rw-r--r--public/js/cover.js8
-rw-r--r--public/js/views/Cover.vue15
-rw-r--r--public/views/index.ejs2
-rw-r--r--webpackBaseConfig.js8
7 files changed, 1 insertions, 60 deletions
diff --git a/.editorconfig b/.editorconfig
index b3e30251..619c178d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,10 +7,6 @@ indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
-[*.vue]
-indent_style = space
-indent_size = 2
-
[*.md]
trim_trailing_whitespace = false
diff --git a/package.json b/package.json
index e22f9e73..1ed81c98 100644
--- a/package.json
+++ b/package.json
@@ -116,8 +116,6 @@
"velocity-animate": "^1.4.0",
"visibilityjs": "^1.2.4",
"viz.js": "^1.4.1",
- "vue": "^2.1.6",
- "vue-loader": "^10.0.2",
"winston": "^2.3.0",
"xss": "^0.3.3"
},
@@ -164,7 +162,6 @@
"script-loader": "^0.7.0",
"style-loader": "^0.13.1",
"url-loader": "^0.5.7",
- "vue-template-compiler": "^2.1.6",
"webpack": "^1.14.0"
}
}
diff --git a/public/js/components/HelloWorld.vue b/public/js/components/HelloWorld.vue
deleted file mode 100644
index d8e3007f..00000000
--- a/public/js/components/HelloWorld.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
- <h1>{{ message }}</h1>
-</template>
-
-<script>
-export default {
- name: 'HelloWorld',
-
- data() {
- return {
- message: 'Hello Vue'
- }
- }
-}
-</script>
-
-<style scoped>
-h1 {
- color: blue;
-}
-</style>
diff --git a/public/js/cover.js b/public/js/cover.js
index 79b168d9..830564e8 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -29,14 +29,6 @@ import { saveAs } from 'file-saver';
import List from 'list.js';
import S from 'string';
-import Cover from './views/Cover';
-import Vue from 'vue';
-
-new Vue({
- el: '#cover-app',
- render: (h) => h(Cover)
-})
-
const options = {
valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'],
item: '<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">\
diff --git a/public/js/views/Cover.vue b/public/js/views/Cover.vue
deleted file mode 100644
index 767d087f..00000000
--- a/public/js/views/Cover.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
- <hello-world />
-</template>
-
-<script>
-import HelloWorld from '../components/HelloWorld';
-
-export default {
- name: 'Cover',
-
- components: {
- HelloWorld
- }
-}
-</script>
diff --git a/public/views/index.ejs b/public/views/index.ejs
index d258857c..b94daf5b 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -30,8 +30,6 @@
<div class="site-wrapper">
<div class="site-wrapper-inner">
<div class="cover-container">
- <div id="cover-app"></div>
-
<div class="masthead clearfix">
<div class="inner">
<h3 class="masthead-brand"></h3>
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index e618bffd..210001b1 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -338,7 +338,7 @@ module.exports = {
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules')
],
- extensions: ["", ".js", ".vue"],
+ extensions: ["", ".js"],
alias: {
codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'),
inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'),
@@ -373,12 +373,6 @@ module.exports = {
test: /\.json$/,
loader: 'json-loader'
}, {
- test: /\.vue$/,
- loader: 'vue',
- options: {
- // vue-loader options go here
- }
- }, {
test: /\.js$/,
loader: 'babel',
exclude: [/node_modules/, /public\/vendor/]