Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
2 changed files with 25 additions and 1 deletions
Showing only changes of commit 6fe3d43049 - Show all commits

View File

@ -4,6 +4,11 @@ import { i18n } from '../i18next';
import { T } from 'inferno-i18next'; import { T } from 'inferno-i18next';
import { repoUrl } from '../utils'; import { repoUrl } from '../utils';
interface SilverUser {
name: string;
link: string;
}
let general = [ let general = [
'Forrest Weghorst', 'Forrest Weghorst',
'Serge Tarkovski', 'Serge Tarkovski',
@ -13,7 +18,12 @@ let general = [
'NotTooHighToHack', 'NotTooHighToHack',
]; ];
let highlighted = ['Oskenso Kashi', 'Alex Benishek']; let highlighted = ['Oskenso Kashi', 'Alex Benishek'];
// let silver = []; let silver: Array<SilverUser> = [
{
name: 'Redjoker',
link: 'https://redcard.iww.org/user/register',
},
];
// let gold = []; // let gold = [];
// let latinum = []; // let latinum = [];
@ -72,6 +82,18 @@ export class Sponsors extends Component<any, any> {
return ( return (
<div class="container"> <div class="container">
<h5>{i18n.t('sponsors')}</h5> <h5>{i18n.t('sponsors')}</h5>
<p>{i18n.t('silver_sponsors')}</p>
<div class="row card-columns">
{silver.map(s => (
<div class="card col-12 col-md-2">
<div>
<a href={s.link} target="_blank">
💎 {s.name}
</a>
</div>
</div>
))}
</div>
<p>{i18n.t('general_sponsors')}</p> <p>{i18n.t('general_sponsors')}</p>
<div class="row card-columns"> <div class="row card-columns">
{highlighted.map(s => ( {highlighted.map(s => (

View File

@ -195,6 +195,8 @@
"donate": "Donate", "donate": "Donate",
"general_sponsors": "general_sponsors":
"General Sponsors are those that pledged $10 to $39 to Lemmy.", "General Sponsors are those that pledged $10 to $39 to Lemmy.",
"silver_sponsors":
"Silver Sponsors are those that pledged $40 to Lemmy.",
"crypto": "Crypto", "crypto": "Crypto",
"bitcoin": "Bitcoin", "bitcoin": "Bitcoin",
"ethereum": "Ethereum", "ethereum": "Ethereum",