diff --git a/.gitignore b/.gitignore index bdb0e2d..e4f0f38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .DS_Store +npm-debug.log + _site dist @@ -8,6 +10,7 @@ dist .jekyll-metadata .idea/ + styles/.sass-cache styles/.sass-cache/* diff --git a/_data/wallets-collection.yml b/_data/wallets-collection.yml index 16d85c9..4347c17 100644 --- a/_data/wallets-collection.yml +++ b/_data/wallets-collection.yml @@ -1,29 +1,3 @@ -- name: "Dash Core Win/32 ZIP" - description: Dash Core QT Wallet (All Features incl IS, PS, ....) - logo_url: /assets/img/dash_circle_normal.png - os: win32 - type: desktop - vendor_id: dash_core - vendor_label: Dash Core - product_id: dash_core_win_32_zip - product_label: Dash Core Win/32 ZIP - product_security_label: "https://www.dash.org" - product_security_url: "https://www.dash.org" - product_website_label: Dash.org - product_website_url: "https://www.dash.org" - product_source_label: Github - product_source_url: "https://github.com/dashpay/dash" - links: - - - label: Download ZIP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip" - - - label: Hash File - url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" - - - label: PGP - url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc" - - name: "Dash Core Win/32 Installer" description: Dash Core QT Wallet (All Features incl IS, PS, ....) logo_url: /assets/img/dash_circle_normal.png @@ -50,6 +24,32 @@ label: PGP
 url: "https://www.dash.org/binaries/dash-0.12.0.58-win32-setup.exe.asc" +- name: "Dash Core Win/32 ZIP" + description: Dash Core QT Wallet (All Features incl IS, PS, ....) + logo_url: /assets/img/dash_circle_normal.png + os: win32 + type: desktop + vendor_id: dash_core + vendor_label: Dash Core + product_id: dash_core_win_32_zip + product_label: Dash Core Win/32 ZIP + product_security_label: "https://www.dash.org" + product_security_url: "https://www.dash.org" + product_website_label: Dash.org + product_website_url: "https://www.dash.org" + product_source_label: Github + product_source_url: "https://github.com/dashpay/dash" + links: + - + label: Download ZIP + url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip" + - + label: Hash File + url: "https://github.com/dashpay/dash/releases/download/v0.12.0.58/SHA256SUMS.asc" + - + label: PGP + url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc" + - name: "Dash Core Win/64 Installer" description: Dash Core QT Wallet (All Features incl IS, PS, ....) logo_url: /assets/img/dash_circle_normal.png diff --git a/_i18n/en/_posts/2017-01-31-TheDosandDonts.md b/_i18n/en/_posts/2017-01-31-TheDosandDonts.md index ca7536c..c0ecd60 100644 --- a/_i18n/en/_posts/2017-01-31-TheDosandDonts.md +++ b/_i18n/en/_posts/2017-01-31-TheDosandDonts.md @@ -2,7 +2,7 @@ author: tungfa layout: post image: TheDosandDonts.jpg -title: The Dos and Don'ts of Pushing Crypto: Evangelist John Bush +title: "The Dos and Don'ts of Pushing Crypto: Evangelist John Bush" --- While Bitcoin value and use continue to grow year after year, cryptocurrency is still a far cry from total main street adoption. diff --git a/_i18n/en/_posts/2017-01-31-ryan-video.md b/_i18n/en/_posts/2017-01-31-ryan-video.md index fff7d50..30797a2 100644 --- a/_i18n/en/_posts/2017-01-31-ryan-video.md +++ b/_i18n/en/_posts/2017-01-31-ryan-video.md @@ -2,6 +2,6 @@ author: tungfa layout: post image: -title: Future of DASH Cryptocurrency : Ryan Taylor (Director of Finance) +title: "Future of DASH Cryptocurrency : Ryan Taylor (Director of Finance)" --- diff --git a/_i18n/en/_posts/2017-02-01-copay.md b/_i18n/en/_posts/2017-02-01-copay.md index 54cc377..d49fcc5 100644 --- a/_i18n/en/_posts/2017-02-01-copay.md +++ b/_i18n/en/_posts/2017-02-01-copay.md @@ -2,7 +2,7 @@ author: tungfa layout: post image: CoPayWalletcopy.jpg -title: Copay-Dash Wallet (Testnet Only / RC 0.1) +title: "Copay-Dash Wallet (Testnet Only / RC 0.1)" --- I’m happy to announce a “Release Candidate” version of Copay-Dash, a variant of the Copay wallet which was originally developed by Bitpay. diff --git a/_i18n/pt/_posts/2017-02-01-copaypt.md b/_i18n/pt/_posts/2017-02-01-copaypt.md index 45db634..6f531f7 100644 --- a/_i18n/pt/_posts/2017-02-01-copaypt.md +++ b/_i18n/pt/_posts/2017-02-01-copaypt.md @@ -1,8 +1,8 @@ --- author: tungfa layout: post -image: CoPayWalletcopy.jpg -title: Copay-Dash Wallet (Testnet só / RC 0.1) +image: +title: "Copay-Dash Wallet (Testnet só / RC 0.1)" --- Estou feliz em anunciar uma versão “Release Candidate” da Copay-Dash, uma carteira Copay que foi desenvolvida pela Bitpay. Além das características habituais de outras carteiras, este aplicativo com todas as características possui: diff --git a/_includes/footer.html b/_includes/footer.html index 1a5b1f6..67c4df3 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,7 @@ {% t nav.get-dash %} diff --git a/_includes/hero/get-dash.html b/_includes/hero/get-dash.html index ecd3c57..ff8b5ab 100644 --- a/_includes/hero/get-dash.html +++ b/_includes/hero/get-dash.html @@ -16,12 +16,14 @@

{% t pages.get-dash.hero-heading %}

{% t pages.get-dash.hero-text %}

-
- - {% t pages.get-dash.hero-all-wallets-btn %} -
-

{% t pages.get-dash.hero-platform-not-detected %}

+
+

{% t pages.get-dash.hero-platform-not-detected %}

+
+ + {% t pages.get-dash.hero-all-wallets-btn %} +
+
{% t pages.get-dash.hero-guide-btn %} {% t pages.get-dash.hero-buy-btn %} diff --git a/_includes/wallets_js_data.html b/_includes/wallets_js_data.html index a98ab51..0de3a07 100644 --- a/_includes/wallets_js_data.html +++ b/_includes/wallets_js_data.html @@ -1,6 +1,6 @@ -{% assign desktop-os-collection = site.data.wallets-collection | where:"type","desktop" | group_by:"os" %} +{% assign wallet-collection-by-os = site.data.wallets-collection | group_by:"os" %} diff --git a/assets/img/merchants/Ecigarttes.jpg b/assets/img/merchants/Ecigarttes.jpg index 60e6c14..c306fe5 100644 Binary files a/assets/img/merchants/Ecigarttes.jpg and b/assets/img/merchants/Ecigarttes.jpg differ diff --git a/index.html b/index.html index 6adf5a9..a68604d 100644 --- a/index.html +++ b/index.html @@ -313,17 +313,18 @@ description: pages.home.description {% for post in site.posts limit:4 %}
-
- {% if post.image %} - - {% endif %} -
-
-

{{ post.title }}

-
{{ post.date | date: "%b %d, %Y" }}
-

{{ post.excerpt | strip_html | truncate: 250 }}

- Read More... -
+ +
+ {% if post.image %} + + {% endif %} +
+
+

{{ post.title }}

+
{{ post.date | date: "%b %d, %Y" }}
+

{{ post.excerpt | strip_html | truncate: 250 }}

+
+
{% endfor %} diff --git a/merchants/index.html b/merchants/index.html index 9e352c4..6574069 100644 --- a/merchants/index.html +++ b/merchants/index.html @@ -11,7 +11,7 @@ description: pages.merchants.description
-

{% t pages.merchants.cards-heading %}

+

{% t pages.merchants.cards-heading %}

    {% for merchant in site.data.merchants-cards %} @@ -24,7 +24,7 @@ description: pages.merchants.description
    -

    {% t pages.merchants.email-heading %}

    +

    {% t pages.merchants.email-heading %}

      {% for merchant in site.data.merchants-email %} @@ -37,7 +37,7 @@ description: pages.merchants.description
      -

      {% t pages.merchants.vpn-heading %}

      +

      {% t pages.merchants.vpn-heading %}

        {% for merchant in site.data.merchants-vpn %} @@ -50,7 +50,7 @@ description: pages.merchants.description
        -

        {% t pages.merchants.hosting-heading %}

        +

        {% t pages.merchants.hosting-heading %}

          {% for merchant in site.data.merchants-hosting %} @@ -63,7 +63,7 @@ description: pages.merchants.description
          -

          {% t pages.merchants.design-heading %}

          +

          {% t pages.merchants.design-heading %}

            {% for merchant in site.data.merchants-design %} @@ -76,7 +76,7 @@ description: pages.merchants.description
            -

            {% t pages.merchants.gifts-heading %}

            +

            {% t pages.merchants.gifts-heading %}

              {% for merchant in site.data.merchants-gifts %} @@ -89,7 +89,7 @@ description: pages.merchants.description
              -

              {% t pages.merchants.games-heading %}

              +

              {% t pages.merchants.games-heading %}

                {% for merchant in site.data.merchants-games %} @@ -102,7 +102,7 @@ description: pages.merchants.description
                -

                {% t pages.merchants.casinos-heading %}

                +

                {% t pages.merchants.casinos-heading %}

                  {% for merchant in site.data.merchants-casinos %} @@ -115,7 +115,7 @@ description: pages.merchants.description
                  -

                  {% t pages.merchants.stores-heading %}

                  +

                  {% t pages.merchants.stores-heading %}

                    {% for merchant in site.data.merchants-stores %} @@ -128,7 +128,7 @@ description: pages.merchants.description
                    -

                    {% t pages.merchants.metals-heading %}

                    +

                    {% t pages.merchants.metals-heading %}

                      {% for merchant in site.data.merchants-metals %} diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 9429b0a..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,45 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ] -2 info using npm@3.10.10 -3 info using node@v6.9.4 -4 verbose run-script [ 'prestart', 'start', 'poststart' ] -5 info lifecycle dash-website@1.0.0~prestart: dash-website@1.0.0 -6 silly lifecycle dash-website@1.0.0~prestart: no script for prestart, continuing -7 info lifecycle dash-website@1.0.0~start: dash-website@1.0.0 -8 verbose lifecycle dash-website@1.0.0~start: unsafe-perm in lifecycle true -9 verbose lifecycle dash-website@1.0.0~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Users/jezuzjezuz/Desktop/dash-website - tungfa/node_modules/.bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/MacGPG2/bin -10 verbose lifecycle dash-website@1.0.0~start: CWD: /Users/jezuzjezuz/Desktop/dash-website - tungfa -11 silly lifecycle dash-website@1.0.0~start: Args: [ '-c', 'npm run build -s && npm run watch' ] -12 silly lifecycle dash-website@1.0.0~start: Returned: code: 1 signal: null -13 info lifecycle dash-website@1.0.0~start: Failed to exec start script -14 verbose stack Error: dash-website@1.0.0 start: `npm run build -s && npm run watch` -14 verbose stack Exit status 1 -14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:255:16) -14 verbose stack at emitTwo (events.js:106:13) -14 verbose stack at EventEmitter.emit (events.js:191:7) -14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:40:14) -14 verbose stack at emitTwo (events.js:106:13) -14 verbose stack at ChildProcess.emit (events.js:191:7) -14 verbose stack at maybeClose (internal/child_process.js:877:16) -14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5) -15 verbose pkgid dash-website@1.0.0 -16 verbose cwd /Users/jezuzjezuz/Desktop/dash-website - tungfa -17 error Darwin 16.4.0 -18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start" -19 error node v6.9.4 -20 error npm v3.10.10 -21 error code ELIFECYCLE -22 error dash-website@1.0.0 start: `npm run build -s && npm run watch` -22 error Exit status 1 -23 error Failed at the dash-website@1.0.0 start script 'npm run build -s && npm run watch'. -23 error Make sure you have the latest version of node.js and npm installed. -23 error If you do, this is most likely a problem with the dash-website package, -23 error not with npm itself. -23 error Tell the author that this fails on your system: -23 error npm run build -s && npm run watch -23 error You can get information on how to open an issue for this project with: -23 error npm bugs dash-website -23 error Or if that isn't available, you can get their info via: -23 error npm owner ls dash-website -23 error There is likely additional logging output above. -24 verbose exit [ 1, true ] diff --git a/src/js/get-dash.js b/src/js/get-dash.js index 9e1d999..cce834f 100644 --- a/src/js/get-dash.js +++ b/src/js/get-dash.js @@ -5,18 +5,32 @@ ;(function ($) { 'use strict'; + var _ = window._ || null, + walletsCollectionByOs = window.walletsCollectionByOs || undefined, + platform = window.platform || undefined + ; + $(document).ready(function () { - initDownloadButton(); + _ = window._ || null, + walletsCollectionByOs = window.walletsCollectionByOs || undefined, + platform = window.platform || undefined + ; + + if (typeof(walletsCollectionByOs) !== 'undefined' && walletsCollectionByOs) { + initDownloadButton(); + } }); function getBestWalletMatch() { - var _walletsCollection = _.flatten(walletsCollectionByOs.map(function (walletGroupCollection){ + var _walletsCollection = _.flatten(walletsCollectionByOs.map(function (walletGroupCollection) { return walletGroupCollection.items; })), - _family = platform.os.family, + _family = platform && platform.os && platform.os.family, _vendor = 'dash_core', + _productId = null, _walletOs = 'win32', - _type = 'desktop' + _type = 'desktop', + detectedWallet = {} ; switch (true) { @@ -36,51 +50,62 @@ _type = 'desktop'; break; case /^ios/gi.test(_family): - _walletOs = 'ios' + _walletOs = 'ios'; _vendor = ''; _type = ''; break; case /(linux|centos|debian|fedora|freebsd|gentoo|haiku|kubuntu|openbsd|red hat|suse|ubuntu|cygwin)/gi.test(_family): _walletOs = 'linux'; + _productId = platform.os.architecture === 32 ? 'dash_core_linux_32' : 'dash_core_linux_64'; _vendor = 'dash_core'; _type = 'desktop'; break; default: + // do nothing; break; } - var detectedWallet = _.find(_walletsCollection,{os:_walletOs,vendor_id:_vendor,type:_type}); + if (_productId) { + detectedWallet = _.find(_walletsCollection,{ product_id: _productId}); + } else { + detectedWallet = _.find(_walletsCollection,{ os: _walletOs, vendor_id: _vendor, type: _type}); + } + console.info('detectedWallet: ' , detectedWallet, { os: _walletOs, vendor_id: _vendor, type: _type}); return detectedWallet; } - function onDownloadClick (event) { + function onDownloadClick(event) { var _dlButton = $(event.target), - _linkTo = _dlButton.data('detectedWallet').links[0].url; + _linkTo = _dlButton.data('detectedWallet').links[0].url ; - window.open(_linkTo,"_blank"); + + window.open(_linkTo,'_blank'); } - function initDownloadButton(){ + function initDownloadButton() { var _downloadButton = $('#download-detected-platform-button'), _detectedWallet = getBestWalletMatch(), - _notDetectedMessage = $('#platform-not-detected'); + _notDetectedMessage = $('#platform-not-detected'), + _platform = platform ; - if (_detectedWallet) { - _downloadButton.html(_detectedWallet.links[0].label+': '+_detectedWallet.name) - .attr({ - title: platform.os.toString() - }) - .data('detectedWallet',_detectedWallet) - .click(onDownloadClick) - .show() - ; - _notDetectedMessage.hide(); - } else { - _downloadButton.hide(); - _notDetectedMessage.show(); + if (_downloadButton && _downloadButton.length > 0) { + if (_detectedWallet && _platform) { + _downloadButton.html(_detectedWallet.links[0].label + ': ' + _detectedWallet.name) + .attr({ + title: _platform.os.toString() + }) + .data('detectedWallet',_detectedWallet) + .click(onDownloadClick) + .show() + ; + _notDetectedMessage.hide(); + } else { + _downloadButton.hide(); + _notDetectedMessage.show(); + } } return _downloadButton; } diff --git a/src/js/platform.js b/src/js/platform.js index 156be0e..a151823 100644 --- a/src/js/platform.js +++ b/src/js/platform.js @@ -1,3 +1,5 @@ +/* eslint-disable */ + /*! * Platform.js * Copyright 2014-2016 Benjamin Tan @@ -6,7 +8,6 @@ */ ;(function() { 'use strict'; - console.log('platform.js'); /** Used to determine if values are of the language type `Object`. */ var objectTypes = { diff --git a/src/scss/_merchant.scss b/src/scss/_merchant.scss index 53cb91e..1d698db 100644 --- a/src/scss/_merchant.scss +++ b/src/scss/_merchant.scss @@ -12,7 +12,7 @@ $m: 'member'; } &__image-wrapper { @include overflow-image-wrapper(); - padding-bottom: ((105/140)*100%); + padding-bottom: ((106/140)*100%); } &__image { diff --git a/update/index.html b/update/index.html index 0de02ae..9f62f6d 100755 --- a/update/index.html +++ b/update/index.html @@ -37,7 +37,7 @@ description: pages.update.description

                      {% tmd pages.update.merchants-text %}

                      - {% t pages.update.merchants-btn%} + {% t pages.update.merchants-btn%}
                    @@ -125,8 +125,8 @@ description: pages.update.description
                @@ -227,7 +227,7 @@ description: pages.update.description {% tmd pages.update.launching-text %} - {% t pages.update.launching-btn %} + {% t pages.update.launching-btn %}
              Dash Evolution