From b35fe1456d6c37bd8e901807b2cf6222fa5041d8 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 8 Jul 2020 15:22:15 +0300 Subject: [PATCH] Finalize @-path imports --- src/components/AdminHeader/AdminHeader.tsx | 2 +- src/components/ColorDiv/ColorDiv.tsx | 2 +- src/components/CommitteeContainer/CommitteeContainer.tsx | 2 +- src/components/ContactCard/ContactCard.tsx | 4 ++-- src/components/Header/Header.tsx | 2 +- .../SignupQuestionsWidget/SignupQuestionsWidget.tsx | 2 +- src/components/TextAnchor/TextAnchor.tsx | 2 +- src/pages/ContactsPage.tsx | 4 ++-- src/pages/EventPage.tsx | 2 +- src/pages/SignUpPage.tsx | 4 ++-- src/pages/SignupCreatePage.tsx | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/AdminHeader/AdminHeader.tsx b/src/components/AdminHeader/AdminHeader.tsx index 3308b92..c299094 100644 --- a/src/components/AdminHeader/AdminHeader.tsx +++ b/src/components/AdminHeader/AdminHeader.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Link } from "react-router-dom"; -import 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/ColorDiv/ColorDiv.tsx b/src/components/ColorDiv/ColorDiv.tsx index 0dba70c..05a9b1c 100644 --- a/src/components/ColorDiv/ColorDiv.tsx +++ b/src/components/ColorDiv/ColorDiv.tsx @@ -1,6 +1,6 @@ import React from "react"; import "./ColorDiv.scss"; -import { Colors, colorToClass, bgColorToClass, hoverColorToClass, bgHoverColorToClass } from "../../theme/colors"; +import { Colors, colorToClass, bgColorToClass, hoverColorToClass, bgHoverColorToClass } from "@theme/colors"; import classNames from "classnames"; export interface ColorDivProps extends React.HTMLAttributes { diff --git a/src/components/CommitteeContainer/CommitteeContainer.tsx b/src/components/CommitteeContainer/CommitteeContainer.tsx index d37d0d6..03bc91a 100644 --- a/src/components/CommitteeContainer/CommitteeContainer.tsx +++ b/src/components/CommitteeContainer/CommitteeContainer.tsx @@ -1,6 +1,6 @@ import React from "react"; import "./CommitteeContainer.scss"; -import { Occupation } from "../../models/Contacts"; +import { Occupation } from "@models/Contacts"; import ContactCard from "../ContactCard/ContactCard"; export interface CommitteeContainerProps { diff --git a/src/components/ContactCard/ContactCard.tsx b/src/components/ContactCard/ContactCard.tsx index 89e8183..34187bd 100644 --- a/src/components/ContactCard/ContactCard.tsx +++ b/src/components/ContactCard/ContactCard.tsx @@ -1,7 +1,7 @@ import React from "react"; import "./ContactCard.scss"; -import blank_profile from "../../assets/img/blank_profile.png"; -import { Role } from "../../models/Contacts"; +import blank_profile from "@assets/img/blank_profile.png"; +import { Role } from "@models/Contacts"; export interface ContactCardProps { first_name: string; diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 5a1ba3f..7978d32 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -4,7 +4,7 @@ import "./Header.scss"; import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink"; import NavbarChildLink from "../NavbarChildLink/NavbarChildLink"; import Navigation from "../Navigation"; -import TitleImage from "../../assets/img/SIK_RGB_W_side.png"; +import TitleImage from "@assets/img/SIK_RGB_W_side.png"; import classNames from "classnames"; import throttle from "lodash/throttle"; diff --git a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx index 62454d0..e5a8994 100644 --- a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -3,7 +3,7 @@ import shortid from "shortid"; import OptionsWidget from "./OptionsWidget"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; import { Question, InputProps, optionTypes } from "." -import 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/TextAnchor/TextAnchor.tsx b/src/components/TextAnchor/TextAnchor.tsx index d44877c..193fab5 100644 --- a/src/components/TextAnchor/TextAnchor.tsx +++ b/src/components/TextAnchor/TextAnchor.tsx @@ -1,6 +1,6 @@ import React from "react"; import "./TextAnchor.scss"; -import { Colors, colorToClass, hoverColorToClass } from "../../theme/colors"; +import { Colors, colorToClass, hoverColorToClass } from "@theme/colors"; import Anchor from "../Anchor"; import classNames from "classnames"; diff --git a/src/pages/ContactsPage.tsx b/src/pages/ContactsPage.tsx index 5b8a33c..d4af859 100644 --- a/src/pages/ContactsPage.tsx +++ b/src/pages/ContactsPage.tsx @@ -1,9 +1,9 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./ContactsPage.scss"; -import { StaticContext } from "../server/StaticContext"; +import { StaticContext } from "@server/StaticContext"; import PageSection from "@components/PageSection"; -import { getContacts, Occupation, Committee, getCommittees } from "../models/Contacts"; +import { getContacts, Occupation, Committee, getCommittees } from "@models/Contacts"; import CommitteeContainer from "@components/CommitteeContainer"; import TextAnchor from "@components/TextAnchor/index"; diff --git a/src/pages/EventPage.tsx b/src/pages/EventPage.tsx index 4d18f6c..957bb61 100644 --- a/src/pages/EventPage.tsx +++ b/src/pages/EventPage.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Helmet } from "react-helmet"; import "./EventPage.scss"; -import { Event, getEvent } from "../models/Event"; +import { Event, getEvent } from "@models/Event"; import { RouteComponentProps } from "react-router-dom"; import Button, { ButtonType } from "@components/Button"; import Anchor from "@components/Anchor"; diff --git a/src/pages/SignUpPage.tsx b/src/pages/SignUpPage.tsx index d04bbad..30be232 100644 --- a/src/pages/SignUpPage.tsx +++ b/src/pages/SignUpPage.tsx @@ -2,8 +2,8 @@ import React from "react"; import { Helmet } from "react-helmet"; import Form from "react-jsonschema-form"; import "./SignUpPage.scss"; -import { getForm, SignupForm } from "../models/SignupForm"; -import { createSignup, Signup } from "../models/Signup"; +import { getForm, SignupForm } from "@models/SignupForm"; +import { createSignup, Signup } from "@models/Signup"; import PageSection from "@components/PageSection"; import { Question } from "@components/SignupQuestionsWidget"; diff --git a/src/pages/SignupCreatePage.tsx b/src/pages/SignupCreatePage.tsx index 1ba1403..dc89580 100644 --- a/src/pages/SignupCreatePage.tsx +++ b/src/pages/SignupCreatePage.tsx @@ -3,7 +3,7 @@ import { Helmet } from "react-helmet"; import { Link } from "react-router-dom"; import "./SignupCreatePage.scss"; import Form from "react-jsonschema-form"; -import { createForm, getForm, updateForm, SignupForm } from "../models/SignupForm"; +import { createForm, getForm, updateForm, SignupForm } from "@models/SignupForm"; import DatetimeWidget from "@components/DatetimeWidget"; import SignupQuestionsWidget from "@components/SignupQuestionsWidget";