From 55f94260d714d5e926c7a99490ba0e71d7d39eb1 Mon Sep 17 00:00:00 2001
From: Rob Stupay <rob@stupay.com>
Date: Tue, 9 Jan 2018 16:42:40 +0100
Subject: [PATCH] moving storage and theme-chooser to the remix side and
 updating files

---
 src/app.js                                   |  4 +-
 src/app/editor/contextView.js                |  2 +-
 src/app/editor/editor.js                     |  2 +-
 src/app/execution/txLogger.js                |  2 +-
 src/app/files/file-explorer.js               |  2 +-
 src/app/panels/editor-panel.js               |  2 +-
 src/app/panels/file-panel.js                 |  2 +-
 src/app/panels/righthand-panel.js            |  2 +-
 src/app/panels/terminal.js                   |  3 +-
 src/app/staticanalysis/staticAnalysisView.js |  2 +-
 src/app/tabs/analysis-tab.js                 |  3 +-
 src/app/tabs/compile-tab.js                  |  3 +-
 src/app/tabs/debugger-tab.js                 |  3 +-
 src/app/tabs/run-tab.js                      |  2 +-
 src/app/tabs/settings-tab.js                 |  5 +-
 src/app/tabs/support-tab.js                  |  2 +-
 src/app/tabs/tabbed-menu.js                  |  2 +-
 src/app/theme/theme-chooser.js               | 34 -----------
 src/app/ui/copy-to-clipboard.js              |  2 +-
 src/app/ui/dropdown.js                       |  2 +-
 src/app/ui/modaldialog.js                    |  2 +-
 src/app/ui/renderer.js                       |  2 +-
 src/app/ui/tooltip.js                        |  2 +-
 src/storage.js                               | 61 --------------------
 src/universal-dapp.js                        |  3 +-
 25 files changed, 29 insertions(+), 122 deletions(-)
 delete mode 100644 src/app/theme/theme-chooser.js
 delete mode 100644 src/storage.js

diff --git a/src/app.js b/src/app.js
index 892aa9626f..5b67b828d5 100644
--- a/src/app.js
+++ b/src/app.js
@@ -13,7 +13,7 @@ var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
 var QueryParams = require('./lib/query-params')
 var GistHandler = require('./lib/gist-handler')
 var helper = require('./lib/helper')
-var Storage = require('./storage')
+var Storage = remixLib.Storage
 var Browserfiles = require('./app/files/browser-files')
 var chromeCloudStorageSync = require('./app/files/chromeCloudStorageSync')
 var SharedFolder = require('./app/files/shared-folder')
@@ -38,7 +38,7 @@ var ContextualListener = require('./app/editor/contextualListener')
 var ContextView = require('./app/editor/contextView')
 var BasicReadOnlyExplorer = require('./app/files/basicReadOnlyExplorer')
 
