From c324bed4f4c30a1006e66834323549da7a2f364e Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Mon, 24 Sep 2018 14:31:05 -0400 Subject: [PATCH 1/8] Update schema.md --- documents/resources/schema.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/documents/resources/schema.md b/documents/resources/schema.md index af38a02..d7c946d 100644 --- a/documents/resources/schema.md +++ b/documents/resources/schema.md @@ -1,8 +1,15 @@ # Schema +The schema defines the structure of the data that is stored in claims in the LBRY blockchain. It has several goals: + +- **Extensibility**. The schema could grow to encompass thousands of fields for dozens of types of content. It should be easy to modify the schema while maintaining backward compatibility. Blockchain data is permanent and cannot be migrated, so any selected data structure will have to be maintained forever. +- **Compactness**. Blockchain space is expensive. Data should be stored as compactly as possible. +- **Cross-language Interop**. These definitions will be used by many projects written in different languages. + + ## [Claim](https://github.com/lbryio/lbryschema/blob/master/lbryschema/proto/claim.proto) -A `Claim` is the toplevel schema for everything that is published to the LBRY blockchain. +A `Claim` is the toplevel schema for everything that is published to the blockchain. ```protobuf message Claim { -- 2.45.2 From eed2e057014c7ee726223f91ab8504d9a5163ed6 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Mon, 24 Sep 2018 14:45:12 -0400 Subject: [PATCH 2/8] Update glossary.md add claim sequence, other minor changes. --- documents/glossary.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/documents/glossary.md b/documents/glossary.md index 03fed37..ed0e586 100644 --- a/documents/glossary.md +++ b/documents/glossary.md @@ -36,9 +36,9 @@ Chainquery provides a SQLized view of the LBRY blockchain. The model of Chainque Informal name for a portion of a *transaction output* that is returned to a sender as a "change" after spending that output. Since *transaction outputs* cannot be partially spent, one can spend 1 BTC out of 3 BTC output only be creating two new outputs: a "payment" output with 1 BTC sent to a payee address, and a "change" output with remaining 2 BTC (minus *transaction fees*) sent to the payer's addresses. -### Channel Claim / Signature +### Channel Claim Signature -Creating a channel claim certificate allows you to group and identify claims based on an identity. A certificate is used to sign the claims and ensure uniqueness along with the claim ID. See [channel signing](https://github.com/lbryio/lbryschema/blob/master/docs/signing.md) for more information +Creating a channel claim certificate allows you to group and identify claims based on an identity. A certificate is used to sign the claims and ensure uniqueness along with the claim ID. See [channel signing](https://lbry.tech/resources/signing-claim) for more information ### Claim @@ -48,6 +48,10 @@ A claim (ClaimTrie) is the data structure which LBRY uses to store claims to nam When creating a channel claim or publishing content onto the LBRY blockchain, a small amount (or more) LBC must be deposited to reserve the name space in the claimtrie. See our [naming documentation](https://lbry.io/faq/naming) for more information. +### Claim Sequence + +The claim sequence provides a way to tell which order a claim was created at a particular claim name and enables claim resolutions via this modifier. If someone had the first claim at lbry://one, you could always reference your claim as lbry://one:1. See [URI documentation](https://lbry.tech/resources/uri) for more details. + ### Claim Support A special type of transaction that includes claim information, a LBC address and a LBC value. Supports to one's own address increase the bid value of a claim and can be revoked anytime. Supports to an outside address also increase the value, but can only be revoked by the receiver (tip mechanism). -- 2.45.2 From 07acceb0fb221a61d0659cf1cbe9911f8264caea Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Tue, 25 Sep 2018 01:46:01 +0700 Subject: [PATCH 3/8] update location,, i saw 404 error on the footer --- app/components/edit-link.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/edit-link.js b/app/components/edit-link.js index dab8e1f..e594ba3 100644 --- a/app/components/edit-link.js +++ b/app/components/edit-link.js @@ -20,7 +20,7 @@ export default function (pagePath) { switch(pagePath) { case "": - githubUrl = `${githubUrl}/views/pages/home.js`; + githubUrl = `${githubUrl}/app/views/home.js`; break; case "/resources": @@ -28,7 +28,7 @@ export default function (pagePath) { break; case "/tour": - githubUrl = `${githubUrl}/views/partials/tour.js`; + githubUrl = `${githubUrl}/app/components/tour.js`; break; default: -- 2.45.2 From b61a4a2f2c073722e7e8111f1f7b84b5960e58f6 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Tue, 25 Sep 2018 02:06:10 +0700 Subject: [PATCH 4/8] fix link 404 error --- app/components/feature-links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/feature-links.js b/app/components/feature-links.js index b406f4a..d53a527 100644 --- a/app/components/feature-links.js +++ b/app/components/feature-links.js @@ -10,7 +10,7 @@ import Component from "choo/component"; const links = [ // TODO: Update images { - href: "https://discord.gg/YjYbwhS", + href: "https://chat.lbry.io", image: "//static.simpledesktops.com/static/images/sd-bg.png", title: "Join us in chat" }, @@ -40,7 +40,7 @@ const links = [ // TODO: Update images title: "Get a job" }, { - href: "https://lbry.io/twitter", + href: "https://twitter.com/lbryio", title: "Twitter" } ]; -- 2.45.2 From 1215c731eec722f7803f88757b42105a05bf6202 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Mon, 24 Sep 2018 15:18:42 -0400 Subject: [PATCH 5/8] Update glossary.md --- documents/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documents/glossary.md b/documents/glossary.md index ed0e586..6ca0dc9 100644 --- a/documents/glossary.md +++ b/documents/glossary.md @@ -50,7 +50,7 @@ When creating a channel claim or publishing content onto the LBRY blockchain, a ### Claim Sequence -The claim sequence provides a way to tell which order a claim was created at a particular claim name and enables claim resolutions via this modifier. If someone had the first claim at lbry://one, you could always reference your claim as lbry://one:1. See [URI documentation](https://lbry.tech/resources/uri) for more details. +The claim sequence provides a way to determine which order a claim was created at a particular claim name and enables claim resolution via this modifier. If someone had the first claim at lbry://one, anyone could reference that claim as `lbry://one:1`. See [URI documentation](https://lbry.tech/resources/uri) for more details. ### Claim Support -- 2.45.2 From 6435c7547df0b2fa2c9b22f7b35fa90e9f7b5841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=96?= Date: Mon, 24 Sep 2018 14:40:53 -0500 Subject: [PATCH 6/8] Closes #148 --- app/components/feature-links.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/feature-links.js b/app/components/feature-links.js index b406f4a..c571c96 100644 --- a/app/components/feature-links.js +++ b/app/components/feature-links.js @@ -11,32 +11,32 @@ import Component from "choo/component"; const links = [ // TODO: Update images { href: "https://discord.gg/YjYbwhS", - image: "//static.simpledesktops.com/static/images/sd-bg.png", + image: "http://static.simpledesktops.com/static/images/sd-bg.png", title: "Join us in chat" }, { href: "https://lbry.io/developer", - image: "//static.simpledesktops.com/uploads/desktops/2017/02/28/GeoShapes_2880x1800.png", + image: "http://static.simpledesktops.com/uploads/desktops/2017/02/28/GeoShapes_2880x1800.png", title: "Join the developer email list" }, { href: "https://lbry.io/meet", - image: "//static.simpledesktops.com/uploads/desktops/2016/12/05/Untitled-1-03-01.png", + image: "http://static.simpledesktops.com/uploads/desktops/2016/12/05/Untitled-1-03-01.png", title: "Host a meet-up" }, { href: "https://www.reddit.com/r/lbry", - image: "//static.simpledesktops.com/uploads/desktops/2016/08/28/Wind-Vector-resize.png", + image: "http://static.simpledesktops.com/uploads/desktops/2016/08/28/Wind-Vector-resize.png", title: "Reddit" }, { href: "https://lbry.fund", - image: "//static.simpledesktops.com/uploads/desktops/2015/08/20/Sunset_by_Banned.png", + image: "http://static.simpledesktops.com/uploads/desktops/2015/08/20/Sunset_by_Banned.png", title: "Get funding for a project" }, { href: "https://lbry.io/join-us", - image: "//static.simpledesktops.com/uploads/desktops/2015/09/25/Siri.png", + image: "http://static.simpledesktops.com/uploads/desktops/2015/09/25/Siri.png", title: "Get a job" }, { -- 2.45.2 From 4ad784da2f6e2020be8aeb78391268d17e7b0d36 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 24 Sep 2018 16:58:03 -0400 Subject: [PATCH 7/8] turn home features section into a component --- app/components/link-grid.js | 22 +++++++++++++ app/sass/bundle.scss | 1 + app/sass/pages/_home.scss | 54 ------------------------------- app/sass/partials/_link-grid.scss | 53 ++++++++++++++++++++++++++++++ app/views/home.js | 26 +++++++-------- 5 files changed, 88 insertions(+), 68 deletions(-) create mode 100644 app/components/link-grid.js create mode 100644 app/sass/partials/_link-grid.scss diff --git a/app/components/link-grid.js b/app/components/link-grid.js new file mode 100644 index 0000000..b68570d --- /dev/null +++ b/app/components/link-grid.js @@ -0,0 +1,22 @@ +"use strict"; + +import html from "choo/html"; + +function returnLinkTemplate(title, description, destination, label) { + return ` +
  • +

    ${title}

    +

    ${description}

    + ${label} +
    • + `; +} + +export default (links) => { + const renderedLinks = links.map((link) => returnLinkTemplate(link.title, link.description, link.destination, link.label)); + return html` +
      + ${renderedLinks.join("\n")} +
    + `; +} diff --git a/app/sass/bundle.scss b/app/sass/bundle.scss index 3e8215f..c5804cf 100755 --- a/app/sass/bundle.scss +++ b/app/sass/bundle.scss @@ -16,6 +16,7 @@ "partials/footer", "partials/github-feed", "partials/glossary", + "partials/link-grid", "partials/navigation", "partials/mission-statement", "partials/modal", diff --git a/app/sass/pages/_home.scss b/app/sass/pages/_home.scss index d178ef5..8b79cfd 100644 --- a/app/sass/pages/_home.scss +++ b/app/sass/pages/_home.scss @@ -63,60 +63,6 @@ .features { grid-area: features; - - .home__features { - align-content: center; - border-bottom: 1px solid rgba($black, 0.05); - display: flex; - flex-flow: row wrap; - list-style-type: none; - padding-top: 2rem; - padding-bottom: 2rem; - } - - .home__feature { - position: relative; - text-align: center; - vertical-align: top; - - @media (min-width: 651px) { - width: 50%; - } - - @media (max-width: 650px) { - width: 100%; - - &:first-of-type { - padding-bottom: 1rem; - } - - &:last-of-type { - padding-top: 1rem; - } - } - } - - - - .home__feature__title { - font-size: 2rem; - margin-bottom: 0.5rem; - } - - .home__feature__description { - font-size: 1rem; - left: 10%; - margin-bottom: 1rem; - position: relative; - width: 80%; - } - - .home__feature__cta { - @extend .__button-black; - display: inline-block; - font-size: 1rem; - position: relative; - } } .intro, diff --git a/app/sass/partials/_link-grid.scss b/app/sass/partials/_link-grid.scss new file mode 100644 index 0000000..952cd11 --- /dev/null +++ b/app/sass/partials/_link-grid.scss @@ -0,0 +1,53 @@ +.home__features { + align-content: center; + border-bottom: 1px solid rgba($black, 0.05); + display: flex; + flex-flow: row wrap; + list-style-type: none; + padding-top: 2rem; + padding-bottom: 2rem; +} + +.home__feature { + position: relative; + text-align: center; + vertical-align: top; + + @media (min-width: 651px) { + width: 50%; + } + + @media (max-width: 650px) { + width: 100%; + + &:first-of-type { + padding-bottom: 1rem; + } + + &:last-of-type { + padding-top: 1rem; + } + } +} + + + +.home__feature__title { + font-size: 2rem; + margin-bottom: 0.5rem; +} + +.home__feature__description { + font-size: 1rem; + left: 10%; + margin-bottom: 1rem; + position: relative; + width: 80%; +} + +.home__feature__cta { + @extend .__button-black; + display: inline-block; + font-size: 1rem; + position: relative; +} diff --git a/app/views/home.js b/app/views/home.js index 028bf14..b24b74b 100644 --- a/app/views/home.js +++ b/app/views/home.js @@ -5,7 +5,7 @@ // P A C K A G E import html from "choo/html"; - +import linkGrid from "../components/link-grid"; // E X P O R T @@ -22,19 +22,17 @@ module.exports = exports = () => html`
    -
      -
    • -

      New to LBRY?

      -

      Learn how LBRY works with 3 easy examples

      - Take the Tour -
      • - -
    • -

      Want to contribute?

      -

      Help make LBRY better!

      - Explore our repos -
      • -
    + ${linkGrid([{ + title: "New to LBRY?", + description: "Learn how LBRY works with 3 easy examples", + destination: "/tour", + label: "Take the Tour" + }, { + title: "New to LBRY?", + description: "Learn how LBRY works with 3 easy examples", + destination: "/tour", + label: "Take the Tour" + }])}
    -- 2.45.2 From 3ba7557d0170fad9d7c49593511d3238bf8052c7 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 24 Sep 2018 17:14:50 -0400 Subject: [PATCH 8/8] fix and refactor names --- app/components/link-grid.js | 12 ++++++------ app/sass/partials/_link-grid.scss | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/components/link-grid.js b/app/components/link-grid.js index b68570d..9e0d42c 100644 --- a/app/components/link-grid.js +++ b/app/components/link-grid.js @@ -4,10 +4,10 @@ import html from "choo/html"; function returnLinkTemplate(title, description, destination, label) { return ` -
  • -

    ${title}

    -

    ${description}

    - ${label} +
  • +

    ${title}

    +

    ${description}

    + ${label}
    • `; } @@ -15,8 +15,8 @@ function returnLinkTemplate(title, description, destination, label) { export default (links) => { const renderedLinks = links.map((link) => returnLinkTemplate(link.title, link.description, link.destination, link.label)); return html` -
      - ${renderedLinks.join("\n")} +
        + ${renderedLinks}
      `; } diff --git a/app/sass/partials/_link-grid.scss b/app/sass/partials/_link-grid.scss index 952cd11..8f4d04f 100644 --- a/app/sass/partials/_link-grid.scss +++ b/app/sass/partials/_link-grid.scss @@ -1,4 +1,4 @@ -.home__features { +.link-grid { align-content: center; border-bottom: 1px solid rgba($black, 0.05); display: flex; @@ -8,7 +8,7 @@ padding-bottom: 2rem; } -.home__feature { +.link-grid__link { position: relative; text-align: center; vertical-align: top; @@ -32,12 +32,12 @@ -.home__feature__title { +.link-grid__title { font-size: 2rem; margin-bottom: 0.5rem; } -.home__feature__description { +.link-grid__description { font-size: 1rem; left: 10%; margin-bottom: 1rem; @@ -45,7 +45,7 @@ width: 80%; } -.home__feature__cta { +.link-grid__cta { @extend .__button-black; display: inline-block; font-size: 1rem; -- 2.45.2