Refactor UI Framework directory structure.

elastic · Dec 5, 2016 · 4e54844 · 4e54844
1 parent de3f34f
commit 4e54844
Show file tree

Hide file tree

Showing 56 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,4 @@ selenium
 *.swp
 *.swo
 *.out
-src/ui_framework/public/*.js*
+src/ui_framework/doc_site/build/*.js*
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "mocha": "mocha",
     "mocha:debug": "mocha --debug-brk",
     "sterilize": "grunt sterilize",
-    "uiFramework:start": "./node_modules/.bin/webpack-dev-server --config src/ui_framework/webpack.config.js --hot --inline --content-base src/ui_framework/public/"
+    "uiFramework:start": "webpack-dev-server --config src/ui_framework/doc_site/webpack.config.js --hot --inline --content-base src/ui_framework/doc_site/build"
   },
   "repository": {
     "type": "git",
@@ -92,6 +92,7 @@
     "babel": "5.8.38",
     "babel-core": "5.8.38",
     "babel-loader": "5.3.2",
+    "babel-polyfill": "6.9.1",
     "babel-runtime": "5.8.38",
     "bluebird": "2.9.34",
     "body-parser": "1.12.0",
@@ -218,7 +219,6 @@
     "nock": "8.0.0",
     "node-sass": "3.8.0",
     "npm": "3.10.8",
-    "numeral": "1.5.3",
     "portscanner": "1.0.0",
     "proxyquire": "1.7.10",
     "react": "15.2.0",

diff --git a/src/ui/public/autoload/styles.js b/src/ui/public/autoload/styles.js
@@ -1,5 +1,5 @@
 // Kibana UI Framework
-require('../../../ui_framework/src/framework/framework.scss');
+require('../../../ui_framework/components/index.scss');
 
 // All Kibana styles inside of the /styles dir
 const context = require.context('../styles', false, /[\/\\](?!mixins|variables|_|\.)[^\/\\]+\.less/);

diff --git a/...ui_framework/src/framework/framework.scss → src/ui_framework/components/index.scss b/...ui_framework/src/framework/framework.scss → src/ui_framework/components/index.scss
@@ -24,4 +24,4 @@ $inputBorderColor--darkTheme: $inputBackgroundColor--darkTheme;
   }
 }
 
-@import "components/local_nav/index";
+@import "local_nav/index";
diff --git a/...ramework/components/local_nav/_index.scss → ...ramework/components/local_nav/_index.scss b/...ramework/components/local_nav/_index.scss → ...ramework/components/local_nav/_index.scss
diff --git a/...ponents/local_nav/_local_breadcrumbs.scss → ...ponents/local_nav/_local_breadcrumbs.scss b/...ponents/local_nav/_local_breadcrumbs.scss → ...ponents/local_nav/_local_breadcrumbs.scss
diff --git a/...components/local_nav/_local_dropdown.scss → ...components/local_nav/_local_dropdown.scss b/...components/local_nav/_local_dropdown.scss → ...components/local_nav/_local_dropdown.scss
diff --git a/...ork/components/local_nav/_local_menu.scss → ...ork/components/local_nav/_local_menu.scss b/...ork/components/local_nav/_local_menu.scss → ...ork/components/local_nav/_local_menu.scss
diff --git a/...work/components/local_nav/_local_nav.scss → ...work/components/local_nav/_local_nav.scss b/...work/components/local_nav/_local_nav.scss → ...work/components/local_nav/_local_nav.scss
diff --git a/...k/components/local_nav/_local_search.scss → ...k/components/local_nav/_local_search.scss b/...k/components/local_nav/_local_search.scss → ...k/components/local_nav/_local_search.scss
diff --git a/...ork/components/local_nav/_local_tabs.scss → ...ork/components/local_nav/_local_tabs.scss b/...ork/components/local_nav/_local_tabs.scss → ...ork/components/local_nav/_local_tabs.scss
diff --git a/...rk/components/local_nav/_local_title.scss → ...rk/components/local_nav/_local_title.scss b/...rk/components/local_nav/_local_title.scss → ...rk/components/local_nav/_local_title.scss
diff --git a/src/ui_framework/public/index.html → src/ui_framework/doc_site/build/index.html b/src/ui_framework/public/index.html → src/ui_framework/doc_site/build/index.html
diff --git a/...amework/src/guide/actions/action_types.js → ...work/doc_site/src/actions/action_types.js b/...amework/src/guide/actions/action_types.js → ...work/doc_site/src/actions/action_types.js
diff --git a/...ctions/code_viewer/code_viewer_actions.js → ...ctions/code_viewer/code_viewer_actions.js b/...ctions/code_viewer/code_viewer_actions.js → ...ctions/code_viewer/code_viewer_actions.js
diff --git a/src/ui_framework/src/guide/actions/index.js → ...i_framework/doc_site/src/actions/index.js b/src/ui_framework/src/guide/actions/index.js → ...i_framework/doc_site/src/actions/index.js
diff --git a/...guide_code_viewer/_guide_code_viewer.scss → ...guide_code_viewer/_guide_code_viewer.scss b/...guide_code_viewer/_guide_code_viewer.scss → ...guide_code_viewer/_guide_code_viewer.scss
diff --git a/...s/guide_code_viewer/guide_code_viewer.jsx → ...s/guide_code_viewer/guide_code_viewer.jsx b/...s/guide_code_viewer/guide_code_viewer.jsx → ...s/guide_code_viewer/guide_code_viewer.jsx
diff --git a/...ponents/guide_example/_guide_example.scss → ...ponents/guide_example/_guide_example.scss b/...ponents/guide_example/_guide_example.scss → ...ponents/guide_example/_guide_example.scss
diff --git a/...omponents/guide_example/guide_example.jsx → ...omponents/guide_example/guide_example.jsx b/...omponents/guide_example/guide_example.jsx → ...omponents/guide_example/guide_example.jsx
diff --git a/...uide/components/guide_nav/_guide_nav.scss → .../src/components/guide_nav/_guide_nav.scss b/...uide/components/guide_nav/_guide_nav.scss → .../src/components/guide_nav/_guide_nav.scss
diff --git a/.../guide/components/guide_nav/guide_nav.jsx → ...te/src/components/guide_nav/guide_nav.jsx b/.../guide/components/guide_nav/guide_nav.jsx → ...te/src/components/guide_nav/guide_nav.jsx
diff --git a/...de/components/guide_page/_guide_page.scss → ...rc/components/guide_page/_guide_page.scss b/...de/components/guide_page/_guide_page.scss → ...rc/components/guide_page/_guide_page.scss
diff --git a/...uide/components/guide_page/guide_page.jsx → .../src/components/guide_page/guide_page.jsx b/...uide/components/guide_page/guide_page.jsx → .../src/components/guide_page/guide_page.jsx
diff --git a/...ide_page_section/_guide_page_section.scss → ...ide_page_section/_guide_page_section.scss b/...ide_page_section/_guide_page_section.scss → ...ide_page_section/_guide_page_section.scss
diff --git a/...guide_page_section/guide_page_section.jsx → ...guide_page_section/guide_page_section.jsx b/...guide_page_section/guide_page_section.jsx → ...guide_page_section/guide_page_section.jsx
diff --git a/...e_page_side_nav/_guide_page_side_nav.scss → ...e_page_side_nav/_guide_page_side_nav.scss b/...e_page_side_nav/_guide_page_side_nav.scss → ...e_page_side_nav/_guide_page_side_nav.scss
diff --git a/...ide_page_side_nav/guide_page_side_nav.jsx → ...ide_page_side_nav/guide_page_side_nav.jsx b/...ide_page_side_nav/guide_page_side_nav.jsx → ...ide_page_side_nav/guide_page_side_nav.jsx
diff --git a/...age_side_nav/guide_page_side_nav_item.jsx → ...age_side_nav/guide_page_side_nav_item.jsx b/...age_side_nav/guide_page_side_nav_item.jsx → ...age_side_nav/guide_page_side_nav_item.jsx
diff --git a/...i_framework/src/guide/components/index.js → ...ramework/doc_site/src/components/index.js b/...i_framework/src/guide/components/index.js → ...ramework/doc_site/src/components/index.js
diff --git a/src/ui_framework/src/guide/index.js → src/ui_framework/doc_site/src/index.js b/src/ui_framework/src/guide/index.js → src/ui_framework/doc_site/src/index.js
diff --git a/src/ui_framework/src/guide/main.scss → src/ui_framework/doc_site/src/main.scss b/src/ui_framework/src/guide/main.scss → src/ui_framework/doc_site/src/main.scss
@@ -1,5 +1,5 @@
 
-@import "../framework/framework";
+@import "../../components/index";
 @import "./views/app";
 @import "./components/guide_code_viewer/guide_code_viewer";
 @import "./components/guide_nav/guide_nav";

diff --git a/...c/guide/services/example/createExample.js → ...ite/src/services/example/createExample.js b/...c/guide/services/example/createExample.js → ...ite/src/services/example/createExample.js
diff --git a/src/ui_framework/src/guide/services/index.js → ..._framework/doc_site/src/services/index.js b/src/ui_framework/src/guide/services/index.js → ..._framework/doc_site/src/services/index.js
diff --git a/...guide/services/js_injector/js_injector.js → ...e/src/services/js_injector/js_injector.js b/...guide/services/js_injector/js_injector.js → ...e/src/services/js_injector/js_injector.js
diff --git a/...ework/src/guide/services/routes/Routes.js → ...rk/doc_site/src/services/routes/Routes.js b/...ework/src/guide/services/routes/Routes.js → ...rk/doc_site/src/services/routes/Routes.js
diff --git a/...work/src/guide/services/string/slugify.js → ...k/doc_site/src/services/string/slugify.js b/...work/src/guide/services/string/slugify.js → ...k/doc_site/src/services/string/slugify.js
diff --git a/...mework/src/guide/store/configure_store.js → ...ork/doc_site/src/store/configure_store.js b/...mework/src/guide/store/configure_store.js → ...ork/doc_site/src/store/configure_store.js
diff --git a/...ide/store/reducers/code_viewer_reducer.js → ...src/store/reducers/code_viewer_reducer.js b/...ide/store/reducers/code_viewer_reducer.js → ...src/store/reducers/code_viewer_reducer.js
diff --git a/src/ui_framework/src/guide/variables.scss → src/ui_framework/doc_site/src/variables.scss b/src/ui_framework/src/guide/variables.scss → src/ui_framework/doc_site/src/variables.scss
diff --git a/src/ui_framework/src/guide/views/_app.scss → ...ui_framework/doc_site/src/views/_app.scss b/src/ui_framework/src/guide/views/_app.scss → ...ui_framework/doc_site/src/views/_app.scss
diff --git a/...ramework/src/guide/views/app_container.js → ...ework/doc_site/src/views/app_container.js b/...ramework/src/guide/views/app_container.js → ...ework/doc_site/src/views/app_container.js
diff --git a/...ui_framework/src/guide/views/app_view.jsx → ...framework/doc_site/src/views/app_view.jsx b/...ui_framework/src/guide/views/app_view.jsx → ...framework/doc_site/src/views/app_view.jsx
diff --git a/...work/src/guide/views/home/_home_view.scss → ...k/doc_site/src/views/home/_home_view.scss b/...work/src/guide/views/home/_home_view.scss → ...k/doc_site/src/views/home/_home_view.scss
diff --git a/...mework/src/guide/views/home/home_view.jsx → ...ork/doc_site/src/views/home/home_view.jsx b/...mework/src/guide/views/home/home_view.jsx → ...ork/doc_site/src/views/home/home_view.jsx
diff --git a/...av_breadcrumbs/local_nav_breadcrumbs.html → ...av_breadcrumbs/local_nav_breadcrumbs.html b/...av_breadcrumbs/local_nav_breadcrumbs.html → ...av_breadcrumbs/local_nav_breadcrumbs.html
diff --git a/...ocal_nav_dropdown/local_nav_dropdown.html → ...ocal_nav_dropdown/local_nav_dropdown.html b/...ocal_nav_dropdown/local_nav_dropdown.html → ...ocal_nav_dropdown/local_nav_dropdown.html
diff --git a/...own_panels/local_nav_dropdown_panels.html → ...own_panels/local_nav_dropdown_panels.html b/...own_panels/local_nav_dropdown_panels.html → ...own_panels/local_nav_dropdown_panels.html
diff --git a/...ide/views/local_nav/local_nav_example.jsx → ...src/views/local_nav/local_nav_example.jsx b/...ide/views/local_nav/local_nav_example.jsx → ...src/views/local_nav/local_nav_example.jsx
diff --git a/...em_states/local_nav_menu_item_states.html → ...em_states/local_nav_menu_item_states.html b/...em_states/local_nav_menu_item_states.html → ...em_states/local_nav_menu_item_states.html
diff --git a/...av/local_nav_search/local_nav_search.html → ...av/local_nav_search/local_nav_search.html b/...av/local_nav_search/local_nav_search.html → ...av/local_nav_search/local_nav_search.html
diff --git a/..._search_error/local_nav_search_error.html → ..._search_error/local_nav_search_error.html b/..._search_error/local_nav_search_error.html → ..._search_error/local_nav_search_error.html
diff --git a/...av/local_nav_simple/local_nav_simple.html → ...av/local_nav_simple/local_nav_simple.html b/...av/local_nav_simple/local_nav_simple.html → ...av/local_nav_simple/local_nav_simple.html
diff --git a/...al_nav/local_nav_tabs/local_nav_tabs.html → ...al_nav/local_nav_tabs/local_nav_tabs.html b/...al_nav/local_nav_tabs/local_nav_tabs.html → ...al_nav/local_nav_tabs/local_nav_tabs.html
diff --git a/.../guide/views/not_found/not_found_view.jsx → ...te/src/views/not_found/not_found_view.jsx b/.../guide/views/not_found/not_found_view.jsx → ...te/src/views/not_found/not_found_view.jsx
diff --git a/src/ui_framework/webpack.config.js → src/ui_framework/doc_site/webpack.config.js b/src/ui_framework/webpack.config.js → src/ui_framework/doc_site/webpack.config.js
@@ -4,17 +4,17 @@ module.exports = {
   devtool: 'source-map',
 
   entry: {
-    guide: './src/ui_framework/src/guide/index.js'
+    guide: './src/ui_framework/doc_site/src/index.js'
   },
 
   output: {
-    path: path.resolve(__dirname, 'src/ui_framework/public'),
+    path: path.resolve(__dirname, 'src/ui_framework/doc_site/build'),
     filename: 'bundle.js'
   },
 
   resolve: {
     root: [
-      path.resolve(__dirname, 'src/ui_framework/src')
+      path.resolve(__dirname, 'src/ui_framework/doc_site')
     ]
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,4 @@ selenium @@
     *.swp
     *.swo
     *.out
-    src/ui_framework/public/*.js*
+    src/ui_framework/doc_site/build/*.js*