Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecated san #302

Merged
merged 3 commits into from
Mar 8, 2018
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 0 additions & 6 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
"lodash": "^4.17.4",
"normalize.css": "^6.0.0",
"qs": "^6.5.1",
"san": "3.2.3",
"san-mui": "^1.0.4",
"san-router": "^1.1.1",
"san-store": "^1.0.1",
"san-update": "^2.1.0",
"vue": "^2.5.2",
"vue-router": "^3.0.1",
"vuetify": "^0.17.7",
Expand Down Expand Up @@ -65,7 +60,6 @@
"postcss-loader": "^1.3.3",
"raw-loader": "^0.5.1",
"rimraf": "^2.6.2",
"san-loader": "^0.0.4",
"style-loader": "^0.16.1",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/common/component/AppMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default {
}
},
methods: {
handleItemClick: function (item) {
handleItemClick: function (item) {
this.selected = item.name
this.$router.push(item.url)
}
Expand Down
13 changes: 7 additions & 6 deletions frontend/src/graph/ui/Config.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
Download image
</v-btn>

<v-slider label="Scale"
max="1"
min="0.1"
step="0.1"
v-model="config.scale"
dark></v-slider>
<v-slider
label="Scale"
max="1"
min="0.1"
step="0.1"
v-model="config.scale"
dark></v-slider>
</div>
</template>
<script>
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/images/ui/ChartPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<script>
import ExpandPanel from '../../common/component/ExpandPanel';
import Image from './Image';
//import Pagination from 'san-mui/Pagination';

import {cloneDeep, flatten} from 'lodash';

Expand All @@ -32,7 +31,6 @@ export default {
components: {
'ui-image': Image,
'ui-expand-panel': ExpandPanel,
//'ui-pagination': Pagination
},
computed: {
filteredRunsList() {
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/images/ui/Config.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
</div>
</template>
<script>
// TODO: Maybe migrate the CheckBoxGroup from San to Vue
//import CheckBoxGroup from '../../common/component/CheckBoxGroup';

export default {
props: {
Expand Down
24 changes: 0 additions & 24 deletions frontend/src/index.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
//import 'normalize.css/normalize.css';
//import 'san-mui/index.css';
//import './common/component/ui-common.styl';
//
//import './home/index';
//import './scalars/index';
//import './images/index';
//import './histogram/index';
//import './graph/index';
//
//import App from './App';
//new App({
// data: {
// titleName: 'VisualDL'
// }
//}).attach(document.getElementById('root'));
//
//var vm = new Vue({
// el: "#root",
//
//})



// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
Expand Down
7 changes: 0 additions & 7 deletions frontend/src/scalars/ui/Chart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@
</template>
<script>

// TODO: Consider create Vue Components for these

// // components
// import Button from 'san-mui/Button';
// import Icon from 'san-mui/Icon';
// import DropDownMenu from '../../common/component/DropDownMenu';

// libs
import echarts from 'echarts';
import axios from 'axios';
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/scalars/ui/ChartPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<script>
import ExpandPanel from '../../common/component/ExpandPanel';
import Chart from './Chart';
// import Pagination from 'san-mui/Pagination';

import {cloneDeep} from 'lodash';

export default {
Expand Down
10 changes: 0 additions & 10 deletions frontend/src/scalars/ui/Config.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@
</template>
<script>

//import TextField from 'san-mui/TextField';

// TODO: Consider create Vue Components for these

//import Slider from '../../common/component/Slider';
//import RadioGroup from '../../common/component/RadioGroup';
//import DropDownMenu from '../../common/component/DropDownMenu';
//import CheckBoxGroup from '../../common/component/CheckBoxGroup';
//import Button from 'san-mui/Button';

export default {
props: {
runsItems: Array,
Expand Down
4 changes: 2 additions & 2 deletions frontend/tool/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const config = {

module: {
noParse: [
/node_modules\/(san|axios)\//
/node_modules\/(axios)\//
],
rules: [
{
Expand Down Expand Up @@ -120,7 +120,7 @@ const config = {

new CaseSensitivePathsPlugin(),
new webpack.LoaderOptionsPlugin({
test: /\.(styl|san)$/
test: /\.(styl)$/
}),
new ExtractTextPlugin({filename: '[name].css'})
]
Expand Down
5 changes: 1 addition & 4 deletions frontend/tool/webpack.prod.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ module.exports = merge(baseWebpackConfig, {
}),

new webpack.LoaderOptionsPlugin({
test: /\.(styl|san)$/,
san: {
autoprefixer: autoPrefixOptions
}
test: /\.(styl)$/,
}),

new webpack.optimize.CommonsChunkPlugin({
Expand Down