From: Dessalines Date: Sat, 24 Oct 2020 15:48:27 +0000 (-0500) Subject: Removing landing and donations page, adding joinlemmy. Fixes #63 X-Git-Url: http://these/git/%22https:/image.com/%7B%7D/%7BpictshareAvatarThumbnail%28?a=commitdiff_plain;h=cb433f12b28d895049e15641daf75a57026735bd;p=lemmy-ui.git Removing landing and donations page, adding joinlemmy. Fixes #63 --- diff --git a/lemmy-translations b/lemmy-translations index 7dc3916..2a49258 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit 7dc391601135a52cddd3112ca75b505b99cec4fc +Subproject commit 2a492580d773e50061bb3a2c9562dde1173c8941 diff --git a/src/shared/components/footer.tsx b/src/shared/components/footer.tsx index 41369a5..5d132ee 100644 --- a/src/shared/components/footer.tsx +++ b/src/shared/components/footer.tsx @@ -1,7 +1,7 @@ import { Component } from 'inferno'; import { Link } from 'inferno-router'; import { i18n } from '../i18next'; -import { repoUrl } from '../utils'; +import { repoUrl, joinLemmyUrl } from '../utils'; import { GetSiteResponse } from 'lemmy-js-client'; interface FooterProps { @@ -38,16 +38,16 @@ export class Footer extends Component { {i18n.t('docs')} -
  • - - {i18n.t('donate')} - -
  • {i18n.t('code')}
    • +
  • + + {i18n.t('join_lemmy')} + +
    • diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx index 149f979..689a4d9 100644 --- a/src/shared/components/main.tsx +++ b/src/shared/components/main.tsx @@ -37,7 +37,6 @@ import { CommunityLink } from './community-link'; import { BannerIconHeader } from './banner-icon-header'; import { wsJsonToRes, - repoUrl, mdToHtml, fetchLimit, toast, @@ -291,10 +290,6 @@ export class Main extends Component {
    {this.sidebar()}
    - -
    -
    {this.landing()}
    -
    )} @@ -493,46 +488,6 @@ export class Main extends Component { ); } - landing() { - return ( - <> -
    - {i18n.t('powered_by')} - - # - - - Lemmybeta - -
    -

    - - # - - # - - # -

    - # -

    - # -

    - # -

    - # - # - # - # -

    - - # - -     -

    - - ); - } - posts() { return (
    diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx index 04dae46..63bc230 100644 --- a/src/shared/components/navbar.tsx +++ b/src/shared/components/navbar.tsx @@ -254,17 +254,6 @@ export class Navbar extends Component { {i18n.t('create_community')} -
  • - - - - - -
      • {this.canAdmin && ( diff --git a/src/shared/components/post.tsx b/src/shared/components/post.tsx index 2010858..c963690 100644 --- a/src/shared/components/post.tsx +++ b/src/shared/components/post.tsx @@ -155,7 +155,6 @@ export class Post extends Component { // let currentId = this.props.match.params.id; // WebSocketService.Instance.getPost(currentId); - // this.context.router.history.push('/sponsors'); // this.context.refresh(); // this.context.router.history.push(_lastProps.location.pathname); } diff --git a/src/shared/components/sponsors.tsx b/src/shared/components/sponsors.tsx deleted file mode 100644 index 0e7156c..0000000 --- a/src/shared/components/sponsors.tsx +++ /dev/null @@ -1,187 +0,0 @@ -import { Component } from 'inferno'; -import { Site } from 'lemmy-js-client'; -import { i18n } from '../i18next'; -import { T } from 'inferno-i18next'; -import { repoUrl, isBrowser } from '../utils'; -import { IsoData } from 'shared/interfaces'; -import { HtmlTags } from './html-tags'; - -interface SilverUser { - name: string; - link?: string; -} - -let general = [ - 'Brendan', - 'mexicanhalloween', - 'William Moore', - 'Rachel Schmitz', - 'comradeda', - 'ybaumy', - 'dude in phx', - 'twilight loki', - 'Andrew Plaza', - 'Jonathan Cremin', - 'Arthur Nieuwland', - 'Ernest Wiśniewski', - 'HN', - 'Forrest Weghorst', - 'Andre Vallestero', - 'NotTooHighToHack', -]; -let highlighted = ['DQW', 'DiscountFuneral', 'Oskenso Kashi', 'Alex Benishek']; -let silver: SilverUser[] = [ - { - name: 'Redjoker', - link: 'https://iww.org', - }, -]; -// let gold = []; -// let latinum = []; - -interface SponsorsState { - site: Site; -} - -export class Sponsors extends Component { - private emptyState: SponsorsState = { - site: undefined, - }; - constructor(props: any, context: any) { - super(props, context); - this.state = this.emptyState; - - let isoData: IsoData; - if (isBrowser()) { - isoData = window.isoData; - } else { - isoData = this.context.router.staticContext; - } - - this.state.site = isoData.site.site; - } - - componentDidMount() { - if (isBrowser()) { - window.scrollTo(0, 0); - } - } - - get documentTitle(): string { - return `${i18n.t('sponsors')} - ${this.state.site.name}`; - } - - render() { - return ( -
      - - {this.topMessage()} -
      - {this.sponsors()} -
      - {this.bitcoin()} -
      - ); - } - - topMessage() { - return ( - - ); - } - sponsors() { - return ( -
      -
      {i18n.t('sponsors')}
      -

      {i18n.t('silver_sponsors')}

      -
      - {silver.map(s => ( -
      -
      - {s.link ? ( - - 💎 {s.name} - - ) : ( -
      💎 {s.name}
      - )} -
      -
      - ))} -
      -

      {i18n.t('general_sponsors')}

      -
      - {highlighted.map(s => ( -
      -
      {s}
      -
      - ))} - {general.map(s => ( -
      -
      {s}
      -
      - ))} -
      -
      - ); - } - - bitcoin() { - return ( -
      -
      {i18n.t('crypto')}
      -
      - - - - - - - - - - - - - - - -
      {i18n.t('bitcoin')} - 1Hefs7miXS5ff5Ck5xvmjKjXf5242KzRtK -
      {i18n.t('ethereum')} - 0x400c96c96acbC6E7B3B43B1dc1BB446540a88A01 -
      {i18n.t('monero')} - - 41taVyY6e1xApqKyMVDRVxJ76sPkfZhALLTjRvVKpaAh2pBd4wv9RgYj1tSPrx8wc6iE1uWUfjtQdTmTy2FGMeChGVKPQuV - -
      -
      -
      - ); - } -} diff --git a/src/shared/routes.ts b/src/shared/routes.ts index 4178fa1..1e45561 100644 --- a/src/shared/routes.ts +++ b/src/shared/routes.ts @@ -14,7 +14,6 @@ import { Setup } from './components/setup'; import { AdminSettings } from './components/admin-settings'; import { Inbox } from './components/inbox'; import { Search } from './components/search'; -import { Sponsors } from './components/sponsors'; import { Instances } from './components/instances'; interface IRoutePropsWithFetch extends IRouteProps { @@ -136,7 +135,6 @@ export const routes: IRoutePropsWithFetch[] = [ component: Search, fetchInitialData: (auth, path) => Search.fetchInitialData(auth, path), }, - { path: `/sponsors`, component: Sponsors }, { path: `/password_change/:token`, component: PasswordChange, diff --git a/src/shared/utils.ts b/src/shared/utils.ts index 9bc9b23..33ba140 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -73,6 +73,7 @@ export const favIconPngUrl = '/static/assets/apple-touch-icon.png'; // export const defaultFavIcon = `${window.location.protocol}//${window.location.host}${favIconPngUrl}`; export const defaultFavIcon = 'test'; export const repoUrl = 'https://github.com/LemmyNet'; +export const joinLemmyUrl = 'https://join.lemmy.ml'; export const helpGuideUrl = '/docs/about_guide.html'; export const markdownHelpUrl = `${helpGuideUrl}#markdown-guide`; export const sortingHelpUrl = `${helpGuideUrl}#sorting`;