Skip to content

Commit

Permalink
uses updated mapboard with pde-merge branch of pvd
Browse files Browse the repository at this point in the history
  • Loading branch information
ajrothwell committed Dec 20, 2019
1 parent cca5017 commit 072a08c
Show file tree
Hide file tree
Showing 7 changed files with 1,547 additions and 1,464 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,11 @@ deploy:
branch: test-api
local_dir: dist
skip_cleanup: true
- provider: s3
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: 'real-estate-test'
on:
branch: pde-merge
local_dir: dist
skip_cleanup: true
7 changes: 6 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
presets: [
'@vue/app',
[
'@vue/app',
// { useBuiltIns: "entry" },
],
],
// ignore: [ /[\/\\]core-js/, /@babel[\/\\]runtime/ ],
// ignore: [/\/core-js/, /@babel\/runtime/]
};
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"@philly/mapboard": "3.0.50",
"@sentry/browser": "4.3.4",
"accounting": "^0.4.1",
"vue": "^2.6.9"
"vue": "^2.6.10"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.4.0",
"@vue/cli-plugin-eslint": "^3.12.0",
"@vue/cli-service": "^3.4.0",
"@vue/cli-plugin-babel": "^4.1.1",
"@vue/cli-plugin-eslint": "^4.1.1",
"@vue/cli-service": "^4.1.1",
"babel-eslint": "^10.0.3",
"eslint": "^6.5.1",
"eslint-plugin-vue": "^5.2.3",
"vue-template-compiler": "^2.6.9",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.0.1",
"vue-template-compiler": "^2.6.10",
"webpack-visualizer-plugin": "^0.1.11"
},
"postcss": {
Expand Down
10 changes: 6 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ __________ .__ ___________ __ __
\/ \/ \/ \/ \/ \/ \/
*/

import * as Sentry from '@sentry/browser';
Sentry.init({ dsn: 'https://6702e2c2f3ea4c6384583fbed0b54f4f@sentry.io/1330799' });
// import * as Sentry from '@sentry/browser';
// Sentry.init({ dsn: 'https://6702e2c2f3ea4c6384583fbed0b54f4f@sentry.io/1330799' });

console.log('real estate tax at top of main.js');

// turn off console logging in production
const { hostname='' } = location;
Expand Down Expand Up @@ -50,8 +52,8 @@ import map from './general/map';
import legendControls from './general/legendControls';
import imageOverlayGroups from './general/imageOverlayGroups';

import '../node_modules/phila-standards/dist/css/phila-app.min.css';
import './styles.css';
// import '../node_modules/phila-standards/dist/css/phila-app.min.css';
// import './styles.css';


var BASE_CONFIG_URL = null;
Expand Down
14 changes: 9 additions & 5 deletions src/topics/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ export default {
slots: {
fields: function() {
let ex = [];
for (let key of keys) {
ex.push({
label: key,
value: transforms.statusMap.transform(key),
});
let i;
for (i = 0; i < keys.length; i++) {
console.log('test');
}
// for (let key of keys) {
// ex.push({
// label: key,
// value: transforms.statusMap.transform(key),
// });
// }
return ex;
}(),
},
Expand Down
15 changes: 7 additions & 8 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@ module.exports = {
config.plugins.delete('prefetch');
},

// outputDir: undefined,
// assetsDir: undefined,
// runtimeCompiler: undefined,
// productionSourceMap: undefined,
// parallel: undefined,
// css: undefined,
transpileDependencies: [
// can be string or regex
'@philly/mapboard',
'@philly/vue-comps',
'@philly/vue-mapping',
'@philly/vue-datafetch',
// /other-dep/
],

outputDir: undefined,
assetsDir: undefined,
runtimeCompiler: undefined,
productionSourceMap: undefined,
parallel: undefined,
css: undefined,
]
};
Loading

0 comments on commit 072a08c

Please sign in to comment.