zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve bad import issues. Remove src/ folder.

Browse Source
pull/14331/head
jesusbotella 6 years ago
parent 041771beaf
commit bc67170dbf
5 changed files with 154 additions and 155 deletions
Show Stats Download Patch File Download Diff File

5
lib/assets/javascripts/new-dashboard/App.vue
Unescape View File

@ -1,6 +1,5 @@
<template>
<div id="app">
<img src="./assets/logo.png">
<router-view/>
</div>
</template>
@ -13,11 +12,11 @@ export default {
<style>
#app {
margin-top: 60px;
color: #2C3E50;
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
margin-top: 60px;
}
</style>

4
lib/assets/javascripts/new-dashboard/router/index.js
Unescape View File

@ -1,6 +1,6 @@
import Vue from 'vue';
import Router from 'vue-router';
import HelloWorld from 'new-dashboard/src/components/HelloWorld';
import HelloWorld from 'new-dashboard/components/HelloWorld';
Vue.use(Router);
@ -12,4 +12,4 @@ export default new Router({
component: HelloWorld
}
]
})
});

4
lib/assets/javascripts/new-dashboard/test/unit/jest.conf.js
Unescape View File

@ -10,7 +10,7 @@ module.exports = {
'vue'
],
moduleNameMapper: {
'^new-dashboard/(.*)$': `<rootDir>/${projectPathFromRoot}/src/$1`
'^new-dashboard/(.*)$': `<rootDir>/${projectPathFromRoot}/$1`
},
transform: {
'^.+\\.js$': '<rootDir>/node_modules/babel-jest',
@ -28,4 +28,4 @@ module.exports = {
roots: [
`<rootDir>/${projectPathFromRoot}/test/unit/specs`
]
}
};

10
lib/assets/javascripts/new-dashboard/test/unit/specs/HelloWorld.spec.js
Unescape View File

@ -3,9 +3,9 @@ import HelloWorld from 'new-dashboard/components/HelloWorld';
describe('HelloWorld.vue', () => {
it('should render correct contents', () => {
const Constructor = Vue.extend(HelloWorld)
const vm = new Constructor().$mount()
const Constructor = Vue.extend(HelloWorld);
const vm = new Constructor().$mount();
expect(vm.$el.querySelector('.hello h1').textContent)
.toEqual('Welcome to Your Vue.js App')
})
})
.toEqual('Welcome to Your Vue.js App');
});
});

286
webpack/v4/entryPoints.js
Unescape View File

