From 5d26ec9e787169b0d2e9a85fc1cc4f9310a2386e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Fri, 3 Jul 2020 15:15:56 +0300 Subject: [PATCH] Use esModuleInterop imports --- plop-templates/component.tsx | 2 +- plop-templates/page.tsx | 2 +- src/auth.ts | 2 +- src/client/App.tsx | 2 +- src/client/index.ts | 2 +- src/components/Accordion/Accordion.tsx | 2 +- src/components/AccordionIcon/AccordionIcon.tsx | 2 +- src/components/AdminHeader/AdminHeader.tsx | 4 ++-- src/components/AdminSidebar/AdminSidebar.tsx | 2 +- .../AdminSidebarLink/AdminSidebarLink.tsx | 2 +- src/components/Anchor/Anchor.tsx | 2 +- src/components/AsideSection/AsideSection.tsx | 2 +- src/components/Button/Button.tsx | 2 +- src/components/Card/Card.tsx | 2 +- src/components/ColorDiv/ColorDiv.tsx | 2 +- .../CommitteeContainer/CommitteeContainer.tsx | 2 +- src/components/ContactCard/ContactCard.tsx | 4 ++-- src/components/DatetimeWidget/DatetimeWidget.tsx | 2 +- src/components/DropDownBox/DropDownBox.tsx | 2 +- src/components/Footer/Footer.tsx | 2 +- src/components/FooterMap/FooterMap.tsx | 2 +- src/components/HeroAsideItem/HeroAsideItem.tsx | 2 +- .../HeroAsideSection/HeroAsideSection.tsx | 2 +- .../HeroMainSection/HeroMainSection.tsx | 2 +- src/components/Icon/Icon.tsx | 2 +- src/components/InfoBox/InfoBox.tsx | 2 +- src/components/JsonLD/JsonLD.tsx | 2 +- src/components/MainSection/MainSection.tsx | 2 +- .../NavbarChildLink/NavbarChildLink.tsx | 2 +- .../NavbarDropdownLink/NavbarDropdownLink.tsx | 2 +- src/components/Navigation/Navigation.tsx | 2 +- src/components/PageLink/PageLink.tsx | 2 +- src/components/PageSection/PageSection.tsx | 2 +- src/components/Ribbon/Ribbon.tsx | 2 +- .../SectionDividerWidget.tsx | 2 +- .../SignupQuestionsWidget/OptionsWidget.tsx | 4 ++-- .../SignupQuestionsWidget/Question.tsx | 2 +- .../SignupQuestionsWidget/QuestionList.tsx | 4 ++-- .../SignupQuestionsWidget.tsx | 6 +++--- .../SignupQuestionsWidget/TypeWidget.tsx | 4 ++-- src/components/SponsorReel/SponsorReel.tsx | 2 +- src/components/TextAnchor/TextAnchor.tsx | 2 +- src/index.tsx | 2 +- src/models/Event.ts | 2 +- src/pages/ActualPage/ActualPage.tsx | 2 +- src/pages/AdminCommonPage/AdminCommonPage.tsx | 2 +- src/pages/AdminEventPage/AdminEventPage.tsx | 4 ++-- src/pages/AdminFeedPage/AdminFeedPage.tsx | 4 ++-- src/pages/AdminFrontPage/AdminFrontPage.tsx | 2 +- src/pages/AdminLoginPage/AdminLoginPage.tsx | 4 ++-- src/pages/AdminLogoutPage/AdminLogoutPage.tsx | 2 +- src/pages/AdminSignupPage/AdminSignupPage.tsx | 4 ++-- src/pages/CommonPage/CommonPage.tsx | 2 +- src/pages/ContactsPage/ContactsPage.tsx | 2 +- src/pages/CorporatePage/CorporatePage.tsx | 2 +- src/pages/EventCreatePage/EventCreatePage.tsx | 2 +- src/pages/EventPage/EventPage.tsx | 2 +- src/pages/FeedCreatePage/FeedCreatePage.tsx | 2 +- src/pages/FreshmenPage/FreshmenPage.tsx | 2 +- src/pages/FrontPage/FrontPage.tsx | 2 +- src/pages/GuildPage/GuildPage.tsx | 2 +- src/pages/InEnglishPage/InEnglishPage.tsx | 2 +- src/pages/NotFoundPage/NotFoundPage.tsx | 2 +- src/pages/SignUpPage/SignUpPage.tsx | 2 +- src/pages/SignupCreatePage/SignupCreatePage.tsx | 2 +- src/pages/StudiesPage/StudiesPage.tsx | 2 +- src/routes.tsx | 2 +- src/server/App.tsx | 2 +- src/server/index.ts | 16 ++++++++-------- 69 files changed, 87 insertions(+), 87 deletions(-) diff --git a/plop-templates/component.tsx b/plop-templates/component.tsx index 61f3bdf..42b9f35 100644 --- a/plop-templates/component.tsx +++ b/plop-templates/component.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; {{#if observer}} import { observer } from "mobx-react"; import {{ camelCase store_name }} from "../../stores/{{ properCase store_name }}"; diff --git a/plop-templates/page.tsx b/plop-templates/page.tsx index 24736dd..5f82725 100644 --- a/plop-templates/page.tsx +++ b/plop-templates/page.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./{{ properCase name}}.scss"; diff --git a/src/auth.ts b/src/auth.ts index a392067..679218b 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -1,5 +1,5 @@ import axios from "axios"; -import * as Cookies from "js-cookie"; +import Cookies from "js-cookie"; const tokenUrl = `${process.env.API_URL}/api-token-auth/`; const checkUrl = `${process.env.API_URL}/api-token-verify/`; diff --git a/src/client/App.tsx b/src/client/App.tsx index 237bca9..ef98499 100644 --- a/src/client/App.tsx +++ b/src/client/App.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { BrowserRouter } from "react-router-dom"; import Routes from "../routes"; diff --git a/src/client/index.ts b/src/client/index.ts index a985923..9fb5b97 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { hydrate } from "react-dom"; import App from "./App"; diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index 41db92c..15fc857 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Accordion.scss"; import AccordionIcon from "../AccordionIcon"; diff --git a/src/components/AccordionIcon/AccordionIcon.tsx b/src/components/AccordionIcon/AccordionIcon.tsx index 157696a..753a7ad 100644 --- a/src/components/AccordionIcon/AccordionIcon.tsx +++ b/src/components/AccordionIcon/AccordionIcon.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./AccordionIcon.scss"; export interface AccordionIconProps { diff --git a/src/components/AdminHeader/AdminHeader.tsx b/src/components/AdminHeader/AdminHeader.tsx index 379e210..3308b92 100644 --- a/src/components/AdminHeader/AdminHeader.tsx +++ b/src/components/AdminHeader/AdminHeader.tsx @@ -1,6 +1,6 @@ -import * as React from "react"; +import React from "react"; import { Link } from "react-router-dom"; -import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png"; +import TitleImage from "../../assets/img/SIK_RGB_W_side.png"; import "./AdminHeader.scss"; export interface AdminHeaderProps { } diff --git a/src/components/AdminSidebar/AdminSidebar.tsx b/src/components/AdminSidebar/AdminSidebar.tsx index 658af6f..ef84fe7 100644 --- a/src/components/AdminSidebar/AdminSidebar.tsx +++ b/src/components/AdminSidebar/AdminSidebar.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./AdminSidebar.scss"; import AdminSidebarLink from "../AdminSidebarLink"; diff --git a/src/components/AdminSidebarLink/AdminSidebarLink.tsx b/src/components/AdminSidebarLink/AdminSidebarLink.tsx index cc64fe0..e77888b 100644 --- a/src/components/AdminSidebarLink/AdminSidebarLink.tsx +++ b/src/components/AdminSidebarLink/AdminSidebarLink.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import Anchor from "../Anchor"; import "./AdminSidebarLink.scss"; diff --git a/src/components/Anchor/Anchor.tsx b/src/components/Anchor/Anchor.tsx index 0eea2b0..8e86b53 100644 --- a/src/components/Anchor/Anchor.tsx +++ b/src/components/Anchor/Anchor.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Link } from "react-router-dom"; import { HashLink } from "react-router-hash-link"; diff --git a/src/components/AsideSection/AsideSection.tsx b/src/components/AsideSection/AsideSection.tsx index 0ed377b..9dce772 100644 --- a/src/components/AsideSection/AsideSection.tsx +++ b/src/components/AsideSection/AsideSection.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./AsideSection.scss"; import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv"; diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index 353523d..003974c 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Button.scss"; export enum ButtonType { diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx index fa33154..9f2e377 100644 --- a/src/components/Card/Card.tsx +++ b/src/components/Card/Card.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Card.scss"; import Anchor from "../Anchor"; diff --git a/src/components/ColorDiv/ColorDiv.tsx b/src/components/ColorDiv/ColorDiv.tsx index f519935..90403d3 100644 --- a/src/components/ColorDiv/ColorDiv.tsx +++ b/src/components/ColorDiv/ColorDiv.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./ColorDiv.scss"; export enum ColorEnum { diff --git a/src/components/CommitteeContainer/CommitteeContainer.tsx b/src/components/CommitteeContainer/CommitteeContainer.tsx index 0dac08b..d37d0d6 100644 --- a/src/components/CommitteeContainer/CommitteeContainer.tsx +++ b/src/components/CommitteeContainer/CommitteeContainer.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./CommitteeContainer.scss"; import { Occupation } from "../../models/Contacts"; import ContactCard from "../ContactCard/ContactCard"; diff --git a/src/components/ContactCard/ContactCard.tsx b/src/components/ContactCard/ContactCard.tsx index 10ff8b9..89e8183 100644 --- a/src/components/ContactCard/ContactCard.tsx +++ b/src/components/ContactCard/ContactCard.tsx @@ -1,6 +1,6 @@ -import * as React from "react"; +import React from "react"; import "./ContactCard.scss"; -import * as blank_profile from "../../assets/img/blank_profile.png"; +import blank_profile from "../../assets/img/blank_profile.png"; import { Role } from "../../models/Contacts"; export interface ContactCardProps { diff --git a/src/components/DatetimeWidget/DatetimeWidget.tsx b/src/components/DatetimeWidget/DatetimeWidget.tsx index 3bd0c3f..9ace004 100644 --- a/src/components/DatetimeWidget/DatetimeWidget.tsx +++ b/src/components/DatetimeWidget/DatetimeWidget.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./DatetimeWidget.scss"; export interface DatetimeWidgetProps { diff --git a/src/components/DropDownBox/DropDownBox.tsx b/src/components/DropDownBox/DropDownBox.tsx index d2a825b..572b1f3 100644 --- a/src/components/DropDownBox/DropDownBox.tsx +++ b/src/components/DropDownBox/DropDownBox.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./DropDownBox.scss"; export interface DropDownBoxProps { diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 4968e0d..dd641a5 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import FooterMap from "../FooterMap"; import Anchor from "../Anchor"; import "./Footer.scss"; diff --git a/src/components/FooterMap/FooterMap.tsx b/src/components/FooterMap/FooterMap.tsx index e781bcb..bddca1a 100644 --- a/src/components/FooterMap/FooterMap.tsx +++ b/src/components/FooterMap/FooterMap.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./FooterMap.scss"; const AnyReactComponent = ({ text }) =>
{text}
; diff --git a/src/components/HeroAsideItem/HeroAsideItem.tsx b/src/components/HeroAsideItem/HeroAsideItem.tsx index a3d2f8a..7468609 100644 --- a/src/components/HeroAsideItem/HeroAsideItem.tsx +++ b/src/components/HeroAsideItem/HeroAsideItem.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./HeroAsideItem.scss"; import Anchor from "../Anchor"; diff --git a/src/components/HeroAsideSection/HeroAsideSection.tsx b/src/components/HeroAsideSection/HeroAsideSection.tsx index d47f6ed..332ea56 100644 --- a/src/components/HeroAsideSection/HeroAsideSection.tsx +++ b/src/components/HeroAsideSection/HeroAsideSection.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./HeroAsideSection.scss"; import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv"; diff --git a/src/components/HeroMainSection/HeroMainSection.tsx b/src/components/HeroMainSection/HeroMainSection.tsx index 6280d86..89ff6bd 100644 --- a/src/components/HeroMainSection/HeroMainSection.tsx +++ b/src/components/HeroMainSection/HeroMainSection.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./HeroMainSection.scss"; export interface HeroMainSectionProps {} diff --git a/src/components/Icon/Icon.tsx b/src/components/Icon/Icon.tsx index cce105f..46f1bcc 100644 --- a/src/components/Icon/Icon.tsx +++ b/src/components/Icon/Icon.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Icon.scss"; export enum IconType { diff --git a/src/components/InfoBox/InfoBox.tsx b/src/components/InfoBox/InfoBox.tsx index c395043..7f9f844 100644 --- a/src/components/InfoBox/InfoBox.tsx +++ b/src/components/InfoBox/InfoBox.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./InfoBox.scss"; export interface InfoBoxProps {} diff --git a/src/components/JsonLD/JsonLD.tsx b/src/components/JsonLD/JsonLD.tsx index 4d6896e..cb73cb8 100644 --- a/src/components/JsonLD/JsonLD.tsx +++ b/src/components/JsonLD/JsonLD.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; export interface JsonLDProps { data: object; diff --git a/src/components/MainSection/MainSection.tsx b/src/components/MainSection/MainSection.tsx index 48fb711..9afe731 100644 --- a/src/components/MainSection/MainSection.tsx +++ b/src/components/MainSection/MainSection.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./MainSection.scss"; import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv"; diff --git a/src/components/NavbarChildLink/NavbarChildLink.tsx b/src/components/NavbarChildLink/NavbarChildLink.tsx index dfa1120..a3a24cc 100644 --- a/src/components/NavbarChildLink/NavbarChildLink.tsx +++ b/src/components/NavbarChildLink/NavbarChildLink.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./NavbarChildLink.scss"; import Anchor from "../Anchor"; diff --git a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx index 2844e7b..c29df71 100644 --- a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx +++ b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./NavbarDropdownLink.scss"; import DropDownBox from "../DropDownBox/DropDownBox"; import Anchor from "../Anchor"; diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx index 0498e80..a584cd1 100644 --- a/src/components/Navigation/Navigation.tsx +++ b/src/components/Navigation/Navigation.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Navigation.scss"; import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink"; import NavbarChildLink from "../NavbarChildLink/NavbarChildLink"; diff --git a/src/components/PageLink/PageLink.tsx b/src/components/PageLink/PageLink.tsx index 2f36d76..cece70f 100644 --- a/src/components/PageLink/PageLink.tsx +++ b/src/components/PageLink/PageLink.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./PageLink.scss"; import TextAnchor from "../TextAnchor"; import { TextSize } from "../TextAnchor/TextAnchor"; diff --git a/src/components/PageSection/PageSection.tsx b/src/components/PageSection/PageSection.tsx index 32714eb..e6e7c0b 100644 --- a/src/components/PageSection/PageSection.tsx +++ b/src/components/PageSection/PageSection.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./PageSection.scss"; import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv"; diff --git a/src/components/Ribbon/Ribbon.tsx b/src/components/Ribbon/Ribbon.tsx index 5c66e5c..240bb27 100644 --- a/src/components/Ribbon/Ribbon.tsx +++ b/src/components/Ribbon/Ribbon.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./Ribbon.scss"; export interface RibbonProps {} diff --git a/src/components/SectionDividerWidget/SectionDividerWidget.tsx b/src/components/SectionDividerWidget/SectionDividerWidget.tsx index 2780b45..46e9c3e 100644 --- a/src/components/SectionDividerWidget/SectionDividerWidget.tsx +++ b/src/components/SectionDividerWidget/SectionDividerWidget.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./SectionDividerWidget.scss"; import Icon from "../Icon"; import { IconType } from "../Icon/Icon"; diff --git a/src/components/SignupQuestionsWidget/OptionsWidget.tsx b/src/components/SignupQuestionsWidget/OptionsWidget.tsx index ef12d2e..fe39775 100644 --- a/src/components/SignupQuestionsWidget/OptionsWidget.tsx +++ b/src/components/SignupQuestionsWidget/OptionsWidget.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; -import * as shortid from "shortid"; +import React from "react"; +import shortid from "shortid"; import { Question, InputProps, optionTypes, SignupQuestionError } from "./index"; export interface OptionsWidgetProps { diff --git a/src/components/SignupQuestionsWidget/Question.tsx b/src/components/SignupQuestionsWidget/Question.tsx index 5aaa5db..9c80c2a 100644 --- a/src/components/SignupQuestionsWidget/Question.tsx +++ b/src/components/SignupQuestionsWidget/Question.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; export interface QuestionProps { children: any; diff --git a/src/components/SignupQuestionsWidget/QuestionList.tsx b/src/components/SignupQuestionsWidget/QuestionList.tsx index 9ae47f3..1f31a59 100644 --- a/src/components/SignupQuestionsWidget/QuestionList.tsx +++ b/src/components/SignupQuestionsWidget/QuestionList.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; -import * as shortid from "shortid"; +import React from "react"; +import shortid from "shortid"; import { Draggable } from "react-beautiful-dnd"; import { Question, InputProps, optionTypes, SignupQuestionError } from "./index"; import OptionsWidget from "./OptionsWidget"; diff --git a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx index 0889425..62454d0 100644 --- a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -1,9 +1,9 @@ -import * as React from "react"; -import * as shortid from "shortid"; +import React from "react"; +import shortid from "shortid"; import OptionsWidget from "./OptionsWidget"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; import { Question, InputProps, optionTypes } from "." -import * as AddIcon from "../../assets/img/add-icon.png"; +import AddIcon from "../../assets/img/add-icon.png"; import "./SignupQuestionsWidget.scss"; import TypeWidget from "./TypeWidget"; import QuestionList from "./QuestionList"; diff --git a/src/components/SignupQuestionsWidget/TypeWidget.tsx b/src/components/SignupQuestionsWidget/TypeWidget.tsx index ec2bbbb..389ffdd 100644 --- a/src/components/SignupQuestionsWidget/TypeWidget.tsx +++ b/src/components/SignupQuestionsWidget/TypeWidget.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; -import * as shortid from "shortid"; +import React from "react"; +import shortid from "shortid"; import { Question, InputProps, optionTypes, SignupQuestionError } from "./index"; export interface TypeWidgetProps { diff --git a/src/components/SponsorReel/SponsorReel.tsx b/src/components/SponsorReel/SponsorReel.tsx index bf9d45f..c7799bc 100644 --- a/src/components/SponsorReel/SponsorReel.tsx +++ b/src/components/SponsorReel/SponsorReel.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./SponsorReel.scss"; import TextAnchor from "../TextAnchor"; import Anchor from "../Anchor"; diff --git a/src/components/TextAnchor/TextAnchor.tsx b/src/components/TextAnchor/TextAnchor.tsx index cf4cb4a..b870f6e 100644 --- a/src/components/TextAnchor/TextAnchor.tsx +++ b/src/components/TextAnchor/TextAnchor.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./TextAnchor.scss"; import { ColorEnum, getColor, getHoverColor } from "../ColorDiv/ColorDiv"; import Anchor from "../Anchor"; diff --git a/src/index.tsx b/src/index.tsx index 5ce0b6b..33bec6e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { render } from "react-dom"; import { BrowserRouter } from "react-router-dom"; import { AppContainer } from "react-hot-loader"; diff --git a/src/models/Event.ts b/src/models/Event.ts index 63579e2..80b3632 100644 --- a/src/models/Event.ts +++ b/src/models/Event.ts @@ -1,7 +1,7 @@ import axios from "axios"; import { getAuthHeader } from "../auth"; import { Tag } from "./Tag"; -import * as qs from "query-string"; +import qs from "query-string"; import { SignupForm } from "./SignupForm"; const url = `${process.env.API_URL}/events/`; diff --git a/src/pages/ActualPage/ActualPage.tsx b/src/pages/ActualPage/ActualPage.tsx index 63e003f..5967204 100644 --- a/src/pages/ActualPage/ActualPage.tsx +++ b/src/pages/ActualPage/ActualPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./ActualPage.scss"; diff --git a/src/pages/AdminCommonPage/AdminCommonPage.tsx b/src/pages/AdminCommonPage/AdminCommonPage.tsx index cb4e856..b9a2f88 100644 --- a/src/pages/AdminCommonPage/AdminCommonPage.tsx +++ b/src/pages/AdminCommonPage/AdminCommonPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Redirect } from "react-router-dom"; import AdminHeader from "../../components/AdminHeader"; import AdminSidebar from "../../components/AdminSidebar"; diff --git a/src/pages/AdminEventPage/AdminEventPage.tsx b/src/pages/AdminEventPage/AdminEventPage.tsx index d697b84..79bf37b 100644 --- a/src/pages/AdminEventPage/AdminEventPage.tsx +++ b/src/pages/AdminEventPage/AdminEventPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import { formatRelative } from "date-fns"; @@ -6,7 +6,7 @@ import { formatRelative } from "date-fns"; import "./AdminEventPage.scss"; import { Event, getEvents } from "../../models/Event"; import { StaticContext } from "../../server/StaticContext"; -import * as AddIcon from "../../assets/img/add-icon.png"; +import AddIcon from "../../assets/img/add-icon.png"; export interface AdminEventPageProps { diff --git a/src/pages/AdminFeedPage/AdminFeedPage.tsx b/src/pages/AdminFeedPage/AdminFeedPage.tsx index 2b91e24..1a7b819 100644 --- a/src/pages/AdminFeedPage/AdminFeedPage.tsx +++ b/src/pages/AdminFeedPage/AdminFeedPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import "./AdminFeedPage.scss"; @@ -7,7 +7,7 @@ import { Post, getFeed } from "../../models/Feed"; import { getEvents } from "../../models/Event"; import { formatRelative } from "date-fns"; import { th } from "date-fns/esm/locale"; -import * as AddIcon from "../../assets/img/add-icon.png"; +import AddIcon from "../../assets/img/add-icon.png"; export interface AdminFeedPageProps { staticContext: StaticContext; diff --git a/src/pages/AdminFrontPage/AdminFrontPage.tsx b/src/pages/AdminFrontPage/AdminFrontPage.tsx index 1739689..1a164a1 100644 --- a/src/pages/AdminFrontPage/AdminFrontPage.tsx +++ b/src/pages/AdminFrontPage/AdminFrontPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import "./AdminFrontPage.scss"; diff --git a/src/pages/AdminLoginPage/AdminLoginPage.tsx b/src/pages/AdminLoginPage/AdminLoginPage.tsx index 1de4efc..d31c011 100644 --- a/src/pages/AdminLoginPage/AdminLoginPage.tsx +++ b/src/pages/AdminLoginPage/AdminLoginPage.tsx @@ -1,7 +1,7 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import { Redirect } from "react-router-dom"; -import * as qs from "query-string"; +import qs from "query-string"; import { generateToken, setTokenCookie, isAuthenticated } from "../../auth"; import "./AdminLoginPage.scss"; diff --git a/src/pages/AdminLogoutPage/AdminLogoutPage.tsx b/src/pages/AdminLogoutPage/AdminLogoutPage.tsx index 06d102a..38e7181 100644 --- a/src/pages/AdminLogoutPage/AdminLogoutPage.tsx +++ b/src/pages/AdminLogoutPage/AdminLogoutPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Redirect } from "react-router-dom"; import { deleteTokenCookie } from "../../auth"; diff --git a/src/pages/AdminSignupPage/AdminSignupPage.tsx b/src/pages/AdminSignupPage/AdminSignupPage.tsx index 8bd5c04..9b582e4 100644 --- a/src/pages/AdminSignupPage/AdminSignupPage.tsx +++ b/src/pages/AdminSignupPage/AdminSignupPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import Anchor from "../../components/Anchor"; @@ -6,7 +6,7 @@ import Anchor from "../../components/Anchor"; import "./AdminSignupPage.scss"; import { SignupForm, getForms } from "../../models/SignupForm"; import { StaticContext } from "../../server/StaticContext"; -import * as AddIcon from "../../assets/img/add-icon.png"; +import AddIcon from "../../assets/img/add-icon.png"; export interface AdminSignupPageProps { staticContext: StaticContext; diff --git a/src/pages/CommonPage/CommonPage.tsx b/src/pages/CommonPage/CommonPage.tsx index f9c6f4a..5b4ae48 100644 --- a/src/pages/CommonPage/CommonPage.tsx +++ b/src/pages/CommonPage/CommonPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import Header from "../../components/Header"; import Footer from "../../components/Footer"; diff --git a/src/pages/ContactsPage/ContactsPage.tsx b/src/pages/ContactsPage/ContactsPage.tsx index 349b587..298a866 100644 --- a/src/pages/ContactsPage/ContactsPage.tsx +++ b/src/pages/ContactsPage/ContactsPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./ContactsPage.scss"; import { ColorEnum, getColor, getHoverColor } from "../../components/ColorDiv/ColorDiv"; diff --git a/src/pages/CorporatePage/CorporatePage.tsx b/src/pages/CorporatePage/CorporatePage.tsx index b4af626..222843a 100644 --- a/src/pages/CorporatePage/CorporatePage.tsx +++ b/src/pages/CorporatePage/CorporatePage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./CorporatePage.scss"; diff --git a/src/pages/EventCreatePage/EventCreatePage.tsx b/src/pages/EventCreatePage/EventCreatePage.tsx index d944cb8..03b59d2 100644 --- a/src/pages/EventCreatePage/EventCreatePage.tsx +++ b/src/pages/EventCreatePage/EventCreatePage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./EventCreatePage.scss"; import { isAuthenticated } from "../../auth"; diff --git a/src/pages/EventPage/EventPage.tsx b/src/pages/EventPage/EventPage.tsx index 6cd3797..06ff827 100644 --- a/src/pages/EventPage/EventPage.tsx +++ b/src/pages/EventPage/EventPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./EventPage.scss"; import { Event, getEvent } from "../../models/Event"; diff --git a/src/pages/FeedCreatePage/FeedCreatePage.tsx b/src/pages/FeedCreatePage/FeedCreatePage.tsx index f269601..922b40e 100644 --- a/src/pages/FeedCreatePage/FeedCreatePage.tsx +++ b/src/pages/FeedCreatePage/FeedCreatePage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./FeedCreatePage.scss"; import { isAuthenticated } from "../../auth"; diff --git a/src/pages/FreshmenPage/FreshmenPage.tsx b/src/pages/FreshmenPage/FreshmenPage.tsx index 6c32014..b64d549 100644 --- a/src/pages/FreshmenPage/FreshmenPage.tsx +++ b/src/pages/FreshmenPage/FreshmenPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./FreshmenPage.scss"; diff --git a/src/pages/FrontPage/FrontPage.tsx b/src/pages/FrontPage/FrontPage.tsx index 3e58329..7a36986 100644 --- a/src/pages/FrontPage/FrontPage.tsx +++ b/src/pages/FrontPage/FrontPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import "./FrontPage.scss"; import appStore from "../../stores/AppStore"; import Card from "../../components/Card"; diff --git a/src/pages/GuildPage/GuildPage.tsx b/src/pages/GuildPage/GuildPage.tsx index c100411..85b6b50 100644 --- a/src/pages/GuildPage/GuildPage.tsx +++ b/src/pages/GuildPage/GuildPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./GuildPage.scss"; import PageSection from "../../components/PageSection"; diff --git a/src/pages/InEnglishPage/InEnglishPage.tsx b/src/pages/InEnglishPage/InEnglishPage.tsx index c2dff29..7c15fb4 100644 --- a/src/pages/InEnglishPage/InEnglishPage.tsx +++ b/src/pages/InEnglishPage/InEnglishPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./InEnglishPage.scss"; diff --git a/src/pages/NotFoundPage/NotFoundPage.tsx b/src/pages/NotFoundPage/NotFoundPage.tsx index 036ffed..6f80494 100644 --- a/src/pages/NotFoundPage/NotFoundPage.tsx +++ b/src/pages/NotFoundPage/NotFoundPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./NotFoundPage.scss"; diff --git a/src/pages/SignUpPage/SignUpPage.tsx b/src/pages/SignUpPage/SignUpPage.tsx index e8668a8..47ede05 100644 --- a/src/pages/SignUpPage/SignUpPage.tsx +++ b/src/pages/SignUpPage/SignUpPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import Form from "react-jsonschema-form"; import "./SignUpPage.scss"; diff --git a/src/pages/SignupCreatePage/SignupCreatePage.tsx b/src/pages/SignupCreatePage/SignupCreatePage.tsx index 4e67ba0..99dac3a 100644 --- a/src/pages/SignupCreatePage/SignupCreatePage.tsx +++ b/src/pages/SignupCreatePage/SignupCreatePage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import { Link } from "react-router-dom"; import "./SignupCreatePage.scss"; diff --git a/src/pages/StudiesPage/StudiesPage.tsx b/src/pages/StudiesPage/StudiesPage.tsx index 7069942..a413550 100644 --- a/src/pages/StudiesPage/StudiesPage.tsx +++ b/src/pages/StudiesPage/StudiesPage.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; import "./StudiesPage.scss"; diff --git a/src/routes.tsx b/src/routes.tsx index 24e7778..1059deb 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React 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/App.tsx b/src/server/App.tsx index 0f39eca..1d26c4c 100644 --- a/src/server/App.tsx +++ b/src/server/App.tsx @@ -1,4 +1,4 @@ -import * as React from "react"; +import React from "react"; import { StaticRouter } from "react-router-dom"; import Routes from "../routes"; diff --git a/src/server/index.ts b/src/server/index.ts index 125534f..4fa57ab 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -1,20 +1,20 @@ -import * as React from "react"; +import React from "react"; import { Helmet } from "react-helmet"; -import * as express from "express"; +import express from "express"; import { renderToString } from "react-dom/server"; -import * as morgan from "morgan"; -import * as helmet from "helmet"; -import * as compression from "compression"; +import morgan from "morgan"; +import helmet from "helmet"; +import compression from "compression"; -import * as dotenv from "dotenv"; +import dotenv from "dotenv"; dotenv.config(); console.log(`API_URL: ${process.env.API_URL}`); import App from "./App"; -import * as fs from "fs"; -import * as path from "path"; +import fs from "fs"; +import path from "path"; import { StaticContext } from "./StaticContext"; const port = 3000;