From 5b9120e4c18c2ed504b314dd9589e0826e883d0f Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Wed, 14 Oct 2020 16:12:41 -0400 Subject: [PATCH 1/5] add new sidebar links - 1.0 (#2188) * add the new links * add https * bump version to 1.0.0 * URLS as env variables * rename env vars, ultimate xdao url * rename again * fix menu item wrapping --- package-lock.json | 2 +- package.json | 2 +- src/layouts/SidebarMenu.scss | 7 +++++-- src/layouts/SidebarMenu.tsx | 22 +++++++++++++++++++--- webpack.base.config.js | 6 ++++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae9b5f993..6ca1d76fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "alchemy-client", - "version": "0.10.17", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2eada9200..a1a2ff264 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alchemy-client", - "version": "0.10.17", + "version": "1.0.0", "description": "An app for collaborative networks (DAOs), based on the DAO stack.", "author": "DAOstack", "license": "GPL-3.0", diff --git a/src/layouts/SidebarMenu.scss b/src/layouts/SidebarMenu.scss index 2b3d5b20c..f132824b9 100644 --- a/src/layouts/SidebarMenu.scss +++ b/src/layouts/SidebarMenu.scss @@ -212,7 +212,10 @@ } .siteLinksWrapper { - height: 270px; + min-height: 315px; + &.testNet { + min-height: 270px; + } left: 0; width: 100%; border-top: 2px solid rgba(78, 137, 208, 1); @@ -354,7 +357,7 @@ } .sidebarWrapper.noDAO { - width: 125px; + width: 127px; .menuContent { background-color: transparent; diff --git a/src/layouts/SidebarMenu.tsx b/src/layouts/SidebarMenu.tsx index b433f40b0..97123d6b0 100644 --- a/src/layouts/SidebarMenu.tsx +++ b/src/layouts/SidebarMenu.tsx @@ -9,7 +9,7 @@ import FollowButton from "components/Shared/FollowButton"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { generate } from "geopattern"; import Analytics from "lib/analytics"; -import { baseTokenName, ethErrorHandler, formatTokens, genName, getExchangesList, supportedTokens, fromWei, ethBalance, linkToEtherScan, standardPolling } from "lib/util"; +import { baseTokenName, ethErrorHandler, formatTokens, genName, getExchangesList, supportedTokens, fromWei, ethBalance, linkToEtherScan, standardPolling, targetedNetwork } from "lib/util"; import { parse } from "query-string"; import * as React from "react"; import { matchPath, Link, RouteComponentProps } from "react-router-dom"; @@ -54,7 +54,7 @@ const mapStateToProps = (state: IRootState, ownProps: IExternalProps): IExternal class SidebarMenu extends React.Component { - constructor(props: IProps) { + constructor (props: IProps) { super(props); } @@ -213,12 +213,15 @@ class SidebarMenu extends React.Component { clearfix: true, }); + const network = targetedNetwork(); + const testNet = !((network === "main") || (network === "xdai")); + return (
{this.props.daoAvatarAddress && this.props.data ? this.daoMenu() : ""} -
+