diff --git a/package.json b/package.json
index d3acd3b2..2c594ce6 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
"license": "Unlicense",
"author": "Lamassu (https://lamassu.is)",
"dependencies": {
- "ajv": "^4.9.0",
"bignumber.js": "^3.0.0",
"body-parser": "^1.15.1",
"cookie-parser": "^1.4.3",
@@ -31,10 +30,10 @@
"moment": "^2.17.0",
"morgan": "^1.7.0",
"node-hkdf-sync": "^1.0.0",
- "numeral": "^2.0.1",
- "pg": "^6.1.0",
+ "numeral": "^2.0.3",
+ "pg": "^6.1.2",
"pg-native": "^1.10.0",
- "pg-promise": "^5.4.4",
+ "pg-promise": "^5.5.0",
"pify": "^2.3.0",
"pretty-ms": "^2.1.0",
"ramda": "^0.22.1",
diff --git a/public/elm.js b/public/elm.js
index 01d941ed..a672433f 100644
--- a/public/elm.js
+++ b/public/elm.js
@@ -22483,6 +22483,7 @@ var _user$project$Css_Classes$NavBarItemActive = {ctor: 'NavBarItemActive'};
var _user$project$Css_Classes$MainRight = {ctor: 'MainRight'};
var _user$project$Css_Classes$MainLeft = {ctor: 'MainLeft'};
var _user$project$Css_Classes$NavBar = {ctor: 'NavBar'};
+var _user$project$Css_Classes$Layout = {ctor: 'Layout'};
var _user$project$FieldSet$updateField = F3(
function (fieldCode, fieldValueString, field) {
@@ -26682,7 +26683,16 @@ var _user$project$Config$rowView = F3(
ctor: '::',
_0: A2(
_elm_lang$html$Html$td,
- {ctor: '[]'},
+ {
+ ctor: '::',
+ _0: _user$project$Css_Admin$class(
+ {
+ ctor: '::',
+ _0: _user$project$Css_Classes$ShortCell,
+ _1: {ctor: '[]'}
+ }),
+ _1: {ctor: '[]'}
+ },
{
ctor: '::',
_0: _elm_lang$html$Html$text(machineDisplay.display),
@@ -29556,62 +29566,33 @@ var _user$project$Main$view = function (model) {
A2(_evancz$url_parser$UrlParser$parseHash, _user$project$Main$parseRoute, model.location));
return A2(
_elm_lang$html$Html$div,
- {ctor: '[]'},
{
ctor: '::',
- _0: A2(
- _elm_lang$html$Html$div,
- {
- ctor: '::',
- _0: _elm_lang$html$Html_Attributes$class('grid'),
- _1: {ctor: '[]'}
- },
- {
- ctor: '::',
- _0: A2(
- _elm_lang$html$Html$div,
- {
- ctor: '::',
- _0: _elm_lang$html$Html_Attributes$class('unit one-quarter no-gutters lamassuAdminMainLeft'),
- _1: {ctor: '[]'}
- },
- {
- ctor: '::',
- _0: A2(_user$project$NavBar$view, route, invalidConfigGroups),
- _1: {ctor: '[]'}
- }),
- _1: {
- ctor: '::',
- _0: A2(
- _elm_lang$html$Html$div,
- {
- ctor: '::',
- _0: _elm_lang$html$Html_Attributes$class('unit three-quarters lamassuAdminMainRight'),
- _1: {ctor: '[]'}
- },
- {
- ctor: '::',
- _0: A2(
- _elm_lang$html$Html$div,
- {
- ctor: '::',
- _0: _elm_lang$html$Html_Attributes$class('lamassuAdminContent'),
- _1: {ctor: '[]'}
- },
- {
- ctor: '::',
- _0: A2(_user$project$Main$content, model, route),
- _1: {ctor: '[]'}
- }),
- _1: {ctor: '[]'}
- }),
- _1: {ctor: '[]'}
- }
- }),
+ _0: _elm_lang$html$Html_Attributes$class('lamassuAdminLayout'),
+ _1: {ctor: '[]'}
+ },
+ {
+ ctor: '::',
+ _0: A2(_user$project$NavBar$view, route, invalidConfigGroups),
_1: {
ctor: '::',
- _0: _user$project$Main$statusBar(model.status),
- _1: {ctor: '[]'}
+ _0: A2(
+ _elm_lang$html$Html$div,
+ {
+ ctor: '::',
+ _0: _elm_lang$html$Html_Attributes$class('lamassuAdminContent'),
+ _1: {ctor: '[]'}
+ },
+ {
+ ctor: '::',
+ _0: A2(_user$project$Main$content, model, route),
+ _1: {ctor: '[]'}
+ }),
+ _1: {
+ ctor: '::',
+ _0: _user$project$Main$statusBar(model.status),
+ _1: {ctor: '[]'}
+ }
}
});
};
diff --git a/public/index.html b/public/index.html
index 27e6afed..9da3dfa9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,7 +1,6 @@
-
diff --git a/public/styles.css b/public/styles.css
index 875bd3b4..31afdad7 100644
--- a/public/styles.css
+++ b/public/styles.css
@@ -7,6 +7,11 @@ p {
margin: 0;
}
+.lamassuAdminLayout {
+ display: flex;
+ height: 100%;
+}
+
.lamassuAdminStatusBar {
position: fixed;
bottom: 0;
@@ -42,12 +47,12 @@ p {
text-align: left;
font-family: Fira Code;
font-weight: 600;
- width: 50%;
+ width: 90%;
outline: none;
}
.lamassuAdminButtonRow {
- text-align: right;
+ text-align: left;
}
.lamassuAdminButton {
@@ -90,10 +95,10 @@ p {
}
.lamassuAdminContent {
- margin: 20px 20px;
- background-color: #ffffff;
- padding: 40px;
+ padding: 20px;
+ background-color: #f6f6f4;
border-radius: 5px;
+ width: 100%;
}
.lamassuAdminCryptoTabs {
@@ -135,14 +140,6 @@ p {
margin-bottom: 10px;
}
-.lamassuAdminConfigContainer {
- padding: 20px;
- border-radius: 0px 7px 7px 7px;
- background-color: #f6f6f4;
- margin: 0 0 10px;
- animation: fadein 0.8s;
-}
-
.lamassuAdminTxTable {
border-radius: 7px;
margin: 20px 0;
@@ -426,6 +423,9 @@ p {
padding: 0 0 60px 0;
background-color: #2d2d2d;
font-size: 18px;
+ width: 15em;
+ max-width: 15em;
+ min-width: 15em;
}
.lamassuAdminNavBar .lamassuAdminNavBarRoute {
diff --git a/yarn.lock b/yarn.lock
index 255d9f3b..1f10db08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,13 +24,6 @@ agent-base@2:
extend "~3.0.0"
semver "~5.0.1"
-ajv@^4.9.0:
- version "4.9.1"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.9.1.tgz#08e1b0a5fddc8b844d28ca7b03510e78812ee3a0"
- dependencies:
- co "^4.6.0"
- json-stable-stringify "^1.0.1"
-
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -57,10 +50,6 @@ ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-ap@~0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/ap/-/ap-0.2.0.tgz#ae0942600b29912f0d2b14ec60c45e8f330b6110"
-
argparse@^0.1.16:
version "0.1.16"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz#cfd01e0fbba3d6caed049fbd758d40f65196f57c"
@@ -437,10 +426,6 @@ clone@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-co@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
co@~3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/co/-/co-3.0.6.tgz#1445f226c5eb956138e68c9ac30167ea7d2e6bda"
@@ -1338,12 +1323,6 @@ json-schema@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-json-stable-stringify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
- dependencies:
- jsonify "~0.0.0"
-
json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -1352,10 +1331,6 @@ json3@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-jsonify@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
jsonpointer@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5"
@@ -1701,9 +1676,9 @@ number-is-nan@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-numeral@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.1.tgz#905935ce72e316b31e81ca0c7586e6b60e132b4f"
+numeral@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.3.tgz#18f2ffb78312cadca116b7bbf7a7591146ea1912"
oauth-sign@~0.8.1:
version "0.8.2"
@@ -1865,26 +1840,16 @@ pg-pool@1.*:
generic-pool "2.4.2"
object-assign "4.1.0"
-pg-promise@^5.4.4:
- version "5.4.7"
- resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-5.4.7.tgz#e74469937f459c733aa5e444565583173b106357"
+pg-promise@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-5.5.0.tgz#a89c7e25e8695c343a51f7821d4e16bb5f46d5cc"
dependencies:
manakin "0.4"
pg "5.1"
pg-minify "0.4"
spex "1.1"
-pg-types@1.*:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.11.0.tgz#aae91a82d952b633bb88d006350a166daaf6ea90"
- dependencies:
- ap "~0.2.0"
- postgres-array "~1.0.0"
- postgres-bytea "~1.0.0"
- postgres-date "~1.0.0"
- postgres-interval "~1.0.0"
-
-pg-types@1.6.0:
+pg-types@1.*, pg-types@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.6.0.tgz#3872a0f199143025497f4ee2a65fdaf00d7ea8b3"
@@ -1900,9 +1865,9 @@ pg@5.1:
pgpass "0.0.6"
semver "4.3.2"
-pg@^6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/pg/-/pg-6.1.0.tgz#4ebc58100a79187b6b98fa5caf1675d669926b41"
+pg@^6.1.2:
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/pg/-/pg-6.1.2.tgz#2c896a7434502e2b938c100fc085b4e974a186db"
dependencies:
buffer-writer "1.0.1"
packet-reader "0.2.0"
@@ -1946,24 +1911,6 @@ plur@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
-postgres-array@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.0.tgz#48c2e82935b178bf805e0dff689d137eec2bfe6b"
-
-postgres-bytea@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
-
-postgres-date@~1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8"
-
-postgres-interval@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.0.2.tgz#7261438d862b412921c6fdb7617668424b73a6ed"
- dependencies:
- xtend "^4.0.0"
-
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"