From e1291a3be76f58e3f745a1e4121ace5f2aa07efa Mon Sep 17 00:00:00 2001
From: abigale Li <annong035@gmail.com>
Date: Tue, 26 Dec 2017 12:53:43 +0800
Subject: [PATCH] some refactor on frontend structure (#14)

* modified something in frontend directory

* modified gitignore

* remove node_modules
---
 .gitignore                                                | 5 +++++
 frontend/.gitignore                                       | 3 ---
 frontend/package.json                                     | 6 ++----
 frontend/src/App.san                                      | 2 +-
 frontend/src/common/{ui => component}/AppMenu.san         | 0
 frontend/src/common/{ui => component}/Charts/chart.san    | 2 +-
 frontend/src/common/{ui => component}/CheckBoxGroup.san   | 0
 frontend/src/common/{ui => component}/DropDownMenu.san    | 0
 frontend/src/common/{ui => component}/ExpandPanel.san     | 0
 .../common/{ui => component}/Notification/Notification.js | 0
 .../common/{ui => component}/Notification/Notification.md | 0
 .../{ui => component}/Notification/Notification.styl      | 0
 .../{ui => component}/Notification/NotificationItem.js    | 0
 .../src/common/{ui => component}/Notification/index.js    | 0
 frontend/src/common/{ui => component}/RadioGroup.san      | 0
 frontend/src/common/{ui => component}/Slider.san          | 0
 frontend/src/common/{ui => component}/ui-common.styl      | 0
 frontend/src/index.js                                     | 2 +-
 frontend/src/scalars/ui/chartPage.san                     | 4 ++--
 frontend/src/scalars/ui/config.san                        | 8 ++++----
 20 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 frontend/.gitignore
 rename frontend/src/common/{ui => component}/AppMenu.san (100%)
 rename frontend/src/common/{ui => component}/Charts/chart.san (98%)
 rename frontend/src/common/{ui => component}/CheckBoxGroup.san (100%)
 rename frontend/src/common/{ui => component}/DropDownMenu.san (100%)
 rename frontend/src/common/{ui => component}/ExpandPanel.san (100%)
 rename frontend/src/common/{ui => component}/Notification/Notification.js (100%)
 rename frontend/src/common/{ui => component}/Notification/Notification.md (100%)
 rename frontend/src/common/{ui => component}/Notification/Notification.styl (100%)
 rename frontend/src/common/{ui => component}/Notification/NotificationItem.js (100%)
 rename frontend/src/common/{ui => component}/Notification/index.js (100%)
 rename frontend/src/common/{ui => component}/RadioGroup.san (100%)
 rename frontend/src/common/{ui => component}/Slider.san (100%)
 rename frontend/src/common/{ui => component}/ui-common.styl (100%)

diff --git a/.gitignore b/.gitignore
index 4f61b8cb..451b678d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,8 @@ ENV/
 .mypy_cache/
 
 .DS_Store
+
+# frontend
+node_modules
+/.vscode
+package-lock.json
diff --git a/frontend/.gitignore b/frontend/.gitignore
deleted file mode 100644
index a7a3b001..00000000
--- a/frontend/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/node_modules
-/.vscode
-package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
index 57dc9b6d..7297c4fc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,9 +1,7 @@
 {
   "name": "front",
-  "version": "1.0.1",
-  "description": "VisualDL frontend",
-  "author": "ecomfe",
-  "private": true,
+  "version": "1.0.0",
+  "description": "Visualization toolkit for deep learning",
   "scripts": {
     "release": "cross-env NODE_ENV=production node ./tool/build.js",
     "build": "cross-env NODE_ENV=dev node ./tool/build.js",
diff --git a/frontend/src/App.san b/frontend/src/App.san
index d161a707..4a7be78e 100644
--- a/frontend/src/App.san
+++ b/frontend/src/App.san
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import AppMenu from './common/ui/AppMenu';
+import AppMenu from './common/component/AppMenu';
 import {router} from 'san-router';
 import {routeTo} from './common/util/routeTo';
 
diff --git a/frontend/src/common/ui/AppMenu.san b/frontend/src/common/component/AppMenu.san
similarity index 100%
rename from frontend/src/common/ui/AppMenu.san
rename to frontend/src/common/component/AppMenu.san
diff --git a/frontend/src/common/ui/Charts/chart.san b/frontend/src/common/component/Charts/chart.san
similarity index 98%
rename from frontend/src/common/ui/Charts/chart.san
rename to frontend/src/common/component/Charts/chart.san
index e9121a34..9aad8953 100644
--- a/frontend/src/common/ui/Charts/chart.san
+++ b/frontend/src/common/component/Charts/chart.san
@@ -17,7 +17,7 @@
 <script>
 import Button from 'san-mui/Button';
 import Icon from 'san-mui/Icon';
-import DropDownMenu from '../../../common/ui/DropDownMenu';
+import DropDownMenu from '../../../common/component/DropDownMenu';
 import {generateJsonAndDownload} from '../../../common/util/downLoadFile';
 import echarts from 'echarts';
 import axios from 'axios';
diff --git a/frontend/src/common/ui/CheckBoxGroup.san b/frontend/src/common/component/CheckBoxGroup.san
similarity index 100%
rename from frontend/src/common/ui/CheckBoxGroup.san
rename to frontend/src/common/component/CheckBoxGroup.san
diff --git a/frontend/src/common/ui/DropDownMenu.san b/frontend/src/common/component/DropDownMenu.san
similarity index 100%
rename from frontend/src/common/ui/DropDownMenu.san
rename to frontend/src/common/component/DropDownMenu.san
diff --git a/frontend/src/common/ui/ExpandPanel.san b/frontend/src/common/component/ExpandPanel.san
similarity index 100%
rename from frontend/src/common/ui/ExpandPanel.san
rename to frontend/src/common/component/ExpandPanel.san
diff --git a/frontend/src/common/ui/Notification/Notification.js b/frontend/src/common/component/Notification/Notification.js
similarity index 100%
rename from frontend/src/common/ui/Notification/Notification.js
rename to frontend/src/common/component/Notification/Notification.js
diff --git a/frontend/src/common/ui/Notification/Notification.md b/frontend/src/common/component/Notification/Notification.md
similarity index 100%
rename from frontend/src/common/ui/Notification/Notification.md
rename to frontend/src/common/component/Notification/Notification.md
diff --git a/frontend/src/common/ui/Notification/Notification.styl b/frontend/src/common/component/Notification/Notification.styl
similarity index 100%
rename from frontend/src/common/ui/Notification/Notification.styl
rename to frontend/src/common/component/Notification/Notification.styl
diff --git a/frontend/src/common/ui/Notification/NotificationItem.js b/frontend/src/common/component/Notification/NotificationItem.js
similarity index 100%
rename from frontend/src/common/ui/Notification/NotificationItem.js
rename to frontend/src/common/component/Notification/NotificationItem.js
diff --git a/frontend/src/common/ui/Notification/index.js b/frontend/src/common/component/Notification/index.js
similarity index 100%
rename from frontend/src/common/ui/Notification/index.js
rename to frontend/src/common/component/Notification/index.js
diff --git a/frontend/src/common/ui/RadioGroup.san b/frontend/src/common/component/RadioGroup.san
similarity index 100%
rename from frontend/src/common/ui/RadioGroup.san
rename to frontend/src/common/component/RadioGroup.san
diff --git a/frontend/src/common/ui/Slider.san b/frontend/src/common/component/Slider.san
similarity index 100%
rename from frontend/src/common/ui/Slider.san
rename to frontend/src/common/component/Slider.san
diff --git a/frontend/src/common/ui/ui-common.styl b/frontend/src/common/component/ui-common.styl
similarity index 100%
rename from frontend/src/common/ui/ui-common.styl
rename to frontend/src/common/component/ui-common.styl
diff --git a/frontend/src/index.js b/frontend/src/index.js
index 5519c686..4c2921d0 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -1,6 +1,6 @@
 import 'normalize.css/normalize.css';
 import 'san-mui/index.css';
-import './common/ui/ui-common.styl';
+import './common/component/ui-common.styl';
 
 import './home/index';
 import './scalars/index';
diff --git a/frontend/src/scalars/ui/chartPage.san b/frontend/src/scalars/ui/chartPage.san
index aa1eb5db..3272ea0c 100644
--- a/frontend/src/scalars/ui/chartPage.san
+++ b/frontend/src/scalars/ui/chartPage.san
@@ -21,8 +21,8 @@
     </div>
 </template>
 <script>
-import ExpandPanel from '../../common/ui/ExpandPanel';
-import chart from '../../common/ui/Charts/chart';
+import ExpandPanel from '../../common/component/ExpandPanel';
+import chart from '../../common/component/Charts/chart';
 import Pagination from 'san-mui/Pagination';
 
 export default {
diff --git a/frontend/src/scalars/ui/config.san b/frontend/src/scalars/ui/config.san
index 98e2f315..cd67cdf9 100644
--- a/frontend/src/scalars/ui/config.san
+++ b/frontend/src/scalars/ui/config.san
@@ -39,10 +39,10 @@
 </template>
 <script>
 import TextField from 'san-mui/TextField';
-import Slider from '../../common/ui/Slider';
-import RadioGroup from '../../common/ui/RadioGroup';
-import DropDownMenu from '../../common/ui/DropDownMenu';
-import CheckBoxGroup from '../../common/ui/CheckBoxGroup';
+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 {
     components: {
-- 
GitLab