Merge pull request #925 from lbryio/staging

cuts release from staging

cli/configure.js

@@ -13,7 +13,8 @@ let thumbnailChannelDefault = '@thumbnails';
 let thumbnailChannel = '';
 let thumbnailChannelId = '';
 
-const createConfigFile = (fileName, configObject, topSecret) => {  // siteConfig.json , siteConfig
+const createConfigFile = (fileName, configObject, topSecret) => {
+  // siteConfig.json , siteConfig
   const fileLocation = topSecret
     ? Path.resolve(__dirname, `../site/private/${fileName}`)
     : Path.resolve(__dirname, `../site/config/${fileName}`);
@@ -39,15 +40,8 @@ try {
   siteConfig = require('./defaults/siteConfig.json');
 }
 const {
-  details: {
-    port,
-    title,
-    host,
-  },
-  publishing: {
-    uploadDirectory,
-    channelClaimBidAmount: channelBid,
-  },
+  details: { port, title, host },
+  publishing: { uploadDirectory, channelClaimBidAmount: channelBid },
 } = siteConfig;
 
 let lbryConfig;
@@ -80,12 +74,12 @@ try {
 
 // authConfig
 let randSessionKey = pwGenerator.generate({
-  length : 20,
+  length: 20,
   numbers: true,
 });
 
 let randMasterPass = pwGenerator.generate({
-  length : 20,
+  length: 20,
   numbers: true,
 });
 
@@ -94,7 +88,7 @@ try {
   authConfig = require('../site/private/authConfig.json');
 } catch (error) {
   authConfig = {
-    sessionKey    : randSessionKey,
+    sessionKey: randSessionKey,
     masterPassword: randMasterPass,
   };
 }
@@ -111,7 +105,7 @@ inquirer
     console.log('\nRetrieving your primary claim address from LBRY...');
     return axios
       .post('http://localhost:5279', {
-        method: 'wallet_list',
+        method: 'address_list',
       })
       .then(response => {
         if (response.data) {
@@ -125,7 +119,8 @@ inquirer
           return;
         }
         throw new Error('No data received from lbrynet');
-      }).catch(error => {
+      })
+      .catch(error => {
         throw error;
       });
   })
@@ -159,7 +154,10 @@ inquirer
               }
               console.log('name:', foundChannel.name);
               console.log('claim_id:', foundChannel.claim_id);
-              if (foundChannel.name === thumbnailChannel && foundChannel.claim_id === thumbnailChannelId) {
+              if (
+                foundChannel.name === thumbnailChannel &&
+                foundChannel.claim_id === thumbnailChannelId
+              ) {
                 console.log('No update to existing thumbnail config required\n');
               } else {
                 console.log(`Replacing thumbnail channel in config...`);
@@ -174,11 +172,12 @@ inquirer
           return false;
         }
         throw new Error('No data received from lbrynet');
-      }).catch(error => {
+      })
+      .catch(error => {
         throw error;
       });
   })
-  .then((thumbnailChannelAlreadyExists) => {
+  .then(thumbnailChannelAlreadyExists => {
     // exit if a channel already exists, skip this step
     if (thumbnailChannelAlreadyExists) {
       return;
@@ -190,7 +189,7 @@ inquirer
         method: 'channel_new',
         params: {
           channel_name: thumbnailChannelDefault,
-          amount      : channelBid,
+          amount: channelBid,
         },
       })
       .then(response => {
@@ -207,7 +206,8 @@ inquirer
           return;
         }
         throw new Error('No data received from lbrynet');
-      }).catch(error => {
+      })
+      .catch(error => {
         throw error;
       });
   })
