LBRYCommunity/lbry.tech
1
0
Fork 0
Code Issues 13 Pull requests 8 Projects Releases Packages Wiki Activity

Launch-ish #163

Merged
kauffj merged 14 commits from launch into master 2018-10-01 17:21:11 +02:00
Conversation 1 Commits 14 Files changed 32 +2 -29
5 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a5137cce1c - Show all commits

1
app/client.js
View file

@ -37,7 +37,6 @@ function main() {
app.use(ssr()); app.use(ssr());
app.route("/", page(require("./views/home"))); app.route("/", page(require("./views/home")));
app.route("/api", page(require("./views/api")));
app.route("/api/*", page(require("./views/api"))); app.route("/api/*", page(require("./views/api")));
app.route("/*", page(require("./views/redirect"))); app.route("/*", page(require("./views/redirect")));

1
app/data/redirects.json
View file

@ -1,6 +1,7 @@
{ {
"/tour" : "/playground", "/tour" : "/playground",
"/play" : "/playground", "/play" : "/playground",
"/api" : "/resources",
"/api/protocol" : "/api/sdk", "/api/protocol" : "/api/sdk",
"/api/lbry" : "/api/sdk", "/api/lbry" : "/api/sdk",
"/api/lbrycrd" : "/api/blockchain", "/api/lbrycrd" : "/api/blockchain",

1
app/sass/pages/_api.scss
View file

@ -106,7 +106,6 @@
} }
} }
.api__content { .api__content {
float: right; float: right;
width: calc(100% - 200px); width: calc(100% - 200px);

2
app/sass/partials/_feature-links.scss
View file

@ -38,8 +38,8 @@ $width-feature-link: 320px;
} }
.feature-link__title { .feature-link__title {
top: 85px;
position: relative; position: relative;
top: 85px;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
z-index: 1; z-index: 1;

26
app/views/api.js
View file

@ -1,9 +1,5 @@
"use strict"; "use strict";
// P A C K A G E S
import asyncHtml from "choo-async/html"; import asyncHtml from "choo-async/html";
import dedent from "dedent"; import dedent from "dedent";
import redirectOr404 from "../modules/redirectOr404"; import redirectOr404 from "../modules/redirectOr404";
NetOpWibby commented 2018-10-01 16:11:20 +02:00 (Migrated from github.com)
Review
Copy link

Why is this here?

Why is this here?
kauffj commented 2018-10-01 16:40:38 +02:00 (Migrated from github.com)
Review
Copy link

this was left over from a conflicted rebased, removed

this was left over from a conflicted rebased, removed
@ -12,28 +8,6 @@ import headerSdk from "../components/api/header-sdk";
const fetch = require("make-fetch-happen").defaults({ cacheManager: "./cache" }); const fetch = require("make-fetch-happen").defaults({ cacheManager: "./cache" });
/*
module.exports = exports = state => parseApiFile(state.params.wildcard).then(response => asyncHtml`
<div class="api__header">
I am a walrus.
</div>
<div class="__slate">
<aside class="api__toc">
<div class="api__toc__search">
<input class="api__toc__search__field" id="input-search" placeholder="Search" type="search"/>
<div class="api__toc__search__clear" id="clear-search" title="Clear search query">&times;</div>
<ul class="api__toc__search__results"></ul>
</div>
<ul class="api__toc__items" id="toc" role="navigation">${createApiSidebar(response)}</ul>
</aside>
<section class="api__content" id="toc-content">${createApiContent(response)}</section>
</div>
`);
*/
module.exports = exports = state => parseApiFile(state.params.wildcard).then(response => { module.exports = exports = state => parseApiFile(state.params.wildcard).then(response => {
/* /*
state.lbry = { state.lbry = {