Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pre production #31

Open
wants to merge 5 commits into
base: production
Choose a base branch
from
Open

Pre production #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
612ccc7
Merge pull request #36 from blaize-tech/develop
Koroqe Aug 17, 2020
7866699
Fix dashboard menu
Aug 17, 2020
60a9583
Merge pull request #37 from Central-Software-Bureau/develop
Koroqe Aug 18, 2020
13b64fb
Fix boostedProposals text and comment superfluous table
StKostyantin Aug 19, 2020
4f01aea
Merge pull request #39 from blaize-tech/develop
Koroqe Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 38 additions & 38 deletions dao-web-app/src/components/Dao/DaoDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class DaoDashboard extends React.Component<IProps, IState> {

<div className={css.pageHead}>
<h1>{t("sidebar.dashboard")}</h1>

<div>
<a className={classNames({
[css.redButton]: true,
Expand Down Expand Up @@ -316,45 +316,45 @@ class DaoDashboard extends React.Component<IProps, IState> {
</InfiniteScroll>

{/* <Sticky enabled top={50} innerZ={10000}> */}
<div className={css.daoHistoryHeader}>
{t('sidebar.history')}
</div>
{/*<div className={css.daoHistoryHeader}>*/}
{/* {t('sidebar.history')}*/}
{/*</div>*/}
{/* </Sticky> */}

<InfiniteScroll
dataLength={proposals.length} //This is important field to render the next data
next={fetchMore}
hasMore={hasMoreToLoad}
loader=""
style={{overflow: "visible"}}
endMessage={
<p style={{textAlign: "center"}}>
<b>&mdash;</b>
</p>
}
>
{ proposals.length === 0 ?
<span>
{t("dashboard.notPassedProposals")}</span> :
<table className={css.proposalHistoryTable}>
<thead>
<tr className={css.proposalHistoryTableHeader}>
<th>{t('dashboard.proposedBy')}</th>
<th>{t('dashboard.endDate')}</th>
<th>{t('dashboard.plugin')}</th>
<th>{t('dashboard.title')}</th>
<th>{t('dashboard.votes')}</th>
<th>{t('dashboard.predictions')}</th>
<th>{t('dashboard.status')}</th>
<th>{t('dashboard.actions')}</th>
</tr>
</thead>
<tbody>
{proposalsHTML}
</tbody>
</table>
}
</InfiniteScroll>
{/*<InfiniteScroll*/}
{/* dataLength={proposals.length} //This is important field to render the next data*/}
{/* next={fetchMore}*/}
{/* hasMore={hasMoreToLoad}*/}
{/* loader=""*/}
{/* style={{overflow: "visible"}}*/}
{/* endMessage={*/}
{/* <p style={{textAlign: "center"}}>*/}
{/* <b>&mdash;</b>*/}
{/* </p>*/}
{/* }*/}
{/*>*/}
{/* { proposals.length === 0 ?*/}
{/* <span>*/}
{/* {t("dashboard.notPassedProposals")}</span> :*/}
{/* <table className={css.proposalHistoryTable}>*/}
{/* <thead>*/}
{/* <tr className={css.proposalHistoryTableHeader}>*/}
{/* <th>{t('dashboard.proposedBy')}</th>*/}
{/* <th>{t('dashboard.endDate')}</th>*/}
{/* <th>{t('dashboard.plugin')}</th>*/}
{/* <th>{t('dashboard.title')}</th>*/}
{/* <th>{t('dashboard.votes')}</th>*/}
{/* <th>{t('dashboard.predictions')}</th>*/}
{/* <th>{t('dashboard.status')}</th>*/}
{/* <th>{t('dashboard.actions')}</th>*/}
{/* </tr>*/}
{/* </thead>*/}
{/* <tbody>*/}
{/* {proposalsHTML}*/}
{/* </tbody>*/}
{/* </table>*/}
{/* }*/}
{/*</InfiniteScroll>*/}
</div>
);
}
Expand Down
8 changes: 4 additions & 4 deletions dao-web-app/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"SNGLS": "SNGLS",
"SGT": "SGT",
"snglsDAO": "snglsDAO",
"news": {
"news": "News",
"resources": {
"resources": "Resources",
"twitter": "Twitter",
"medium": "Medium",
"weibo": "WeiBo"
Expand Down Expand Up @@ -87,7 +87,7 @@
"comingSoon": "COMING SOON",
"validationFee": "Validation Fee",
"minimumAmount": "Minimum amount paid to validators.",
"boostedProposals": "Boosted proposals (3)",
"boostedProposals": "Proposals",
"notPassedProposals": "This DAO has not passed any proposals yet.",
"notPassedProposalsLink": "DAO&apos;s installed schemes",
"proposedBy": "Proposed by",
Expand Down Expand Up @@ -566,7 +566,7 @@
"iAccept": "I Accept",
"fullProfile": "Full Profile",
"yourReputation": "your reputation: ",
"en": "ENG",
"en": "English",
"tchin": "繁體中文",
"schin": "简体中文",
"Protocol Parameters": "Protocol Parameters",
Expand Down
6 changes: 3 additions & 3 deletions dao-web-app/src/i18n/sc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"SNGLS": "SNGLS",
"SGT": "SGT",
"snglsDAO": "snglsDAO",
"news": {
"news": "社群动向",
"resources": {
"resources": "社群动向",
"twitter": "Twitter",
"medium": "Medium",
"weibo": "微博"
Expand Down Expand Up @@ -87,7 +87,7 @@
"comingSoon": "敬请期待",
"validationFee": "验证费用：SNGLS",
"minimumAmount": "给付验证者的最低收费。",
"boostedProposals": "助推提案 (3)",
"boostedProposals": "提案",
"notPassedProposals": "目前未有通过任何提案。",
"notPassedProposalsLink": "DAO现已安装的方案(Scheme)",
"proposedBy": "发起者",
Expand Down
6 changes: 3 additions & 3 deletions dao-web-app/src/i18n/tc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"SNGLS": "SNGLS",
"SGT": "SGT",
"snglsDAO": "snglsDAO",
"news": {
"news": "社群動向",
"resources": {
"resources": "社群動向",
"twitter": "Twitter",
"medium": "Medium",
"weibo": "微博"
Expand Down Expand Up @@ -87,7 +87,7 @@
"comingSoon": "敬請期待",
"validationFee": "驗証費用：SNGLS",
"minimumAmount": "給付驗証者的最低收費。",
"boostedProposals": "助推提案 (3)",
"boostedProposals": "提案",
"notPassedProposals": "目前未有通過任何提案。",
"notPassedProposalsLink": "DAO現已安裝的方案(Scheme)",
"proposedBy": "發起者",
Expand Down
25 changes: 6 additions & 19 deletions dao-web-app/src/layouts/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,28 +917,19 @@ h4 {
}
}

&.langSelector {
min-width: 96px;
&.redSelector {
position: relative;
transform: translateY(11px);
padding: 0;
padding: 4px 7px !important;

.menu__link {
min-width: 84px;
min-height: 36px;
display: block;
background: #D40D26;
box-shadow: 0 0 20px #e4112a;
border-radius: 30px;
padding: 6px 18px;
top: -6px;


&:before {
right: 18px;
}
}

& > ul {
max-width: 84px;
padding: 6px 10px !important;
text-align: center;
}
}

Expand Down Expand Up @@ -1019,10 +1010,6 @@ h4 {
ul {
li {
padding: 10px 15px;

&.langSelector {
padding: 0;
}
}
}
}
Expand Down
17 changes: 8 additions & 9 deletions dao-web-app/src/layouts/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ function LangSwitcher() {
}

return (
<li className={css.submenu + ' ' + css.langSelector}>
<span className={css.menu__link}>{lang}</span>
<li className={css.submenu}>
<span>{lang}</span>
<ul>
{langs.filter((it: any)=> it.title !== lang).map((it: any)=> (
<li onClick={() => setLanguage(it)}><a href="#">{it.title}</a></li>
Expand Down Expand Up @@ -270,7 +270,6 @@ class Header extends React.Component<IProps, null> {
</div>
<div className={navigationClass}>
<ul>
<li><a href="https://app.snglsdao.io/">{t("header.dao")}</a></li>
<li><a href="https://forum.snglsdao.io/" target="_blank">{t('header.forum')}</a></li>
<li className={css.submenu}><span>{t('header.consumerProtection.consumer')}</span>
<ul>
Expand Down Expand Up @@ -308,18 +307,18 @@ class Header extends React.Component<IProps, null> {
</li>
</ul>
</li>
<li className={css.submenu}><span>{t('header.news.news')}</span>
<li className={css.submenu}><span>{t('header.resources.resources')}</span>
<ul>
<li><a href="https://twitter.com/SNGLSDAO" target="_blank">{t('header.news.twitter')}</a></li>
<li><a href="https://medium.com/singulardtv" target="_blank">{t('header.news.medium')}</a></li>
<li><a href="https://weibo.com/snglsdao" target="_blank">{t('header.news.weibo')}</a></li>
<li><a href="https://twitter.com/SNGLSDAO" target="_blank">{t('header.resources.twitter')}</a></li>
<li><a href="https://medium.com/singulardtv" target="_blank">{t('header.resources.medium')}</a></li>
<li><a href="https://weibo.com/snglsdao" target="_blank">{t('header.resources.weibo')}</a></li>
</ul>
</li>
<li><a href="https://snglsdao.io/#contacts">{t('header.sub')}</a></li>
<LangSwitcher/>
<li><a href="https://github.com/SingularDTV/snglsdao-pm" target="_blank"><svg className={css.gitIcon} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M5.156 12.438c0-.063-.062-.126-.156-.126s-.156.063-.156.126c0 .062.062.124.156.093.094 0 .156-.031.156-.094zm-.968-.157c0 .063.062.156.156.156a.15.15 0 00.187-.062c0-.063-.031-.125-.125-.156-.093-.031-.187 0-.218.062zm1.406-.031c-.094 0-.157.063-.157.156 0 .063.094.094.188.063s.156-.063.125-.125c0-.063-.094-.125-.156-.094zm2.031-12C3.312.25 0 3.563 0 7.875c0 3.469 2.156 6.438 5.281 7.5.407.063.532-.188.532-.375v-1.938s-2.188.47-2.657-.937c0 0-.344-.906-.844-1.125 0 0-.718-.5.032-.5 0 0 .781.063 1.219.813.687 1.218 1.812.874 2.28.656.063-.5.25-.844.5-1.063-1.75-.187-3.53-.437-3.53-3.437 0-.875.25-1.282.75-1.844-.094-.219-.344-1.031.093-2.125.625-.188 2.156.844 2.156.844.625-.188 1.282-.25 1.938-.25.688 0 1.344.062 1.969.25 0 0 1.5-1.063 2.156-.844.438 1.094.156 1.906.094 2.125.5.563.812.969.812 1.844 0 3-1.844 3.25-3.594 3.437.282.25.532.719.532 1.469 0 1.031-.031 2.344-.031 2.594 0 .219.156.469.562.375 3.125-1.031 5.25-4 5.25-7.469C15.5 3.562 11.969.25 7.625.25zM3.031 11.031c-.062.031-.031.125 0 .188.063.031.125.062.188.031.031-.031.031-.125-.031-.188-.063-.03-.126-.062-.157-.03zm-.344-.25c-.03.063 0 .094.063.125s.125.031.156-.031c0-.031-.031-.063-.094-.094-.062-.031-.093-.031-.124 0zm1 1.125c-.03.031-.03.125.063.188.063.062.156.094.188.031.03-.031.03-.125-.032-.188-.062-.062-.156-.093-.219-.03zm-.343-.469c-.063.032-.063.126 0 .188.062.063.125.094.187.063.031-.032.031-.126 0-.188-.062-.063-.125-.094-.187-.063z"></path>
</svg>{t('header.git')}</a></li>
<LangSwitcher/>

<li className={css.redSelector}><a className={css.menu__link} href="https://app.snglsdao.io/">{t("header.dao")}</a></li>


</ul>
Expand Down
8 changes: 4 additions & 4 deletions dao-web-app/src/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ export const settings = {
web3ConnectProviderOptions: {},
},
rinkeby: {
graphqlHttpProvider: process.env.ARC_GRAPHQLHTTPPROVIDER || "https://api.thegraph.com/subgraphs/name/gofsd/sub",
graphqlWsProvider: process.env.ARC_GRAPHQLWSPROVIDER || "wss://api.thegraph.com/subgraphs/name/gofsd/sub",
graphqlHttpProvider: process.env.ARC_GRAPHQLHTTPPROVIDER || "https://api.thegraph.com/subgraphs/name/obaranni-blaize/s4",
graphqlWsProvider: process.env.ARC_GRAPHQLWSPROVIDER || "wss://api.thegraph.com/subgraphs/name/obaranni-blaize/s4",
graphqlSubscribeToQueries: false,
web3Provider: process.env.ARC_WEB3PROVIDER || "wss://rinkeby.infura.io/ws/v3/ef306a43234747eb9c087e5301ed9363",
web3ProviderRead: process.env.ARC_WEB3PROVIDERREAD || "wss://rinkeby.infura.io/ws/v3/ef306a43234747eb9c087e5301ed9363",
Expand Down Expand Up @@ -229,8 +229,8 @@ export const settings = {
web3ConnectProviderOptions: getWeb3ConnectProviderOptions("xdai"),
},
main: {
graphqlHttpProvider: process.env.ARC_GRAPHQLHTTPPROVIDER || "https://api.thegraph.com/subgraphs/name/obaranni-blaize/s2",
graphqlWsProvider: process.env.ARC_GRAPHQLWSPROVIDER || "wss://api.thegraph.com/subgraphs/name/obaranni-blaize/s2",
graphqlHttpProvider: process.env.ARC_GRAPHQLHTTPPROVIDER || "https://api.thegraph.com/subgraphs/name/obaranni-blaize/s5",
graphqlWsProvider: process.env.ARC_GRAPHQLWSPROVIDER || "wss://api.thegraph.com/subgraphs/name/obaranni-blaize/s5",
graphqlSubscribeToQueries: false,
web3Provider: process.env.ARC_WEB3PROVIDER || "wss://mainnet.infura.io/ws/v3/e0cdf3bfda9b468fa908aa6ab03d5ba2",
web3ProviderRead: process.env.ARC_WEB3PROVIDERREAD || "wss://mainnet.infura.io/ws/v3/e0cdf3bfda9b468fa908aa6ab03d5ba2",
Expand Down