@@ -232,11 +232,15 @@ inquirer
     createConfigFile('authConfig.json', authConfig, true);
   })
   .then(() => {
-    console.log('\nYou\'re all done!');
-    console.log('\nIt\'s a good idea to BACK UP YOUR MASTER PASSWORD \nin "/site/private/authConfig.json" so that you don\'t lose \ncontrol of your channel.');
+    console.log("\nYou're all done!");
+    console.log(
+      '\nIt\'s a good idea to BACK UP YOUR MASTER PASSWORD \nin "/site/private/authConfig.json" so that you don\'t lose \ncontrol of your channel.'
+    );
 
     console.log('\nNext step: run "npm run start" to build and start your server!');
-    console.log('If you want to change any settings, you can edit the files in the "/site" folder.');
+    console.log(
+      'If you want to change any settings, you can edit the files in the "/site" folder.'
+    );
     process.exit(0);
   })
   .catch(error => {

cli/defaults/siteConfig.json

@@ -23,7 +23,7 @@
   "publishing": {
     "primaryClaimAddress": null,
     "uploadDirectory": "/home/lbry/Uploads",
-    "lbrynetHome": "/home/lbry",
+    "lbrynetHome": "/CURRENTLYUNUSED",
     "thumbnailChannel": null,
     "thumbnailChannelId": null,
     "additionalClaimAddresses": [],
@@ -36,20 +36,75 @@
     "publishingChannelWhitelist": [],
     "channelClaimBidAmount": "0.1",
     "fileClaimBidAmount": "0.01",
+    "fileSizeLimits": {
+      "image": 50000000,
+      "video": 50000000,
+      "audio": 50000000,
+      "text": 50000000,
+      "model": 50000000,
+      "application": 50000000,
+      "customByContentType": {
+        "application/octet-stream": 50000000
+      }
+    },
     "maxSizeImage": 10000000,
     "maxSizeGif": 50000000,
     "maxSizeVideo": 50000000
   },
   "serving": {
     "markdownSettings": {
-      "skipHtml": true,
-      "privilegedDisallowedTypesDescriptions": ["Image"],
-      "privilegedDisallowedTypesMain": [],
-      "publicDisallowedTypesDescriptions": ["Image"],
-      "publicDisallowedTypesMain": []
+      "skipHtmlMain": true,
+      "escapeHtmlMain": true,
+      "skipHtmlDescriptions": true,
+      "escapeHtmlDescriptions": true,
+      "allowedTypesMain": [],
+      "allowedTypesDescriptions": [],
+      "allowedTypesExample": [
+        "see react-markdown docs",
+        "root",
+        "text",
+        "break",
+        "paragraph",
+        "emphasis",
+        "strong",
+        "thematicBreak",
+        "blockquote",
+        "delete",
+        "link",
+        "image",
+        "linkReference",
+        "imageReference",
+        "table",
+        "tableHead",
+        "tableBody",
+        "tableRow",
+        "tableCell",
+        "list",
+        "listItem",
+        "heading",
+        "inlineCode",
+        "code",
+        "html",
+        "parsedHtml"
+      ],
+      "disallowedTypesMain": [],
+      "disallowedTypesDescriptions": ["image", "html"],
+      "disallowedTypesExample": ["image", "html"]
     },
     "customFileExtensions": {
-      "application/example-type": "example"
+      "application/x-troff-man": ".man",
+      "application/x-troff-me": ".me",
+      "application/x-mif": ".mif",
+      "application/x-troff-ms": ".ms",
+      "application/x-troff": ".roff",
+      "application/x-python-code": ".pyc",
+      "text/x-python": ".py",
+      "application/x-pn-realaudio": ".ram",
+      "application/x-sgml": ".sgm",
+      "model/stl": ".stl",
+      "image/pict": ".pct",
+      "text/xul": ".xul",
+      "text/x-go": "go"
     }
   },
   "startup": {

client/scss/_asset-display.scss

@@ -5,7 +5,7 @@
 }
 
 .asset-document {
-  width: 100%;
+  max-width: 1000px;
   padding: $thin-padding;
   height: fit-content;
   box-sizing: border-box;
@@ -16,15 +16,17 @@
 }
 
 .asset-title {
+  max-width: 1000px;
   padding-bottom: $thin-padding;
   text-align: center;
 }
 
 .asset-image, .asset-video {
-  max-height: 95vh;
-  max-width: 95vw;
+  max-height: 75vh;
+  max-width: 85vw;
   object-fit: contain;
   object-position: center;
+  background: black;
 }
 
 /*below must die if this is intended to be shareable component! it also probably doesn't need to be*/
@@ -111,12 +113,15 @@
   margin: $primary-padding;
   width: 100%;
 
+  @media (min-width: $break-point-tablet) {
+    padding: $primary-padding;
+  }
   @media (max-width: $break-point-tablet) {
-    margin: $primary-padding $secondary-padding;
+    padding: $tertiary-padding;
   }
 
   @media (max-width: $break-point-mobile) {
-    margin: $primary-padding 0;
+    margin: $tertiary-padding;
   }
 }
 
@@ -125,4 +130,5 @@
   padding-top: $primary-padding;
   margin-top: $primary-padding;
   color: $grey;
+  text-align: center;
 }

client/scss/_markdown.scss

@@ -1,22 +1,26 @@
 .markdown-preview {
-  // Headers
+
+  margin: $tertiary-padding 0px;
+
   h1,
   h2,
-  h3,
-  h4,
-  h5,
-  h6 {
+  h3 {
     font-size: inherit;
+    font-weight: inherit;
+    margin: $tertiary-padding 0px;
+  }
+
+  h4, h5, h6 {
+    font-size: $text-large;
     font-weight: 600;
-    margin-bottom: $tertiary-padding;
-    padding-top: $tertiary-padding;
+    margin: $tertiary-padding 0px;
   }
 
   // Paragraphs
   p {
     font-size: 1.15rem;
-    margin-bottom: $tertiary-padding;
     white-space: pre-line;
+    margin: $tertiary-padding 0px;
 
     svg {
       width: 1rem;
@@ -29,10 +33,20 @@
   }
 
   blockquote {
-    border-radius: 8px;
     background: $blockquote-background;
     padding: $tertiary-padding;
     min-width: 60%;
+    margin: $tertiary-padding;
+    p:first-child{
+      margin-top: 0px;
+    }
+    p:last-child {
+      margin-bottom: 0px;
+    }
+
+    div {
+      display: none;
+    }
   }
 
   // Strikethrough text
@@ -42,10 +56,10 @@
   // Tables
   table {
     width: 100%;
-    margin-bottom: 1.2rem;
     background-color: $base-color;
     border-spacing: 0;
     border: .5px solid $chrome-color;
+    margin: $tertiary-padding 0px;
 
     tr {
       td,
@@ -77,9 +91,20 @@
     margin-top: $tertiary-padding;
     padding: $secondary-padding;
     object-fit: scale-down;
-    max-width: 100%;
-    border: $subtle-border;
     box-sizing: border-box;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 90vw;
+  }
+
+  iframe {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 90vw;
+    margin-top: $tertiary-padding 0px;
+    margin-bottom: $tertiary-padding 0px;
   }
 
   // Horizontal Rule
@@ -114,7 +139,7 @@
 
   a {
     color: $primary-color;
-    display: inline-block;
+    display: inline;
   }
 
   // Lists