@ -12,10 +12,10 @@ module.exports = {
rootDir('node_modules/cartoassets/src/scss/entry.scss')
]),
// deep_insights_new: [
// rootDir('assets/stylesheets/deep-insights/entry.scss'),
// rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
// ],
deep_insights_new: [
rootDir('assets/stylesheets/deep-insights/entry.scss'),
rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
],
public_map_new: glob.sync(rootDir('assets/stylesheets/public_map/**/*.scss')),
@ -27,148 +27,148 @@ module.exports = {
],
new_dashboard: [
rootDir('lib/assets/javascripts/new-dashboard/src/main.js'),
rootDir('lib/assets/javascripts/new-dashboard/main.js'),
...glob.sync(rootDir('assets/stylesheets/dashboard/*.scss')),
rootDir('assets/stylesheets/editor-3/_scroll-view.scss'),
rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
],
// public_table_new: [
// rootDir('lib/assets/javascripts/dashboard/public-dataset.js'),
// rootDir('assets/stylesheets/table/table.scss'),
// rootDir('assets/stylesheets/public/public_map_wrapper_new.scss'),
// rootDir('assets/stylesheets/public/public_table_wrapper_new.scss'),
// rootDir('assets/stylesheets/public/public_map_data.scss'),
// rootDir('assets/stylesheets/public/public_map_body.scss'),
// rootDir('assets/stylesheets/public/public_export.scss'),
// ...glob.sync(rootDir('assets/stylesheets/public_table/**/*.scss')),
// rootDir('assets/stylesheets/public/public_map_fullscreen.scss'),
// rootDir('assets/stylesheets/map/map.scss'),
// rootDir('node_modules/leaflet/dist/leaflet.css')
// ],
// public_dashboard_new: [
// rootDir('lib/assets/javascripts/dashboard/public-dashboard.js'),
// ...glob.sync(rootDir('assets/stylesheets/public_dashboard/**/*.scss')),
// rootDir('assets/stylesheets/public_map/public_map_buttons.scss'),
// rootDir('assets/stylesheets/public_map/public_map_footer.scss')
// ],
// user_feed_new: [
// rootDir('lib/assets/javascripts/dashboard/user-feed.js'),
// ...glob.sync(rootDir('assets/stylesheets/user_feed/**/*.scss'))
// ],
// api_keys_new: [
// rootDir('lib/assets/javascripts/dashboard/api-keys.js'),
// rootDir('assets/stylesheets/dashboard/api-keys.scss'),
// rootDir('vendor/assets/stylesheets/tipsy.css'),
// rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
// ],
// data_library: [
// rootDir('lib/assets/javascripts/dashboard/data-library.js'),
// ...glob.sync(rootDir('assets/stylesheets/data_library/**/*.scss')),
// rootDir('assets/stylesheets/public_map/public_map_buttons.scss'),
// rootDir('assets/stylesheets/public_map/public_map_footer.scss')
// ],
// mobile_apps: [
// rootDir('lib/assets/javascripts/dashboard/mobile-apps.js'),
// ...glob.sync(rootDir('assets/stylesheets/mobile_apps/*.scss'))
// ],
// account: rootDir('lib/assets/javascripts/dashboard/account.js'),
// profile: rootDir('lib/assets/javascripts/dashboard/profile.js'),
// sessions: [
// rootDir('lib/assets/javascripts/dashboard/sessions.js'),
// rootDir('assets/stylesheets/common/flash-message.scss'),
// rootDir('assets/stylesheets/common/tooltip.scss'),
// rootDir('assets/stylesheets/common/logo.scss'),
// rootDir('node_modules/cartoassets/src/scss/entry.scss'),
// ...glob.sync(rootDir('assets/stylesheets/sessions/*.scss'))
// ],
// confirmation: rootDir('lib/assets/javascripts/dashboard/confirmation.js'),
// lockout: rootDir('lib/assets/javascripts/dashboard/lockout.js'),
// organization: [
// rootDir('lib/assets/javascripts/dashboard/organization.js'),
// rootDir('assets/stylesheets/plugins/tagit.scss'),
// ...glob.sync(rootDir('assets/stylesheets/organization/*.scss')),
// rootDir('assets/stylesheets/editor-3/_assets.scss'),
// rootDir('assets/stylesheets/editor-3/_modals-layout.scss'),
// rootDir('assets/stylesheets/editor-3/_tab-pane.scss'),
// rootDir('assets/stylesheets/editor-3/_modals-elements.scss'),
// rootDir('assets/stylesheets/editor-3/_scroll-view.scss')
// ],
// common_editor3: removeDuplicated([
// rootDir('assets/stylesheets/common/buttons.scss'),
// rootDir('assets/stylesheets/common/create/create_footer.scss'),
// rootDir('assets/stylesheets/common/create/create_header.scss'),
// rootDir('assets/stylesheets/common/error-details.scss'),
// rootDir('assets/stylesheets/common/default.scss'),
// rootDir('assets/stylesheets/common/dialog.scss'),
// rootDir('assets/stylesheets/common/onboarding.scss'),
// rootDir('assets/stylesheets/common/builder-onboarding.scss'),
// rootDir('assets/stylesheets/common/layer-onboarding.scss'),
// rootDir('assets/stylesheets/common/onboarding-notification.scss'),
// rootDir('assets/stylesheets/common/default-paragraph.scss'),
// rootDir('assets/stylesheets/common/default-description.scss'),
// rootDir('assets/stylesheets/common/default-title.scss'),
// rootDir('assets/stylesheets/common/default-time-diff.scss'),
// rootDir('assets/stylesheets/common/privacy-indicator.scss'),
// rootDir('assets/stylesheets/common/no-results.scss'),
// rootDir('assets/stylesheets/common/likes-indicator.scss'),
// rootDir('assets/stylesheets/common/filters.scss'),
// rootDir('assets/stylesheets/common/intermediate-info.scss'),
// rootDir('assets/stylesheets/common/nav-button.scss'),
// rootDir('assets/stylesheets/common/spinner.scss'),
// rootDir('assets/stylesheets/common/tabs.scss'),
// rootDir('assets/stylesheets/common/titles.scss'),
// rootDir('assets/stylesheets/common/utilities.scss'),
// ...glob.sync(rootDir('assets/stylesheets/common/background-polling/**/*.scss')),
// rootDir('assets/stylesheets/plugins/tipsy.scss'),
// rootDir('assets/stylesheets/common/pagination.scss'),
// rootDir('assets/stylesheets/common/datepicker.scss'),
// rootDir('assets/stylesheets/common/datasets-list.scss'),
// rootDir('assets/stylesheets/common/notifications-list.scss'),
// ...glob.sync(rootDir('assets/stylesheets/common/create/**/*.scss')),
// rootDir('assets/stylesheets/common/form-content.scss'),
// ...glob.sync(rootDir('assets/stylesheets/common/forms/**/*.scss')),
// rootDir('assets/stylesheets/common/option-card.scss'),
// ...glob.sync(rootDir('assets/stylesheets/common/icons/**/*.scss')),
// rootDir('assets/stylesheets/common/maps-list.scss'),
// rootDir('assets/stylesheets/common/map-card.scss')
// ]),
// editor3: [
// rootDir('node_modules/cartoassets/src/scss/entry.scss'),
// rootDir('node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css'),
// rootDir('assets/stylesheets/editor-3/entry.scss')
// ],
// builder_embed: [
// 'whatwg-fetch',
// resolve(__dirname, '../../', 'lib/assets/javascripts/builder/public_editor.js'),
// rootDir('assets/stylesheets/plugins/tipsy.scss'),
// rootDir('node_modules/cartoassets/src/scss/entry.scss')
// ],
// password_protected: [
// rootDir('assets/stylesheets/public/password_protected.scss'),
// rootDir('node_modules/cartoassets/src/scss/entry.scss')
// ],
// dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/dataset.js'),
// builder: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/editor.js'),
// oauth: [
// rootDir('assets/stylesheets/oauth/oauth.scss')
// ]
public_table_new: [
rootDir('lib/assets/javascripts/dashboard/public-dataset.js'),
rootDir('assets/stylesheets/table/table.scss'),
rootDir('assets/stylesheets/public/public_map_wrapper_new.scss'),
rootDir('assets/stylesheets/public/public_table_wrapper_new.scss'),
rootDir('assets/stylesheets/public/public_map_data.scss'),
rootDir('assets/stylesheets/public/public_map_body.scss'),
rootDir('assets/stylesheets/public/public_export.scss'),
...glob.sync(rootDir('assets/stylesheets/public_table/**/*.scss')),
rootDir('assets/stylesheets/public/public_map_fullscreen.scss'),
rootDir('assets/stylesheets/map/map.scss'),
rootDir('node_modules/leaflet/dist/leaflet.css')
],
public_dashboard_new: [
rootDir('lib/assets/javascripts/dashboard/public-dashboard.js'),
...glob.sync(rootDir('assets/stylesheets/public_dashboard/**/*.scss')),
rootDir('assets/stylesheets/public_map/public_map_buttons.scss'),
rootDir('assets/stylesheets/public_map/public_map_footer.scss')
],
user_feed_new: [
rootDir('lib/assets/javascripts/dashboard/user-feed.js'),
...glob.sync(rootDir('assets/stylesheets/user_feed/**/*.scss'))
],
api_keys_new: [
rootDir('lib/assets/javascripts/dashboard/api-keys.js'),
rootDir('assets/stylesheets/dashboard/api-keys.scss'),
rootDir('vendor/assets/stylesheets/tipsy.css'),
rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
],
data_library: [
rootDir('lib/assets/javascripts/dashboard/data-library.js'),
...glob.sync(rootDir('assets/stylesheets/data_library/**/*.scss')),
rootDir('assets/stylesheets/public_map/public_map_buttons.scss'),
rootDir('assets/stylesheets/public_map/public_map_footer.scss')
],
mobile_apps: [
rootDir('lib/assets/javascripts/dashboard/mobile-apps.js'),
...glob.sync(rootDir('assets/stylesheets/mobile_apps/*.scss'))
],
account: rootDir('lib/assets/javascripts/dashboard/account.js'),
profile: rootDir('lib/assets/javascripts/dashboard/profile.js'),
sessions: [
rootDir('lib/assets/javascripts/dashboard/sessions.js'),
rootDir('assets/stylesheets/common/flash-message.scss'),
rootDir('assets/stylesheets/common/tooltip.scss'),
rootDir('assets/stylesheets/common/logo.scss'),
rootDir('node_modules/cartoassets/src/scss/entry.scss'),
...glob.sync(rootDir('assets/stylesheets/sessions/*.scss'))
],
confirmation: rootDir('lib/assets/javascripts/dashboard/confirmation.js'),
lockout: rootDir('lib/assets/javascripts/dashboard/lockout.js'),
organization: [
rootDir('lib/assets/javascripts/dashboard/organization.js'),
rootDir('assets/stylesheets/plugins/tagit.scss'),
...glob.sync(rootDir('assets/stylesheets/organization/*.scss')),
rootDir('assets/stylesheets/editor-3/_assets.scss'),
rootDir('assets/stylesheets/editor-3/_modals-layout.scss'),
rootDir('assets/stylesheets/editor-3/_tab-pane.scss'),
rootDir('assets/stylesheets/editor-3/_modals-elements.scss'),
rootDir('assets/stylesheets/editor-3/_scroll-view.scss')
],
common_editor3: removeDuplicated([
rootDir('assets/stylesheets/common/buttons.scss'),
rootDir('assets/stylesheets/common/create/create_footer.scss'),
rootDir('assets/stylesheets/common/create/create_header.scss'),
rootDir('assets/stylesheets/common/error-details.scss'),
rootDir('assets/stylesheets/common/default.scss'),
rootDir('assets/stylesheets/common/dialog.scss'),
rootDir('assets/stylesheets/common/onboarding.scss'),
rootDir('assets/stylesheets/common/builder-onboarding.scss'),
rootDir('assets/stylesheets/common/layer-onboarding.scss'),
rootDir('assets/stylesheets/common/onboarding-notification.scss'),
rootDir('assets/stylesheets/common/default-paragraph.scss'),
rootDir('assets/stylesheets/common/default-description.scss'),
rootDir('assets/stylesheets/common/default-title.scss'),
rootDir('assets/stylesheets/common/default-time-diff.scss'),
rootDir('assets/stylesheets/common/privacy-indicator.scss'),
rootDir('assets/stylesheets/common/no-results.scss'),
rootDir('assets/stylesheets/common/likes-indicator.scss'),
rootDir('assets/stylesheets/common/filters.scss'),
rootDir('assets/stylesheets/common/intermediate-info.scss'),
rootDir('assets/stylesheets/common/nav-button.scss'),
rootDir('assets/stylesheets/common/spinner.scss'),
rootDir('assets/stylesheets/common/tabs.scss'),
rootDir('assets/stylesheets/common/titles.scss'),
rootDir('assets/stylesheets/common/utilities.scss'),
...glob.sync(rootDir('assets/stylesheets/common/background-polling/**/*.scss')),
rootDir('assets/stylesheets/plugins/tipsy.scss'),
rootDir('assets/stylesheets/common/pagination.scss'),
rootDir('assets/stylesheets/common/datepicker.scss'),
rootDir('assets/stylesheets/common/datasets-list.scss'),
rootDir('assets/stylesheets/common/notifications-list.scss'),
...glob.sync(rootDir('assets/stylesheets/common/create/**/*.scss')),
rootDir('assets/stylesheets/common/form-content.scss'),
...glob.sync(rootDir('assets/stylesheets/common/forms/**/*.scss')),
rootDir('assets/stylesheets/common/option-card.scss'),
...glob.sync(rootDir('assets/stylesheets/common/icons/**/*.scss')),
rootDir('assets/stylesheets/common/maps-list.scss'),
rootDir('assets/stylesheets/common/map-card.scss')
]),
editor3: [
rootDir('node_modules/cartoassets/src/scss/entry.scss'),
rootDir('node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css'),
rootDir('assets/stylesheets/editor-3/entry.scss')
],
builder_embed: [
'whatwg-fetch',
resolve(__dirname, '../../', 'lib/assets/javascripts/builder/public_editor.js'),
rootDir('assets/stylesheets/plugins/tipsy.scss'),
rootDir('node_modules/cartoassets/src/scss/entry.scss')
],
password_protected: [
rootDir('assets/stylesheets/public/password_protected.scss'),
rootDir('node_modules/cartoassets/src/scss/entry.scss')
],
dataset: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/dataset.js'),
builder: resolve(__dirname, '../../', 'lib/assets/javascripts/builder/editor.js'),
oauth: [
rootDir('assets/stylesheets/oauth/oauth.scss')
]
};

Write Preview
Loading…
Cancel
Save