{
- document.getElementById('user-thumb').click();
+ document.getElementById('user-thumb')!.click();
}}
>
diff --git a/client/src/components/EventList/EventCard/EventCard.js b/client/src/components/EventList/EventCard/EventCard.tsx
similarity index 100%
rename from client/src/components/EventList/EventCard/EventCard.js
rename to client/src/components/EventList/EventCard/EventCard.tsx
diff --git a/client/src/components/EventList/EventList.js b/client/src/components/EventList/EventList.tsx
similarity index 75%
rename from client/src/components/EventList/EventList.js
rename to client/src/components/EventList/EventList.tsx
index 6048731..b844616 100644
--- a/client/src/components/EventList/EventList.js
+++ b/client/src/components/EventList/EventList.tsx
@@ -1,8 +1,11 @@
import React, { Component } from 'react';
import EventCard from './EventCard/EventCard';
import { Container, Row } from 'reactstrap';
+import { Events } from '../../types/multi-types';
-export class EventList extends Component {
+type Props = Events;
+
+export class EventList extends Component
{
render() {
const eventArray = this.props.events;
return (
diff --git a/client/src/components/EventList/SubHeader/SubHeader.js b/client/src/components/EventList/SubHeader/SubHeader.tsx
similarity index 100%
rename from client/src/components/EventList/SubHeader/SubHeader.js
rename to client/src/components/EventList/SubHeader/SubHeader.tsx
diff --git a/client/src/components/ForgotPassword/ForgotPasswordForm.js b/client/src/components/ForgotPassword/ForgotPasswordForm.tsx
similarity index 100%
rename from client/src/components/ForgotPassword/ForgotPasswordForm.js
rename to client/src/components/ForgotPassword/ForgotPasswordForm.tsx
diff --git a/client/src/components/ForgotPassword/ForgotPasswordValidator.js b/client/src/components/ForgotPassword/ForgotPasswordValidator.ts
similarity index 80%
rename from client/src/components/ForgotPassword/ForgotPasswordValidator.js
rename to client/src/components/ForgotPassword/ForgotPasswordValidator.ts
index 5d17f32..588fff2 100644
--- a/client/src/components/ForgotPassword/ForgotPasswordValidator.js
+++ b/client/src/components/ForgotPassword/ForgotPasswordValidator.ts
@@ -1,7 +1,11 @@
import { isEmail } from 'validator';
+type Errors = {
+ email?: string
+}
+
const validate = values => {
- const errors = {},
+ const errors: Errors = {},
{ email } = values;
if (!email) errors.email = '*Email Required';
diff --git a/client/src/components/GoogleMap/GoogleMap.js b/client/src/components/GoogleMap/GoogleMap.tsx
similarity index 82%
rename from client/src/components/GoogleMap/GoogleMap.js
rename to client/src/components/GoogleMap/GoogleMap.tsx
index 8a7fcf1..e8d6d12 100644
--- a/client/src/components/GoogleMap/GoogleMap.js
+++ b/client/src/components/GoogleMap/GoogleMap.tsx
@@ -5,16 +5,21 @@ import {
Map,
Marker,
} from 'google-maps-react';
-import type { BaseReduxPropTypes } from '../types/base-props-types';
-import { GOOGLE_API_KEY } from '../../config.env';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
+import { MapLocation } from '../../types/multi-types';
type Props = BaseReduxPropTypes & {
- location: Object,
+ location: MapLocation,
google: Object,
- coordinates: Object,
};
-class GoogleMap extends Component {
+type State = {
+ showingInfoWindow: boolean,
+ activeMarker: any,
+ selectedPlace: any,
+}
+
+class GoogleMap extends Component {
constructor(props) {
super(props);
this.state = {
@@ -71,5 +76,5 @@ class GoogleMap extends Component {
}
}
export default apiWrapper({
- apiKey: GOOGLE_API_KEY,
+ apiKey: process.env.GOOGLE_API_KEY,
})(GoogleMap);
diff --git a/client/src/components/LoginForm/LoginForm.js b/client/src/components/LoginForm/LoginForm.tsx
similarity index 92%
rename from client/src/components/LoginForm/LoginForm.js
rename to client/src/components/LoginForm/LoginForm.tsx
index 137f973..7cc6aba 100644
--- a/client/src/components/LoginForm/LoginForm.js
+++ b/client/src/components/LoginForm/LoginForm.tsx
@@ -1,5 +1,3 @@
-// @flow
-
import React from 'react';
import { Button } from 'reactstrap';
import './LoginForm.css';
@@ -7,9 +5,9 @@ import { Field, reduxForm } from 'redux-form';
import renderField from '../RenderField';
import validate from './LoginValidator';
-// type LoginEvent = (Event<>;)
type Props = {
- onSubmit(e: SyntheticEvent): void,
+ onSubmit(e: React.SyntheticEvent): void,
+ valid: boolean,
};
let LoginForm = (props: Props) => {
diff --git a/client/src/components/LoginForm/LoginValidator.js b/client/src/components/LoginForm/LoginValidator.js
deleted file mode 100644
index 343e626..0000000
--- a/client/src/components/LoginForm/LoginValidator.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const validate = values => {
- const errors = {},
- { username, password } = values;
-
- if (!username) errors.username = '*Username Required';
- if (!password) errors.password = '*Password Required';
-
- return errors;
-};
-
-export default validate;
diff --git a/client/src/components/LoginForm/LoginValidator.ts b/client/src/components/LoginForm/LoginValidator.ts
new file mode 100644
index 0000000..d349347
--- /dev/null
+++ b/client/src/components/LoginForm/LoginValidator.ts
@@ -0,0 +1,22 @@
+type Errors = {
+ username?: string,
+ password?: string
+}
+type Args = {
+ username: string,
+ password: string
+}
+
+const validate = (values: Args) => {
+ const errors: Errors = {
+ username: '', password: ''
+ };
+ const { username, password } = values;
+
+ if (!username) errors.username = '*Username Required';
+ if (!password) errors.password = '*Password Required';
+
+ return errors;
+};
+
+export default validate;
diff --git a/client/src/components/RenderField.js b/client/src/components/RenderField.tsx
similarity index 100%
rename from client/src/components/RenderField.js
rename to client/src/components/RenderField.tsx
diff --git a/client/src/components/SignupForm/SignupForm.js b/client/src/components/SignupForm/SignupForm.tsx
similarity index 100%
rename from client/src/components/SignupForm/SignupForm.js
rename to client/src/components/SignupForm/SignupForm.tsx
diff --git a/client/src/components/SignupForm/SignupValidator.js b/client/src/components/SignupForm/SignupValidator.ts
similarity index 83%
rename from client/src/components/SignupForm/SignupValidator.js
rename to client/src/components/SignupForm/SignupValidator.ts
index 706c613..4f1ba0b 100644
--- a/client/src/components/SignupForm/SignupValidator.js
+++ b/client/src/components/SignupForm/SignupValidator.ts
@@ -1,7 +1,15 @@
import { isEmail, isLowercase, isLength } from 'validator';
+type Errors = {
+ firstname?: string,
+ lastname?: string,
+ username?: string,
+ email?: string,
+ password?: string,
+}
+
const validate = values => {
- const errors = {},
+ const errors: Errors = {},
{ firstname, lastname, username, email, password } = values;
if (!email) errors.email = '*Email Required';
diff --git a/client/src/components/SocialShare/MetaTagsComponent.js b/client/src/components/SocialShare/MetaTagsComponent.tsx
similarity index 100%
rename from client/src/components/SocialShare/MetaTagsComponent.js
rename to client/src/components/SocialShare/MetaTagsComponent.tsx
diff --git a/client/src/components/SocialShare/SocialShare.js b/client/src/components/SocialShare/SocialShare.tsx
similarity index 100%
rename from client/src/components/SocialShare/SocialShare.js
rename to client/src/components/SocialShare/SocialShare.tsx
diff --git a/client/src/components/SummaryContainer/SummaryContainer.js b/client/src/components/SummaryContainer/SummaryContainer.tsx
similarity index 69%
rename from client/src/components/SummaryContainer/SummaryContainer.js
rename to client/src/components/SummaryContainer/SummaryContainer.tsx
index 41d1d87..41597da 100644
--- a/client/src/components/SummaryContainer/SummaryContainer.js
+++ b/client/src/components/SummaryContainer/SummaryContainer.tsx
@@ -2,6 +2,14 @@ import React, { Component } from 'react';
import { Row, Col } from 'reactstrap';
import { Link } from 'react-router-dom';
+type Props = {
+ url?: string | null,
+ content?: string,
+ externalLink?: boolean,
+ iconName?: string,
+ logo?: string,
+}
+
class SummaryContainer extends Component {
render() {
return this.props.content || this.props.url ? (
@@ -11,8 +19,8 @@ class SummaryContainer extends Component {
{this.props.logo ? (
) : (
-
- )}
+
+ )}
{this.props.url === null ? (
@@ -26,12 +34,12 @@ class SummaryContainer extends Component {
) : (
-
-
- {this.props.content}
-
-
- )}
+
+
+ {this.props.content}
+
+
+ )}
diff --git a/client/src/components/UserProfile/UserProfile.js b/client/src/components/UserProfile/UserProfile.tsx
similarity index 93%
rename from client/src/components/UserProfile/UserProfile.js
rename to client/src/components/UserProfile/UserProfile.tsx
index 3e560e7..a877171 100644
--- a/client/src/components/UserProfile/UserProfile.js
+++ b/client/src/components/UserProfile/UserProfile.tsx
@@ -6,16 +6,17 @@ import './UserProfile.css';
type Props = {
user: AttendeeType,
+ isUserLoggedIn: boolean,
};
type InfoGroupProps = {
name: string,
value: string,
};
-const InfoGroup = (e: InfoGroupProps) => {
+const InfoGroup = e => {
return (
- |
+ |
{e.name}
|
{e.value || '-'} |
diff --git a/client/src/config.env b/client/src/config.env
index 3673350..6921d09 100644
--- a/client/src/config.env
+++ b/client/src/config.env
@@ -1 +1 @@
-export const GOOGLE_API_KEY = 'AIzaSyAzHCccXh0UbA8TqR8WwbLmSval6_M9_0w';
+process.env.GOOGLE_API_KEY = 'AIzaSyAzHCccXh0UbA8TqR8WwbLmSval6_M9_0w';
diff --git a/client/src/containers/App/App.test.js b/client/src/containers/App/App.test.js
deleted file mode 100644
index 5d6cc75..0000000
--- a/client/src/containers/App/App.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-import { Provider } from 'react-redux';
-import configureStore from './../../store/configureStore';
-
-it('renders without crashing', () => {
- const store = configureStore();
- const div = document.createElement('div');
- ReactDOM.render(
-
-
- ,
- div
- );
- ReactDOM.unmountComponentAtNode(div);
-});
diff --git a/client/src/containers/App/App.js b/client/src/containers/App/App.tsx
similarity index 100%
rename from client/src/containers/App/App.js
rename to client/src/containers/App/App.tsx
diff --git a/client/src/containers/App/routes/index.js b/client/src/containers/App/routes/index.tsx
similarity index 100%
rename from client/src/containers/App/routes/index.js
rename to client/src/containers/App/routes/index.tsx
diff --git a/client/src/containers/App/routes/private.routes.js b/client/src/containers/App/routes/private.routes.tsx
similarity index 100%
rename from client/src/containers/App/routes/private.routes.js
rename to client/src/containers/App/routes/private.routes.tsx
diff --git a/client/src/containers/App/routes/public.routes.js b/client/src/containers/App/routes/public.routes.tsx
similarity index 100%
rename from client/src/containers/App/routes/public.routes.js
rename to client/src/containers/App/routes/public.routes.tsx
diff --git a/client/src/containers/CurrentEvent/CurrentEvent.js b/client/src/containers/CurrentEvent/CurrentEvent.tsx
similarity index 89%
rename from client/src/containers/CurrentEvent/CurrentEvent.js
rename to client/src/containers/CurrentEvent/CurrentEvent.tsx
index 8827dd2..09585b6 100644
--- a/client/src/containers/CurrentEvent/CurrentEvent.js
+++ b/client/src/containers/CurrentEvent/CurrentEvent.tsx
@@ -1,4 +1,3 @@
-// @flow
import React, { Component } from 'react';
import {
Container,
@@ -19,12 +18,34 @@ import moment from 'moment';
import DescriptionContainer from '../../components/DescriptionContainer/DescriptionContainer';
import { Link } from 'react-router-dom';
import { AttendeeType } from '../../types/attendee-types';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
import './CurrentEvent.css';
import GoogleMap from '../../components/GoogleMap/GoogleMap';
import CommentsBlock from '../../components/Comments/CommentsBlock';
+import { EventType } from '../../types/event-types';
+import { MapLocation } from '../../types/multi-types';
const DATE_FORMAT = 'LLLL';
+type Tags = {
+ id: string,
+ name: string,
+}
+
+type Props = BaseReduxPropTypes & {
+ currentEvent: {
+ event: EventType & {
+ location: MapLocation,
+ tags: Array,
+ },
+ },
+ match: {
+ params: {
+ event_id: string
+ }
+ },
+}
+
class CurrentEvent extends Component {
eventId;
componentDidMount() {
@@ -38,7 +59,7 @@ class CurrentEvent extends Component {
dispatch(fetchCurrentEvent(eventId));
};
- getAttendeesProfiles = (attendees: Array) => {
+ getAttendeesProfiles = attendees => {
return (
{attendees &&
@@ -88,12 +109,12 @@ class CurrentEvent extends Component {
{
) : (
-
- )}
+
+ )}
);
}
diff --git a/client/src/containers/DevTools.js b/client/src/containers/DevTools.tsx
similarity index 100%
rename from client/src/containers/DevTools.js
rename to client/src/containers/DevTools.tsx
diff --git a/client/src/containers/EditProfile/EditUserProfile.js b/client/src/containers/EditProfile/EditUserProfile.tsx
similarity index 83%
rename from client/src/containers/EditProfile/EditUserProfile.js
rename to client/src/containers/EditProfile/EditUserProfile.tsx
index 6960a18..2b13064 100644
--- a/client/src/containers/EditProfile/EditUserProfile.js
+++ b/client/src/containers/EditProfile/EditUserProfile.tsx
@@ -7,11 +7,21 @@ import {
userProfilePictureUpload,
} from '../../actions';
import { EditUserForm } from '../../components/EditUserForm/EditUserForm';
-
import { connect } from 'react-redux';
import { AttendeeType } from '../../types/attendee-types';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
+import { History } from '../../types/react-router-types';
+
+type Props = BaseReduxPropTypes & History & {
+ userProfile: Object,
+ match: {
+ params: {
+ user_id: string
+ }
+ },
+}
-class EditUserProfile extends React.Component {
+class EditUserProfile extends React.Component {
constructor(props) {
super(props);
this.getCurrentUser();
@@ -39,7 +49,7 @@ class EditUserProfile extends React.Component {
dispatch(userProfilePictureUpload(file));
};
- getUserDetails(): AttendeeType {
+ getUserDetails = (): any => {
const user = this.props.userProfile;
return user ? user : null;
}
diff --git a/client/src/containers/Events/Events.js b/client/src/containers/Events/Events.tsx
similarity index 86%
rename from client/src/containers/Events/Events.js
rename to client/src/containers/Events/Events.tsx
index e433943..7232117 100644
--- a/client/src/containers/Events/Events.js
+++ b/client/src/containers/Events/Events.tsx
@@ -1,10 +1,9 @@
-// @flow
-
import React, { Component } from 'react';
import { Row, Col, Jumbotron, Container } from 'reactstrap';
import { fetchEvents, postEvent } from '../../actions';
import { makeQueryStringTransformable } from '../../utils/utils';
-import type { BaseReduxPropTypes } from '../../types/base-props-types';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
+import { Events as EventsTypes } from '../../types/multi-types';
import { connect } from 'react-redux';
import { EventList } from '../../components/EventList/EventList';
import DropSearch, {
@@ -16,7 +15,7 @@ const eventNotFound = 'No events found.';
type Props = BaseReduxPropTypes & {
userState: Object,
- events: Object,
+ events: EventsTypes,
};
class Events extends Component {
@@ -52,17 +51,17 @@ class Events extends Component {
];
};
- handleSearchChange = (searchParams: DropSearchState) => {
+ handleSearchChange = searchParams => {
if (searchParams) searchParams = makeQueryStringTransformable(searchParams);
this.getData(searchParams);
};
- getData = e => {
+ getData = (e?: string) => {
const { dispatch } = this.props;
dispatch(fetchEvents(e));
};
- handleSubmit = (event: any) => {
+ handleSubmit = event => {
event.preventDefault();
const {
@@ -105,10 +104,10 @@ class Events extends Component {
{events.events.length ? (
) : (
-
- {eventNotFound}
-
- )}
+
+ {eventNotFound}
+
+ )}
);
}
diff --git a/client/src/containers/ForgotPassword/ForgotPassword.js b/client/src/containers/ForgotPassword/ForgotPassword.tsx
similarity index 90%
rename from client/src/containers/ForgotPassword/ForgotPassword.js
rename to client/src/containers/ForgotPassword/ForgotPassword.tsx
index 80e31c0..bf00eef 100644
--- a/client/src/containers/ForgotPassword/ForgotPassword.js
+++ b/client/src/containers/ForgotPassword/ForgotPassword.tsx
@@ -1,7 +1,6 @@
-// @flow
import React, { Component } from 'react';
import ForgotPasswordForm from '../../components/ForgotPassword/ForgotPasswordForm';
-import type { BaseReduxPropTypes } from '../../types/base-props-types';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
import { Container } from 'reactstrap';
import { connect } from 'react-redux';
import { resetPassword } from '../../actions';
@@ -11,6 +10,11 @@ import 'react-toastify/dist/ReactToastify.css';
type Props = BaseReduxPropTypes & {
resetPasswordState: Object,
+ match: {
+ params: {
+ organisation_id: string
+ }
+ },
};
class ForgotPassword extends Component {
diff --git a/client/src/containers/Login/Login.js b/client/src/containers/Login/Login.tsx
similarity index 63%
rename from client/src/containers/Login/Login.js
rename to client/src/containers/Login/Login.tsx
index ebe2fa5..79c587b 100644
--- a/client/src/containers/Login/Login.js
+++ b/client/src/containers/Login/Login.tsx
@@ -1,7 +1,5 @@
-// @flow
-
import React, { Component } from 'react';
-import type { BaseReduxPropTypes } from '../../types/base-props-types';
+import { BaseReduxPropTypes, BaseReducerPropsTypes } from '../../types/base-props-types';
import { connect } from 'react-redux';
import { userLogin } from '../../actions';
import { Redirect, Link } from 'react-router-dom';
@@ -10,19 +8,15 @@ import LoginForm from '../../components/LoginForm/LoginForm';
import { Container } from 'reactstrap';
import './Login.css';
-type Props = BaseReduxPropTypes & {
- userState: Object,
- appState: Object,
- events: Object,
-};
+type Props = BaseReduxPropTypes & BaseReducerPropsTypes;
type State = {
error: string,
};
class Login extends Component {
- constructor() {
- super();
+ constructor(props) {
+ super(props);
this.state = { error: '' };
}
login = async e => {
@@ -44,21 +38,21 @@ class Login extends Component {
render() {
return this.props.userState.token === undefined ||
this.props.userState.token === null ? (
-
- Login
-
- {this.state.error}
-
- Forgot Password?
+
+ Login
+
+ {this.state.error}
+
+ Forgot Password?
-
-
- Not registered yet? Sign Up
-
-
- ) : (
-
- );
+
+
+ Not registered yet? Sign Up
+
+
+ ) : (
+
+ );
}
}
diff --git a/client/src/containers/Organisation/Organisation.js b/client/src/containers/Organisation/Organisation.tsx
similarity index 82%
rename from client/src/containers/Organisation/Organisation.js
rename to client/src/containers/Organisation/Organisation.tsx
index bce8e6a..23c1960 100644
--- a/client/src/containers/Organisation/Organisation.js
+++ b/client/src/containers/Organisation/Organisation.tsx
@@ -5,12 +5,21 @@ import ContentHeader from '../../components/ContentHeader/ContentHeader';
import { fetchCurrentOrganisation } from '../../actions';
import { isEmpty } from 'lodash';
import DescriptionContainer from '../../components/DescriptionContainer/DescriptionContainer';
-import type { BaseReduxPropTypes } from '../../types/base-props-types';
+import { BaseReduxPropTypes } from '../../types/base-props-types';
import { connect } from 'react-redux';
import MetaTagsComponent from '../../components/SocialShare/MetaTagsComponent';
+import { OrganisationType } from '../../types/organisation-types';
+import { Events } from '../../types/multi-types';
type Props = BaseReduxPropTypes & {
- organisation: Object,
+ currentOrganisation: {
+ organisation: OrganisationType & Events,
+ },
+ match: {
+ params: {
+ organisation_id: string
+ }
+ },
};
class Organisation extends Component {
@@ -50,13 +59,13 @@ class Organisation extends Component {
{organisation.events ? (
) : (
- No Events
- )}
+ No Events
+ )}
) : (
-
- )}
+
+ )}
);
}
diff --git a/client/src/containers/Root/Root.js b/client/src/containers/Root/Root.js
deleted file mode 100644
index 9cea0b2..0000000
--- a/client/src/containers/Root/Root.js
+++ /dev/null
@@ -1,5 +0,0 @@
-if (process.env.NODE_ENV === 'production') {
- module.exports = require('./Root.prod');
-} else {
- module.exports = require('./Root.dev');
-}
diff --git a/client/src/containers/Root/Root.ts b/client/src/containers/Root/Root.ts
new file mode 100644
index 0000000..70ae84e
--- /dev/null
+++ b/client/src/containers/Root/Root.ts
@@ -0,0 +1,7 @@
+let defaultExport;
+if (process.env.NODE_ENV === 'production') {
+ defaultExport = require('./Root.prod').default;
+} else {
+ defaultExport = require('./Root.dev').default;
+}
+export default defaultExport;
diff --git a/client/src/containers/Signup/Signup.js b/client/src/containers/Signup/Signup.tsx
similarity index 76%
rename from client/src/containers/Signup/Signup.js
rename to client/src/containers/Signup/Signup.tsx
index 786be08..5f14b63 100644
--- a/client/src/containers/Signup/Signup.js
+++ b/client/src/containers/Signup/Signup.tsx
@@ -1,29 +1,32 @@
import React, { Component } from 'react';
import { Container } from 'reactstrap';
-import type { BaseReduxPropTypes } from '../../types/base-props-types';
+import { BaseReduxPropTypes, BaseReducerPropsTypes } from '../../types/base-props-types';
import SignupForm from '../../components/SignupForm/SignupForm';
import { Link, Redirect } from 'react-router-dom';
import { connect } from 'react-redux';
import { userSignup } from '../../actions/index';
+import { History } from '../../types/react-router-types';
-type Props = BaseReduxPropTypes & {
- userState: Object,
-};
+type Props = BaseReduxPropTypes & History & BaseReducerPropsTypes;
-class Signup extends Component {
- constructor() {
- super();
+type State = {
+ errors: Array