-
+
{
this.props.history.push(`/events/edit/${data.events_CreateEvent.id}`);
@@ -114,51 +120,57 @@ class Create extends React.Component {
/>
-
-
- Create a new event
-
-
diff --git a/client/src/Components/Event/Create/styles.js b/src/Components/Event/Create/styles.js
similarity index 79%
rename from client/src/Components/Event/Create/styles.js
rename to src/Components/Event/Create/styles.js
index 9d5460326..50a3490ca 100644
--- a/client/src/Components/Event/Create/styles.js
+++ b/src/Components/Event/Create/styles.js
@@ -13,14 +13,6 @@ const styles = theme => ({
clickable: {
cursor: 'pointer',
},
- card: {
- flexGrow: 1,
- padding: 20,
- marginTop: 20,
- marginBottom: 20,
- marginLeft: 400,
- marginRight: 400,
- },
buttonList: {
margin: theme.spacing.unit,
float: 'right',
@@ -32,11 +24,10 @@ const styles = theme => ({
marginTop: 20,
},
paperRoot: {
- width: '50%',
flexGrow: 1,
padding: 10,
- marginLeft: '25%',
- marginTop: '2%',
+ marginTop: 25,
+ marginBottom: 25,
},
inputField: {
width: '80%',
diff --git a/src/Components/Event/Edit/Tabs/Basic.js b/src/Components/Event/Edit/Tabs/Basic.js
new file mode 100644
index 000000000..d3d34e69a
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Basic.js
@@ -0,0 +1,115 @@
+import React from 'react';
+import {
+ TextField,
+ Button,
+ FormGroup,
+ Typography,
+ Grid,
+} from '@material-ui/core';
+import {
+ ChevronLeft,
+ ChevronRight,
+} from '@material-ui/icons';
+import { DateTimePicker } from 'material-ui-pickers';
+
+
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
+
+
+class Basic extends React.Component {
+ render() {
+ const { classes, event, edit } = this.props;
+ return (
+
+
+ These are the basic information you need to input in order to create an event.
+ There might be some heavy changes in the near future as the application is still at a very early stage.
+
+
+
+
+ edit('title', newVal.target.value)}
+ />
+ edit('subtitle', newVal.target.value)}
+ />
+ edit('description', newVal.target.value)}
+ />
+
+
+ The dates are purely indicative, as it is important for you to make sure everything is
+ ready before manually triggering the beginning and end of the event.
+ If you are confident use the scheduler to start it for you(incoming).
+
+
+
+
+
+ }
+ rightArrowIcon={}
+ value={event.startDatetime}
+ helperText='Competition start date'
+ onChange={newVal => edit('startDatetime', newVal)}
+ />
+
+
+ }
+ rightArrowIcon={}
+ value={event.finishDatetime}
+ helperText='Competition finishing date'
+ onChange={newVal => edit('finishDatetime', newVal)}
+ />
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(Basic);
diff --git a/src/Components/Event/Edit/Tabs/PresentationPage.js b/src/Components/Event/Edit/Tabs/PresentationPage.js
new file mode 100644
index 000000000..1c674ddcc
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/PresentationPage.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Typography } from '@material-ui/core';
+
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
+
+
+class PresentationPage extends React.Component {
+ render() {
+ const { classes } = this.props;
+ return (
+
+
+ PresentationPage
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(PresentationPage);
diff --git a/src/Components/Event/Edit/Tabs/TeamsServer.js b/src/Components/Event/Edit/Tabs/TeamsServer.js
new file mode 100644
index 000000000..874c72d6f
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/TeamsServer.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Typography } from '@material-ui/core';
+
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../styles';
+
+
+class TeamsServer extends React.Component {
+ render() {
+ const { classes } = this.props;
+ return (
+
+
+ TeamsServer
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(TeamsServer);
diff --git a/src/Components/Event/Edit/Tabs/Technical/Formula/New.js b/src/Components/Event/Edit/Tabs/Technical/Formula/New.js
new file mode 100644
index 000000000..605782b2d
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Formula/New.js
@@ -0,0 +1,78 @@
+import React from 'react';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogContentText,
+ Button,
+ TextField,
+} from '@material-ui/core';
+
+import { Mutation } from 'react-apollo';
+import { getOptionsCalls } from '../../../../../../GraphQL/Calls/index';
+
+class New extends React.Component {
+ constructor() {
+ super();
+ this.state = { name: '' };
+ }
+
+ render() {
+ const { name } = this.state;
+ const { closeDialogs } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default New;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Formula/index.js b/src/Components/Event/Edit/Tabs/Technical/Formula/index.js
new file mode 100644
index 000000000..6f7047dad
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Formula/index.js
@@ -0,0 +1,5 @@
+import New from './New';
+
+export {
+ New,
+};
diff --git a/src/Components/Event/Edit/Tabs/Technical/Plotter/New.js b/src/Components/Event/Edit/Tabs/Technical/Plotter/New.js
new file mode 100644
index 000000000..5dc2b3b06
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Plotter/New.js
@@ -0,0 +1,108 @@
+import React from 'react';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogContentText,
+ Button,
+ TextField,
+} from '@material-ui/core';
+
+import { Mutation } from 'react-apollo';
+import { getOptionsCalls } from '../../../../../../GraphQL/Calls/index';
+
+class New extends React.Component {
+ constructor() {
+ super();
+ this.state = {
+ name: '',
+ host: '',
+ repo: '',
+ moduleName: '',
+ };
+ }
+
+ render() {
+ const {
+ name, host, repo, moduleName,
+ } = this.state;
+ const { closeDialogs } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default New;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Plotter/index.js b/src/Components/Event/Edit/Tabs/Technical/Plotter/index.js
new file mode 100644
index 000000000..6f7047dad
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Plotter/index.js
@@ -0,0 +1,5 @@
+import New from './New';
+
+export {
+ New,
+};
diff --git a/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js b/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js
new file mode 100644
index 000000000..4a08a93df
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Prizes/List.js
@@ -0,0 +1,80 @@
+import React from 'react';
+import {
+ Paper,
+ Grid,
+ Typography,
+} from '@material-ui/core';
+import {
+ SortableContainer,
+ SortableElement,
+ SortableHandle,
+} from 'react-sortable-hoc';
+
+const DragHandle = SortableHandle(() => );
+
+const SortableItem = SortableElement(({ value, deletePrize }) => (
+
+
+
+
+
+
+
+
+ {value.fromRank}{value.toRank}{value.additional}{value.amount}{value.asset}
+
+
+
+
+
+ deletePrize(value.position)} >Remove
+
+
+
+
+));
+
+const SortableList = SortableContainer(({ items, deletePrize }) => (
+
+ {items.map((value, index) => (
+ deletePrize(deleteId)} />
+ ))}
+
+));
+
+class List extends React.Component {
+ onSortEnd = ({ oldIndex, newIndex }) => {
+ let newPrizes = this.props.prizes.slice(0);
+ newPrizes.splice(newIndex, 0, newPrizes.splice(oldIndex, 1)[0]);
+ newPrizes = newPrizes.map((prize, index) => {
+ prize.position = index;
+ return prize;
+ });
+ this.props.edit(newPrizes);
+ }
+
+ deletePrize = (deletedIndex) => {
+ let newPrizes = this.props.prizes.slice(0);
+ newPrizes.splice(deletedIndex, 1);
+ newPrizes = newPrizes.map((prize, index) => {
+ prize.position = index;
+ return prize;
+ });
+ this.props.edit(newPrizes);
+ }
+
+ render() {
+ return (
+
+ this.deletePrize(deleteId)}
+ />
+
+ );
+ }
+}
+
+export default List;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Prizes/New.js b/src/Components/Event/Edit/Tabs/Technical/Prizes/New.js
new file mode 100644
index 000000000..882c8b340
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Prizes/New.js
@@ -0,0 +1,106 @@
+import React from 'react';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogContentText,
+ Button,
+ TextField,
+} from '@material-ui/core';
+
+class New extends React.Component {
+ constructor() {
+ super();
+ this.state = {
+ additional: '',
+ amount: 0,
+ asset: '',
+ };
+ }
+
+ render() {
+ const {
+ fromRank, toRank, additional, amount, asset,
+ } = this.state;
+ const { addPrize, closeDialogs } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default New;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Prizes/index.js b/src/Components/Event/Edit/Tabs/Technical/Prizes/index.js
new file mode 100644
index 000000000..307bbe029
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Prizes/index.js
@@ -0,0 +1,7 @@
+import List from './List';
+import New from './New';
+
+export {
+ List,
+ New,
+};
diff --git a/src/Components/Event/Edit/Tabs/Technical/Rules/List.js b/src/Components/Event/Edit/Tabs/Technical/Rules/List.js
new file mode 100644
index 000000000..c9570ae4c
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Rules/List.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import {
+ Paper,
+ Grid,
+ Typography,
+} from '@material-ui/core';
+import {
+ SortableContainer,
+ SortableElement,
+ SortableHandle,
+} from 'react-sortable-hoc';
+
+const DragHandle = SortableHandle(() => );
+
+const SortableItem = SortableElement(({ value, deleteRule }) => (
+
+
+
+
+
+
+
+
+ {value.title}
+
+
+ {value.description}
+
+
+
+ deleteRule(value.position)} >Remove
+
+
+
+
+));
+
+const SortableList = SortableContainer(({ items, deleteRule }) => (
+
+ {items.map((value, index) => (
+ deleteRule(deleteId)} />
+ ))}
+
+));
+
+class List extends React.Component {
+ onSortEnd = ({ oldIndex, newIndex }) => {
+ let newRules = this.props.rules.slice(0);
+ newRules.splice(newIndex, 0, newRules.splice(oldIndex, 1)[0]);
+ newRules = newRules.map((rule, index) => {
+ rule.position = index;
+ return rule;
+ });
+ this.props.edit(newRules);
+ }
+
+ deleteRule = (deletedIndex) => {
+ let newRules = this.props.rules.slice(0);
+ newRules.splice(deletedIndex, 1);
+ newRules = newRules.map((rule, index) => {
+ rule.position = index;
+ return rule;
+ });
+ this.props.edit(newRules);
+ }
+
+ render() {
+ return (
+
+ this.deleteRule(deleteId)}
+ />
+
+ );
+ }
+}
+
+export default List;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Rules/New.js b/src/Components/Event/Edit/Tabs/Technical/Rules/New.js
new file mode 100644
index 000000000..e133c1508
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Rules/New.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogContentText,
+ Button,
+ TextField,
+} from '@material-ui/core';
+
+class New extends React.Component {
+ constructor() {
+ super();
+ this.state = {
+ title: '',
+ description: '',
+ };
+ }
+
+ render() {
+ const {
+ title, description,
+ } = this.state;
+ const { addRule, closeDialogs } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default New;
diff --git a/src/Components/Event/Edit/Tabs/Technical/Rules/index.js b/src/Components/Event/Edit/Tabs/Technical/Rules/index.js
new file mode 100644
index 000000000..307bbe029
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/Rules/index.js
@@ -0,0 +1,7 @@
+import List from './List';
+import New from './New';
+
+export {
+ List,
+ New,
+};
diff --git a/src/Components/Event/Edit/Tabs/Technical/index.js b/src/Components/Event/Edit/Tabs/Technical/index.js
new file mode 100644
index 000000000..1db2027c2
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/Technical/index.js
@@ -0,0 +1,195 @@
+import React from 'react';
+import { Query } from 'react-apollo';
+
+import {
+ Typography,
+ FormControl,
+ InputLabel,
+ Input,
+ Select,
+ FormHelperText,
+ MenuItem,
+ Grid,
+ Button,
+} from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
+import styles from '../../styles';
+
+import { getOptionsCalls } from '../../../../../GraphQL/Calls/index';
+
+import { List as RulesList, New as NewRule } from './Rules';
+import { List as PrizesList, New as NewPrize } from './Prizes';
+
+import { New as NewPlotter } from './Plotter';
+import { New as NewFormula } from './Formula';
+
+class Technical extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isNewFormulaOpen: false,
+ isNewPlotterOpen: false,
+ isNewRuleOpen: false,
+ isNewPrizeOpen: false,
+ };
+ }
+
+ addRule = (title, description) => {
+ this.props.edit('rules', [...this.props.event.rules, {
+ title,
+ description,
+ position: this.props.event.rules.length,
+ }]);
+ this.closeDialogs();
+ }
+
+ addPrize = (prize) => {
+ this.props.edit('prizes', [...this.props.event.prizes, prize]);
+ this.closeDialogs();
+ }
+
+ closeDialogs = () => {
+ this.setState({
+ isNewFormulaOpen: false,
+ isNewPlotterOpen: false,
+ isNewRuleOpen: false,
+ isNewPrizeOpen: false,
+ });
+ }
+
+ render() {
+ const { classes, event, edit } = this.props;
+ const {
+ isNewPlotterOpen, isNewFormulaOpen, isNewRuleOpen, isNewPrizeOpen,
+ } = this.state;
+ return (
+
+
+ Select the formula and the plotter you want to use, you can also create your own with the corresponding button.
+
+
+
+ Select the formula
+
+
+ {({ loading, error, data }) => {
+ if (loading) {
+ return (
+ }
+ displayEmpty
+ className={classes.selectEmpty}
+ disabled
+ >
+
+
+ );
+ }
+ if (error) return `Error! ${error.message}`;
+ const selects = data.events_Formulas.map((formula, index) => (
+
+ ));
+ return (
+
+ }
+ displayEmpty
+ className={classes.selectEmpty}
+ onChange={newVal => edit('formulaId', newVal.target.value)}
+ >
+ {selects}
+
+ { isNewFormulaOpen ? this.closeDialogs()} /> : ''}
+
+ );
+ }}
+
+ { this.setState({ isNewFormulaOpen: true }); }}>
+ To create a new formula, click here
+
+
+
+
+ Select the Plotter
+
+
+ {({ loading, error, data }) => {
+ if (loading) {
+ return (
+ }
+ displayEmpty
+ className={classes.selectEmpty}
+ disabled
+ >
+
+
+ );
+ }
+ if (error) return `Error! ${error.message}`;
+ const selects = data.events_Plotters.map((plotter, index) => (
+
+ ));
+ return (
+
+ }
+ displayEmpty
+ className={classes.selectEmpty}
+ onChange={newVal => edit('plotterId', newVal.target.value)}
+ >
+ {selects}
+
+ { isNewPlotterOpen ? this.closeDialogs()} /> : ''}
+
+ );
+ }}
+
+ { this.setState({ isNewPlotterOpen: true }); }} >
+ To create a new plotter, click here
+
+
+
+
+
+ Define the rules of your event.
+
+ edit('rules', newVal)} />
+ { isNewRuleOpen
+ ? this.closeDialogs()} addRule={(title, description) => this.addRule(title, description)} />
+ : ''}
+ { this.setState({ isNewRuleOpen: true }); }} >
+ To add a new rule, click here
+
+
+
+
+
+ Define the prizes of your event.
+
+ edit('prizes', newVal)} />
+ { isNewPrizeOpen
+ ? this.closeDialogs()} addPrize={prize => this.addPrize(prize)} />
+ : ''}
+ { this.setState({ isNewPrizeOpen: true }); }} >
+ To add a new prize, click here
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(Technical);
diff --git a/src/Components/Event/Edit/Tabs/index.js b/src/Components/Event/Edit/Tabs/index.js
new file mode 100644
index 000000000..feecaaf55
--- /dev/null
+++ b/src/Components/Event/Edit/Tabs/index.js
@@ -0,0 +1,11 @@
+import Basic from './Basic';
+import PresentationPage from './PresentationPage';
+import TeamsServer from './TeamsServer';
+import Technical from './Technical';
+
+export {
+ Basic,
+ PresentationPage,
+ TeamsServer,
+ Technical,
+};
diff --git a/client/src/Components/Event/Edit/index.js b/src/Components/Event/Edit/index.js
similarity index 59%
rename from client/src/Components/Event/Edit/index.js
rename to src/Components/Event/Edit/index.js
index c1a8cb646..1db70051c 100644
--- a/client/src/Components/Event/Edit/index.js
+++ b/src/Components/Event/Edit/index.js
@@ -1,10 +1,9 @@
import React from 'react';
import { Query } from 'react-apollo';
-import Typography from '@material-ui/core/Typography';
import { withStyles } from '@material-ui/core/styles';
-
import styles from './styles';
+import Queried from './queried';
import BannerTopBar from '../../BannerTopBar';
@@ -14,15 +13,8 @@ class Edit extends React.Component {
render() {
return (
-
-
- Enroll in an competition {this.props.match.params.slug}
-
+
+
{
if (loading) return 'Loading...';
if (error) return `Error! ${error.message}`;
- return (
-
- {data.events_Event.description}
-
- );
+ return ();
}}
diff --git a/src/Components/Event/Edit/queried.js b/src/Components/Event/Edit/queried.js
new file mode 100644
index 000000000..ed3cde6d6
--- /dev/null
+++ b/src/Components/Event/Edit/queried.js
@@ -0,0 +1,179 @@
+import React from 'react';
+import { Mutation } from 'react-apollo';
+
+import {
+ Paper,
+ Typography,
+ AppBar,
+ Tabs,
+ Tab,
+} from '@material-ui/core';
+import {
+ Face as BasicIcon,
+ Alarm as TechnicalIcon,
+ Group as TeamAndServerIcon,
+ PresentToAll as PresentationIcon,
+} from '@material-ui/icons';
+import { withStyles } from '@material-ui/core/styles';
+import styles from './styles';
+
+import {
+ Basic,
+ PresentationPage,
+ TeamsServer,
+ Technical,
+} from './Tabs';
+
+import { hostedEventsCalls } from '../../../GraphQL/Calls/index';
+
+function TabContainer(props) {
+ return (
+
+ {props.children}
+
+ );
+}
+
+class Queried extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ value: 0,
+ title: this.props.event.title,
+ subtitle: this.props.event.subtitle,
+ description: this.props.event.description,
+ startDatetime: this.props.event.startDatetime * 1000,
+ finishDatetime: this.props.event.finishDatetime * 1000,
+ formulaId: this.props.event.formula.id,
+ plotterId: this.props.event.plotter.id,
+ prizes: this.props.event.prizes,
+ rules: this.props.event.rules,
+ };
+ }
+
+ handleTabChange = (event, value) => {
+ this.setState({ value });
+ }
+
+ handleEventChange = (newType, newVal) => {
+ this.setState({ [newType]: newVal });
+ }
+
+
+ render() {
+ const {
+ title,
+ subtitle,
+ description,
+ startDatetime,
+ finishDatetime,
+ value,
+ formulaId,
+ plotterId,
+ prizes,
+ rules,
+ } = this.state;
+ const { classes } = this.props;
+ return (
+
+ {
+ this.props.history.push(`/events/edit/${data.events_CreateEvent.id}`);
+ }
+ }
+ >
+ {hostEvent => (
+
+
+
+ }
+ />
+ }
+ />
+ }
+ disabled
+ />
+ }
+ disabled
+ />
+
+
+
+
+
+ Create a new event
+
+
+
+
+
+ )}
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(Queried);
diff --git a/src/Components/Event/Edit/styles.js b/src/Components/Event/Edit/styles.js
new file mode 100644
index 000000000..50a3490ca
--- /dev/null
+++ b/src/Components/Event/Edit/styles.js
@@ -0,0 +1,51 @@
+const styles = theme => ({
+ root: {
+ flexGrow: 1,
+ width: '100%',
+ backgroundColor: theme.palette.background.paper,
+ padding: 0,
+ margin: 0,
+ },
+ tabTitle: {
+ width: '25%',
+ maxWidth: 'none',
+ },
+ clickable: {
+ cursor: 'pointer',
+ },
+ buttonList: {
+ margin: theme.spacing.unit,
+ float: 'right',
+ },
+ buttonGrid: {
+ marginTop: -20,
+ },
+ title: {
+ marginTop: 20,
+ },
+ paperRoot: {
+ flexGrow: 1,
+ padding: 10,
+ marginTop: 25,
+ marginBottom: 25,
+ },
+ inputField: {
+ width: '80%',
+ marginLeft: '10%',
+ marginTop: 25,
+ },
+ typography: {
+ width: '80%',
+ marginLeft: '10%',
+ marginTop: 40,
+ },
+ selectEmpty: {
+ marginTop: theme.spacing.unit * 2,
+ },
+ bottomButton: {
+ padding: 15,
+ margin: 20,
+ },
+});
+
+export default styles;
diff --git a/client/src/Components/Event/Show/index.js b/src/Components/Event/Show/index.js
similarity index 100%
rename from client/src/Components/Event/Show/index.js
rename to src/Components/Event/Show/index.js
diff --git a/client/src/Components/Event/Edit/styles.js b/src/Components/Event/Show/styles.js
similarity index 100%
rename from client/src/Components/Event/Edit/styles.js
rename to src/Components/Event/Show/styles.js
diff --git a/client/src/Components/Events/index.js b/src/Components/Events/index.js
similarity index 71%
rename from client/src/Components/Events/index.js
rename to src/Components/Events/index.js
index 71623c568..8b6283b65 100644
--- a/client/src/Components/Events/index.js
+++ b/src/Components/Events/index.js
@@ -6,7 +6,7 @@ const Index = () => (
size='big'
title='Your events'
text='Here will be the list of YOUR events'
- backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/events.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/events.jpg'
/>
);
diff --git a/client/src/Components/HostedEvents/Event.js b/src/Components/HostedEvents/Event.js
similarity index 92%
rename from client/src/Components/HostedEvents/Event.js
rename to src/Components/HostedEvents/Event.js
index bab987a59..0379834f6 100644
--- a/client/src/Components/HostedEvents/Event.js
+++ b/src/Components/HostedEvents/Event.js
@@ -26,7 +26,7 @@ class Event extends React.Component {
- {name}
+ {name}
From : {toLocalTime(startDatetime)}
To : {toLocalTime(finishDatetime)}
@@ -40,7 +40,7 @@ class Event extends React.Component {
- Description :
+ Description :
{description}
diff --git a/client/src/Components/HostedEvents/index.js b/src/Components/HostedEvents/index.js
similarity index 85%
rename from client/src/Components/HostedEvents/index.js
rename to src/Components/HostedEvents/index.js
index 0a1305b0f..d5fc17506 100644
--- a/client/src/Components/HostedEvents/index.js
+++ b/src/Components/HostedEvents/index.js
@@ -13,7 +13,7 @@ const HostedEvent = () => (
size='medium'
title='Your hosted events'
text='You are one of the pillars of this community, thank you'
- backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/events.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/events.jpg'
/>
(
));
return (
-
+
{ list }
-
+
);
}}
diff --git a/client/src/Components/HostedEvents/styles.js b/src/Components/HostedEvents/styles.js
similarity index 85%
rename from client/src/Components/HostedEvents/styles.js
rename to src/Components/HostedEvents/styles.js
index 866f1e2fc..62239d966 100644
--- a/client/src/Components/HostedEvents/styles.js
+++ b/src/Components/HostedEvents/styles.js
@@ -4,8 +4,6 @@ const styles = theme => ({
padding: 20,
marginTop: 20,
marginBottom: 20,
- marginLeft: 400,
- marginRight: 400,
},
buttonList: {
margin: theme.spacing.unit,
diff --git a/client/src/Components/Search/Event.js b/src/Components/Search/Event.js
similarity index 91%
rename from client/src/Components/Search/Event.js
rename to src/Components/Search/Event.js
index 1736098ee..cf9c08d8a 100644
--- a/client/src/Components/Search/Event.js
+++ b/src/Components/Search/Event.js
@@ -26,7 +26,7 @@ class Event extends React.Component {
- {name}
+ {name}
From : {toLocalTime(startDatetime)}
To : {toLocalTime(finishDatetime)}
@@ -40,7 +40,7 @@ class Event extends React.Component {
- Description :
+ Description :
{description}
diff --git a/client/src/Components/Search/Tabs/Future.js b/src/Components/Search/Tabs/Future.js
similarity index 94%
rename from client/src/Components/Search/Tabs/Future.js
rename to src/Components/Search/Tabs/Future.js
index d5dbfc089..21ba1383e 100644
--- a/client/src/Components/Search/Tabs/Future.js
+++ b/src/Components/Search/Tabs/Future.js
@@ -15,7 +15,7 @@ class Future extends React.Component {
));
return (
-
+
{futureEvents}
-
+
);
}
}
diff --git a/client/src/Components/Search/Tabs/History.js b/src/Components/Search/Tabs/History.js
similarity index 52%
rename from client/src/Components/Search/Tabs/History.js
rename to src/Components/Search/Tabs/History.js
index 21d848289..bc3577f8e 100644
--- a/client/src/Components/Search/Tabs/History.js
+++ b/src/Components/Search/Tabs/History.js
@@ -8,15 +8,17 @@ class History extends React.Component {
render() {
const { classes } = this.props;
return (
-
- Your old events (maybe here, maybe not, who knows)
-
+
+
+ Your old events (maybe here, maybe not, who knows)
+
+
);
}
}
diff --git a/client/src/Components/Search/Tabs/Incoming.js b/src/Components/Search/Tabs/Incoming.js
similarity index 96%
rename from client/src/Components/Search/Tabs/Incoming.js
rename to src/Components/Search/Tabs/Incoming.js
index ab6b070dc..6d92f4dd8 100644
--- a/client/src/Components/Search/Tabs/Incoming.js
+++ b/src/Components/Search/Tabs/Incoming.js
@@ -18,7 +18,7 @@ class Incoming extends React.Component {
));
return (
-
+
{incomingEvents}
-
+
);
}
}
diff --git a/client/src/Components/Search/Tabs/Past.js b/src/Components/Search/Tabs/Past.js
similarity index 94%
rename from client/src/Components/Search/Tabs/Past.js
rename to src/Components/Search/Tabs/Past.js
index b01cb0684..c4939b19b 100644
--- a/client/src/Components/Search/Tabs/Past.js
+++ b/src/Components/Search/Tabs/Past.js
@@ -15,7 +15,7 @@ class Past extends React.Component {
));
return (
-
+
{pastEvents}
-
+
);
}
}
diff --git a/client/src/Components/Search/Tabs/index.js b/src/Components/Search/Tabs/index.js
similarity index 100%
rename from client/src/Components/Search/Tabs/index.js
rename to src/Components/Search/Tabs/index.js
diff --git a/client/src/Components/Search/index.js b/src/Components/Search/index.js
similarity index 97%
rename from client/src/Components/Search/index.js
rename to src/Components/Search/index.js
index 4c07b3071..304b5224d 100644
--- a/client/src/Components/Search/index.js
+++ b/src/Components/Search/index.js
@@ -57,7 +57,7 @@ class Search extends React.Component {
size='medium'
title='Events'
text='All the events are going to be listed here'
- backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/events.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/events.jpg'
/>
({
padding: 20,
marginTop: 20,
marginBottom: 20,
- marginLeft: 400,
- marginRight: 400,
},
buttonList: {
margin: theme.spacing.unit,
diff --git a/client/src/GraphQL/Calls/getOptions.js b/src/GraphQL/Calls/getOptions.js
similarity index 100%
rename from client/src/GraphQL/Calls/getOptions.js
rename to src/GraphQL/Calls/getOptions.js
diff --git a/client/src/GraphQL/Calls/hostedEvents.js b/src/GraphQL/Calls/hostedEvents.js
similarity index 100%
rename from client/src/GraphQL/Calls/hostedEvents.js
rename to src/GraphQL/Calls/hostedEvents.js
diff --git a/client/src/GraphQL/Calls/index.js b/src/GraphQL/Calls/index.js
similarity index 100%
rename from client/src/GraphQL/Calls/index.js
rename to src/GraphQL/Calls/index.js
diff --git a/client/src/GraphQL/Calls/listEvents.js b/src/GraphQL/Calls/listEvents.js
similarity index 100%
rename from client/src/GraphQL/Calls/listEvents.js
rename to src/GraphQL/Calls/listEvents.js
diff --git a/client/src/GraphQL/Calls/showEvent.js b/src/GraphQL/Calls/showEvent.js
similarity index 100%
rename from client/src/GraphQL/Calls/showEvent.js
rename to src/GraphQL/Calls/showEvent.js
diff --git a/src/GraphQL/Fragments/event.js b/src/GraphQL/Fragments/event.js
new file mode 100644
index 000000000..499266c68
--- /dev/null
+++ b/src/GraphQL/Fragments/event.js
@@ -0,0 +1,125 @@
+import gql from 'graphql-tag';
+
+export const eventMinimalInfo = gql`
+ fragment EventMinimalInfo on events_Event {
+ id
+ state
+ title
+ startDatetime
+ finishDatetime
+ host {
+ alias
+ firstName
+ lastName
+ }
+ description
+ formula{
+ name
+ }
+ plotter{
+ name
+ }
+ }
+`;
+
+export const eventFullInfo = gql`
+ fragment EventFullInfo on events_Event {
+ id
+ title
+ subtitle
+ hostId
+ host {
+ id
+ email
+ firstName
+ middleName
+ lastName
+ }
+ description
+ startDatetime
+ finishDatetime
+ state
+ rules {
+ title
+ description
+ }
+ prizes {
+ condition {
+ from
+ to
+ additional
+ }
+ pool {
+ amount
+ asset
+ }
+ }
+ participants {
+ participantId
+
+ participant {
+ id
+ name
+ }
+ state
+ botId
+ releaseId
+ }
+ invitations {
+ inviteeId
+ invitee {
+ id
+ name
+ }
+ acceptedDate
+ refusedDate
+ by {
+ date
+ inviterId
+ inviter {
+ id
+ email
+ firstName
+ middleName
+ lastName
+ }
+ }
+ }
+ presentation {
+ banner
+ profile
+ page
+ }
+ formula {
+ id
+ ownerId
+
+ owner {
+ id
+ email
+ firstName
+ middleName
+ lastName
+ }
+ isTemplate
+ name
+ }
+
+ plotter {
+ id
+ ownerId
+ owner {
+ id
+ email
+ firstName
+ middleName
+ lastName
+ }
+ isTemplate
+ name
+ host
+ repo
+ moduleName
+ }
+ }
+`;
diff --git a/client/src/GraphQL/Fragments/index.js b/src/GraphQL/Fragments/index.js
similarity index 100%
rename from client/src/GraphQL/Fragments/index.js
rename to src/GraphQL/Fragments/index.js
diff --git a/client/src/GraphQL/Fragments/options.js b/src/GraphQL/Fragments/options.js
similarity index 100%
rename from client/src/GraphQL/Fragments/options.js
rename to src/GraphQL/Fragments/options.js
diff --git a/client/src/index.js b/src/index.js
similarity index 54%
rename from client/src/index.js
rename to src/index.js
index cdcd36eb2..02ebb96be 100644
--- a/client/src/index.js
+++ b/src/index.js
@@ -10,16 +10,20 @@ import HostedEvents from './Components/HostedEvents';
import EditEvent from './Components/Event/Edit';
import CreateEvent from './Components/Event/Create';
+import './styles.scss';
+
const App = () => (
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
);
diff --git a/src/styles.scss b/src/styles.scss
new file mode 100644
index 000000000..09aac0f1c
--- /dev/null
+++ b/src/styles.scss
@@ -0,0 +1,22 @@
+.eventsModule{
+ .sortableListItem{
+ padding-top: 15px;
+ margin-right: 15px;
+ padding-bottom: 15px;
+ margin-left: 15px;
+ border-bottom: 1px solid rgba(142, 144, 146, 0.3);
+ }
+}
+
+.dragHandle{
+ position: relative;
+ top: 1px;
+ display: block;
+ width: 18px;
+ height: 11px;
+ opacity: .25;
+ margin-right: 20px;
+ cursor: row-resize;
+ background: -webkit-linear-gradient(top,#000,#000 20%,#fff 0,#fff 40%,#000 0,#000 60%,#fff 0,#fff 80%,#000 0,#000);
+ background: linear-gradient(180deg,#000,#000 20%,#fff 0,#fff 40%,#000 0,#000 60%,#fff 0,#fff 80%,#000 0,#000);
+}
diff --git a/client/src/utils/index.js b/src/utils/index.js
similarity index 100%
rename from client/src/utils/index.js
rename to src/utils/index.js
diff --git a/client/src/utils/local-storage.js b/src/utils/local-storage.js
similarity index 100%
rename from client/src/utils/local-storage.js
rename to src/utils/local-storage.js