From 6a3cd4bb7aacdf88dcc7492721d9fdfb71417dd3 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 8 Jul 2020 14:37:11 +0300 Subject: [PATCH] Import with @components --- src/models/SignupForm.ts | 2 +- src/pages/ActualPage/ActualPage.tsx | 22 +++++++++---------- src/pages/AdminCommonPage/AdminCommonPage.tsx | 4 ++-- src/pages/AdminEventPage/AdminEventPage.tsx | 2 +- src/pages/AdminFeedPage/AdminFeedPage.tsx | 2 +- src/pages/AdminFrontPage/AdminFrontPage.tsx | 2 +- src/pages/AdminSignupPage/AdminSignupPage.tsx | 2 +- src/pages/CommonPage/CommonPage.tsx | 4 ++-- src/pages/ContactsPage/ContactsPage.tsx | 6 ++--- src/pages/CorporatePage/CorporatePage.tsx | 18 +++++++-------- src/pages/EventCreatePage/EventCreatePage.tsx | 8 +++---- src/pages/EventPage/EventPage.tsx | 10 ++++----- src/pages/FeedCreatePage/FeedCreatePage.tsx | 2 +- src/pages/FreshmenPage/FreshmenPage.tsx | 20 ++++++++--------- src/pages/GuildPage/GuildPage.tsx | 22 +++++++++---------- src/pages/SignUpPage/SignUpPage.tsx | 4 ++-- .../SignupCreatePage/SignupCreatePage.tsx | 4 ++-- src/pages/StudiesPage/StudiesPage.tsx | 18 +++++++-------- src/routes.tsx | 2 +- 19 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/models/SignupForm.ts b/src/models/SignupForm.ts index 1ff02a9..507a389 100644 --- a/src/models/SignupForm.ts +++ b/src/models/SignupForm.ts @@ -1,7 +1,7 @@ import axios from "axios"; import { getAuthHeader } from "../auth"; const url = `${process.env.API_URL}/signupForm/`; -import { Question } from "../components/SignupQuestionsWidget"; +import { Question } from "@components/SignupQuestionsWidget"; export interface SignupForm { id?: number; diff --git a/src/pages/ActualPage/ActualPage.tsx b/src/pages/ActualPage/ActualPage.tsx index b4aff27..80df124 100644 --- a/src/pages/ActualPage/ActualPage.tsx +++ b/src/pages/ActualPage/ActualPage.tsx @@ -1,17 +1,17 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./ActualPage.scss"; -import PageSection from "../../components/PageSection"; -import HeroMainSection from "../../components/Hero/HeroMainSection/HeroMainSection"; -import HeroAsideSection from "../../components/Hero/HeroAsideSection/HeroAsideSection"; -import HeroAsideItem from "../../components/Hero/HeroAsideItem/HeroAsideItem"; -import AsideSection from "../../components/AsideSection"; -import MainSection from "../../components/MainSection/index"; -import Ribbon from "../../components/Ribbon/index"; -import TextAnchor from "../../components/TextAnchor/index"; -import Button, { ButtonType } from "../../components/Button/index"; -import Accordion from "../../components/Accordion"; -import HeroSecondarySection, { HeroSecondarySectionItem } from "../../components/Hero/HeroSecondarySection/HeroSecondarySection"; +import PageSection from "@components/PageSection"; +import HeroMainSection from "@components/Hero/HeroMainSection/HeroMainSection"; +import HeroAsideSection from "@components/Hero/HeroAsideSection/HeroAsideSection"; +import HeroAsideItem from "@components/Hero/HeroAsideItem/HeroAsideItem"; +import AsideSection from "@components/AsideSection"; +import MainSection from "@components/MainSection/index"; +import Ribbon from "@components/Ribbon/index"; +import TextAnchor from "@components/TextAnchor/index"; +import Button, { ButtonType } from "@components/Button/index"; +import Accordion from "@components/Accordion"; +import HeroSecondarySection, { HeroSecondarySectionItem } from "@components/Hero/HeroSecondarySection/HeroSecondarySection"; export interface ActualPageProps {} export interface ActualPageState {} diff --git a/src/pages/AdminCommonPage/AdminCommonPage.tsx b/src/pages/AdminCommonPage/AdminCommonPage.tsx index b9a2f88..172eaad 100644 --- a/src/pages/AdminCommonPage/AdminCommonPage.tsx +++ b/src/pages/AdminCommonPage/AdminCommonPage.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Redirect } from "react-router-dom"; -import AdminHeader from "../../components/AdminHeader"; -import AdminSidebar from "../../components/AdminSidebar"; +import AdminHeader from "@components/AdminHeader"; +import AdminSidebar from "@components/AdminSidebar"; import { isAuthenticated } from "../../auth"; import "./AdminCommonPage.scss"; diff --git a/src/pages/AdminEventPage/AdminEventPage.tsx b/src/pages/AdminEventPage/AdminEventPage.tsx index 79bf37b..304cce7 100644 --- a/src/pages/AdminEventPage/AdminEventPage.tsx +++ b/src/pages/AdminEventPage/AdminEventPage.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Helmet } from "react-helmet"; -import Anchor from "../../components/Anchor"; +import Anchor from "@components/Anchor"; import { formatRelative } from "date-fns"; import "./AdminEventPage.scss"; diff --git a/src/pages/AdminFeedPage/AdminFeedPage.tsx b/src/pages/AdminFeedPage/AdminFeedPage.tsx index 1a7b819..f88acd1 100644 --- a/src/pages/AdminFeedPage/AdminFeedPage.tsx +++ b/src/pages/AdminFeedPage/AdminFeedPage.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Helmet } from "react-helmet"; -import Anchor from "../../components/Anchor"; +import Anchor from "@components/Anchor"; import "./AdminFeedPage.scss"; import { StaticContext } from "../../server/StaticContext"; import { Post, getFeed } from "../../models/Feed"; diff --git a/src/pages/AdminFrontPage/AdminFrontPage.tsx b/src/pages/AdminFrontPage/AdminFrontPage.tsx index a6a5474..a111b10 100644 --- a/src/pages/AdminFrontPage/AdminFrontPage.tsx +++ b/src/pages/AdminFrontPage/AdminFrontPage.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Helmet } from "react-helmet"; -import Anchor from "../../components/Anchor"; +import Anchor from "@components/Anchor"; import "./AdminFrontPage.scss"; export interface AdminFrontPageProps { } diff --git a/src/pages/AdminSignupPage/AdminSignupPage.tsx b/src/pages/AdminSignupPage/AdminSignupPage.tsx index 9b582e4..2702ab0 100644 --- a/src/pages/AdminSignupPage/AdminSignupPage.tsx +++ b/src/pages/AdminSignupPage/AdminSignupPage.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; -import Anchor from "../../components/Anchor"; +import Anchor from "@components/Anchor"; import "./AdminSignupPage.scss"; import { SignupForm, getForms } from "../../models/SignupForm"; diff --git a/src/pages/CommonPage/CommonPage.tsx b/src/pages/CommonPage/CommonPage.tsx index 5b4ae48..fe83558 100644 --- a/src/pages/CommonPage/CommonPage.tsx +++ b/src/pages/CommonPage/CommonPage.tsx @@ -1,6 +1,6 @@ import React from "react"; -import Header from "../../components/Header"; -import Footer from "../../components/Footer"; +import Header from "@components/Header"; +import Footer from "@components/Footer"; export interface CommonPageProps { page: any; diff --git a/src/pages/ContactsPage/ContactsPage.tsx b/src/pages/ContactsPage/ContactsPage.tsx index 797d503..eff4eae 100644 --- a/src/pages/ContactsPage/ContactsPage.tsx +++ b/src/pages/ContactsPage/ContactsPage.tsx @@ -2,10 +2,10 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./ContactsPage.scss"; import { StaticContext } from "../../server/StaticContext"; -import PageSection from "../../components/PageSection"; +import PageSection from "@components/PageSection"; import { getContacts, Occupation, Committee, getCommittees } from "../../models/Contacts"; -import CommitteeContainer from "../../components/CommitteeContainer"; -import TextAnchor from "../../components/TextAnchor/index"; +import CommitteeContainer from "@components/CommitteeContainer"; +import TextAnchor from "@components/TextAnchor/index"; interface ContactsPageProps { staticContext: StaticContext; diff --git a/src/pages/CorporatePage/CorporatePage.tsx b/src/pages/CorporatePage/CorporatePage.tsx index 6337517..c7117b3 100644 --- a/src/pages/CorporatePage/CorporatePage.tsx +++ b/src/pages/CorporatePage/CorporatePage.tsx @@ -1,15 +1,15 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./CorporatePage.scss"; -import PageSection from "../../components/PageSection"; -import HeroMainSection from "../../components/Hero/HeroMainSection/HeroMainSection"; -import HeroAsideSection from "../../components/Hero/HeroAsideSection/HeroAsideSection"; -import HeroAsideItem from "../../components/Hero/HeroAsideItem/HeroAsideItem"; -import AsideSection from "../../components/AsideSection"; -import MainSection from "../../components/MainSection/index"; -import PageLink from "../../components/PageLink/index"; -import Ribbon from "../../components/Ribbon/index"; -import TextAnchor from "../../components/TextAnchor/index"; +import PageSection from "@components/PageSection"; +import HeroMainSection from "@components/Hero/HeroMainSection/HeroMainSection"; +import HeroAsideSection from "@components/Hero/HeroAsideSection/HeroAsideSection"; +import HeroAsideItem from "@components/Hero/HeroAsideItem/HeroAsideItem"; +import AsideSection from "@components/AsideSection"; +import MainSection from "@components/MainSection/index"; +import PageLink from "@components/PageLink/index"; +import Ribbon from "@components/Ribbon/index"; +import TextAnchor from "@components/TextAnchor/index"; export interface CorporatePageProps {} export interface CorporatePageState {} diff --git a/src/pages/EventCreatePage/EventCreatePage.tsx b/src/pages/EventCreatePage/EventCreatePage.tsx index 03b59d2..cd551e2 100644 --- a/src/pages/EventCreatePage/EventCreatePage.tsx +++ b/src/pages/EventCreatePage/EventCreatePage.tsx @@ -6,10 +6,10 @@ import Form from "react-jsonschema-form"; import { Tag, getTags } from "../../models/Tag"; import { SignupForm, getForms } from "../../models/SignupForm"; import { createEvent, getEvent, updateEvent, Event } from "../../models/Event"; -import DatetimeWidget from "../../components/DatetimeWidget"; -import SectionDividerWidget from "../../components/SectionDividerWidget"; -import Icon from "../../components/Icon"; -import { IconType } from "../../components/Icon/Icon"; +import DatetimeWidget from "@components/DatetimeWidget"; +import SectionDividerWidget from "@components/SectionDividerWidget"; +import Icon from "@components/Icon"; +import { IconType } from "@components/Icon/Icon"; const widgets = { datetime: DatetimeWidget, diff --git a/src/pages/EventPage/EventPage.tsx b/src/pages/EventPage/EventPage.tsx index c3e2904..d3463e1 100644 --- a/src/pages/EventPage/EventPage.tsx +++ b/src/pages/EventPage/EventPage.tsx @@ -3,11 +3,11 @@ import { Helmet } from "react-helmet"; import "./EventPage.scss"; import { Event, getEvent } from "../../models/Event"; import { RouteComponentProps } from "react-router-dom"; -import Button, { ButtonType } from "../../components/Button"; -import Anchor from "../../components/Anchor"; -import PageSection from "../../components/PageSection"; -import MainSection from "../../components/MainSection"; -import AsideSection from "../../components/AsideSection/AsideSection"; +import Button, { ButtonType } from "@components/Button"; +import Anchor from "@components/Anchor"; +import PageSection from "@components/PageSection"; +import MainSection from "@components/MainSection"; +import AsideSection from "@components/AsideSection/AsideSection"; interface MatchParams { id: string; diff --git a/src/pages/FeedCreatePage/FeedCreatePage.tsx b/src/pages/FeedCreatePage/FeedCreatePage.tsx index 922b40e..28baa07 100644 --- a/src/pages/FeedCreatePage/FeedCreatePage.tsx +++ b/src/pages/FeedCreatePage/FeedCreatePage.tsx @@ -5,7 +5,7 @@ import { isAuthenticated } from "../../auth"; import Form from "react-jsonschema-form"; import { Tag, getTags } from "../../models/Tag"; import { createPost, getPost, updatePost } from "../../models/Feed"; -import DatetimeWidget from "../../components/DatetimeWidget"; +import DatetimeWidget from "@components/DatetimeWidget"; const widgets = { datetime: DatetimeWidget, diff --git a/src/pages/FreshmenPage/FreshmenPage.tsx b/src/pages/FreshmenPage/FreshmenPage.tsx index a7c59b3..e232f3a 100644 --- a/src/pages/FreshmenPage/FreshmenPage.tsx +++ b/src/pages/FreshmenPage/FreshmenPage.tsx @@ -1,16 +1,16 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./FreshmenPage.scss"; -import PageSection from "../../components/PageSection/index"; -import HeroMainSection from "../../components/Hero/HeroMainSection/HeroMainSection"; -import HeroAsideSection from "../../components/Hero/HeroAsideSection/HeroAsideSection"; -import HeroAsideItem from "../../components/Hero/HeroAsideItem/HeroAsideItem"; -import AsideSection from "../../components/AsideSection/index"; -import MainSection from "../../components/MainSection/index"; -import PageLink from "../../components/PageLink/index"; -import Ribbon from "../../components/Ribbon/index"; -import TextAnchor from "../../components/TextAnchor/index"; -import InfoBox from "../../components/InfoBox/index"; +import PageSection from "@components/PageSection/index"; +import HeroMainSection from "@components/Hero/HeroMainSection/HeroMainSection"; +import HeroAsideSection from "@components/Hero/HeroAsideSection/HeroAsideSection"; +import HeroAsideItem from "@components/Hero/HeroAsideItem/HeroAsideItem"; +import AsideSection from "@components/AsideSection/index"; +import MainSection from "@components/MainSection/index"; +import PageLink from "@components/PageLink/index"; +import Ribbon from "@components/Ribbon/index"; +import TextAnchor from "@components/TextAnchor/index"; +import InfoBox from "@components/InfoBox/index"; export interface FreshmenPageProps {} export interface FreshmenPageState {} diff --git a/src/pages/GuildPage/GuildPage.tsx b/src/pages/GuildPage/GuildPage.tsx index 1843385..74a2ddf 100644 --- a/src/pages/GuildPage/GuildPage.tsx +++ b/src/pages/GuildPage/GuildPage.tsx @@ -1,17 +1,17 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./GuildPage.scss"; -import PageSection from "../../components/PageSection"; -import MainSection from "../../components/MainSection"; -import AsideSection from "../../components/AsideSection"; -import PageLink from "../../components/PageLink"; -import HeroMainSection from "../../components/Hero/HeroMainSection/HeroMainSection"; -import HeroAsideSection from "../../components/Hero/HeroAsideSection/HeroAsideSection"; -import HeroAsideItem from "../../components/Hero/HeroAsideItem/HeroAsideItem"; -import Ribbon from "../../components/Ribbon"; -import InfoBox from "../../components/InfoBox"; -import Accordion from "../../components/Accordion"; -import TextAnchor from "../../components/TextAnchor"; +import PageSection from "@components/PageSection"; +import MainSection from "@components/MainSection"; +import AsideSection from "@components/AsideSection"; +import PageLink from "@components/PageLink"; +import HeroMainSection from "@components/Hero/HeroMainSection/HeroMainSection"; +import HeroAsideSection from "@components/Hero/HeroAsideSection/HeroAsideSection"; +import HeroAsideItem from "@components/Hero/HeroAsideItem/HeroAsideItem"; +import Ribbon from "@components/Ribbon"; +import InfoBox from "@components/InfoBox"; +import Accordion from "@components/Accordion"; +import TextAnchor from "@components/TextAnchor"; export interface GuildPageProps { } export interface GuildPageState { } diff --git a/src/pages/SignUpPage/SignUpPage.tsx b/src/pages/SignUpPage/SignUpPage.tsx index 5c88e63..da23f71 100644 --- a/src/pages/SignUpPage/SignUpPage.tsx +++ b/src/pages/SignUpPage/SignUpPage.tsx @@ -4,8 +4,8 @@ import Form from "react-jsonschema-form"; import "./SignUpPage.scss"; import { getForm, SignupForm } from "../../models/SignupForm"; import { createSignup, Signup } from "../../models/Signup"; -import PageSection from "../../components/PageSection"; -import { Question } from "../../components/SignupQuestionsWidget"; +import PageSection from "@components/PageSection"; +import { Question } from "@components/SignupQuestionsWidget"; export interface SignUpPageProps { match: { diff --git a/src/pages/SignupCreatePage/SignupCreatePage.tsx b/src/pages/SignupCreatePage/SignupCreatePage.tsx index 99dac3a..0c90659 100644 --- a/src/pages/SignupCreatePage/SignupCreatePage.tsx +++ b/src/pages/SignupCreatePage/SignupCreatePage.tsx @@ -4,8 +4,8 @@ import { Link } from "react-router-dom"; import "./SignupCreatePage.scss"; import Form from "react-jsonschema-form"; import { createForm, getForm, updateForm, SignupForm } from "../../models/SignupForm"; -import DatetimeWidget from "../../components/DatetimeWidget"; -import SignupQuestionsWidget from "../../components/SignupQuestionsWidget"; +import DatetimeWidget from "@components/DatetimeWidget"; +import SignupQuestionsWidget from "@components/SignupQuestionsWidget"; const widgets = { datetime: DatetimeWidget, diff --git a/src/pages/StudiesPage/StudiesPage.tsx b/src/pages/StudiesPage/StudiesPage.tsx index 360376a..df8ff7b 100644 --- a/src/pages/StudiesPage/StudiesPage.tsx +++ b/src/pages/StudiesPage/StudiesPage.tsx @@ -1,15 +1,15 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./StudiesPage.scss"; -import PageSection from "../../components/PageSection/index"; -import HeroMainSection from "../../components/Hero/HeroMainSection/HeroMainSection"; -import HeroAsideSection from "../../components/Hero/HeroAsideSection/HeroAsideSection"; -import HeroAsideItem from "../../components/Hero/HeroAsideItem/HeroAsideItem"; -import AsideSection from "../../components/AsideSection/index"; -import MainSection from "../../components/MainSection/index"; -import PageLink from "../../components/PageLink/index"; -import Ribbon from "../../components/Ribbon/index"; -import TextAnchor from "../../components/TextAnchor/index"; +import PageSection from "@components/PageSection/index"; +import HeroMainSection from "@components/Hero/HeroMainSection/HeroMainSection"; +import HeroAsideSection from "@components/Hero/HeroAsideSection/HeroAsideSection"; +import HeroAsideItem from "@components/Hero/HeroAsideItem/HeroAsideItem"; +import AsideSection from "@components/AsideSection/index"; +import MainSection from "@components/MainSection/index"; +import PageLink from "@components/PageLink/index"; +import Ribbon from "@components/Ribbon/index"; +import TextAnchor from "@components/TextAnchor/index"; export interface StudiesPageProps {} export interface StudiesPageState {} diff --git a/src/routes.tsx b/src/routes.tsx index 440b449..5f497bc 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -5,7 +5,7 @@ import FrontPage from "./pages/FrontPage"; import GuildPage from "./pages/GuildPage"; import NotFoundPage from "./pages/NotFoundPage"; import CommonPage from "./pages/CommonPage"; -import JsonLD from "./components/JsonLD"; +import JsonLD from "@components/JsonLD"; import "./index.scss"; import AdminFrontPage from "./pages/AdminFrontPage"; import AdminEventPage from "./pages/AdminEventPage";