Skip to content

C
console
Commit 09016128 authored by nano's avatar nano
Browse files
Options

fix

parent 1929910c
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 28 deletions
.idea/workspace.xml
View file @ 09016128
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment=""> <list default="true" id="7dc474d0-9fc0-4b76-8c2f-3c98df702116" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.roadhogrc.js" afterPath="$PROJECT_DIR$/.roadhogrc.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.roadhogrc.js" afterPath="$PROJECT_DIR$/.roadhogrc.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
<entry file="file://$PROJECT_DIR$/src/index.js"> <entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#33#0" expanded="true" /> <element signature="e#0#33#0" expanded="true" />
</folding> </folding>
...@@ -32,6 +33,16 @@ ...@@ -32,6 +33,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".roadhogrc.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.roadhogrc.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="8" column="53" lean-forward="true" selection-start-line="8" selection-start-column="53" selection-end-line="8" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="request.js" pinned="false" current-in-tab="false"> <file leaf-file-name="request.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/request.js"> <entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -52,11 +63,11 @@ ...@@ -52,11 +63,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".roadhogrc.js" pinned="false" current-in-tab="true"> <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.roadhogrc.js"> <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="90">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> <caret line="5" column="53" lean-forward="true" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -121,7 +132,6 @@ ...@@ -121,7 +132,6 @@
<option value="$PROJECT_DIR$/src/models/Apps.js" /> <option value="$PROJECT_DIR$/src/models/Apps.js" />
<option value="$PROJECT_DIR$/src/models/packages.js" /> <option value="$PROJECT_DIR$/src/models/packages.js" />
<option value="$PROJECT_DIR$/.travis.yml" /> <option value="$PROJECT_DIR$/.travis.yml" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/config.js" /> <option value="$PROJECT_DIR$/src/config.js" />
<option value="$PROJECT_DIR$/src/routes/AppDetail.js" /> <option value="$PROJECT_DIR$/src/routes/AppDetail.js" />
<option value="$PROJECT_DIR$/src/models/Common.js" /> <option value="$PROJECT_DIR$/src/models/Common.js" />
...@@ -131,6 +141,7 @@ ...@@ -131,6 +141,7 @@
<option value="$PROJECT_DIR$/src/router.js" /> <option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/public/index.html" /> <option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/src/index.js" /> <option value="$PROJECT_DIR$/src/index.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.roadhogrc.js" /> <option value="$PROJECT_DIR$/.roadhogrc.js" />
</list> </list>
</option> </option>
...@@ -327,12 +338,12 @@ ...@@ -327,12 +338,12 @@
<workItem from="1493000910904" duration="789000" /> <workItem from="1493000910904" duration="789000" />
<workItem from="1493002113686" duration="19444000" /> <workItem from="1493002113686" duration="19444000" />
<workItem from="1493107576287" duration="271000" /> <workItem from="1493107576287" duration="271000" />
<workItem from="1493174987157" duration="3925000" /> <workItem from="1493174987157" duration="5024000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="101665000" /> <option name="totallyTimeSpent" value="102764000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="384" y="1103" width="1093" height="739" extended-state="0" /> <frame x="384" y="1103" width="1093" height="739" extended-state="0" />
...@@ -553,13 +564,6 @@ ...@@ -553,13 +564,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Apps/All.js"> <entry file="file://$PROJECT_DIR$/src/routes/Apps/All.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -691,13 +695,19 @@ ...@@ -691,13 +695,19 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/index.js"> <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="90">
<caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="5" column="53" lean-forward="true" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" />
<folding> <folding />
<element signature="e#0#33#0" expanded="true" /> </state>
</folding> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -709,18 +719,20 @@ ...@@ -709,18 +719,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/config.js"> <entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="198">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding /> <folding>
<element signature="e#0#33#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.roadhogrc.js"> <entry file="file://$PROJECT_DIR$/.roadhogrc.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="144">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> <caret line="8" column="53" lean-forward="true" selection-start-line="8" selection-start-column="53" selection-end-line="8" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
.roadhogrc.js
View file @ 09016128
...@@ -7,7 +7,7 @@ const API_ROOT = { ...@@ -7,7 +7,7 @@ const API_ROOT = {
}; };
const RETURN_SSO = { const RETURN_SSO = {
development: `http://localhost:8000/loginCallback`, development: `http://localhost:8000/loginCallback`,
test: `http://114.215.243.95:8000/loginCallback`, test: `http://localhost:8000/loginCallback`,
production: `https://moecube.com/console/loginCallback` production: `https://moecube.com/console/loginCallback`
}; };
......
package.json
View file @ 09016128
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"start": "cross-env ENV=development roadhog server", "start": "cross-env ENV=development roadhog server",
"start:test":"cross-env ENV=test roadhog server",
"build:test": "cross-env ENV=test roadhog build", "build:test": "cross-env ENV=test roadhog build",
"build": "cross-env ENV=production roadhog build", "build": "cross-env ENV=production roadhog build",
"lint": "eslint --ext .js src test", "lint": "eslint --ext .js src test",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment