From d2cd4872fc6312ad913ddfe31b1641af4bd260e7 Mon Sep 17 00:00:00 2001 From: iamreyne Date: Fri, 27 Apr 2018 19:02:14 -0400 Subject: [PATCH 01/24] Themes System Addition 1: Added support for themes using css 2: Restored default bootstrap using CDN to avoid compatibility issues with themes system 3: Updated front-end html/css to use more efficient code for theme support. 4: Created light theme to-do: - re-create dark theme - add blue logos for light theme - update CMC widget to look nicer with both themes - Update "Contribute" page to match light theme possibilities: - buttons outside of address box for copy/explorer links - better default "Contribute" page --- .idea/modules.xml | 9 + .idea/nanoNodeMonitor.iml | 9 + .idea/vcs.xml | 6 + .idea/workspace.xml | 475 ++++++++++++++++++++++++++++++++++++ modules/config.sample.php | 3 + modules/defaults.php | 3 + modules/footer.php | 11 +- modules/header.php | 5 +- modules/navbar.php | 10 +- static/css/bg-logo-dark.png | Bin 0 -> 20052 bytes static/css/custom.css | 5 - static/css/light.css | 106 ++++++++ templates/index-temp.html | 131 ++++++++++ templates/index.hbs | 224 ++++++++--------- 14 files changed, 871 insertions(+), 126 deletions(-) create mode 100644 .idea/modules.xml create mode 100644 .idea/nanoNodeMonitor.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 static/css/bg-logo-dark.png create mode 100644 static/css/light.css create mode 100644 templates/index-temp.html diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..1a7f04b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/nanoNodeMonitor.iml b/.idea/nanoNodeMonitor.iml new file mode 100644 index 0000000..b1477d8 --- /dev/null +++ b/.idea/nanoNodeMonitor.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..fdb4f3d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1524864650636 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 7f4b5f31199ca73d8b88253e92a6522e9a735913 Mon Sep 17 00:00:00 2001 From: iamreyne Date: Fri, 27 Apr 2018 23:39:27 -0400 Subject: [PATCH 06/24] Re-Ignore .idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5193ef3..c8ce735 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode/ modules/config.php +.idea/ From b64434b337a1a274aa32a1e6b129db36e36f66a7 Mon Sep 17 00:00:00 2001 From: iamreyne Date: Sat, 28 Apr 2018 00:15:07 -0400 Subject: [PATCH 07/24] Added Dark Theme + Minor Bugfixes - Recreated dark theme to be compatible with theme system - Added dark theme logos - Made n-logo-theme around just text, not image - Added n-card-theme to cards, allowing greater customization for themes. - Removed old logos --- modules/navbar.php | 2 +- static/css/dark.css | 107 ++++++++++++++++++ static/css/light.css | 1 + .../{logo-white.svg => nano-full-dark.svg} | 0 ...logo-only-white.svg => nano-mark-dark.svg} | 0 templates/index.hbs | 8 +- 6 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 static/css/dark.css rename static/img/{logo-white.svg => nano-full-dark.svg} (100%) rename static/img/{logo-only-white.svg => nano-mark-dark.svg} (100%) diff --git a/modules/navbar.php b/modules/navbar.php index 5cae99c..792be8e 100644 --- a/modules/navbar.php +++ b/modules/navbar.php @@ -1,6 +1,6 @@
- Nano Logo Nano Node Monitor + Nano LogoNano Node Monitor diff --git a/static/css/dark.css b/static/css/dark.css new file mode 100644 index 0000000..56bfa24 --- /dev/null +++ b/static/css/dark.css @@ -0,0 +1,107 @@ +/** + + -- Body CSS + + */ + +body { + background: #272B30; + color: #fff; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: 800px auto; + padding-top: 145px; +} + +/* + + -- Navigation Menu CSS + + */ + +.n-navbar-theme { + font-family: 'Nunito', sans-serif; + font-size: 1.1rem; + line-height: 1.6rem; + letter-spacing: 0.02rem; + font-weight: 400; + background-color: #3A3F44; + padding:1.5% 4%; + border-bottom: 1px solid #242a38; +} + +.n-logo-theme { + color: #ffffff; + padding-left:12px; +} + +.n-pullUp:hover { + color: #c8d6e5; + width: 100%; + height: 100%; + content: ''; + background: #222f3e; + opacity: 1; + transition: all 0s; +} + +/* + + -- Body Content CSS + + */ + +.n-text-theme { + color: #ffffff!important; +} + +.n-h2-theme { + font-family: 'Nunito', sans-serif; + font-size: 2.5rem; + line-height: 2.9rem; + font-weight: 400; + max-width: 930px; + color: #ea882e; +} + +.n-h3-theme { + font-family: 'Nunito', sans-serif; + font-size: 1.4rem; + font-weight: 400; + max-width: 930px; + color: #ea882e; +} + +.n-p-theme { + font-family: 'Nunito', sans-serif; + font-size: 0.9rem; + line-height: 1.6rem; + letter-spacing: 0.02em; +} + +.n-address-theme { + background-color: #3A3F44!important; + display: block; + width: 100%; + padding: .375rem .75rem; + font-size: 1rem; + line-height: 1.5; + background-clip: padding-box; + border: 1px solid rgba(0,0,0,0.4); + border-radius: 0rem; + transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; +} + +.n-card-theme { + background-color: #3A3F44!important; +} + +.list-group-item { + background-color: #3A3F44!important; + border: 1px solid rgba(0,0,0,0.4); +} + +a { + color: #ea882e; +} \ No newline at end of file diff --git a/static/css/light.css b/static/css/light.css index 3b3b75e..267cec6 100644 --- a/static/css/light.css +++ b/static/css/light.css @@ -32,6 +32,7 @@ body { .n-logo-theme { color: #0f1121; + padding-left:12px; } .n-pullUp:hover { diff --git a/static/img/logo-white.svg b/static/img/nano-full-dark.svg similarity index 100% rename from static/img/logo-white.svg rename to static/img/nano-full-dark.svg diff --git a/static/img/logo-only-white.svg b/static/img/nano-mark-dark.svg similarity index 100% rename from static/img/logo-only-white.svg rename to static/img/nano-mark-dark.svg diff --git a/templates/index.hbs b/templates/index.hbs index b44728d..095eb84 100644 --- a/templates/index.hbs +++ b/templates/index.hbs @@ -12,7 +12,7 @@

Node Account

    -
  • +
  • Address {{nanoNodeAccount}} - Heads up! A new Nano Node version - {{newNodeVersionAvailable}} is available. - Download it here! -
-{{/if}} - -
-
-

Node Account

- -
-
- -
-
-

Node Info

-
-
    -
  • - Version - {{version}} -
    • -
  • - Current Block - {{formatNumber currentBlock}} -
    • -
  • - Unchecked Blocks - {{formatNumber uncheckedBlocks}} -
    • -
  • - Peers - {{formatNumber numPeers}} -
    • -
  • - Sync Status - {{formatNumber blockSync}} % -
    • -
-
-
- - -
-

Node Account Info

-
-
    -
  • - Balance - {{formatNano accBalanceMnano}} Nano -
    • -
  • - Pending - {{formatNano accPendingMnano 6}} Nano -
    • -
  • -
    -
    Representative
    -
    - {{#if repAccount}} - {{repAccount}} - {{else}} Account not opened {{/if}} -
    -
    -
    • -
  • - Delegators - {{formatNumber nodeNinja.delegators}} -
    • -
  • - Voting Weight - {{formatNano votingWeight 6}} Nano -
    • -
-
-
- - - -
-

System Info

-
-
    -
  • - Hostname - {{nanoNodeName}} -
    • - {{#if nodeUptime}} -
  • - Node Uptime - {{formatNumber nodeUptime}} % -
    • - {{else if nodeNinja.uptime}} -
  • - Node Uptime - {{formatNumber nodeNinja.uptime}} % -
    • - {{else}} -
  • - Uptime - {{systemUptime}} -
    • - {{/if}} -
  • - Load - {{formatNumber systemLoad}} -
    • -
  • - Memory Free - {{formatNumber usedMem}} MB -
    • -
  • - Memory Total - {{formatNumber totalMem}} MB -
    • -
-
-
-
From 81b57ce47a94132c7931b0ede340280e5e336666 Mon Sep 17 00:00:00 2001 From: Tobias Palmer Date: Sun, 29 Apr 2018 16:15:09 +0200 Subject: [PATCH 10/24] move themedocs to wiki https://github.com/NanoTools/nanoNodeMonitor/wiki/Create-a-theme --- THEMEDOCS.md | 117 --------------------------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 THEMEDOCS.md diff --git a/THEMEDOCS.md b/THEMEDOCS.md deleted file mode 100644 index b8120bc..0000000 --- a/THEMEDOCS.md +++ /dev/null @@ -1,117 +0,0 @@ -# Creating a theme - -1: Create a CSS file inside of the /static/css folder - -2: Using the list below, edit specific elements using their div class selectors. - -3: Edit the $themeChoice to be the name of your css file (without the '.css' at the end) - -4: Your theme is now live! - - -## CSS Class Selectors - -The following will be all of the class selectors followed by how they are used in the Light Theme. - -##### .n-navbar-theme -Highest div of the navigation menu - - .n-navbar-theme { - font-family: 'Nunito', sans-serif; - font-size: 1.1rem; - line-height: 1.6rem; - letter-spacing: 0.02rem; - font-weight: 400; - background-color: #ffffff; - padding:1.5% 4%; - } - -##### .n-logo-theme -Used to color the text next to the logo - - .n-logo-theme { - color: #0f1121; - } - -##### .n-pullUp:hover -On-Hover effects for the menu items - - .n-pullUp:hover { - color: #ffffff; - width: 100%; - height: 100%; - content: ''; - background: #0f1121; - opacity: 1; - transition: all 0s; - } - -##### .n-text-theme -Text color for text inside of Node Cards + Address Field - - .n-text-theme { - color: #0f1121!important; - } - -##### .n-h2-theme -Modifies the h2 divs - - .n-h2-theme { - font-family: 'Nunito', sans-serif; - font-size: 2.5rem; - line-height: 2.9rem; - font-weight: 400; - max-width: 930px; - } - -##### .n-h3-theme -Modifies the h3 divs - - .n-h3-theme { - font-family: 'Nunito', sans-serif; - font-size: 1.4rem; - font-weight: 400; - max-width: 930px; - } - -##### .n-p-theme -Modifies the p divs - - .n-p-theme { - font-family: 'Nunito', sans-serif; - font-size: 0.9rem; - line-height: 1.6rem; - letter-spacing: 0.02em; - } - -##### .n-address-theme -Modifies the address input field - - .n-address-theme { - background-color: #ffffff!important; - display: block; - width: 100%; - padding: .375rem .75rem; - font-size: 1rem; - line-height: 1.5; - background-clip: padding-box; - border: 1px solid #000034; - border-radius: 0rem; - transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; - } - -##### .n-card-theme -Modifies the Nano Info Cards - - .n-card-theme { - background-color: #fff; - } - - -## Tips - -- Add a padding-top to the 'body' element in your css file, to properly show CMC widget + Nano Logo - -- Make sure you include your own logo images in static/img/ - the header logo image is nano-mark- and the logo to the left of the CMC Ticker Widget is nano-full- - -- Need help? Ask icarus#2597 on discord. From 89137a21396431afe62ba96ded88beb2b42292e1 Mon Sep 17 00:00:00 2001 From: Tobias Palmer Date: Sun, 29 Apr 2018 16:19:40 +0200 Subject: [PATCH 11/24] dark as default (backwards compatibility) --- modules/defaults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/defaults.php b/modules/defaults.php index 64e6aef..42d4d7c 100644 --- a/modules/defaults.php +++ b/modules/defaults.php @@ -7,7 +7,7 @@ // ----------- General Variables ----------- // Theme of your Node Monitor (dark or light) -$themeChoice = 'light'; +$themeChoice = 'dark'; // autorefresh interval for the status webpage in seconds $autoRefreshInSeconds = 5; @@ -16,7 +16,7 @@ $nanoNodeName = gethostname(); // a welcome message shown on top -$welcomeMsg = 'Welcome to Nano Node Monitor'; +$welcomeMsg = ''; // coinmarketcap widget // market data base and second currency e.g. USD, EUR, BTC, ETH From 44107c6b7c892a57aabb20d9b16c1a7e25064714 Mon Sep 17 00:00:00 2001 From: Tobias Palmer Date: Sun, 29 Apr 2018 16:20:54 +0200 Subject: [PATCH 12/24] changed link to wiki --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 75a179a..0df61c9 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,8 @@ Switch to your installation directory and execute `git pull`. ## Creating a Theme -If you're interested in creating your own theme in addition to the official Light and Dark themes, we've made it very simple for you to do so. +If you're interested in creating your own theme in addition to the official Light and Dark themes, we've made it very simple for you to do so. Check out the [Wiki](https://github.com/NanoTools/nanoNodeMonitor/wiki/Create-a-theme) for more info. -Check out [THEMEDOCS.md](https://github.com/iamreyne/nanoNodeMonitor/blob/master/THEMEDOCS.md) for more info. ## Links From 9ed1924a7c64c5ef5f1a72e0769eb9ff60b783b6 Mon Sep 17 00:00:00 2001 From: Tobias Palmer Date: Sun, 29 Apr 2018 16:35:10 +0200 Subject: [PATCH 13/24] remove mobile screenshot and add the two themes --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0df61c9..1d30534 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,9 @@ Nano Node Monitor is a server-side PHP-based monitor for a Nano node. It connects to a running node via RPC and displays it's status on a simple webpage. Being server-side, it does not expose the RPC interface of the Nano node to the public. -Here is what it looks like on a desktop computer ... +![Light](https://i.imgur.com/fbaAFvC.png) -![Desktop screenshot](https://i.imgur.com/15izp38.png) - - -... and on a mobile device (iPhone 7 Plus): - -![Mobile screenshot](https://i.imgur.com/oesBBPG.png) +![Dark](https://i.imgur.com/1Gu9ohX.png) ## Prerequisites From a3719018f272e68ac40adbb7f3eca5633655d640 Mon Sep 17 00:00:00 2001 From: dbachm123 Date: Sun, 29 Apr 2018 18:51:22 +0000 Subject: [PATCH 14/24] minor adaptation of theme colors; clipboard icon colors; line spacing; font size --- modules/footer.php | 7 ++++--- static/themes/dark/css/theme.css | 21 ++++++++++++++++++--- static/themes/light/css/theme.css | 25 +++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/modules/footer.php b/modules/footer.php index e719f84..0f0fdea 100644 --- a/modules/footer.php +++ b/modules/footer.php @@ -2,9 +2,10 @@


GitHub: Source | Wiki | API


-

Made by Nano Tools.

-

Donations to Nano Node Monitor: - +

Made by Nano Tools. +
+ Donations to Nano Node Monitor: +

diff --git a/static/themes/dark/css/theme.css b/static/themes/dark/css/theme.css index 9a60e74..20496b2 100644 --- a/static/themes/dark/css/theme.css +++ b/static/themes/dark/css/theme.css @@ -10,7 +10,7 @@ body { font-family: 'Nunito', sans-serif; background: #272B30; - color: #fff; + color: #cccccc; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; @@ -78,7 +78,7 @@ h3 { p { font-size: 0.9rem; - line-height: 1.6rem; + line-height: 1.3rem; letter-spacing: 0.02em; } @@ -97,15 +97,17 @@ p { .card { background-color: #3A3F44!important; + font-size: 0.9rem; } .list-group-item { background-color: #3A3F44!important; border: 1px solid rgba(0,0,0,0.4); + font-size: 0.9rem; } a { - color: #fff; + color: #ffffff; } a:hover { @@ -116,3 +118,16 @@ a:hover { color: #ffffff; } +.btn-clipboard:hover{ + color: #ea882e; +} + +.btn-clipboard-light { + color: #ffffff; +} + +.btn-clipboard-light:hover { + color: #ea882e; +} + + diff --git a/static/themes/light/css/theme.css b/static/themes/light/css/theme.css index 5f0f817..b3e4727 100644 --- a/static/themes/light/css/theme.css +++ b/static/themes/light/css/theme.css @@ -61,6 +61,7 @@ body { .list-group-item { color: #0f1121 !important; + font-size: 0.9rem; } h2 { @@ -78,10 +79,11 @@ h3 { p { font-size: 0.9rem; - line-height: 1.6rem; + line-height: 1.3rem; letter-spacing: 0.02em; } + .n-address-theme { background-color: #ffffff !important; display: block; @@ -97,16 +99,35 @@ p { .card { background-color: #fff; + font-size: 0.9rem; } .list-group-item a { color: #0f1121; } +a { + color: #4a90e2 +} + a:hover { - color: #007bff; + color: #4a90e2 } + .btn-clipboard { color: #0f1121; +} + + +.btn-clipboard:hover{ + color: #4a90e2; +} + +.btn-clipboard-light { + color: #ffffff; +} + +.btn-clipboard-light:hover { + color: #4a90e2; } \ No newline at end of file From 90a7d77ca55a3a0221527833d71be60613337dbb Mon Sep 17 00:00:00 2001 From: dbachm123 Date: Sun, 29 Apr 2018 18:51:53 +0000 Subject: [PATCH 15/24] version bump to 1.4.4 --- modules/constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/constants.php b/modules/constants.php index 22aae17..a077cd0 100644 --- a/modules/constants.php +++ b/modules/constants.php @@ -1,7 +1,7 @@ Date: Sun, 29 Apr 2018 18:54:28 +0000 Subject: [PATCH 16/24] reduced heading size --- contribute.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contribute.php b/contribute.php index 7a46c86..362a223 100644 --- a/contribute.php +++ b/contribute.php @@ -6,19 +6,21 @@ ?> -

Contribute to Nano Node Monitor

+

Contribute to Nano Node Monitor

If you want to contribute to Nano Node Monitor and further improve it, your help is very welcome. Have a look at its GitHub page, browse through open issues, check out the source code, create a branch, develop features, fix some bugs, and open pull requests. Development follows the standard GitHub Flow method.

+
-

Donate to the Maintainer of This Node

+

Donate to the Maintainer of This Node

Donations support the efforts of the Nano community to further decentralize the Nano network by running representative nodes. - Please consider donating to the maintainer of this Nano node to help cover some of its costs. Simply click the button below. + Please consider donating to the maintainer of this Nano node to help cover some of its costs. Simply click the BrainBlocks button below.

+
@@ -70,5 +72,9 @@ function updateBrainButton() { + +
+ + From df7b740f75a3097abbc6a98a3ddd4b9dbcc5c227 Mon Sep 17 00:00:00 2001 From: Ryan LeFevre Date: Fri, 27 Apr 2018 10:34:57 -0400 Subject: [PATCH 17/24] Set connect timeout for curl calls --- modules/functions.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/functions.php b/modules/functions.php index 038e1db..c989a37 100644 --- a/modules/functions.php +++ b/modules/functions.php @@ -94,6 +94,7 @@ function getLatestReleaseVersion() CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, CURLOPT_TIMEOUT => 30, + CURLOPT_CONNECTTIMEOUT => 2, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, CURLOPT_CUSTOMREQUEST => "GET", CURLOPT_HTTPHEADER => array( @@ -160,7 +161,8 @@ function getLatestNodeReleaseVersion() CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, - CURLOPT_TIMEOUT => 1, + CURLOPT_TIMEOUT => 2, + CURLOPT_CONNECTTIMEOUT => 1, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, CURLOPT_CUSTOMREQUEST => "GET", CURLOPT_HTTPHEADER => array( @@ -221,7 +223,8 @@ function getNodeUptime($apiKey, $uptimeRatio = 30) CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, - CURLOPT_TIMEOUT => 1, + CURLOPT_TIMEOUT => 2, + CURLOPT_CONNECTTIMEOUT => 1, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, CURLOPT_CUSTOMREQUEST => "POST", CURLOPT_POSTFIELDS => "api_key=$apiKey&format=json&custom_uptime_ratios=$uptimeRatio", @@ -264,7 +267,8 @@ function getNodeNinja($account) CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, - CURLOPT_TIMEOUT => 1, + CURLOPT_TIMEOUT => 2, + CURLOPT_CONNECTTIMEOUT => 1, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1 )); @@ -328,7 +332,8 @@ function getNodeNinjaBlockcount() CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, - CURLOPT_TIMEOUT => 1, + CURLOPT_TIMEOUT => 2, + CURLOPT_CONNECTTIMEOUT => 1, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1 )); From 2160b3da7b5beda21613daf38a83670ed74f5e19 Mon Sep 17 00:00:00 2001 From: Ryan LeFevre Date: Fri, 27 Apr 2018 10:37:05 -0400 Subject: [PATCH 18/24] Set connect timeout on RPC calls --- modules/functions_rpc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/functions_rpc.php b/modules/functions_rpc.php index e6e9688..4885cf1 100644 --- a/modules/functions_rpc.php +++ b/modules/functions_rpc.php @@ -6,6 +6,7 @@ function postCurl($ch, $data) $data_string = json_encode($data); curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string); curl_setopt($ch, CURLOPT_TIMEOUT, 5); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2); curl_setopt($ch, CURLOPT_HTTPHEADER, array( 'Content-Type: application/json', 'Content-Length: ' . strlen($data_string)) From 5b601cce75166320f631757018d8227ac266bba0 Mon Sep 17 00:00:00 2001 From: Ryan LeFevre Date: Fri, 27 Apr 2018 17:00:22 -0400 Subject: [PATCH 19/24] Add Redis caching option --- modules/Cache.php | 2 ++ modules/cache/RedisCache.php | 29 +++++++++++++++++++++++++++++ modules/config.sample.php | 8 +++++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 modules/cache/RedisCache.php diff --git a/modules/Cache.php b/modules/Cache.php index f5ad069..f087feb 100644 --- a/modules/Cache.php +++ b/modules/Cache.php @@ -3,6 +3,7 @@ require_once __DIR__.'/cache/ApcCache.php'; require_once __DIR__.'/cache/ApcuCache.php'; require_once __DIR__.'/cache/FileCache.php'; +require_once __DIR__.'/cache/RedisCache.php'; require_once __DIR__.'/cache/NullCache.php'; abstract class Cache { @@ -12,6 +13,7 @@ public static function factory() { case 'apc': return new ApcCache($cache['options']); case 'apcu': return new ApcuCache($cache['options']); case 'files': return new FileCache($cache['options']); + case 'redis': return new RedisCache($cache['options']); default: return new NullCache(); } } diff --git a/modules/cache/RedisCache.php b/modules/cache/RedisCache.php new file mode 100644 index 0000000..34506ca --- /dev/null +++ b/modules/cache/RedisCache.php @@ -0,0 +1,29 @@ +ttl = array_key_exists('ttl', $options) ? $options['ttl'] : 30; + + if (array_key_exists('redis', $options)) { + $this->redis = $options['redis']; + } else { + $this->redis = new Redis(); + $this->redis->connect( + $options['host'], + array_key_exists('port', $options) ? $options['port'] : 6379 + ); + } + } + + public function read($key) { + $data = $this->redis->get($key); + if ($data) return json_decode($data); + return NULL; + } + + public function write($key, $data) { + return $this->redis->setEx($key, $this->ttl, json_encode($data)); + } +} diff --git a/modules/config.sample.php b/modules/config.sample.php index 77fce93..2a4f5d1 100644 --- a/modules/config.sample.php +++ b/modules/config.sample.php @@ -35,7 +35,7 @@ // choice of Nano block explorer ('nanode', 'ninja', 'nanoexplorer', 'nano', 'nanowatch', 'meltingice') // $blockExplorer = 'nanode'; -// ----------- Cache Engine ----------- +// ----------- Cache Engine ----------- // The cache engine allows for caching of RPC calls to reduce load on your Nano node. @@ -49,6 +49,12 @@ // - Options: 'ttl' => cache time in seconds // - "apcu" (APCu cache; requires extension; fast) // - Options: 'ttl' => cache time in seconds +// - "redis" (Redis cache; requires extension; fast) +// - Options: +// - 'host' => required; address of the Redis host +// - 'port' => optional; port for the Redis host +// - 'redis' => optional; an instantiated Redis instance (replaces use of host/port) +// - 'ttl' => optional; cache time in seconds // $cache = [ // "engine" => "files", From 41c34b777844de6f5b29b948745d8dae54f7473f Mon Sep 17 00:00:00 2001 From: Ryan LeFevre Date: Fri, 27 Apr 2018 17:03:18 -0400 Subject: [PATCH 20/24] Set default host for Redis cache --- modules/cache/RedisCache.php | 2 +- modules/config.sample.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cache/RedisCache.php b/modules/cache/RedisCache.php index 34506ca..d3c49b9 100644 --- a/modules/cache/RedisCache.php +++ b/modules/cache/RedisCache.php @@ -11,7 +11,7 @@ public function __construct(array $options = array()) { } else { $this->redis = new Redis(); $this->redis->connect( - $options['host'], + array_key_exists('host', $options) ? $options['host'] : '127.0.0.1', array_key_exists('port', $options) ? $options['port'] : 6379 ); } diff --git a/modules/config.sample.php b/modules/config.sample.php index 2a4f5d1..8493343 100644 --- a/modules/config.sample.php +++ b/modules/config.sample.php @@ -51,8 +51,8 @@ // - Options: 'ttl' => cache time in seconds // - "redis" (Redis cache; requires extension; fast) // - Options: -// - 'host' => required; address of the Redis host -// - 'port' => optional; port for the Redis host +// - 'host' => optional; address of the Redis host (defaults to localhost) +// - 'port' => optional; port for the Redis host (defaults to 6379) // - 'redis' => optional; an instantiated Redis instance (replaces use of host/port) // - 'ttl' => optional; cache time in seconds From f4d5ad919a20fcd1674ba49035705f24d5f71695 Mon Sep 17 00:00:00 2001 From: Tobias Palmer Date: Mon, 30 Apr 2018 13:02:24 +0200 Subject: [PATCH 21/24] project version on css + js --- modules/footer.php | 8 ++++---- modules/header.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/footer.php b/modules/footer.php index 0f0fdea..c71a4ce 100644 --- a/modules/footer.php +++ b/modules/footer.php @@ -11,10 +11,10 @@
- - - - + + + + diff --git a/modules/header.php b/modules/header.php index 94c940e..51bf0dd 100644 --- a/modules/header.php +++ b/modules/header.php @@ -8,9 +8,9 @@ - - - + + + From 193519c107976732884b3a98135cb95ff8df1267 Mon Sep 17 00:00:00 2001 From: dbachm123 Date: Mon, 30 Apr 2018 23:11:21 +0200 Subject: [PATCH 22/24] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d30534..6c33b22 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ If you're interested in creating your own theme in addition to the official Ligh ## Support -Feel free to change your representative to my Nano node `xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj` to support further decentralization within the Nano network. In case of problems, please send an [issue](https://github.com/NanoTools/nanoNodeMonitor/issues). +Feel free to change your representative to the Nano Node Monitor Rep `xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj` to support further decentralization within the Nano network. In case of problems, please send an [issue](https://github.com/NanoTools/nanoNodeMonitor/issues). Donations to the development of Nano Node Monitor are very welcome to: [xrb_1nanomon9uycemhgonue4twmcqmsu7oxw43maro8amj751ozpus8r8gsic48](https://www.nanode.co/account/xrb_1nanomon9uycemhgonue4twmcqmsu7oxw43maro8amj751ozpus8r8gsic48) From 9dac8ef0ddc17504cd94d24719ab0406fa4daeae Mon Sep 17 00:00:00 2001 From: dbachm123 Date: Mon, 30 Apr 2018 23:13:43 +0200 Subject: [PATCH 23/24] added ninja link to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c33b22..c5cb0c8 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ If you're interested in creating your own theme in addition to the official Ligh ## Support -Feel free to change your representative to the Nano Node Monitor Rep `xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj` to support further decentralization within the Nano network. In case of problems, please send an [issue](https://github.com/NanoTools/nanoNodeMonitor/issues). +Feel free to change your representative to the [Nano Node Monitor Rep](https://nanonode.ninja/account/xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj) `xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj` to support further decentralization within the Nano network. In case of problems, please send an [issue](https://github.com/NanoTools/nanoNodeMonitor/issues). Donations to the development of Nano Node Monitor are very welcome to: [xrb_1nanomon9uycemhgonue4twmcqmsu7oxw43maro8amj751ozpus8r8gsic48](https://www.nanode.co/account/xrb_1nanomon9uycemhgonue4twmcqmsu7oxw43maro8amj751ozpus8r8gsic48) From acc6ef42542c351b5b075eb615bef7feeba8930c Mon Sep 17 00:00:00 2001 From: dbachm123 Date: Mon, 30 Apr 2018 23:46:20 +0200 Subject: [PATCH 24/24] added node monitor rep account --- modules/constants.php | 3 +++ modules/footer.php | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/constants.php b/modules/constants.php index a077cd0..406315f 100644 --- a/modules/constants.php +++ b/modules/constants.php @@ -9,6 +9,9 @@ // URL to get version of latest release from github define('GITHUB_LATEST_API_URL', 'https://api.github.com/repos/NanoTools/nanoNodeMonitor/releases/latest'); +// rep account for Nano Node Monitor +define ('NODEMON_REP_ACCOUNT', 'xrb_1f56swb9qtpy3yoxiscq9799nerek153w43yjc9atoaeg3e91cc9zfr89ehj'); + // donation account for Nano Node Monitor development define ('NODEMON_DON_ACCOUNT', 'xrb_1nanomon9uycemhgonue4twmcqmsu7oxw43maro8amj751ozpus8r8gsic48'); diff --git a/modules/footer.php b/modules/footer.php index c71a4ce..b9c6c71 100644 --- a/modules/footer.php +++ b/modules/footer.php @@ -4,8 +4,12 @@

Made by Nano Tools.
+ Representative: + +

+

Donations to Nano Node Monitor: - +