Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Resolved Issue #53 #57

Merged
merged 3 commits into from
Oct 24, 2017
Merged

Resolved Issue #53 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8fb98d
rearrange discord and subscribe sections
pbteja1998 Oct 24, 2017
e4cc95d
remove redundant vertical divider
pbteja1998 Oct 24, 2017
9d7cc95
fix mobile view of subscribe section
pbteja1998 Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions components/subscribe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { Form, Message } from 'semantic-ui-react';
import { Form, Message, Grid } from 'semantic-ui-react';
import { baseEventsURL, subscribeURL } from '../utils/urls';

class Subscribe extends Component {
Expand Down Expand Up @@ -65,7 +65,7 @@ class Subscribe extends Component {
return (
<div>
<section className="update">
<div className="container update_container">
<div>
<h3 className="taglines">
We are constanly updating our platform.<br />If you would like to
stay informed about our updates, drop you email.
Expand All @@ -76,18 +76,24 @@ class Subscribe extends Component {
) : (
<Form onSubmit={this.handleSubmit} error={hasError}>
<Form.Group>
<Form.Input
placeholder="Enter email address"
name="email"
value={this.state.subscribersEmail}
onChange={this.handleChange}
disabled={this.state.submittingEmail}
/>
<Form.Button
loading={this.state.submittingEmail}
color="pink"
content="Subscribe"
/>
<Grid stackable columns={2}>
<Grid.Column width={12}>
<Form.Input
placeholder="Enter email address"
name="email"
value={this.state.subscribersEmail}
onChange={this.handleChange}
disabled={this.state.submittingEmail}
/>
</Grid.Column>
<Grid.Column width={4}>
<Form.Button
loading={this.state.submittingEmail}
color="pink"
content="Subscribe"
/>
</Grid.Column>
</Grid>
</Form.Group>
<Message
error
Expand All @@ -103,9 +109,6 @@ class Subscribe extends Component {
.taglines {
padding-bottom: 20px;
}
.update_container {
background-color: #f6f6f6 !important;
}
.update_content {
display: flex;
flex-direction: row;
Expand All @@ -114,11 +117,6 @@ class Subscribe extends Component {
align-content: center;
align-items: center;
}
.container {
background-color: #ffffff;
text-align: center;
padding: 60px;
}
`}</style>
</div>
);
Expand Down
48 changes: 31 additions & 17 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import Link from 'next/link';
import { Card, Button, Divider } from 'semantic-ui-react';

import { Card, Button, Divider, Grid, Segment } from 'semantic-ui-react';
import { baseEventsURL, indexPageEventURL } from '../utils/urls';
import RowEvent from '../components/row-events';
import publicPage from '../hocs/public-page';
Expand Down Expand Up @@ -170,23 +169,38 @@ class Home extends React.Component {
</div>
</section>
<Divider hidden />
<section className="discord">
<section className="discord-subscribe">
<div className="container">
<h3 className="taglines">
Join our Discord server, and say Hello World!
</h3>
<Button.Group basic>
<Button
content="Join Chat"
icon="discussions"
labelPosition="left"
onClick={() =>
window.open('https://discord.gg/dVnQ2Gf', '_blank')}
/>
</Button.Group>
<Grid stackable columns={2} divided>
<Grid.Column>
<Segment basic>
<section className="discord">
<div>
<h3 className="taglines">
Join our Discord server, and say Hello World!
</h3>
<Button.Group basic>
<Button
content="Join Chat"
icon="discussions"
labelPosition="left"
onClick={() =>
window.open(
'https://discord.gg/dVnQ2Gf',
'_blank',
)}
/>
</Button.Group>
</div>
</section>
</Segment>
</Grid.Column>
<Grid.Column>
<Subscribe />
</Grid.Column>
</Grid>
</div>
</section>
<Subscribe />
</main>
<style jsx>{`
main {
Expand Down Expand Up @@ -239,7 +253,7 @@ class Home extends React.Component {
padding-left: 30px;
padding-right: 30px;
}
.discord .container {
.discord-subscribe .container {
background: #FAFAFA;
}

Expand Down