Skip to content

Commit

Permalink
v0.11.1-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
blarfoon committed Feb 18, 2019
1 parent 1f6b7e0 commit 735a653
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 33 deletions.
89 changes: 57 additions & 32 deletions app/components/NewUserPage/NewUserPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import store from '../../localStore';
import background from '../../assets/images/login_background.jpg';
import circleBlue from '../../assets/images/circleBlue.svg';


const colors = store.get('settings') ? store.get('settings').theme : THEMES.default;
const colors = store.get('settings')
? store.get('settings').theme
: THEMES.default;

const defaultStyle = {
transition: `all ${700}ms ease-in-out`,
Expand All @@ -18,51 +19,74 @@ const defaultStyle = {
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat',
backgroundSize: '0 0'
}

};

const internalDivStyles = {
entered: { opacity: 1 }
}
};

const NewUserPage = props => {
const [mounted, setMounted] = useState(true);
const transitionStyles = {
entered: {
backgroundSize: `${window.screen.availWidth * 3}px ${window.screen.availHeight * 3}px`
backgroundSize: `${window.screen.availWidth * 3}px ${window.screen
.availHeight * 3}px`
},
exiting: {
backgroundSize: `0px 0px`
}
};
return (
<div style={{
background: `linear-gradient( ${colors['secondary-color-2']}8A, ${colors['secondary-color-2']}8A), url(${background})`
}}>
<Transition in={mounted} timeout={{ enter: 250, exit: 0 }} appear={true} key="1">
{(state) => (
<div style={{
...defaultStyle,
...transitionStyles[state],
}}>
<div style={{
opacity: 0,
transition: 'all 400ms ease-in-out',
padding: 30,
...internalDivStyles[state]
}}>
<div
style={{
background: `linear-gradient( ${colors['secondary-color-2']}8A, ${
colors['secondary-color-2']
}8A), url(${background})`
}}
>
<Transition
in={mounted}
timeout={{ enter: 250, exit: 0 }}
appear
key="1"
>
{state => (
<div
style={{
...defaultStyle,
...transitionStyles[state]
}}
>
<div
style={{
opacity: 0,
transition: 'all 400ms ease-in-out',
padding: 30,
...internalDivStyles[state]
}}
>
<h1 style={{ fontSize: 37 }}>Welcome to GDLauncher!</h1>
<div style={{ display: 'flex' }}>
<p style={{ fontSize: 25 }}>
Hello {props.username}!<br />
GDLauncher is free and open source,
it wouldn't exist without its community. If you find any bug or have any suggestion, tell us on Discord!<br /><br />
GDLauncher is free and open source, it wouldn't exist without
its community. If you find any bug or have any suggestion,
tell us on Discord!
<br />
<br />
Happy gaming!
</p>
<iframe style={{
marginTop: '-70px',
paddingLeft: 30
}} src="https://discordapp.com/widget?id=398091532881756161&theme=dark" width="350" height="515" allowtransparency="true" frameborder="0"></iframe>
<iframe
style={{
marginTop: '-70px',
paddingLeft: 30
}}
src="https://discordapp.com/widget?id=398091532881756161&theme=dark"
width="350"
height="515"
allowtransparency="true"
frameborder="0"
/>
</div>
<DelayLink
to="home"
Expand All @@ -71,20 +95,21 @@ const NewUserPage = props => {
style={{
position: 'absolute',
bottom: 30,
fontSize: 25,
}}>
fontSize: 25
}}
>
GOT IT
</DelayLink>
</div>
</div>
)}
</Transition>
</div>
)
);
};

const mapStateToProps = state => ({
username: state.auth.displayName
})
});

export default connect(mapStateToProps)(NewUserPage);
export default connect(mapStateToProps)(NewUserPage);
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gdlauncher",
"version": "0.11.0",
"version": "0.11.1-beta",
"description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience",
"keywords": [
"boilerplate",
Expand Down

0 comments on commit 735a653

Please sign in to comment.