This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Rework dapps list #7206
Merged
Merged
Rework dapps list #7206
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* Copyright 2015-2017 Parity Technologies (UK) Ltd. | ||
/* This file is part of Parity. | ||
/* | ||
/* Parity is free software: you can redistribute it and/or modify | ||
/* it under the terms of the GNU General Public License as published by | ||
/* the Free Software Foundation, either version 3 of the License, or | ||
/* (at your option) any later version. | ||
/* | ||
/* Parity is distributed in the hope that it will be useful, | ||
/* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
/* GNU General Public License for more details. | ||
/* | ||
/* You should have received a copy of the GNU General Public License | ||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
.card { | ||
padding: 0.25em; | ||
|
||
.content { | ||
background: white; | ||
box-sizing: content-box; | ||
min-height: 100px; | ||
|
||
.title { | ||
min-height: 1em; | ||
padding-left: 72px; | ||
} | ||
|
||
.description { | ||
color: #333; | ||
min-height: 1em; | ||
padding-left: 72px; | ||
padding-top: 0.25em; | ||
opacity: 0.66; | ||
} | ||
|
||
.image { | ||
border-radius: 8px; | ||
position: absolute; | ||
} | ||
|
||
.vouching { | ||
padding: 0.5em; | ||
margin: 0.5em 1em; | ||
background: transparent; | ||
position: relative; | ||
white-space: nowrap; | ||
|
||
img { | ||
position: relative; | ||
display: inline-block; | ||
margin: 0.25em 0.25em 0.25em 0; | ||
} | ||
|
||
div { | ||
right: auto; | ||
left: 0; | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
// Copyright 2015-2017 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
|
||
import Container from '@parity/ui/lib/Container'; | ||
import DappIcon from '@parity/ui/lib/DappIcon'; | ||
import DappVouchFor from '@parity/ui/lib/DappVouchFor'; | ||
|
||
import styles from './dappCard.css'; | ||
|
||
export default class DappCard extends Component { | ||
static propTypes = { | ||
app: PropTypes.object.isRequired, | ||
availability: PropTypes.string.isRequired, | ||
className: PropTypes.string | ||
}; | ||
|
||
render () { | ||
const { app, availability, className } = this.props; | ||
|
||
if (app.onlyPersonal && availability !== 'personal') { | ||
return null; | ||
} | ||
|
||
return ( | ||
<div className={ [styles.card, className].join(' ') }> | ||
<Container | ||
className={ styles.content } | ||
link={ | ||
app.url === 'web' | ||
? '/web' | ||
: `/${app.id}` | ||
} | ||
> | ||
<DappIcon | ||
app={ app } | ||
className={ styles.image } | ||
/> | ||
<div className={ styles.title }> | ||
{ app.name } | ||
</div> | ||
<div className={ styles.description }> | ||
{ app.description } | ||
</div> | ||
<DappVouchFor | ||
app={ app } | ||
className={ styles.vouching } | ||
maxNumber={ 10 } | ||
/> | ||
</Container> | ||
</div> | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// Copyright 2015-2017 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
export default from './dappCard'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't app.id be enough?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, overkill (as I typed it that thought came to mind)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually no. Just "fixed", the "reverted" as I remembered why I took this longer route.
When I have the app as both a local app (linked from dapps) as well as an app of the network, the ids are the same. (It was not an issue previously since they were in separate lists)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK makes sense.