Skip to content

Commit

Permalink
Bring good news on the future of StellarTerm
Browse files Browse the repository at this point in the history
  • Loading branch information
irisli committed Sep 28, 2018
1 parent 31a1d6b commit 70a8371
Show file tree
Hide file tree
Showing 18 changed files with 66 additions and 128 deletions.
5 changes: 1 addition & 4 deletions CONTRIBUTING.md
@@ -1,8 +1,5 @@
# Contributing to StellarTerm
StellarTerm is primarily written by and maintained by [Iris Li](https://iris.li/). If you would like to make a code contribution, please make a pull request and we can discuss further details on there.

## How to request inclusion in the Markets tab
If you would like your asset listed in StellarTerm, please send me an email at **stellarterm@iris.li**.
StellarTerm is maintained by Ultra Stellar, LLC. If you would like to make a code contribution, please make a pull request and we can discuss further details on there.

## License
The project is licensed under the [Apache-2.0 license](./LICENSE-2.0.txt). By contributing, you are agreeing to the terms in the project's [LICENSE file](./LICENSE-2.0.txt).
2 changes: 1 addition & 1 deletion LICENSE-2.0.txt
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2017 Iris Li
Copyright 2017 Ultra Stellar, LLC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion directory/package.json
Expand Up @@ -10,7 +10,7 @@
"stellar",
"stellarterm"
],
"author": "Iris Li",
"author": "Ultra Stellar, LLC",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/stellarterm/stellarterm/issues"
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "stellar-terminal",
"version": "0.0.1",
"author": "Iris Li",
"author": "Ultra Stellar, LLC",
"license": "Apache-2.0",
"private": true,
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/app.jsx
Expand Up @@ -10,7 +10,7 @@ import Exchange from './components/Exchange.jsx';
import Generic from './components/Generic.jsx';
import Download from './components/Download.jsx';
import Loading from './components/Loading.jsx';
import ShutDown from './components/ShutDown.jsx';
import OpenUp from './components/OpenUp.jsx';
import Stellarify from './lib/Stellarify';
import url from 'url';
import Header from './components/Header.jsx';
Expand Down Expand Up @@ -103,7 +103,7 @@ class TermApp extends React.Component {
body = <div>
<div className="HomePage__black">
<div className="so-back">
<ShutDown />
<OpenUp />
<div className="HomePage__lead">
<h2 className="HomePage__lead__title">Trade on the <a href="#exchange">Stellar Decentralized Exchange</a></h2>
<p className="HomePage__lead__summary">StellarTerm is an <a href="https://github.com/stellarterm/stellarterm" target="_blank" rel="nofollow noopener noreferrer">open source</a> client for the <a href="https://www.stellar.org/" target="_blank" rel="nofollow noopener noreferrer">Stellar network</a>. <br />Send, receive, and <a href="#exchange">trade</a> assets on the Stellar network easily with StellarTerm.</p>
Expand All @@ -125,7 +125,7 @@ class TermApp extends React.Component {
<div className="island__sub__division">
<div className="HomePage__sideBlurb">
<p>StellarTerm is just a client that can be used to access the Stellar Decentralized Exchange. Neither StellarTerm nor the developers of it are involved with operating the Stellar network.</p>
<p>StellarTerm is developed by Iris Li, a former employee of the Stellar Development Foundation. The project is independent of the Stellar Development Foundation.</p>
<p>StellarTerm is developed by Ultra Stellar, LLC, the same company that developed the LOBSTR wallet. The project is independent of the Stellar Development Foundation.</p>
</div>
</div>
<div className="island__sub__division">
Expand Down
13 changes: 12 additions & 1 deletion src/components/Download.jsx
Expand Up @@ -3,5 +3,16 @@ import Generic from './Generic.jsx';

export default function Download() {
return <Generic title="Download">
</Generic>
<p>StellarTerm is a web app that runs in the browser. Downloading is <strong>not required</strong> to use StellarTerm. In both the web and desktop version, keys are <strong>never</strong> sent to any server and transactions are only signed locally. Downloads are for users that prefer a desktop version.</p>
<p>Unlike the web version, downloaded versions do not auto-update (this is preferrable to some people). Also, the web version will receive updates sooner than the desktop versions do. The code to run StellarTerm is self contained in the downloads, though it does not run a Stellar node or run a Stellar API.</p>
<div className="Generic__divider"></div>
<h2>StellarTerm Desktop Client Download</h2>
<br />
<table className="Generic__table">
<tr><td>Platform</td><td>Location</td></tr>
<tr><td>Mac OSX</td><td><a href="https://github.com/stellarterm/stellarterm-desktop-client/releases" target="_blank" rel="nofollow noopener noreferrer">https://github.com/stellarterm/stellarterm-desktop-client/releases</a></td></tr>
<tr><td>Windows</td><td><a href="https://github.com/stellarterm/stellarterm-desktop-client/releases" target="_blank" rel="nofollow noopener noreferrer">https://github.com/stellarterm/stellarterm-desktop-client/releases</a></td></tr>
<tr><td>Standalone html</td><td><a href="https://github.com/stellarterm/stellarterm.github.io" target="_blank" rel="nofollow noopener noreferrer">https://github.com/stellarterm/stellarterm.github.io</a></td></tr>
</table>
</Generic>
}
3 changes: 0 additions & 3 deletions src/components/Exchange.jsx
Expand Up @@ -9,7 +9,6 @@ import Stellarify from '../lib/Stellarify';
import TermsOfUse from './TermsOfUse.jsx';
import Ellipsis from './Ellipsis.jsx';
import directory from '../../directory';
import ShutDown from './ShutDown.jsx';

export default class Exchange extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -83,8 +82,6 @@ export default class Exchange extends React.Component {
}

return <div>
<ShutDown className="ShutDown--top" />

<div className="so-back islandBack islandBack--t">
<PairPicker d={this.props.d}></PairPicker>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/Header.jsx
Expand Up @@ -27,6 +27,7 @@ export default class Header extends React.Component {
<a className={'Header__nav__item Header__nav__item--link' + (this.props.urlParts[0] === 'exchange' ? ' is-current' : '')} href="#exchange">Exchange</a>
<a className={'Header__nav__item Header__nav__item--link' + (this.props.urlParts[0] === 'markets' ? ' is-current' : '')} href="#markets">Markets</a>
<a className={'Header__nav__item Header__nav__item--link' + (this.props.urlParts[0] === 'account' ? ' is-current' : '')} href="#account">Account</a>
<a className={'Header__nav__item Header__nav__item--link' + (this.props.urlParts[0] === 'download' ? ' is-current' : '')} href="#download">Download</a>
</nav>
<span className="Header__version">v{window.stBuildInfo.version}</span>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/components/Markets.jsx
Expand Up @@ -6,7 +6,6 @@ import CustomMarketPicker from './CustomMarketPicker.jsx';
import Stellarify from '../lib/Stellarify';
import ErrorBoundary from './ErrorBoundary.jsx';
import _ from 'lodash';
import ShutDown from './ShutDown.jsx';


export default class Markets extends React.Component {
Expand All @@ -16,7 +15,6 @@ export default class Markets extends React.Component {
render() {
return (
<div>
<ShutDown className="ShutDown--top" />
<div className="so-back islandBack islandBack--t">
<div className="island">
<AssetList d={this.props.d}></AssetList>
Expand Down
24 changes: 24 additions & 0 deletions src/components/OpenUp.jsx
@@ -0,0 +1,24 @@
const React = window.React = require('react');

export default class OpenUp extends React.Component {
link(content, url) {
return <a href={url} target="_blank" rel="nofollow noopener noreferrer">{content}</a>
}
render() {
let LOBSTR = this.link('LOBSTR', 'https://lobstr.co/');

let iOS = this.link('iOS', 'https://itunes.apple.com/us/app/lobstr-stellar-wallet/id1404357892');
let Android = this.link('Android', 'https://play.google.com/store/apps/details?id=com.lobstr.client');

return <div className="OpenUp">
<div className="OpenUp__inside">
<h2 className="OpenUp__title">The future of StellarTerm is bright!</h2>
<br />
<p>The developers of {LOBSTR} are now leading the future development of StellarTerm! They built LOBSTR which is one of the leading Stellar wallets on {iOS} and {Android}, rated highly by the Stellar community. Their team has been actively building on the Stellar network since 2015, before StellarTerm was even made.</p>

<p>StellarTerm will continue to be its own product, and receive new developments that it and all its users deserve!</p>

<p>Thank you all for your support. Exciting times ahead!</p>
</div></div>
}
};
4 changes: 0 additions & 4 deletions src/components/Session/LoginPage.jsx
Expand Up @@ -2,7 +2,6 @@ const React = window.React = require('react');
const images = require('../../images');
import Ellipsis from '../Ellipsis.jsx';
import clickToSelect from '../../lib/clickToSelect';
import ShutDown from '../ShutDown.jsx';


// TODO: Move this into Validator
Expand Down Expand Up @@ -122,7 +121,6 @@ export default class LoginPage extends React.Component {

if (this.props.urlParts[0] === 'account') {
body = <div className="LoginPage__body">
<ShutDown className="ShutDown--bottom" />
<div className="LoginPage__greenBox">
<div className="LoginPage__form">
<p className="LoginPage__intro">Log in with your secret key to manage your account.</p>
Expand Down Expand Up @@ -153,7 +151,6 @@ export default class LoginPage extends React.Component {
</div>
} else if (this.props.urlParts[0] === 'signup') {
body = <div className="LoginPage__body">
<ShutDown className="ShutDown--bottom" />

<div className="LoginPage__greenBox">
<div className="LoginPage__form">
Expand Down Expand Up @@ -236,7 +233,6 @@ export default class LoginPage extends React.Component {
}

body = <div className="LoginPage__body">
<ShutDown className="ShutDown--bottom" />

<div className="LoginBox__ledgerNanoHeader">
<img src={images['ledger-logo']} className="img--noSelect" alt="Ledger Logo" width="300" height="80" />
Expand Down
20 changes: 0 additions & 20 deletions src/components/ShutDown.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/styles/_HomePage.scss
Expand Up @@ -4,7 +4,7 @@
color: #000; // bold color
text-shadow: 0 1px 3px rgba(255,255,255,0.1);
padding-top: 60px;
padding-bottom: 120px;
padding-bottom: 90px;
font-weight: 400;
}

Expand Down
20 changes: 20 additions & 0 deletions src/styles/_OpenUp.scss
@@ -0,0 +1,20 @@
.OpenUp {
margin: 0 auto 0 auto;
max-width: 870px;
}

.OpenUp__title {
font-size: $s-scale-2;
font-weight: normal;
}

.OpenUp p:last-child {
margin-bottom: 0;
}

.OpenUp__inside {
padding: 32px 36px;
border: 1px solid $s-color-primary3;
background: $s-color-primary8;
border-radius: 6px;
}
40 changes: 0 additions & 40 deletions src/styles/_Sale.scss

This file was deleted.

25 changes: 0 additions & 25 deletions src/styles/_ShutDown.scss

This file was deleted.

3 changes: 1 addition & 2 deletions src/styles/app.scss
Expand Up @@ -100,5 +100,4 @@ ul.privacy__ul {
@import 'AddTrust';
@import 'AddTrustRow';
@import 'Deposit';
@import 'Sale';
@import 'ShutDown';
@import 'OpenUp';
20 changes: 0 additions & 20 deletions src/styles/solar-stellarterm/package.json

This file was deleted.

0 comments on commit 70a8371

Please sign in to comment.