diff --git a/.babelrc b/.babelrc index 6dbff55..389a64d 100644 --- a/.babelrc +++ b/.babelrc @@ -1,4 +1,4 @@ { - "presets": ["es2015-loose", "stage-1"], + "presets": ["es2015"], "plugins": ["transform-runtime", "add-module-exports"] } diff --git a/.eslintrc b/.eslintrc index c0cd477..0a00094 100644 --- a/.eslintrc +++ b/.eslintrc @@ -15,6 +15,8 @@ "ON_DEV": false, "ON_TEST": false, "ON_PROD": false, + "APP_NAME": false, + "VERSION": false, "sinon": false, "expect": false, "angular": false, diff --git a/CHANGELOG.md b/FRAMEWORK-CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to FRAMEWORK-CHANGELOG.md diff --git a/FRAMEWORK-CONTRIBUTING.md b/FRAMEWORK-CONTRIBUTING.md new file mode 100644 index 0000000..c87a258 --- /dev/null +++ b/FRAMEWORK-CONTRIBUTING.md @@ -0,0 +1,27 @@ +## Contributing + +We are open to, and grateful for, any contributions made by the community. + +## Reporting Issues + +Please use the [issue tracker](https://github.com/DomoApps/starter-kit/issues) to log bugs, ask questions, and request features. Search through the issues to make sure your issue hasn’t already been reported. + +## Development + +Visit the [issue tracker](https://github.com/DomoApps/starter-kit/issues) to find a list of open issues that need attention. + +Fork, then clone the repo: + +``` +git clone https://github.com/your-username/starter-kit.git +``` + +Develop your feature or bugfix and create a Pull Request. Our team will review the PR. If we see potential problems with the code's functionality or design, we will ask you to make changes during the review process; otherwise, we will merge your changes and create a new version of starter-kit. Please keep your Pull Request focused to a specific issue. + +Make sure your contributions pass starter-kit's unit tests and linter. To run both the tests and the linter, use this command: + +``` +npm run test +``` + +Thank you for contributing! diff --git a/lab.html b/lab.html index c7191da..c97b314 100644 --- a/lab.html +++ b/lab.html @@ -1,7 +1,7 @@ - + @@ -156,7 +155,7 @@
-
+
diff --git a/other/init-repo.es6.js b/other/init-repo.es6.js index 7419219..239c97c 100644 --- a/other/init-repo.es6.js +++ b/other/init-repo.es6.js @@ -5,8 +5,7 @@ import inquirer from 'inquirer'; import kebabCase from 'lodash.kebabcase'; import shelljs from 'shelljs'; -// TODO: update with the repo location on Github after we migrate -const STARTER_REPO = 'git@git.empdev.domo.com:AppTeam6/da-webpack.git'; +const STARTER_REPO = 'https://github.com/DomoApps/starter-kit.git'; const GENERATOR_KEYWORDS = ['da-webpack', 'starter-kit']; const DOMO_STRICT_LICENSE = [ diff --git a/other/karma.conf.es6.js b/other/karma.conf.es6.js index 5314689..3eb20ad 100644 --- a/other/karma.conf.es6.js +++ b/other/karma.conf.es6.js @@ -1,70 +1,46 @@ -const path = require('path'); +module.exports = config => { + // load external cdn dependencies + const pkg = require('../package.json'); + const cdns = Object.values(pkg.cdnDependencies); -// load webpack config here for for webpack preprocessor -const webpackConfig = require('../webpack.config'); -delete webpackConfig.devtool; -webpackConfig.cache = true; + // entry file that bundles all the test files + const testEntryFile = './other/tests.js'; -let file; -// Add new cdns resouces here. -const cdns = [ - 'https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.10/d3.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-alpha1/jquery.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-animate.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.min.js', -]; + const webpackConfig = require('../webpack.config'); + const webpackLoaders = webpackConfig.module.loaders; -const entry = [ - ...cdns, - 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-mocks.js', -]; -const preprocessors = {}; -for (const chunk in webpackConfig.entry) { - if ({}.hasOwnProperty.call(webpackConfig.entry, chunk)) { - file = path.resolve(webpackConfig.context, webpackConfig.entry[chunk]); - entry.push(file); - preprocessors[file] = ['webpack']; - } -} - -module.exports = (config) => { config.set({ - basePath: './', frameworks: ['mocha', 'chai', 'sinon'], - files: entry, - webpack: webpackConfig, - + files: [ + ...cdns, + testEntryFile + ], + preprocessors: { + [testEntryFile]: ['webpack', 'sourcemap'] + }, + webpack: { + module: { + loaders: webpackLoaders + }, + devtool: 'inline-source-map' + }, webpackMiddleware: { noInfo: true }, - - // list of files to exclude - exclude: [ - 'src/switcher.js' - ], - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: preprocessors, - + // how the test success/failure status is reported: reporters: ['dots'], - port: 9876, - colors: true, - autoWatch: true, + logLevel: config.LOG_ERROR, browsers: ['PhantomJS', 'Chrome', 'Firefox', 'Safari'], plugins: [ - require('karma-webpack'), - 'karma-coverage', 'karma-phantomjs-launcher', + 'karma-sourcemap-loader', 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-safari-launcher', 'karma-mocha', 'karma-chai', 'karma-sinon', - ], - logLevel: config.LOG_ERROR + 'karma-webpack' + ] }); }; diff --git a/other/server.es6.js b/other/server.es6.js index bd6b185..a537da1 100644 --- a/other/server.es6.js +++ b/other/server.es6.js @@ -20,6 +20,7 @@ portfinder.basePort = 3000; let baseUrl; const home = Domo.getHomeDir(); const mostRecent = getMostRecentLogin(); +const domo = new Domo(mostRecent.instance, mostRecent.sid, mostRecent.devtoken); const manifest = fs.readJsonSync(path.resolve(process.cwd() + '/domo/manifest.json')); const domainPromise = getDomoappsDomain() .then(_baseUrl => baseUrl = _baseUrl) @@ -46,23 +47,21 @@ server.app.all('/data/v1/:query', proxyRequest); function proxyRequest(req, res) { domainPromise .then(context => { - const j = request.jar(); const url = baseUrl + req.url; - const auth = `DA-SID-${getCustomer()}="${mostRecent.sid}"`; - const cookie = request.cookie(auth); - j.setCookie(cookie, baseUrl); + const j = request.jar(); const referer = req.headers.referer.indexOf('?') >= 0 ? `${req.headers.referer}&context=${context.id}` : `${req.headers.referer}?userId=27&customer=dev&locale=en-US&platform=desktop&context=${context.id}`; // jshint ignore:line + const headers = Object.assign({ + referer, + accept: req.headers.accept, + 'content-type': req.headers['content-type'] || req.headers['Content-Type'] + }, domo.getAuthHeader()); const r = request({ url, method: req.method, + headers, jar: j, - headers: { - 'content-type': req.headers['content-type'] || req.headers['Content-Type'], - referer, - accept: req.headers.accept - }, body: JSON.stringify(req.body) }); @@ -84,8 +83,8 @@ checkSession() }); }); }) - .catch(() => { - console.warn('Session expired. Please login again using domo login.'); + .catch(reason => { + console.warn(reason); }); // helpers @@ -113,14 +112,10 @@ function getEnv() { function getDomoappsDomain() { const uuid = Domo.createUUID(); - const j = request.jar(); - const auth = `SID="${mostRecent.sid}"`; - const cookie = request.cookie(auth); - j.setCookie(cookie, `https://${mostRecent.instance}`); return new Promise((resolve) => { request({ url: `https://${mostRecent.instance}/api/content/v1/mobile/environment`, - jar: j + headers: domo.getAuthHeader() }, (err, res) => { if (res.statusCode === 200) { resolve(`https://${uuid}.${JSON.parse(res.body).domoappsDomain}`); @@ -140,9 +135,7 @@ function createContext(designId, mapping) { designId, mapping }, - headers: { - 'X-Domo-Authentication': mostRecent.sid - } + headers: domo.getAuthHeader() }; request(options, (err, res) => { @@ -155,6 +148,11 @@ function createContext(designId, mapping) { function checkSession() { return new Promise((resolve, reject) => { + if (typeof mostRecent.devtoken !== 'undefined') { + // we don't have any way to check tokens, so we'll default to accent + // until this is fixed + resolve(true); + } const options = { url: `https://${mostRecent.instance}/auth/validate`, method: 'GET', @@ -170,7 +168,7 @@ function checkSession() { if (isValid) { resolve(true); } else { - reject(false); + reject('Session expired. Please login again using domo login.'); } } catch (e) { // couldn't parse as JSON which means the service doesn't exist yet. diff --git a/other/tests.js b/other/tests.js new file mode 100644 index 0000000..06165c2 --- /dev/null +++ b/other/tests.js @@ -0,0 +1,4 @@ +require('angular-mocks/ngMock'); +const testFiles = require.context('../src', true, /\.spec\.js$/); +const ngModule = angular.module('da.test', []); +testFiles.keys().forEach(key => { testFiles(key)(ngModule); }); diff --git a/other/webpack.config.es6.js b/other/webpack.config.es6.js index 670ffb4..47e1001 100644 --- a/other/webpack.config.es6.js +++ b/other/webpack.config.es6.js @@ -13,288 +13,303 @@ module.exports = function getConfig(configOptions) { -// Handle options -const INCLUDE_DESKTOP_VIEW = (configOptions.hasOwnProperty('includeDesktopView') ? configOptions.includeDesktopView : true); -const INCLUDE_RESPONSIVE_VIEW = (configOptions.hasOwnProperty('includeResponsiveView') ? configOptions.includeResponsiveView : true); + // Handle options + const INCLUDE_DESKTOP_VIEW = (configOptions.hasOwnProperty('includeDesktopView') ? configOptions.includeDesktopView : true); + const INCLUDE_RESPONSIVE_VIEW = (configOptions.hasOwnProperty('includeResponsiveView') ? configOptions.includeResponsiveView : true); -// dependencies -const fs = require('fs'); -const path = require('path'); -const webpack = require('webpack'); -const HtmlWebpackPlugin = require('html-webpack-plugin'); -const NgAnnotatePlugin = require('ng-annotate-webpack-plugin'); + // dependencies + const fs = require('fs'); + const path = require('path'); + const webpack = require('webpack'); + const HtmlWebpackPlugin = require('html-webpack-plugin'); + const NgAnnotatePlugin = require('ng-annotate-webpack-plugin'); -// postcss plugins -const precss = require('precss'); -const postcssImport = require('postcss-import'); -const reporter = require('postcss-reporter'); -const cssnano = require('cssnano'); -const messages = require('postcss-browser-reporter'); -const autoprefixer = require('autoprefixer'); + // postcss plugins + const precss = require('precss'); + const postcssImport = require('postcss-import'); + const reporter = require('postcss-reporter'); + const cssnano = require('cssnano'); + const messages = require('postcss-browser-reporter'); + const autoprefixer = require('autoprefixer'); -// Environment -const ON_DEV = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV; -const ON_TEST = process.env.NODE_ENV === 'test'; -const ON_PROD = process.env.NODE_ENV === 'production'; -const pkg = require('../package.json'); -const bannerText = fs.readFileSync(path.resolve(__dirname, '../BANNER.txt')).toString(); + // Environment + const ON_DEV = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV; + const ON_TEST = process.env.NODE_ENV === 'test'; + const ON_PROD = process.env.NODE_ENV === 'production'; + const pkg = require('../package.json'); + const bannerText = fs.readFileSync(path.resolve(__dirname, '../BANNER.txt')).toString(); -const config = { - cache: false, - context: path.resolve(__dirname, '../src'), + const config = { + context: path.resolve(__dirname, '../src'), - // We will add entry points based on the platform configs. - entry: {}, + // We will add entry points based on the platform configs. + entry: {}, - // where 3rd-party modules can reside - resolve: { - modulesDirectories: ['node_modules', 'bower_components'] - }, - - output: { - // where to put standalone build file - path: './dist', - publicPath: '', - filename: '/[name]/[name].js', - sourceMapFilename: '[file].map', - libraryTarget: 'umd' - }, - - // dependencies listed here will NOT be bundled into the app, even if you `require` them. - externals: { - 'angular': { - root: 'angular', - commonjs: 'angular', - commonjs2: 'angular', - amd: 'angular' - }, - 'lodash': { - root: '_', - commonjs: 'lodash', - commonjs2: 'lodash', - amd: 'lodash' + // where 3rd-party modules can reside + resolve: { + modulesDirectories: ['node_modules', 'bower_components'] }, - 'jquery': { - root: '$', - commonjs: 'jquery', - commonjs2: 'jquery', - amd: 'jQuery' - }, - 'd3': { - root: 'd3', - commonjs: 'd3', - commonjs2: 'd3', - amd: 'd3' - } - }, - // optimization plugins - // we add more items to this array based on configs set at top of file. - plugins: [ - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.ResolverPlugin( - new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main']) - ), - new webpack.optimize.DedupePlugin(), - new NgAnnotatePlugin({ - add: true, - remove: false - }), - new webpack.BannerPlugin(bannerText), - new webpack.DefinePlugin({ - ON_DEV: ON_DEV, - ON_TEST: ON_TEST, - ON_PROD: ON_PROD - }) - ], + output: { + // where to put standalone build file + path: './dist', + publicPath: '', + filename: '/[name]/[name].js', + sourceMapFilename: '[file].map', + libraryTarget: 'umd' + }, - // what loaders to use based on file type. - module: { - preLoaders: [ - { - test: /\.js$/, - loader: 'eslint-loader', - exclude: /(node_modules|bower_components)/, - } - ], - loaders: [ - { - test: /\.js$/, - exclude: /(node_modules|bower_components)/, - loader: 'babel', - query: { - cacheDirectory: true, - presets: ['es2015-loose', 'stage-1'], - plugins: ['transform-runtime', 'add-module-exports'] - } + // dependencies listed here will NOT be bundled into the app, even if you `require` them. + externals: { + 'angular': { + root: 'angular', + commonjs: 'angular', + commonjs2: 'angular', + amd: 'angular' }, - { - test: /\.css$/, - loader: 'style!css!postcss', - exclude: /(node_modules|bower_components)/ + 'lodash': { + root: '_', + commonjs: 'lodash', + commonjs2: 'lodash', + amd: 'lodash' }, - { - test: /\.(png|jpeg|gif).*$/, - loader: 'file?name=/[name].[ext]?[hash]' + 'jquery': { + root: '$', + commonjs: 'jquery', + commonjs2: 'jquery', + amd: 'jQuery' }, - { - test: /\.html$/, - loader: 'raw' + 'd3': { + root: 'd3', + commonjs: 'd3', + commonjs2: 'd3', + amd: 'd3' }, - { - test: /\.(woff|ttf|eot|svg).*$/, - loader: 'file?name=/[name].[ext]?[hash]' - } - ] - }, + 'angular-animate': { + root: 'angular-animate', + commonjs: 'angular-animate', + commonjs2: 'angular-animate', + amd: 'angular-animate', + }, + }, - // postcss plugins settings - postcss: function postcss(_webpack) { - const postcssPlugins = [ - postcssImport({ - addDependencyTo: _webpack, - onImport: function onImport(files) { - files.forEach(this.addDependency); - }.bind(this) + // optimization plugins + // we add more items to this array based on configs set at top of file. + plugins: [ + new webpack.optimize.OccurenceOrderPlugin(), + new webpack.ResolverPlugin( + new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main']) + ), + new webpack.optimize.DedupePlugin(), + new NgAnnotatePlugin({ + add: true, + remove: false }), - precss(), - autoprefixer({ browsers: ['last 2 versions'] }), - reporter() - ]; - // only minify when on production - if (ON_PROD) { - postcssPlugins.push(cssnano({ - mergeRules: false, - zindex: false, - reduceIdents: false, - mergeIdents: false - })); - } else { - // use the message reported when on development - postcssPlugins.push(messages()); - } + new webpack.BannerPlugin(bannerText), + new webpack.DefinePlugin({ + ON_DEV: ON_DEV, + ON_TEST: ON_TEST, + ON_PROD: ON_PROD, + 'process.env': { + 'NODE_ENV': JSON.stringify(process.env.NODE_ENV) + } + }), + new webpack.DefinePlugin({ + VERSION: JSON.stringify(pkg.version), + APP_NAME: JSON.stringify(pkg.name) + }) + ], - return postcssPlugins; - }, + // what loaders to use based on file type. + module: { + preLoaders: [ + { + test: /\.js$/, + loader: 'eslint-loader', + exclude: /(node_modules|bower_components)/, + } + ], + loaders: [ + { + test: /\.js$/, + exclude: /(node_modules|bower_components)/, + loader: 'babel', + query: { + cacheDirectory: true, + presets: ['es2015'], + plugins: ['transform-runtime', 'add-module-exports'] + } + }, + { + test: /\.css$/, + loader: 'style!css!postcss', + exclude: /(node_modules|bower_components)/ + }, + { + test: /\.(png|jpeg|gif).*$/, + loader: 'file?name=/[name].[ext]?[hash]' + }, + { + test: /\.html$/, + loader: 'raw' + }, + { + test: /\.(woff|ttf|eot|svg).*$/, + loader: 'file?name=/[name].[ext]?[hash]' + } + ] + }, - eslint: { - formatter: require('eslint-friendly-formatter'), - }, + // postcss plugins settings + postcss: function postcss(_webpack) { + const postcssPlugins = [ + postcssImport({ + addDependencyTo: _webpack, + onImport: function onImport(files) { + files.forEach(this.addDependency); + }.bind(this) + }), + precss(), + autoprefixer({ browsers: ['last 2 versions'] }), + reporter() + ]; + // only minify when on production + if (ON_PROD) { + postcssPlugins.push(cssnano({ + mergeRules: false, + zindex: false, + reduceIdents: false, + mergeIdents: false, + safe: true + })); + } else { + // use the message reported when on development + postcssPlugins.push(messages()); + } - devtool: 'source-map', + return postcssPlugins; + }, - devServer: { - contentBase: 'dist/', - noInfo: false, - hot: false, - inline: false - } -}; + eslint: { + formatter: require('eslint-friendly-formatter'), + }, -/** - * If on production then minify code else (on dev) and turn on hot module replacement. - */ -if (ON_PROD) { - config.plugins.push(new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })); -} else { - config.plugins.push(new webpack.HotModuleReplacementPlugin()); -} + devtool: ON_PROD ? 'source-map' : 'cheap-module-eval-source-map', + devServer: { + contentBase: 'dist/', + noInfo: false, + hot: false, + inline: false + } + }; -/** - * Logic to change build based on configs at top of file. - */ -const INCLUDE_MULTIPLE_VIEWS = INCLUDE_DESKTOP_VIEW && INCLUDE_RESPONSIVE_VIEW; -if (!INCLUDE_DESKTOP_VIEW && !INCLUDE_RESPONSIVE_VIEW) { - throw new Error('You must include at least one view!'); -} -/** - * Setup the desktop view if INCLUDE_DESKTOP_VIEW is set to true - */ -if (INCLUDE_DESKTOP_VIEW) { - config.entry.desktop = './desktop/index.js'; - if (!ON_TEST) { - config.plugins.push( - new HtmlWebpackPlugin({ - title: 'Desktop', - dev: ON_DEV, - pkg: pkg, - template: 'src/desktop/desktop.html', // Load a custom template - inject: 'body', // Inject all scripts into the body - filename: INCLUDE_MULTIPLE_VIEWS ? 'desktop/index.html' : 'index.html', - chunks: ['desktop'] - }) - ); + /** + * If on production then minify code else (on dev) and turn on hot module replacement. + */ + if (ON_PROD) { + config.plugins.push(new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } })); + } else { + config.plugins.push(new webpack.HotModuleReplacementPlugin()); } -} -/** - * Setup the responsive view if INCLUDE_RESPONSIVE_VIEW is set to true - */ -if (INCLUDE_RESPONSIVE_VIEW) { - config.entry.responsive = './responsive/index.js'; - if (!ON_TEST) { - config.plugins.push( - new HtmlWebpackPlugin({ - title: 'Responsive', - dev: ON_DEV, - pkg: pkg, - template: 'src/responsive/responsive.html', // Load a custom template - inject: 'body', // Inject all scripts into the body - filename: INCLUDE_MULTIPLE_VIEWS ? 'responsive/index.html' : 'index.html', - chunks: ['responsive'] - }) - ); + + + /** + * Logic to change build based on configs at top of file. + */ + const INCLUDE_MULTIPLE_VIEWS = INCLUDE_DESKTOP_VIEW && INCLUDE_RESPONSIVE_VIEW; + if (!INCLUDE_DESKTOP_VIEW && !INCLUDE_RESPONSIVE_VIEW) { + throw new Error('You must include at least one view!'); } -} -/** - * add swither and lab view when app has multiple views. - * INCLUDE_MULTIPLE_VIEWS is true when INCLUDE_DESKTOP_VIEW and INCLUDE_RESPONSIVE_VIEW views are both true - */ -if (INCLUDE_MULTIPLE_VIEWS) { - config.entry.switcher = './switcher.js'; - if (!ON_TEST) { - config.plugins.push( - new HtmlWebpackPlugin({ - title: 'Switcher', - dev: ON_DEV, - pkg: pkg, - chunks: ['switcher'] - }), - new HtmlWebpackPlugin({ - title: 'Lab', - dev: ON_DEV, - pkg: pkg, - template: 'lab.html', - filename: 'lab.html', - chunks: [] - }) - ); + /** + * Setup the desktop view if INCLUDE_DESKTOP_VIEW is set to true + */ + if (INCLUDE_DESKTOP_VIEW) { + config.entry.desktop = './desktop/index.js'; + if (!ON_TEST) { + config.plugins.push( + new HtmlWebpackPlugin({ + title: 'Desktop', + dev: ON_DEV, + pkg: pkg, + template: 'src/desktop/desktop.html', // Load a custom template + inject: 'body', // Inject all scripts into the body + filename: INCLUDE_MULTIPLE_VIEWS ? 'desktop/index.html' : 'index.html', + chunks: ['desktop'] + }) + ); + } + } + /** + * Setup the responsive view if INCLUDE_RESPONSIVE_VIEW is set to true + */ + if (INCLUDE_RESPONSIVE_VIEW) { + config.entry.responsive = './responsive/index.js'; + if (!ON_TEST) { + config.plugins.push( + new HtmlWebpackPlugin({ + title: 'Responsive', + dev: ON_DEV, + pkg: pkg, + template: 'src/responsive/responsive.html', // Load a custom template + inject: 'body', // Inject all scripts into the body + filename: INCLUDE_MULTIPLE_VIEWS ? 'responsive/index.html' : 'index.html', + chunks: ['responsive'] + }) + ); + } + } + /** + * add swither and lab view when app has multiple views. + * INCLUDE_MULTIPLE_VIEWS is true when INCLUDE_DESKTOP_VIEW and INCLUDE_RESPONSIVE_VIEW views are both true + */ + if (INCLUDE_MULTIPLE_VIEWS) { + config.entry.switcher = './switcher.js'; + if (!ON_TEST) { + config.plugins.push( + new HtmlWebpackPlugin({ + title: 'Switcher', + dev: ON_DEV, + pkg: pkg, + inject: 'body', + template: 'index.html', + chunks: ['switcher'] + }), + new HtmlWebpackPlugin({ + title: 'Lab', + dev: ON_DEV, + pkg: pkg, + template: 'lab.html', + filename: 'lab.html', + chunks: [] + }) + ); + } } -} -/** - * Add any extra externals - */ -if (configOptions.hasOwnProperty('externals')) { - const addedExternals = configOptions.externals; - for (const key in addedExternals) { - if (addedExternals.hasOwnProperty(key)) { - config.externals[key] = addedExternals[key]; + /** + * Add any extra externals + */ + if (configOptions.hasOwnProperty('externals')) { + const addedExternals = configOptions.externals; + for (const key in addedExternals) { + if (addedExternals.hasOwnProperty(key)) { + config.externals[key] = addedExternals[key]; + } } } -} -/** - * Add any extra loaders - */ -if (configOptions.hasOwnProperty('loaders') && configOptions.loaders.length > 0) { - const addedLoaders = configOptions.loaders; - config.module.loaders.push.apply(config.module.loaders, addedLoaders); -} + /** + * Add any extra loaders + */ + if (configOptions.hasOwnProperty('loaders') && configOptions.loaders.length > 0) { + const addedLoaders = configOptions.loaders; + config.module.loaders.push.apply(config.module.loaders, addedLoaders); + } -/** - * Return the finished configuration back to the caller - */ -return config; + /** + * Return the finished configuration back to the caller + */ + return config; }; diff --git a/package.json b/package.json index 9685afd..31030c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sample-app", - "version": "0.1.2", + "version": "0.1.3", "description": "A sample app created with starter-kit", "scripts": { "setup": "node other/setup.js", @@ -15,7 +15,8 @@ "version": "npm run build && npm run changelog && git add -A CHANGELOG.md", "postversion": "git push && git push --tags", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -w -r 0", - "upload": "npm run build && cd dist/ && domo publish && cd ..", + "clean": "rm -rf node_modules && npm install", + "upload": "npm run clean && npm run build && cd dist/ && domo publish && cp manifest.json ../domo/ && cd ..", "update-tools": "node other/update.js" }, "author": "AppTeam6 ", @@ -23,20 +24,19 @@ "license": "SEE LICENSE IN LICENSE", "devDependencies": { "@domoinc/ca-icon-trends-with-text": "^6.0.6", - "@domoinc/da-plop": "^3.0.0", + "@domoinc/da-plop": "^4.1.0", "@domoinc/multi-line-chart": "^4.0.11", "@domoinc/query": "^1.0.3", - "angular-animate": "^1.5.7", - "angular-aria": "^1.5.7", + "angular-aria": "1.5.3", "angular-material": "^1.1.0-rc.5", + "angular-mocks": "1.5.3", "autoprefixer": "^6.1.2", "babel-core": "^6.3.17", "babel-loader": "^6.2.0", "babel-plugin-add-module-exports": "^0.1.1", "babel-plugin-closure-elimination": "0.0.2", "babel-plugin-transform-runtime": "^6.3.13", - "babel-preset-es2015-loose": "^6.1.3", - "babel-preset-stage-1": "^6.3.13", + "babel-preset-es2015": "^6.1.3", "babel-register": "^6.3.13", "babel-runtime": "^6.3.13", "body-parser": "^1.15.1", @@ -72,6 +72,7 @@ "karma-phantomjs-launcher": "^1.0.0", "karma-safari-launcher": "^0.1.1", "karma-sinon": "^1.0.4", + "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.7.0", "lcov-filter": "0.1.1", "lodash.kebabcase": "^3.1.1", @@ -99,12 +100,21 @@ }, "dependencies": { "enquire.js": "^2.1.1", + "ng-redux": "^3.3.3", "ryuu.js": "2.5.4" }, + "cdnDependencies": { + "d3": "https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.10/d3.min.js", + "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-alpha1/jquery.min.js", + "lodash": "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js", + "angular": "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular.min.js", + "angular-animate": "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-animate.min.js", + "angular-ui-router": "https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.min.js" + }, "config": { "AppTeam6": { - "framework": "da-webpack", - "frameworkVersion": "0.0.5", + "framework": "starter-kit", + "frameworkVersion": "0.0.8", "features": [] }, "commitizen": { diff --git a/src/common/index.js b/src/common/index.js index 8015eeb..7039d32 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,4 +1,7 @@ require('./styles/typebase.css'); +require('./store/reducers'); +require('./store/constants'); +require.context('./store/actions', true, /\.actions\.js$/); import angular from 'angular'; import { attachAll } from '../../other/boilerplate-utils.js'; diff --git a/src/common/services/README.md b/src/common/services/README.md new file mode 100644 index 0000000..46c9a49 --- /dev/null +++ b/src/common/services/README.md @@ -0,0 +1 @@ +Place services here. \ No newline at end of file diff --git a/src/common/store/actions/README.md b/src/common/store/actions/README.md new file mode 100644 index 0000000..4d1c121 --- /dev/null +++ b/src/common/store/actions/README.md @@ -0,0 +1,3 @@ +- Place your action creator files in this directory. +- See [here](http://redux.js.org/docs/basics/Actions.html) for examples. +- Action files should be postfixed with `.actions.js`. \ No newline at end of file diff --git a/src/common/store/constants/index.js b/src/common/store/constants/index.js new file mode 100644 index 0000000..81691d3 --- /dev/null +++ b/src/common/store/constants/index.js @@ -0,0 +1,10 @@ +/* + * Export named constants only + * e.g. + * export const MY_ACTION_CONST = 'MY_ACTION_CONST'; + * export const MY_ACTION_2_CONST = 'MY_ACTION_2_CONST'; + * + * This allows for proper ES6 module importing into files + * e.g. + * import { MY_ACTION_CONST } from './constants' + */ diff --git a/src/common/store/reducers/index.js b/src/common/store/reducers/index.js new file mode 100644 index 0000000..9fca737 --- /dev/null +++ b/src/common/store/reducers/index.js @@ -0,0 +1,6 @@ +import { combineReducers } from 'redux'; + +const reducers = require.context('./', true, /\.reducer\.js$/); +const rootReducer = combineReducers(Object.assign({}, ...reducers.keys().map(reducers))); + +export default rootReducer; diff --git a/src/desktop/desktop.config.js b/src/desktop/desktop.config.js index 4b3dd7f..8b102c2 100644 --- a/src/desktop/desktop.config.js +++ b/src/desktop/desktop.config.js @@ -1,6 +1,7 @@ module.exports = config; -function config($urlRouterProvider, $mdThemingProvider, $mdIconProvider) { +function config($ngReduxProvider, $urlRouterProvider, $mdThemingProvider, $mdIconProvider) { + $ngReduxProvider.createStoreWith(require('../common/store/reducers')); $urlRouterProvider.otherwise('/'); const customPrimary = { '50': '#ffffff', // white background color for toolbar @@ -45,4 +46,4 @@ function config($urlRouterProvider, $mdThemingProvider, $mdIconProvider) { $mdIconProvider.defaultFontSet('iconbits'); } -config.$inject = ['$urlRouterProvider', '$mdThemingProvider', '$mdIconProvider']; +config.$inject = ['$ngReduxProvider', '$urlRouterProvider', '$mdThemingProvider', '$mdIconProvider']; diff --git a/src/desktop/desktop.html b/src/desktop/desktop.html index 7fc286b..3fe7746 100644 --- a/src/desktop/desktop.html +++ b/src/desktop/desktop.html @@ -1,5 +1,6 @@ + @@ -8,23 +9,20 @@ {%= o.htmlWebpackPlugin.options.title %} - - - - - - - - - + {% for (var dependency in o.htmlWebpackPlugin.options.pkg.cdnDependencies) { %} + + {% } %} - + +
- {% if (o.htmlWebpackPlugin.options.dev) { %}{% } %} + {% if (o.htmlWebpackPlugin.options.dev) { %} + {% } %} + diff --git a/src/desktop/index.js b/src/desktop/index.js index b4fdefc..1fde5da 100644 --- a/src/desktop/index.js +++ b/src/desktop/index.js @@ -2,11 +2,13 @@ require('angular-material'); require('./desktop.css'); import angular from 'angular'; +import 'ng-redux'; import { attachAll, getNgModuleNames } from '../../other/boilerplate-utils.js'; const ngDependencies = [ 'ui.router', 'ngAnimate', + 'ngRedux', require('../common').name, // Add additional external Angular dependencies here 'ngMaterial' diff --git a/src/responsive/index.js b/src/responsive/index.js index 0b8cf7e..32e9f9d 100644 --- a/src/responsive/index.js +++ b/src/responsive/index.js @@ -1,11 +1,13 @@ require('./responsive.css'); import angular from 'angular'; +import 'ng-redux'; import { attachAll, getNgModuleNames } from '../../other/boilerplate-utils.js'; const ngDependencies = [ 'ui.router', 'ngAnimate', + 'ngRedux', require('../common').name, // Add additional external Angular dependencies here ]; diff --git a/src/responsive/responsive.html b/src/responsive/responsive.html index 5a531b6..5f22825 100644 --- a/src/responsive/responsive.html +++ b/src/responsive/responsive.html @@ -1,5 +1,6 @@ + @@ -7,21 +8,19 @@ {%= o.htmlWebpackPlugin.options.title %} - - - - - - - - + {% for (var dependency in o.htmlWebpackPlugin.options.pkg.cdnDependencies) { %} + + {% } %} - + +

Responsive

- {% if (o.htmlWebpackPlugin.options.dev) { %}{% } %} + {% if (o.htmlWebpackPlugin.options.dev) { %} + {% } %} + diff --git a/webpack.config.js b/webpack.config.js index 3cdb8a4..1977cde 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,7 +6,7 @@ const getConfig = require('./other/webpack.config.es6'); * Configure your webpack setup here. These settings can be changed at any time. * * Read more on the wiki: - * https://git.empdev.domo.com/AppTeam6/da-webpack/wiki/Webpack-Configuration + * https://github.com/DomoApps/starter-kit/wiki/Webpack-Configuration */ module.exports = getConfig({ includeDesktopView: true,