Skip to content
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
View file @ 0e431b11
......@@ -2,20 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="26632678-d8a8-4639-9a45-ad2e64f0e3df" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/Server.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/Server.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/Server.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/Server.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/Server.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/Server.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/module/Client.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/module/Client.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/module/Server.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/module/Server.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/perspective/Client.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/perspective/Client.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/perspective/Server.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/perspective/Server.js.map" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -29,11 +18,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="package.json" pinned="false" current-in-tab="true">
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="851">
<caret line="37" column="38" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="38" />
<state relative-caret-position="46">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state>
</provider>
</entry>
......@@ -68,13 +57,12 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.ts" pinned="false" current-in-tab="false">
<file leaf-file-name="index.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/index.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="87" column="92" selection-start-line="87" selection-start-column="92" selection-end-line="87" selection-end-column="92" />
<state relative-caret-position="1104">
<caret line="177" column="72" selection-start-line="177" selection-start-column="72" selection-end-line="177" selection-end-column="72" />
<folding>
<element signature="e#741#1514#0" />
<element signature="e#1537#2137#0" />
<element signature="n#!!block;n#createModule#0;n#ExtLB#0" />
<element signature="n#!!block;n#createPerspective#0;n#ExtLB#0" />
......@@ -133,7 +121,7 @@
<file leaf-file-name="app.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmds/app.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<state relative-caret-position="184">
<caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<folding>
<element signature="e#0#32#0" expanded="true" />
......@@ -150,7 +138,7 @@
<file leaf-file-name="module.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmds/module.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1058">
<state relative-caret-position="920">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<folding>
<element signature="e#0#32#0" expanded="true" />
......@@ -220,8 +208,8 @@
<component name="Git.Settings">
<option name="PREVIOUS_COMMIT_AUTHORS">
<list>
<option value="Colton McInroy &lt;colton@nextgenagritech.com&gt;" />
<option value="Colton McInroy &lt;colton@dosarrest.com&gt;" />
<option value="Colton McInroy &lt;colton@nextgenagritech.com&gt;" />
</list>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -267,8 +255,8 @@
<option value="$PROJECT_DIR$/src/model/code.ejs" />
<option value="$PROJECT_DIR$/cmds/view.ts" />
<option value="$PROJECT_DIR$/cmds/model.ts" />
<option value="$PROJECT_DIR$/src/index.ts" />
<option value="$PROJECT_DIR$/src/app/Server.ts" />
<option value="$PROJECT_DIR$/src/index.ts" />
<option value="$PROJECT_DIR$/package.json" />
</list>
</option>
......@@ -357,7 +345,7 @@
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="js.buildTools.grunt.grunt-cli.package" value="$USER_HOME$/AppData/Roaming/npm/node_modules/grunt-cli" />
<property name="last_opened_file_path" value="Z:/NextGen AgriTech/Software Development/extlb/dm-admin-drones" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="C:/Program Files/nodejs/node" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="yarn" />
......@@ -466,14 +454,11 @@
<workItem from="1545991091151" duration="591000" />
<workItem from="1546003314323" duration="2198000" />
<workItem from="1547054340859" duration="148000" />
<workItem from="1575499395261" duration="2774000" />
</task>
<task id="LOCAL-00008" summary="Working on initial features">
<created>1535007584934</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1535007584934</updated>
<workItem from="1575499395261" duration="4246000" />
<workItem from="1575580212871" duration="558000" />
<workItem from="1575654701127" duration="578000" />
<workItem from="1575928149621" duration="1186000" />
<workItem from="1583857383968" duration="3355000" />
</task>
<task id="LOCAL-00009" summary="Working on initial features">
<created>1535008018792</created>
......@@ -811,11 +796,18 @@
<option name="project" value="LOCAL" />
<updated>1536860703008</updated>
</task>
<option name="localTasksCounter" value="57" />
<task id="LOCAL-00057" summary="Working on initial features">
<created>1575574919893</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1575574919893</updated>
</task>
<option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="190651000" />
<option name="totallyTimeSpent" value="197800000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -828,6 +820,7 @@
</component>
<component name="ToolWindowManager">
<frame x="560" y="292" width="2227" height="1740" extended-state="0" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" weight="0.32999372" />
<window_info id="DB Browser" order="2" />
......@@ -835,20 +828,20 @@
<window_info anchor="bottom" id="Regex Tester" order="7" />
<window_info anchor="right" id="Quick Notes" order="3" weight="0.32963988" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.30274656" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32999372" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" weight="0.30274656" />
<window_info anchor="right" id="Mongo Explorer" order="3" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32958803" />
<window_info anchor="bottom" id="TypeScript" order="7" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.7215757" visible="true" weight="0.21883656" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.71910113" visible="true" weight="0.21883656" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Grunt " order="2" sideWeight="0.27842435" side_tool="true" visible="true" weight="0.21883656" />
<window_info id="Grunt " order="2" sideWeight="0.28089887" side_tool="true" visible="true" weight="0.21883656" />
<window_info anchor="right" id="LuaJ" order="3" />
<window_info anchor="bottom" id="Tail" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
......@@ -1292,7 +1285,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/cmds/module.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1058">
<state relative-caret-position="920">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<folding>
<element signature="e#0#32#0" expanded="true" />
......@@ -1304,7 +1297,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/cmds/app.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<state relative-caret-position="184">
<caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<folding>
<element signature="e#0#32#0" expanded="true" />
......@@ -1324,24 +1317,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/index.ts">
<entry file="file://$PROJECT_DIR$/src/app/index.ts">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="87" column="92" selection-start-line="87" selection-start-column="92" selection-end-line="87" selection-end-column="92" />
<folding>
<element signature="e#741#1514#0" />
<element signature="e#1537#2137#0" />
<element signature="n#!!block;n#createModule#0;n#ExtLB#0" />
<element signature="n#!!block;n#createPerspective#0;n#ExtLB#0" />
<element signature="n#!!block;n#createModel#0;n#ExtLB#0" />
<element signature="n#!!block;n#createView#0;n#ExtLB#0" />
</folding>
<state relative-caret-position="322">
<caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/index.ts">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/app/Client.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
......@@ -1356,17 +1341,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="46">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/src/index.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="851">
<caret line="37" column="38" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="38" />
<state relative-caret-position="1104">
<caret line="177" column="72" selection-start-line="177" selection-start-column="72" selection-end-line="177" selection-end-column="72" />
<folding>
<element signature="e#1537#2137#0" />
<element signature="n#!!block;n#createModule#0;n#ExtLB#0" />
<element signature="n#!!block;n#createPerspective#0;n#ExtLB#0" />
<element signature="n#!!block;n#createModel#0;n#ExtLB#0" />
<element signature="n#!!block;n#createView#0;n#ExtLB#0" />
</folding>
</state>
</provider>
</entry>
......
package.json
View file @ 0e431b11
{
"name": "@extlb/cli",
"version": "1.0.31",
"version": "1.0.32",
"description": "ExtLB Cli",
"main": "index.js",
"engines": {
......
src/index.ts
View file @ 0e431b11
......@@ -2,6 +2,7 @@ import inquirer = require('inquirer');
import * as path from 'path';
import * as jsonfile from 'jsonfile';
import * as _ from 'lodash';
import * as async from 'async';
import * as fs from 'fs';
import * as shelljs from 'shelljs';
import * as ejs from 'ejs';
......@@ -28,6 +29,10 @@ export class ExtLB {
name: 'Socket.IO',
value: 'socketio',
checked: true
}, {
name: 'Authentication',
value: 'auth',
checked: true
}, {
name: 'Queues',
value: 'queues'
......@@ -135,19 +140,49 @@ export class ExtLB {
_.includes(options.features, 'perspective-admin') ||
_.includes(options.features, 'perspective-auth') ||
_.includes(options.features, 'perspective-error') ||
_.includes(options.features, 'perspective-main')
_.includes(options.features, 'perspective-main') ||
_.includes(options.features, 'auth')
) {
let perspectives = _.filter(options.features, (feature) => {
return _.startsWith(feature, 'perspective-');
}).map((feature) => {
return `@extlb/${feature}`;
});
process.stdout.write(chalk.keyword('limegreen')(`Installing ${perspectives.length} Perspectives `));
shelljs.exec(`npm install ${perspectives.join(' ')} -S`, {silent:true}, (err) => {
let installs: async.Dictionary<async.AsyncFunction<{},{}>> = {};
// let installs: {perspectives?: Function, authentication?: Function} = {};
if (perspectives.length !== 0) {
installs.perspectives = (cb: (err?: {}, result?: {}) => void) => {
process.stdout.write(chalk.keyword('limegreen')(`Installing ${perspectives.length} Perspectives `));
shelljs.exec(`npm install ${perspectives.join(' ')} -S`, {silent:true}, (err) => {
if (err) {
console.error(err);
cb(err);
} else {
process.stdout.write(chalk.keyword('limegreen')(' done!\n'));
cb();
}
});
};
}
if (_.includes(options.features, 'auth')) {
installs.authentication = (cb: (err?: {}, result?: {}) => void) => {
process.stdout.write(chalk.keyword('limegreen')('Installing Authentication Module '));
shelljs.exec('npm install @extlb/auth -S', {silent:true}, (err) => {
if (err) {
console.error(err);
cb(err);
} else {
process.stdout.write(chalk.keyword('limegreen')(' done!\n'));
cb();
}
});
};
}
async.series(installs, (err) => {
if (err) {
console.error(err);
console.log(err);
} else {
process.stdout.write(chalk.keyword('limegreen')(' done!\n'));
console.log(chalk.keyword('limegreen')('Install Completed!'));
}
});
}
......