From 79b6d98f7dac4bb90698b9fe58bf634338b62342 Mon Sep 17 00:00:00 2001 From: Madiator2011 Date: Mon, 16 Aug 2021 12:21:58 +0200 Subject: [PATCH] Fixed branding and env file --- .env.defaults | 42 ++++++++++++------------- README.md | 85 +++------------------------------------------------ 2 files changed, 26 insertions(+), 101 deletions(-) diff --git a/.env.defaults b/.env.defaults index c7f381e..4e4aae4 100644 --- a/.env.defaults +++ b/.env.defaults @@ -1,30 +1,31 @@ # Copy this file to .env to make modifications # Base config -MATOMO_URL=https://analytics.lbry.com/ -MATOMO_ID=4 +SDK_API_PATH=https://api.madiator.com/ +MATOMO_URL=https://analytics.madiator.com/ +MATOMO_ID=1 WEBPACK_WEB_PORT=9090 WEBPACK_ELECTRON_PORT=9091 WEB_SERVER_PORT=1337 -LBRY_WEB_API=https://api.lbry.tv -LBRY_WEB_STREAMING_API=https://cdn.lbryplayer.xyz -LBRY_WEB_BUFFER_API=https://collector-service.api.lbry.tv/api/v1/events/video +LBRY_API_URL=https://disabled/ +LBRY_WEB_API=https://api.madiator.com/ +LBRY_WEB_STREAMING_API=https://cdn.madiator.com:/ +LBRY_WEB_BUFFER_API=https://disabled COMMENT_SERVER_API=https://comments.lbry.com/api/v2 WELCOME_VERSION=1.0 - # Custom Site info -DOMAIN=lbry.tv -URL=https://lbry.tv +DOMAIN=madiator.com +URL=https://madiator.com THUMBNAIL_CDN_URL=https://image-optimizer.vanwanet.com/?address= # UI -SITE_TITLE=lbry.tv -SITE_NAME=lbry.tv -SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland. -SITE_HELP_EMAIL=help@lbry.com -LOGO_TITLE=lbry.tv +SITE_TITLE=madiator.com +SITE_NAME=madiator.com +SITE_DESCRIPTION=Madiator P2P powered instance. +SITE_HELP_EMAIL= +LOGO_TITLE=Madiator.com - P2P Powered LBRY Instance SIMPLE_SITE=false -SHOW_ADS=true +SHOW_ADS=false YRBL_HAPPY_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-happy/7aa50a7e5adaf48691935d55e45d697547392929/839d9a YRBL_SAD_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd ENABLE_COMMENT_REACTIONS=true @@ -37,10 +38,10 @@ CHANNEL_STAKED_LEVEL_LIVESTREAM=5 WEB_PUBLISH_SIZE_LIMIT_GB=4 # OG -OG_TITLE_SUFFIX=| lbry.tv -OG_HOMEPAGE_TITLE=lbry.tv +OG_TITLE_SUFFIX=| madiator.com +OG_HOMEPAGE_TITLE=madiator.com OG_IMAGE_URL= -SITE_CANONICAL_URL=https://lbry.tv +SITE_CANONICAL_URL=https://madiator.com # LOCALE DEFAULT_LANGUAGE=en @@ -49,7 +50,7 @@ DEFAULT_LANGUAGE=en # Additional settings for below are found in ui/constants/settings and are for # preventing user settings from applying to custom sites without overwriting them. # UNSYNCED_SETTINGS='theme dark_mode_times automatic_dark_mode_enabled' -KNOWN_APP_DOMAINS=lbry.tv,lbry.lat,odysee.com +KNOWN_APP_DOMAINS=lbry.tv,lbry.lat,odysee.com,madiator.com # Custom Content # If the following is true, copy custom/homepage.example.js to custom/homepage.js and modify @@ -57,8 +58,7 @@ CUSTOM_HOMEPAGE=false # Add channels to auto-follow on first run AUTO_FOLLOW_CHANNELS=lbry://@lbry#3fda836a92faaceedfe398225fb9b2ee2ed1f01a # Add up to 2 sidebar links: -# PINNED_URI_1=@Lbrylatam#2/Integracionesporseguridad#4 -# PINNED_LABEL_1=LBRY LATAM +PINNED_URI_1=@Madiator2011:e +PINNED_LABEL_1=Madiator2011 Chanel # PINNED_URI_2=$/discover?t=lbrytvpaidbeta&fee_amount=>0&claim_type=stream&channel_ids=5af39f818f668d8c00943c9326c5201c4fe3c423,cda9c4e92f19d6fe0764524a2012056e06ca2055,760da3ba3dd85830a843beaaed543a89b7a367e7,40c36948f0da072dcba3e4833e90f71e16de78be,e8f68563d242f6ac9784dcbc41dd86c28a9391d6,7236fc5d2783ea7314d9076ae6c8a250e3992d1a,cf7792c2a37d0d76aaaff84aff0b99a8c791429d,8316ac90764fedf3147799b7b81a6575a9cc398e,8627af93c1a1219150f06b698f4b33e6ed2f1c1e,8972a1bd06de5186e5e89292b05aac8aaa817791,c5b0b17838df2f6c31162f64d55f60f34ae8bfc6,f576d5dba905fc179de880c3fe3eb3281ea74f59,97dd77c93c9603cbb2583f3589f7f5a6c92baa43,f399d873e0c37cf24de9569b5f22bbb30a5c6709,dba870d0620d41b2b9a152c961e0c06cf875ccfc,ca1fd651c9d14bf2e5088bb2aa0146ee7aeb2ae0,50ad846a4b1543b847bf3fdafb7b45f6b2f5844c,e09ff5abe9fb44dd0dd0576894a6db60a6211603,7b6f7517f6b816827d076fa0eaad550aa315a4e7,2068452c41d8da3bd68961335da0072a99258a1a,5da63df97c8255ae94a88940695b8471657dd5a1,3645cf2f5d0bdac0523f945be1c3ff60758f7845,4da85b12244839d6368b9290f1619ff9514ab2a8,4ad942982e43326c7700b1b6443049b3cfd82161,55304f219244abf82f684f759cc0c7769242f3b4,8f42e5b592bb7f7a03f4a94a86a41b1236bb099f,e2a014d885a48f5be2dc6409610996337312facb,c18996ca488753f714d36d4654715927c1d7f9c2,ebc4214424cfa683a7046e1f794fea1e44788d84,06b6d6d6a893fb589ec2ded948f5122856921ed5,07e4546674268fc0222b2ca22d31d0549dc217ee,060940e41973d4f7f16d72a2733138e931c35f41,f8d6eccd887c9cebd36b1d42aa349279b7f5c3ed,68098b8426f967b8d04cc566348b5c128823219e,2bfe6cdb24a21bdc1b76fb7c416edd50e9e85945,1f9bb08bfa2259629f4aaa9ed40f97e9a41b6fa1,2f20148495612946675fe1c8ea99171e4d950b81,bc6938fa1e09e840056c2e831abf9664f397c472,2a6194792beac5130641e932b5ac6e5a99b5ca4f,185ba2bd547a5e4a77d29fe6c1484f47db5e058f,29cc7f6081268eaa5b3f2946e0cd0b952a94812c,49389450b1241f5d8f4c8c4271a3eb56bba33965,ffdc62ac2f7549398d3aca9d2119e83d80d588d5,d7a4d2808074b0c55d6b239f69d90e7a4930f943,d58aa4a0b2f6c2504c3abce8de3f1afb71800acc,77ae23dc7eb8a75609881d4548a79e4935a89d37,f79bce8a60fbece671f6265adc39f6469f3b9b8c,051995fdf0af634e4911704057a551e9392e62b1 # PINNED_LABEL_2=Paid Beta - diff --git a/README.md b/README.md index 697098e..9b01e8b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ - +# madiator.com - https://madiator.com -# LBRY App - https://lbry.tv - -This repo contains the UI code that powers the official LBRY desktop app, as well as lbry.tv. The LBRY app is a graphical browser for the decentralized content marketplace provided by the +This repo contains the UI code that powers the official LBRY desktop app, as well as madiator.com (fork of LBRY.tv). The LBRY app is a graphical browser for the decentralized content marketplace provided by the [LBRY](https://lbry.com) protocol. It is essentially the [lbry daemon](https://github.com/lbryio/lbry) bundled with a UI using [Electron](https://electron.atom.io/). @@ -10,68 +8,9 @@ This repo contains the UI code that powers the official LBRY desktop app, as wel npm - - - - - Build Status - - - GitHub contributors - - -

