mirror of
https://github.com/ApfelTeeSaft/LiveSplitOne.git
synced 2026-08-26 19:23:40 +00:00
Move over to LiveSplit Organization
This commit is contained in:
+1
-1
@@ -1,3 +1,3 @@
|
||||
[submodule "livesplit-core"]
|
||||
path = livesplit-core
|
||||
url = https://github.com/CryZe/livesplit-core
|
||||
url = https://github.com/LiveSplit/livesplit-core
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<h1> <img src="https://raw.githubusercontent.com/LiveSplit/LiveSplit/master/LiveSplit/Resources/Icon.png" alt="LiveSplit" height="42" width="45" align="top"/> LiveSplit One</h1>
|
||||
|
||||
[](https://travis-ci.org/CryZe/LiveSplitOne)
|
||||
[](https://travis-ci.org/LiveSplit/LiveSplitOne)
|
||||
|
||||
LiveSplit One is a version of LiveSplit that uses the multiplatform [livesplit-core](https://github.com/CryZe/livesplit-core) Library and Web Technologies like React and Electron to create a new LiveSplit experience that works on a lot of different platforms.
|
||||
LiveSplit One is a version of LiveSplit that uses the multiplatform [livesplit-core](https://github.com/LiveSplit/livesplit-core) Library and Web Technologies like React and Electron to create a new LiveSplit experience that works on a lot of different platforms.
|
||||
|
||||
The Web Version is available [here](https://cryze.github.io/LiveSplitOne/).
|
||||
The Web Version is available [here](https://livesplit.github.io/LiveSplitOne/).
|
||||
|
||||
+1
-1
@@ -41,6 +41,6 @@ chmod 600 deploy_key
|
||||
eval `ssh-agent -s`
|
||||
ssh-add deploy_key
|
||||
|
||||
git remote set-url origin [email protected]:CryZe/LiveSplitOne.git
|
||||
git remote set-url origin [email protected]:LiveSplit/LiveSplitOne.git
|
||||
|
||||
git push origin gh-pages -f
|
||||
|
||||
+1
-1
Submodule livesplit-core updated: c87cb6f0d1...8f0aef44db
+15
-7
@@ -1,5 +1,6 @@
|
||||
import * as React from "react";
|
||||
import * as LiveSplit from "../livesplit";
|
||||
import { gradientToCss } from "../util/ColorUtil";
|
||||
|
||||
export interface Props { state: LiveSplit.TextComponentStateJson }
|
||||
|
||||
@@ -9,22 +10,29 @@ export default class Text extends React.Component<Props> {
|
||||
}
|
||||
|
||||
public render() {
|
||||
const { state } = this.props;
|
||||
const text = "Center" in state ? (
|
||||
const { background, text } = this.props.state;
|
||||
|
||||
const rendered = "Center" in text ? (
|
||||
<tr>
|
||||
<td className="text-component-text center-text">{state.Center}</td>
|
||||
<td className="text-component-text center-text">{text.Center}</td>
|
||||
</tr>
|
||||
) : (
|
||||
<tr>
|
||||
<td className="text-component-text">{state.Split[0]}</td>
|
||||
<td className="text-component-text">{state.Split[1]}</td>
|
||||
<td className="text-component-text">{text.Split[0]}</td>
|
||||
<td className="text-component-text">{text.Split[1]}</td>
|
||||
</tr>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="text-component">
|
||||
<div
|
||||
className="text-component"
|
||||
style={{
|
||||
background: gradientToCss(background),
|
||||
}}
|
||||
>
|
||||
<table>
|
||||
<tbody>
|
||||
{text}
|
||||
{rendered}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
+9
-1
@@ -363,8 +363,16 @@ export interface GraphComponentStatePointJson {
|
||||
is_best_segment: boolean,
|
||||
}
|
||||
|
||||
/** The state object describes the information to visualize for this component. */
|
||||
export interface TextComponentStateJson {
|
||||
/** The background shown behind the component. */
|
||||
background: Gradient,
|
||||
/** The text to show for the component. */
|
||||
text: TextComponentStateText,
|
||||
}
|
||||
|
||||
/** The text that is supposed to be shown. */
|
||||
export type TextComponentStateJson =
|
||||
export type TextComponentStateText =
|
||||
{ Center: string } |
|
||||
{ Split: string[] };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user