-var styleGuide = require('./app/theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js
index 5e72e80dfb..120ea57557 100644
--- a/src/app/editor/contextView.js
+++ b/src/app/editor/contextView.js
@@ -2,7 +2,7 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var remixLib = require('remix-lib')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 var SourceMappingDecoder = remixLib.SourceMappingDecoder
 
diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js
index 092299fae7..88272973ff 100644
--- a/src/app/editor/editor.js
+++ b/src/app/editor/editor.js
@@ -12,7 +12,7 @@ require('brace/ext/language_tools')
 require('brace/ext/searchbox')
 var langTools = ace.acequire('ace/ext/language_tools')
 require('./mode-solidity.js')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 function setTheme (cb) {
diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js
index 9001103bd3..6e782a7acc 100644
--- a/src/app/execution/txLogger.js
+++ b/src/app/execution/txLogger.js
@@ -5,7 +5,7 @@ var copyToClipboard = require('../ui/copy-to-clipboard')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
 var remixLib = require('remix-lib')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var EventManager = remixLib.EventManager
diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js
index 9fc808bc79..af45a99c92 100755
--- a/src/app/files/file-explorer.js
+++ b/src/app/files/file-explorer.js
@@ -9,7 +9,7 @@ var EventManager = remixLib.EventManager
 
 var helper = require('../../lib/helper')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index 6066d48f3b..605e8995ec 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -2,7 +2,7 @@ var csjs = require('csjs-inject')
 var yo = require('yo-yo')
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var Terminal = require('./terminal')
diff --git a/src/app/panels/file-panel.js b/src/app/panels/file-panel.js
index 8e49a0022d..0733adbd08 100644
--- a/src/app/panels/file-panel.js
+++ b/src/app/panels/file-panel.js
@@ -12,7 +12,7 @@ var QueryParams = require('../../lib/query-params')
 var queryParams = new QueryParams()
 var helper = require('../../lib/helper')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 module.exports = filepanel
diff --git a/src/app/panels/righthand-panel.js b/src/app/panels/righthand-panel.js
index 2800222b89..f870913867 100644
--- a/src/app/panels/righthand-panel.js
+++ b/src/app/panels/righthand-panel.js
@@ -13,7 +13,7 @@ var PluginManager = require('../../pluginManager')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index d010454a05..aefda026e3 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -10,10 +10,11 @@ var Web3 = require('web3')
 
 var executionContext = require('../../execution-context')
 var Dropdown = require('../ui/dropdown')
+
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js
index 1c16eb00f7..508958e589 100644
--- a/src/app/staticanalysis/staticAnalysisView.js
+++ b/src/app/staticanalysis/staticAnalysisView.js
@@ -6,7 +6,7 @@ var remixLib = require('remix-lib')
 var utils = remixLib.util
 var csjs = require('csjs-inject')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var EventManager = remixLib.EventManager
diff --git a/src/app/tabs/analysis-tab.js b/src/app/tabs/analysis-tab.js
index 08b7f2bcba..bf17e4037a 100644
--- a/src/app/tabs/analysis-tab.js
+++ b/src/app/tabs/analysis-tab.js
@@ -1,8 +1,9 @@
 var yo = require('yo-yo')
+var remixLib = require('remix-lib')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js
index 5033067a71..7e801d9806 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -9,10 +9,11 @@ var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
 var TreeView = require('remix-debugger').ui.TreeView
 var copyToClipboard = require('../ui/copy-to-clipboard')
+var remixLib = require('remix-lib')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/tabs/debugger-tab.js b/src/app/tabs/debugger-tab.js
index 9a50551c92..a0a03f6bdd 100644
--- a/src/app/tabs/debugger-tab.js
+++ b/src/app/tabs/debugger-tab.js
@@ -1,8 +1,7 @@
 var yo = require('yo-yo')
-
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index f80792bd37..b25ef973fc 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -13,7 +13,7 @@ var EventManager = require('remix-lib').EventManager
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js
index 6b258027d0..b01f5e729a 100644
--- a/src/app/tabs/settings-tab.js
+++ b/src/app/tabs/settings-tab.js
@@ -2,8 +2,9 @@
 var $ = require('jquery')
 var yo = require('yo-yo')
 var QueryParams = require('../../lib/query-params')
-var Storage = require('../../storage')
-var styleGuide = require('../theme/theme-chooser')
+var remixLib = require('remix-lib')
+var Storage = remixLib.Storage
+var styleGuide = remixLib.ui.themeChooser
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
diff --git a/src/app/tabs/support-tab.js b/src/app/tabs/support-tab.js
index a19321c1d6..0d91e47978 100644
--- a/src/app/tabs/support-tab.js
+++ b/src/app/tabs/support-tab.js
@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/tabs/tabbed-menu.js b/src/app/tabs/tabbed-menu.js
index 2ce5c89aa9..f601086429 100644
--- a/src/app/tabs/tabbed-menu.js
+++ b/src/app/tabs/tabbed-menu.js
@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var helper = require('../../lib/helper')
diff --git a/src/app/theme/theme-chooser.js b/src/app/theme/theme-chooser.js
deleted file mode 100644
index d15d10a2c0..0000000000
--- a/src/app/theme/theme-chooser.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var remixLib = require('remix-lib')
-var styleGuideLight = remixLib.ui.styleGuide
-var styleGuideDark = remixLib.ui.styleGuideDark
-var Storage = require('../../storage')
-module.exports = {
-
-  chooser: function () {
-    var themeStorage = new Storage('style:')
-    if (themeStorage.exists('theme')) {
-      console.log('10! ' + themeStorage.exists('theme'))
-      // console.log('lll ' + )
-      if (themeStorage.get('theme') === 'dark') {
-        return styleGuideDark()
-      } else {
-        return styleGuideLight()
-      }
-    } else {
-      console.log('17! ' + themeStorage.exists('style:'))
-      return styleGuideLight()
-    }
-  },
-
-  switchTheme: function (theme) {
-    var themeStorage = new Storage('style:')
-    themeStorage.set('theme', theme)
-    if (theme === 'dark') {
-      return styleGuideDark()
-    } else if (theme === 'light') {
-      return styleGuideLight()
-    } else {
-      return styleGuideLight()
-    }
-  }
-}
diff --git a/src/app/ui/copy-to-clipboard.js b/src/app/ui/copy-to-clipboard.js
index 7ce903ab75..8588d2cdd0 100644
--- a/src/app/ui/copy-to-clipboard.js
+++ b/src/app/ui/copy-to-clipboard.js
@@ -4,7 +4,7 @@ const copy = require('clipboard-copy')
 var addTooltip = require('./tooltip')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/ui/dropdown.js b/src/app/ui/dropdown.js
index 1a49e63a4d..6aaa065925 100644
--- a/src/app/ui/dropdown.js
+++ b/src/app/ui/dropdown.js
@@ -3,7 +3,7 @@ var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/ui/modaldialog.js b/src/app/ui/modaldialog.js
index b2c1b893f7..5417e2bd83 100644
--- a/src/app/ui/modaldialog.js
+++ b/src/app/ui/modaldialog.js
@@ -1,6 +1,6 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/app/ui/renderer.js b/src/app/ui/renderer.js
index 57af92f5cd..2a16993557 100644
--- a/src/app/ui/renderer.js
+++ b/src/app/ui/renderer.js
@@ -5,7 +5,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 // var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = yo`<style>
diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js
index 9938fd5075..388d53dcc1 100644
--- a/src/app/ui/tooltip.js
+++ b/src/app/ui/tooltip.js
@@ -1,7 +1,7 @@
 var yo = require('yo-yo')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`
diff --git a/src/storage.js b/src/storage.js
deleted file mode 100644
index c43ebd62b5..0000000000
--- a/src/storage.js
+++ /dev/null
@@ -1,61 +0,0 @@
-'use strict'
-
-function Storage (prefix) {
-  this.exists = function (name) {
-    return this.get(name) !== null
-  }
-
-  this.get = function (name) {
-    return window.localStorage.getItem(prefix + name)
-  }
-
-  this.set = function (name, content) {
-    try {
-      window.localStorage.setItem(prefix + name, content)
-    } catch (exception) {
-      return false
-    }
-    return true
-  }
-
-  this.remove = function (name) {
-    window.localStorage.removeItem(prefix + name)
-    return true
-  }
-
-  this.rename = function (originalName, newName) {
-    var content = this.get(originalName)
-    if (!this.set(newName, content)) {
-      return false
-    }
-    this.remove(originalName)
-    return true
-  }
-
-  function safeKeys () {
-    // NOTE: this is a workaround for some browsers
-    return Object.keys(window.localStorage).filter(function (item) { return item !== null && item !== undefined })
-  }
-
-  this.keys = function () {
-    return safeKeys()
-      // filter any names not including the prefix
-      .filter(function (item) { return item.indexOf(prefix, 0) === 0 })
-      // remove prefix from filename and add the 'browser' path
-      .map(function (item) { return item.substr(prefix.length) })
-  }
-
-  // on startup, upgrade the old storage layout
-  safeKeys().forEach(function (name) {
-    if (name.indexOf('sol-cache-file-', 0) === 0) {
-      var content = window.localStorage.getItem(name)
-      window.localStorage.setItem(name.replace(/^sol-cache-file-/, 'sol:'), content)
-      window.localStorage.removeItem(name)
-    }
-  })
-
-  // remove obsolete key
-  window.localStorage.removeItem('editor-size-cache')
-}
-
-module.exports = Storage
diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index 55567e9b6e..b7eaf2c3e6 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -18,8 +18,7 @@ var copyToClipboard = require('./app/ui/copy-to-clipboard')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-
-var styleGuide = require('./app/theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`