- - forthebadge - - - forthebadge - -

![App GIF](https://spee.ch/ba/lbry-joule.gif) -## Table of Contents - -1. [Install](#install) -2. [Usage](#usage) -3. [Running from Source](#running-from-source) -4. [Contributing](#contributing) -5. [License](#license) -6. [Security](#security) -7. [Contact](#contact) - -## Install - -[![Windows](https://img.shields.io/badge/Windows-Install-blue)](https://lbry.com/get/lbry.exe) -[![Linux](https://img.shields.io/badge/Linux-Install-blue)](https://lbry.com/get/lbry.deb) -[![MacOS](https://img.shields.io/badge/MacOS-Install-blue)](https://lbry.com/get/lbry.dmg) - -We provide installers for Windows, macOS (v10.12.4, Sierra, or greater), and Debian-based Linux. See community maintained builds section for alternative Linux installations. - -| | Windows | macOS | Linux | -| --------------------- | --------------------------------------------- | --------------------------------------------- | --------------------------------------------- | -| Latest Stable Release | [Download](https://lbry.com/get/lbry.exe) | [Download](https://lbry.com/get/lbry.dmg) | [Download](https://lbry.com/get/lbry.deb) | -| Latest Pre-release | [Download](https://lbry.com/get/lbry.pre.exe) | [Download](https://lbry.com/get/lbry.pre.dmg) | [Download](https://lbry.com/get/lbry.pre.deb) | - -Our [releases page](https://github.com/lbryio/lbry-desktop/releases) also contains the latest -release, pre-releases, and past builds. -_Note: If the deb fails to install using the Ubuntu Software Center, install manually via `sudo dpkg -i `. You'll need to run `sudo apt-get install -f` if this is the first time installing it to install dependencies_ - -To install from source or make changes to the application, continue to the next section below. - -**Community maintained** builds for Arch Linux and Flatpak are available, see below. These installs will need to be updated manually as the in-app update process only supports Debian installs at this time. -_Note: If coming from a deb install, the directory structure is different and you'll need to [migrate data](https://lbry.com/faq/backup-data)._ - -| | Flatpak | Arch | Nixpkgs | ARM/ARM64 | -| -------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | ------------------------------------------- | -| Latest Release | [FlatHub Page](https://flathub.org/apps/details/io.lbry.lbry-app) | [AUR Package](https://aur.archlinux.org/packages/lbry-app-bin/) | [Nixpkgs](https://search.nixos.org/packages?channel=unstable&show=lbry&query=lbry) | [Build Guide](https://lbry.tv/@LBRYarm:5) | -| Maintainers | [@kcSeb](https://keybase.io/kcseb) | [@kcSeb](https://keybase.io/kcseb)/[@TimurKiyivinski](https://github.com/TimurKiyivinski) | [@Enderger](https://github.com/enderger) | [@Madiator2011](https://github.com/kodxana) | - -## Usage - -Double click the installed application to interact with the LBRY network. - ## Running from Source You can run the web version (lbry.tv), the electron app, or both at the same time. @@ -82,8 +21,8 @@ You can run the web version (lbry.tv), the electron app, or both at the same tim - [Node.js](https://nodejs.org/en/download/) (v10 required) - [Yarn](https://yarnpkg.com/en/docs/install) -1. Clone (or [fork](https://help.github.com/articles/fork-a-repo/)) this repository: `git clone https://github.com/lbryio/lbry-desktop` -2. Change directory into the cloned repository: `cd lbry-desktop` +1. Clone (or [fork](https://help.github.com/articles/fork-a-repo/)) this repository: `git clone https://gitlab.com/romanrex19/madiator.com` +2. Change directory into the cloned repository: `cd madiator.com` 3. Install the dependencies: `yarn` #### Run the electron app @@ -96,7 +35,7 @@ You can run the web version (lbry.tv), the electron app, or both at the same tim `yarn dev:web` -- This uses webpack-dev-server and includes hot-reloading. If you want to debug the [web server we use in production](https://github.com/lbryio/lbry-desktop/blob/master/src/platforms/web/server.js) you can run `yarn dev:web-server`. This starts a server at `localhost:1337` and does not include hot reloading. +- This uses webpack-dev-server and includes hot-reloading. If you want to debug the [web server we use in production](https://gitlab.com/romanrex19/madiator.com/blob/master/src/platforms/web/server.js) you can run `yarn dev:web-server`. This starts a server at `localhost:1337` and does not include hot reloading. #### Customize the web app @@ -158,21 +97,7 @@ If the app isn't building, or `yarn xxx` commands aren't working you may need to If you _really_ think something might have gone wrong, you can force your repo to clear everything that doesn't match the repo with `git reset --hard HEAD && git clean -fxd && git pull -r` -## Contributing - -We :heart: contributions from everyone and contributions to this project are encouraged, and compensated. We welcome [bug reports](https://github.com/lbryio/lbry-desktop/issues/), [bug fixes](https://github.com/lbryio/lbry-desktop/pulls) and feedback is always appreciated. For more details, see [CONTRIBUTING.md](CONTRIBUTING.md). - -## [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/lbryio/lbry-desktop/issues) [![GitHub contributors](https://img.shields.io/github/contributors/lbryio/lbry-desktop.svg)](https://GitHub.com/lbryio/lbry-desktop/graphs/contributors/) - ## License This project is MIT licensed. For the full license, see [LICENSE](LICENSE). -## Security - -We take security seriously. Please contact security@lbry.com regarding any security issues. Our PGP key is [here](https://lbry.com/faq/pgp-key) if you need it. Previous versions up to v0.50.2 were signed by [Sean Yesmunt](https://keybase.io/seanyesmunt/key.asc). -New Releases are signed by [Jessop Breth](https://keybase.io/jessopb/key.asc). - -## Contact - -The primary contact for this project is [@jessopb](https://github.com/jessopb).