Merge pull request #670 from ethereum/projectFolder

reorganize project folders

package.json

@@ -65,7 +65,7 @@
   "standard": {
     "ignore": [
       "build/",
-      "src/mode-solidity.js",
+      "src/app/editor/mode-solidity.js",
       "soljson.js"
     ],
     "parser": "babel-eslint"

src/app.js

@@ -14,25 +14,25 @@ var UniversalDApp = require('./universal-dapp.js')
 var Remixd = require('./lib/remixd')
 var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
 
-var QueryParams = require('./app/query-params')
-var GistHandler = require('./app/gist-handler')
-var Storage = require('./app/files/storage')
+var QueryParams = require('./lib/query-params')
+var GistHandler = require('./lib/gist-handler')
+var Storage = require('./storage')
 var Browserfiles = require('./app/files/browser-files')
 var SharedFolder = require('./app/files/shared-folder')
-var Config = require('./app/config')
-var Editor = require('./app/editor')
-var Renderer = require('./app/renderer')
-var Compiler = require('./app/compiler')
-var ExecutionContext = require('./app/execution-context')
-var Debugger = require('./app/debugger')
+var Config = require('./config')
+var Editor = require('./app/editor/editor')
+var Renderer = require('./app/ui/renderer')
+var Compiler = require('./app/compiler/compiler')
+var ExecutionContext = require('./execution-context')
+var Debugger = require('./app/debugger/debugger')
 var StaticAnalysis = require('./app/staticanalysis/staticAnalysisView')
-var FilePanel = require('./app/file-panel')
-var EditorPanel = require('./app/editor-panel')
-var RighthandPanel = require('./app/righthand-panel')
-var examples = require('./app/example-contracts')
-var modalDialogCustom = require('./app/modal-dialog-custom')
-var Txlistener = require('./app/txListener')
-var EventsDecoder = require('./app/eventsDecoder')
+var FilePanel = require('./app/panels/file-panel')
+var EditorPanel = require('./app/panels/editor-panel')
+var RighthandPanel = require('./app/panels/righthand-panel')
+var examples = require('./app/editor/example-contracts')
+var modalDialogCustom = require('./app/ui/modal-dialog-custom')
+var Txlistener = require('./app/execution/txListener')
+var EventsDecoder = require('./app/execution/eventsDecoder')
 var Web3VMProvider = remix.web3.web3VMProvider
 
 var css = csjs`

src/app/compiler/compiler.js

@@ -4,7 +4,7 @@ var solc = require('solc/wrapper')
 var solcABI = require('solc/abi')
 
 var webworkify = require('webworkify')
-var utils = require('./utils')
+var utils = require('../../lib/utils')
 
 var EventManager = require('ethereum-remix').lib.EventManager
 

src/app/editor/editor.js

@@ -5,7 +5,7 @@ var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var ace = require('brace')
 var Range = ace.acequire('ace/range').Range
-require('../mode-solidity.js')
+require('./mode-solidity.js')
 
 var css = csjs`
   .ace-editor         {

src/app/files/file-explorer.js

@@ -2,8 +2,8 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var Treeview = require('ethereum-remix').ui.TreeView
-var modalDialog = require('./modaldialog')
-var modalDialogCustom = require('./modal-dialog-custom')
+var modalDialog = require('../ui/modaldialog')
+var modalDialogCustom = require('../ui/modal-dialog-custom')
 
 var EventManager = require('ethereum-remix').lib.EventManager
 

src/app/panels/file-panel.js

@@ -3,9 +3,9 @@ var csjs = require('csjs-inject')
 var yo = require('yo-yo')
 
 var EventManager = require('ethereum-remix').lib.EventManager
-var FileExplorer = require('./file-explorer')
-var modalDialog = require('./modaldialog')
-var modalDialogCustom = require('./modal-dialog-custom')
+var FileExplorer = require('../files/file-explorer')
+var modalDialog = require('../ui/modaldialog')
+var modalDialogCustom = require('../ui/modal-dialog-custom')
 
 module.exports = filepanel
 

src/app/panels/righthand-panel.js

@@ -1,16 +1,16 @@
 var yo = require('yo-yo')
 var EventManager = require('ethereum-remix').lib.EventManager
-var tabbedMenu = require('./tabbed-menu')
-var compileTab = require('./compile-tab')
-var runTab = require('./run-tab')
-var settingsTab = require('./settings-tab')
-var analysisTab = require('./analysis-tab')
-var debuggerTab = require('./debugger-tab')
-var filesTab = require('./files-tab')
+var tabbedMenu = require('../tabs/tabbed-menu')
+var compileTab = require('../tabs/compile-tab')
+var runTab = require('../tabs/run-tab')
+var settingsTab = require('../tabs/settings-tab')
+var analysisTab = require('../tabs/analysis-tab')
+var debuggerTab = require('../tabs/debugger-tab')
+var filesTab = require('../tabs/files-tab')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/staticanalysis/modules/staticAnalysisCommon.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var utils = require('../../utils')
+var utils = require('../../../lib/utils')
 
 var nodeTypes = {
   IDENTIFIER: 'Identifier',

src/app/staticanalysis/staticAnalysisView.js

@@ -2,10 +2,10 @@
 var StaticAnalysisRunner = require('./staticAnalysisRunner.js')
 var yo = require('yo-yo')
 var $ = require('jquery')
-var utils = require('../utils')
+var utils = require('../../lib/utils')
 var csjs = require('csjs-inject')
 
-var styleGuide = require('../style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/analysis-tab.js

@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/compile-tab.js

@@ -4,13 +4,13 @@ var $ = require('jquery')
 var yo = require('yo-yo')
 const copy = require('clipboard-copy')
 
-var parseContracts = require('./contract/contractParser')
-var publishOnSwarm = require('./contract/publishOnSwarm')
-var modalDialog = require('./modaldialog')
+var parseContracts = require('../contract/contractParser')
+var publishOnSwarm = require('../contract/publishOnSwarm')
+var modalDialog = require('../ui/modaldialog')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/debugger-tab.js

@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/files-tab.js

@@ -1,13 +1,13 @@
 /* global confirm, prompt */
 var yo = require('yo-yo')
 var $ = require('jquery')
-var modalDialogCustom = require('./modal-dialog-custom')
-var QueryParams = require('./query-params')
+var modalDialogCustom = require('../ui/modal-dialog-custom')
+var QueryParams = require('../../lib/query-params')
 var queryParams = new QueryParams()
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/tabs/run-tab.js

@@ -2,15 +2,15 @@
 var $ = require('jquery')
 
 var yo = require('yo-yo')
-var helper = require('../lib/helper.js')
-var txExecution = require('./execution/txExecution')
-var txFormat = require('./execution/txFormat')
-var txHelper = require('./execution/txHelper')
+var helper = require('../../lib/helper.js')
+var txExecution = require('../execution/txExecution')
+var txFormat = require('../execution/txFormat')
+var txHelper = require('../execution/txHelper')
 const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`
@@ -172,7 +172,6 @@ function runTab (container, appAPI, appEvents, opts) {
   setInterval(() => { updateAccountBalances(container, appAPI) }, 1000)
 }
 
-
 function fillAccountsList (appAPI, container) {
   var $txOrigin = $(container.querySelector('#txorigin'))
   $txOrigin.empty()

src/app/tabs/settings-tab.js

@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./style-guide')
+var styleGuide = require('../../style-guide')
 var styles = styleGuide()
 
 var css = csjs`

src/app/ui/renderer.js

@@ -2,7 +2,7 @@
 
 var $ = require('jquery')
 
-var utils = require('./utils')
+var utils = require('../../lib/utils')
 
 /**
  * After refactor, the renderer is only used to render error/warning
@@ -26,7 +26,7 @@ Renderer.prototype.error = function (message, container, options) {
   } else {
     $pre = $(opt.useSpan ? '<span />' : '<pre />').text(message)
   }
-  var $error = $('<div class="sol ' + opt.type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre)  
+  var $error = $('<div class="sol ' + opt.type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre)
   container.append($error)
   var err = message.match(/^([^:]*):([0-9]*):(([0-9]*):)? /)
   if (err) {

src/lib/remixd.js

@@ -1,6 +1,6 @@
 'use strict'
 var EventManager = require('ethereum-remix').lib.EventManager
-var modalDialog = require('../app/modaldialog')
+var modalDialog = require('../app/ui/modaldialog')
 var yo = require('yo-yo')
 
 class Remixd {

src/universal-dapp.js

@@ -8,7 +8,7 @@ var BN = ethJSUtil.BN
 var EventManager = require('ethereum-remix').lib.EventManager
 var crypto = require('crypto')
 var async = require('async')
-var TxRunner = require('./app/txRunner')
+var TxRunner = require('./app/execution/txRunner')
 var yo = require('yo-yo')
 var txFormat = require('./app/execution/txFormat')
 var txHelper = require('./app/execution/txHelper')
@@ -20,7 +20,7 @@ const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./app/style-guide')
+var styleGuide = require('./style-guide')
 var styles = styleGuide()
 
 var css = csjs`

test-browser/tests/ballot.js

@@ -1,6 +1,6 @@
 'use strict'
 var contractHelper = require('../helpers/contracts')
-var examples = require('../../src/app/example-contracts')
+var examples = require('../../src/app/editor/example-contracts')
 var init = require('../helpers/init')
 var sauce = require('./sauce')
 

test-browser/tests/fileExplorer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var examples = require('../../src/app/example-contracts')
+var examples = require('../../src/app/editor/example-contracts')
 var init = require('../helpers/init')
 var sauce = require('./sauce')
 

test/compiler-test.js

@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var Compiler = require('../src/app/compiler')
+var Compiler = require('../src/app/compiler/compiler')
 
 test('compiler.compile smoke', function (t) {
   t.plan(1)

test/gist-handler-test.js

@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var GistHandler = require('../src/app/gist-handler')
+var GistHandler = require('../src/lib/gist-handler')
 
 test('gistHandler.handleLoad with no gist param', function (t) {
   t.plan(1)

test/query-params-test.js

@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var QueryParams = require('../src/app/query-params')
+var QueryParams = require('../src/lib/query-params')
 
 test('queryParams.get', function (t) {
   t.plan(2)

test/staticanalysis/staticAnalysisCommon-test.js

@@ -1,7 +1,7 @@
 var test = require('tape')
 
 var common = require('../../src/app/staticanalysis/modules/staticAnalysisCommon')
-var utils = require('../../src/app/utils')
+var utils = require('../../src/lib/utils')
 
 test('staticAnalysisCommon.helpers.buildFunctionSignature', function (t) {
   t.plan(7)

test/util-test.js

@@ -1,6 +1,6 @@
 var test = require('tape')
 
-var utils = require('../src/app/utils')
+var utils = require('../src/lib/utils')
 
 test('util.groupBy on valid input', function (t) {
   t.plan(1)