Merge pull request #457 from Lezek123/references-to-older-chains

References to older chains

README.md

@@ -4,7 +4,7 @@
 
 A Portal into the Joystream network. Provides a view and interaction layer from a browser.
 
-This can be accessed as a hosted application via [https://testnet.joystream.org/acropolis/pioneer](https://testnet.joystream.org/acropolis/pioneer).
+This can be accessed as a hosted application via [https://testnet.joystream.org](https://testnet.joystream.org).
 
 ## overview
 

packages/apps-routing/src/index.ts

@@ -14,7 +14,7 @@ import members from './joy-members';
 import proposals from './joy-proposals';
 import roles from './joy-roles';
 import storageRoles from './joy-storage';
-// import pages from './joy-pages';
+import pages from './joy-pages';
 
 // import template from './123code';
 import accounts from './accounts';
@@ -55,7 +55,9 @@ const routes: Routes = ([] as Routes).concat(
   storage,
   extrinsics,
   sudo,
-  settings
+  settings,
+  null,
+  pages
 );
 const setup: Routing = {
   default: 'staking',

packages/apps/src/SideBar/index.tsx

@@ -9,7 +9,7 @@ import './SideBar.css';
 
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { Responsive } from 'semantic-ui-react';
+import { Responsive, Icon, SemanticICONS } from 'semantic-ui-react';
 import routing from '@polkadot/apps-routing';
 import { Button, ChainImg, Menu, media } from '@polkadot/react-components';
 import { classes } from '@polkadot/react-components/util';
@@ -18,8 +18,6 @@ import translate from '../translate';
 import Item from './Item';
 import NetworkModal from '../modals/Network';
 
-// import { SemanticICONS } from 'semantic-ui-react';
-
 interface Props extends I18nProps /*ApiProps,*/ {
   className?: string;
   collapse: () => void;
@@ -29,22 +27,22 @@ interface Props extends I18nProps /*ApiProps,*/ {
   toggleMenu: () => void;
 }
 
-// type OuterLinkProps = {
-//   url: string;
-//   title: string;
-//   icon?: SemanticICONS;
-// };
-
-// function OuterLink({ url, title, icon = 'external alternate' }: OuterLinkProps) {
-//   return (
-//     <Menu.Item className="apps--SideBar-Item">
-//       <a className="apps--SideBar-Item-NavLink" href={url} target="_blank">
-//         <Icon name={icon} />
-//         <span className="text">{title}</span>
-//       </a>
-//     </Menu.Item>
-//   );
-// }
+type OuterLinkProps = {
+  url: string;
+  title: string;
+  icon?: SemanticICONS;
+};
+
+function OuterLink({ url, title, icon = 'external alternate' }: OuterLinkProps) {
+  return (
+    <Menu.Item className="apps--SideBar-Item">
+      <a className="apps--SideBar-Item-NavLink" href={url} target="_blank">
+        <Icon name={icon} />
+        <span className="text">{title}</span>
+      </a>
+    </Menu.Item>
+  );
+}
 
 /*
 interface State {
@@ -165,6 +163,10 @@ function SideBar({
                   <Menu.Divider hidden key={index} />
                 )
             )}
+            <Menu.Divider hidden />
+            <OuterLink url='https://joystream.org/testnet' title='Tokenomics' />
+            <OuterLink url='https://blog.joystream.org/constantinople-incentives/' title='Earn Monero' />
+            <Menu.Divider hidden />
           </div>
           <Responsive
             minWidth={SIDEBAR_MENU_THRESHOLD}

packages/joy-pages/src/md/Privacy.md

@@ -14,7 +14,7 @@ Relevant to the Privacy Policy and Cookie Policy are the following terms:
 
 
 # Privacy Policy
-**Last updated on the 17th of March 2020**
+**Last updated on the 19th of May 2020**
 
 ## 1. Agreement to the Policy
 By using any of Our Software, the User are accepting this Privacy Policy. If you are acting on behalf of another company or an employer, you must have the rights to act on their behalf. The Privacy Policy is not extended to any of our newsletters, where Users are bound by the [privacy policy](https://mailchimp.com/legal/privacy/) of [Mailchimp](https://mailchimp.com/).
@@ -28,8 +28,6 @@ This Privacy Policy may be changed at the sole discretion of Company. If any mat
 All data written to the Blockchain, is implicitly collected not only by Company, but also anyone else in the world that is running the Full Node locally, or accessed via the App or a third party.
 This includes, but is not limited to, Content hashes, Membership profile, Memo field, and any other way a User can record data on the Blockchain.
 
-When using the [faucet](https://faucet.joystream.org/) ("Faucet") subpage of the Website, Company will record the IP address behind every new request for tokens. This data will be deleted every 14 days.
-
 Company uses [Google Analytics](https://marketingplatform.google.com/about/analytics/), with IP anonymization, to collect statistics on Website and the version of App hosted by us. All customizable data sharing settings are turned off to improve the privacy of Users.
 
 Company will not sell your data for advertising, or other purposes.

packages/joy-settings/src/defaults/endpoints.ts

@@ -5,7 +5,7 @@
 import { Option } from '../types';
 
 // type ChainName = 'alexander' | 'edgeware' | 'edgewareTest' | 'flamingFir' | 'kusama';
-type ChainName = 'rome';
+type ChainName = 'testnet';
 
 interface ChainData {
   chainDisplay: string;
@@ -22,17 +22,17 @@ interface PoviderData {
 }
 
 // we use this to give an ordering to the chains available
-const ORDER_CHAINS: ChainName[] = ['rome'];
+const ORDER_CHAINS: ChainName[] = ['testnet'];
 
 // we use this to order the providers inside the chains
 const ORDER_PROVIDERS: ProviderName[] = ['joystream_org'];
 
 // some suplementary info on a per-chain basis
 const CHAIN_INFO: Record<ChainName, ChainData> = {
-  rome: {
+  testnet: {
     chainDisplay: 'Joystream',
     logo: 'joystream',
-    type: 'Rome Testnet'
+    type: 'Current Testnet'
   },
 };
 
@@ -41,12 +41,12 @@ const PROVIDERS: Record<ProviderName, PoviderData> = {
   'joystream_org': {
     providerDisplay: 'Joystream.org',
     nodes: {
-      'rome' : 'wss://rome-rpc-endpoint.joystream.org:9944/'
+      'testnet' : 'wss://rome-rpc-endpoint.joystream.org:9944/'
     }
   }
 };
 
-export const ENDPOINT_DEFAULT = PROVIDERS.joystream_org.nodes.rome;
+export const ENDPOINT_DEFAULT = PROVIDERS.joystream_org.nodes.testnet;
 
 export const ENDPOINTS: Option[] = ORDER_CHAINS.reduce((endpoints: Option[], chainName): Option[] => {
   const { chainDisplay, logo, type } = CHAIN_INFO[chainName];