diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index d13e300..41db92c 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -35,7 +35,7 @@ class Accordion extends React.Component { const { isOpen } = this.state; return (
- diff --git a/src/components/AdminHeader/AdminHeader.tsx b/src/components/AdminHeader/AdminHeader.tsx index 92df2c2..d4bcc8a 100644 --- a/src/components/AdminHeader/AdminHeader.tsx +++ b/src/components/AdminHeader/AdminHeader.tsx @@ -1,5 +1,4 @@ -import * as React from "react"; -import { Fragment } from "react"; +import React, { Fragment, Component } from "react"; import { Link } from "react-router-dom"; // @ts-ignore import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png"; @@ -8,7 +7,7 @@ import "./AdminHeader.scss"; export interface AdminHeaderProps { } export interface AdminHeaderState { } -class AdminHeader extends React.Component { +class AdminHeader extends Component { render() { return ( diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index 66ffaeb..353523d 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -21,7 +21,7 @@ export default class Button extends React.Component { const { type } = this.props; const className = `button ${buttonClassNames.get(type)}`; return ( - ); diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx index 68b8d74..d64f578 100644 --- a/src/components/Card/Card.tsx +++ b/src/components/Card/Card.tsx @@ -16,7 +16,7 @@ export interface CardState { } class Card extends React.Component { render() { const { title, text, link, image, button } = this.props; - let options = { + const options = { day: "numeric", month: "numeric", year: "numeric", @@ -38,18 +38,16 @@ class Card extends React.Component {
{button}
); - } else { - return ( -
- {imageElem} -
{datetime}
-
{title}
-
{text}
- {button} -
- ); } - + return ( +
+ {imageElem} +
{datetime}
+
{title}
+
{text}
+ {button} +
+ ); } } diff --git a/src/components/DatetimeWidget/DatetimeWidget.tsx b/src/components/DatetimeWidget/DatetimeWidget.tsx index 13964cc..3bd0c3f 100644 --- a/src/components/DatetimeWidget/DatetimeWidget.tsx +++ b/src/components/DatetimeWidget/DatetimeWidget.tsx @@ -9,13 +9,14 @@ export interface DatetimeWidgetProps { required: boolean; disabled: boolean; } -export interface DatetimeWidgetState {} +export interface DatetimeWidgetState { } class DatetimeWidget extends React.Component { render() { const { value, onChange, onFocus, onBlur, required, disabled } = this.props; - let date, time; + let date; + let time; if (value && value.length !== 0) { let rest; [date, rest] = value.split("T"); diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index f9ce678..0971bd8 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -1,5 +1,4 @@ -import * as React from "react"; -import { Fragment } from "react"; +import React, { Fragment, Component } from "react"; import { Link } from "react-router-dom"; import "./Header.scss"; import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink"; @@ -8,12 +7,12 @@ import Navigation from "../Navigation"; // @ts-ignore import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png"; -export interface HeaderProps {} +export interface HeaderProps { } export interface HeaderState { mobileMenuOpen: boolean; } -class Header extends React.Component { +class Header extends Component { constructor(props) { super(props); this.state = { @@ -48,7 +47,7 @@ class Header extends React.Component { Arkisto - + {/* Simo Höglund */} diff --git a/src/components/Icon/Icon.tsx b/src/components/Icon/Icon.tsx index a344bcd..59e3ebb 100644 --- a/src/components/Icon/Icon.tsx +++ b/src/components/Icon/Icon.tsx @@ -13,7 +13,7 @@ export interface IconProps { link?: string; onClick?: (event?: any) => void; } -export interface IconState {} +export interface IconState { } const nameToIcon = (name: IconType): JSX.Element => { if (name === IconType.Facebook) { @@ -25,7 +25,8 @@ const nameToIcon = (name: IconType): JSX.Element => { ); - } else if (name === IconType.Instagram) { + } + if (name === IconType.Instagram) { return ( { ); - } else if (name === IconType.LinkedIn) { + } + if (name === IconType.LinkedIn) { return ( { ); - } else if (name === IconType.HamburgerMenu) { + } + if (name === IconType.HamburgerMenu) { return ( { {elem} ); - } else { - return ( - - {elem} - - ); } + return ( + + {elem} + + ); } } diff --git a/src/components/InfoBox/InfoBox.tsx b/src/components/InfoBox/InfoBox.tsx index 06a2d0e..c395043 100644 --- a/src/components/InfoBox/InfoBox.tsx +++ b/src/components/InfoBox/InfoBox.tsx @@ -8,8 +8,9 @@ class InfoBox extends React.Component { constructor(props: InfoBoxProps) { super(props); } + render() { - const {children} = this.props; + const { children } = this.props; return (
{children} diff --git a/src/components/MainSection/MainSection.tsx b/src/components/MainSection/MainSection.tsx index 473a3e9..48fb711 100644 --- a/src/components/MainSection/MainSection.tsx +++ b/src/components/MainSection/MainSection.tsx @@ -9,6 +9,7 @@ class MainSection extends React.Component { - constructor(props) { super(props); this.state = { diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx index ebbdfef..fbdb9d8 100644 --- a/src/components/Navigation/Navigation.tsx +++ b/src/components/Navigation/Navigation.tsx @@ -1,7 +1,6 @@ -import * as React from "react"; -import { Fragment } from "react"; +import React, { Fragment } from "react"; import "./Navigation.scss"; -import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink"; +import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink"; import NavbarChildLink from "../NavbarChildLink/NavbarChildLink"; import Icon from "../Icon"; import { IconType } from "../Icon/Icon"; diff --git a/src/components/PageSection/PageSection.tsx b/src/components/PageSection/PageSection.tsx index fc7cb7c..32714eb 100644 --- a/src/components/PageSection/PageSection.tsx +++ b/src/components/PageSection/PageSection.tsx @@ -5,7 +5,7 @@ import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv"; export interface PageSectionProps { center?: boolean; bottomBorder?: boolean; - cardSection?: boolean; // does section contain a grid of cards + cardSection?: boolean; // does section contain a grid of cards fullSize?: boolean; } export interface PageSectionState { } diff --git a/src/components/SignupQuestionsWidget/OptionsWidget.tsx b/src/components/SignupQuestionsWidget/OptionsWidget.tsx index 99933a1..8acf430 100644 --- a/src/components/SignupQuestionsWidget/OptionsWidget.tsx +++ b/src/components/SignupQuestionsWidget/OptionsWidget.tsx @@ -28,7 +28,7 @@ class OptionsWidget extends React.Component { return (
- + {children}
); diff --git a/src/components/SignupQuestionsWidget/QuestionList.tsx b/src/components/SignupQuestionsWidget/QuestionList.tsx index 657b55b..2dea3f3 100644 --- a/src/components/SignupQuestionsWidget/QuestionList.tsx +++ b/src/components/SignupQuestionsWidget/QuestionList.tsx @@ -1,5 +1,4 @@ -import * as React from "react"; -import { Fragment } from "react"; +import React, { Component } from "react"; import * as shortid from "shortid"; import { Draggable } from "react-beautiful-dnd"; import { Question, InputProps, optionTypes, SignupQuestionError } from "./index"; @@ -15,7 +14,7 @@ export interface QuestionListProps { } export interface QuestionListState { } -class QuestionList extends React.Component { +class QuestionList extends Component { renderTextWidget = ({ questions, value, index }: InputProps) => ( ) @@ -45,22 +44,22 @@ class QuestionList extends React.Component const typeSelectWidget = ; return ( - {(provided) => ( -
- ( +
- {nameWidget} - {typeSelectWidget} - {optionsWidget} - -
- )} + + {nameWidget} + {typeSelectWidget} + {optionsWidget} + +
+ )}
); }); @@ -71,8 +70,8 @@ class QuestionList extends React.Component return (
- { this.renderQuestions() } - { placeholder } + {this.renderQuestions()} + {placeholder}
); } diff --git a/src/index.d.ts b/src/index.d.ts index 999d0e9..06ff260 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -1,3 +1,3 @@ -declare module "*.jpeg" { export default '' as string; }; -declare module '*.css' { export default '' as string; }; -declare module '*.png' { export default '' as string; }; \ No newline at end of file +declare module "*.jpeg" { export default "" as string; } +declare module "*.css" { export default "" as string; } +declare module "*.png" { export default "" as string; } diff --git a/src/pages/AdminFeedPage/AdminFeedPage.tsx b/src/pages/AdminFeedPage/AdminFeedPage.tsx index 34d4135..fd897c4 100644 --- a/src/pages/AdminFeedPage/AdminFeedPage.tsx +++ b/src/pages/AdminFeedPage/AdminFeedPage.tsx @@ -103,7 +103,6 @@ class AdminFeedPage extends React.Component diff --git a/src/pages/ContactsPage/ContactsPage.tsx b/src/pages/ContactsPage/ContactsPage.tsx index bb9005b..49c3c21 100644 --- a/src/pages/ContactsPage/ContactsPage.tsx +++ b/src/pages/ContactsPage/ContactsPage.tsx @@ -5,6 +5,10 @@ import { ColorEnum } from "../../components/ColorDiv/ColorDiv"; import { StaticContext } from "../../server/StaticContext"; import PageLink from "../../components/PageLink/PageLink"; import Card from "../../components/Card"; +<<<<<<< HEAD +======= +import { BackgroundColor as PageSectionColor } from "../../components/PageSection/PageSection"; +>>>>>>> Style fixes import PageSection from "../../components/PageSection"; import HeroMainSection from "../../components/HeroMainSection"; import ContactCard from "../../components/ContactCard"; @@ -70,7 +74,7 @@ class ContactsPage extends React.Component

Aalto-yliopiston Sähköinsinöörikilta

lorem ipsum dolor est -

+

{contacts.map(contact => ( diff --git a/src/pages/FeedCreatePage/FeedCreatePage.tsx b/src/pages/FeedCreatePage/FeedCreatePage.tsx index 7f59d2d..7863d50 100644 --- a/src/pages/FeedCreatePage/FeedCreatePage.tsx +++ b/src/pages/FeedCreatePage/FeedCreatePage.tsx @@ -215,17 +215,17 @@ class FeedCreatePage extends React.Component

{title}

- { statusMessage &&
{ statusMessage }
} + {statusMessage &&
{statusMessage}
}
- { error &&
{error}
} + uiSchema={uiSchema} + formData={formData} + idPrefix="rjsf" + widgets={widgets} + onChange={this.onChange} + onSubmit={this.onSubmit} + onError={this.onError} + onFocus={this.onFocus} /> + {error &&
{error}
}
); } diff --git a/src/pages/GuildPage/GuildPage.tsx b/src/pages/GuildPage/GuildPage.tsx index ed09f2a..c3ab058 100644 --- a/src/pages/GuildPage/GuildPage.tsx +++ b/src/pages/GuildPage/GuildPage.tsx @@ -146,7 +146,7 @@ class GuildPage extends React.Component {

Kiltatoimintaa järjestää ja ylläpitää kilta-aktiivit, toimikunnat ja jaokset.

-
+
Miksi alkaa kilta-aktiiviksi?

diff --git a/src/pages/InEnglishPage/index.ts b/src/pages/InEnglishPage/index.ts index 0022fc0..8238ed1 100644 --- a/src/pages/InEnglishPage/index.ts +++ b/src/pages/InEnglishPage/index.ts @@ -1,2 +1,3 @@ import InEnglishPage from "./InEnglishPage"; + export default InEnglishPage; diff --git a/src/pages/NotFoundPage/NotFoundPage.tsx b/src/pages/NotFoundPage/NotFoundPage.tsx index faa725f..0108242 100644 --- a/src/pages/NotFoundPage/NotFoundPage.tsx +++ b/src/pages/NotFoundPage/NotFoundPage.tsx @@ -2,9 +2,9 @@ import * as React from "react"; import Helmet from "react-helmet"; import "./NotFoundPage.scss"; -export interface NotFoundPageProps {} +export interface NotFoundPageProps { } - class NotFoundPage extends React.Component { +class NotFoundPage extends React.Component { render() { return (

diff --git a/src/pages/SignupCreatePage/SignupCreatePage.tsx b/src/pages/SignupCreatePage/SignupCreatePage.tsx index e00b3d7..c893a0d 100644 --- a/src/pages/SignupCreatePage/SignupCreatePage.tsx +++ b/src/pages/SignupCreatePage/SignupCreatePage.tsx @@ -137,7 +137,7 @@ class SignupCreatePage extends React.Component

{title}

- { statusMessage &&
{ statusMessage }
} + {statusMessage &&
{statusMessage}
} - { error &&
{error}
} + uiSchema={uiSchema} + formData={formData} + idPrefix="rjsf" + widgets={widgets} + onChange={this.onChange} + onSubmit={this.onSubmit} + onError={this.onError} + onFocus={this.onFocus} /> + {error &&
{error}
}
); } diff --git a/src/routes.tsx b/src/routes.tsx index 46d5598..6494f6b 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,5 +1,4 @@ -import * as React from "react"; -import { Component, Fragment } from "react"; +import React, { Component, Fragment } from "react"; import { Switch, Route, Redirect } from "react-router-dom"; import Helmet from "react-helmet"; import FrontPage from "./pages/FrontPage"; diff --git a/src/server/index.ts b/src/server/index.ts index f6e604c..399059e 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -7,6 +7,7 @@ import * as helmet from "helmet"; import * as compression from "compression"; import * as dotenv from "dotenv"; + dotenv.config(); console.log(`API_URL: ${process.env.API_URL}`); diff --git a/tsconfig.json b/tsconfig.json index d6dfe84..b59b044 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "esModuleInterop": true, "outDir": "./dist/", "sourceMap": true, "noImplicitAny": false,