Cleaned imports

This commit is contained in:
2018-10-22 20:30:47 +11:00
parent 44332a923c
commit 2ef9c3fe30
22 changed files with 72 additions and 65 deletions

View File

@ -25,7 +25,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { HashRouter, BrowserRouter } from 'react-router-dom';
import Background from './../objects/background/Background';
import Background from '@objects/background/Background';
import Header from './header/Header';
import Footer from './footer/Footer';
import Routes from './page/Routes';

View File

@ -28,7 +28,7 @@
import React from 'react';
import Helmet from 'react-helmet';
const prefix = './../assets/images/favicon/';
const prefix = '@assets/images/favicon/';
export default (props) => {
return (

View File

@ -23,9 +23,9 @@
import React from 'react';
import { connect } from 'react-redux';
import Language from './../../language/Language';
import Language from '@public/language/Language';
import { NavLink } from 'react-router-dom'
import { PageBoundary } from './../page/Page';
import { PageBoundary } from '@components/page/Page';
const FooterLink = function(props) {
let key = "footer.links." + props.title;

View File

@ -22,7 +22,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Navbar from './../nav/navbar/Navbar';
import Navbar from '@components/nav/navbar/Navbar';
export default function(props) {
return (

View File

@ -24,8 +24,8 @@
import React from 'react';
import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom';
import Language from './../../../language/Language';
import * as MenuActions from './../../../actions/MenuActions';
import Language from '@public/language/Language';
import * as MenuActions from '@public/actions/MenuActions';
const HamburerMenuItem = function(props) {
return (

View File

@ -25,10 +25,10 @@ import React from 'react';
import { withRouter } from 'react-router';
import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom'
import PageBoundary from './../../page/PageBoundary';
import Language from './../../../language/Language';
import PageBoundary from '@components/page/PageBoundary';
import Language from '@public/language/Language';
import HamburgerMenu from './../menu/HamburgerMenu';
import Image from './../../../objects/image/Image';
import Image from '@objects/image/Image';
const NavbarLink = function(props) {
return (

View File

@ -25,7 +25,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { Helmet } from "react-helmet";
import PageBoundary from './PageBoundary';
import Language from './../../language/Language';
import Language from '@public/language/Language';
class Page extends React.Component {
constructor(props) {

View File

@ -27,7 +27,7 @@ import { bindActionCreators } from 'redux';
//Components
import Page, { PageBoundary } from './../Page';
import Language from './../../../language/Language';
import Language from '@public/language/Language';
//Objects
import ElementScrollFader from './../../../objects/animation/fade/ElementScrollFader';

View File

@ -24,7 +24,7 @@
import React from 'react';
import { connect } from 'react-redux';
import Page from './../Page';
import Language from './../../../language/Language'
import Language from '@public/language/Language'
import BannerSection from './sections/BannerSection';
import PromoVideoSection from './sections/PromoVideoSection';

View File

@ -22,12 +22,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Language from './../../../../language/Language';
import { PageBoundary } from './../../Page';
import { ImageSection } from './../../../section/Section';
import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
import { Title, Subtitle } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
import Language from '@public/language/Language';
import { PageBoundary } from '@components/page/Page';
import { ImageSection } from '@components/section/Section';
import FloatingContentBox from '@objects/content/FloatingContentBox';
import { Title, Subtitle } from '@objects/typography/Typography';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
export default (props) => {

View File

@ -22,14 +22,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Language from './../../../../language/Language';
import { PageBoundary } from './../../Page';
import { ImageSection, SplitSection, Split, ClearSection } from './../../../section/Section';
import ContentBox from './../../../../objects/content/ContentBox';
import { Title, Subtitle, Paragraph, Heading1, Heading2 } from './../../../../objects/typography/Typography';
import { Button } from './../../../../objects/input/Input';
import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
import Image from './../../../../objects/image/Image';
import Language from '@public/language/Language';
import { PageBoundary } from '@components/page/Page';
import { ImageSection, SplitSection, Split, ClearSection } from '@components/section/Section';
import ContentBox from '@objects/content/ContentBox';
import { Title, Subtitle, Paragraph, Heading1, Heading2 } from '@objects/typography/Typography';
import { Button } from '@objects/input/Input';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
import Image from '@objects/image/Image';
import Window95, {
TitleBar, Close, Minimize,

View File

@ -22,15 +22,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Language from './../../../../language/Language';
import { PageBoundary } from './../../Page';
import { ImageSection, SplitSection, Split } from './../../../section/Section';
import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
import ContentBox from './../../../../objects/content/ContentBox';
import Image from './../../../../objects/image/Image';
import Video from './../../../../objects/video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
import Language from '@public/language/Language';
import { PageBoundary } from '@components/page/Page';
import { ImageSection, SplitSection, Split } from '@components/section/Section';
import FloatingContentBox from '@objects/content/FloatingContentBox';
import ContentBox from '@objects/content/ContentBox';
import Image from '@objects/image/Image';
import Video from '@objects/video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from '@objects/typography/Typography';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
const Platform = (props) => {
let children;

View File

@ -23,12 +23,12 @@
import React from 'react';
import { connect } from 'react-redux';
import Language from './../../../../language/Language';
import { PageBoundary } from './../../Page';
import { ImageSection } from './../../../section/Section';
import ContentBox from './../../../../objects/content/ContentBox';
import { Title, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
import Language from '@public/language/Language';
import { PageBoundary } from '@components/page/Page';
import { ImageSection } from '@components/section/Section';
import ContentBox from '@objects/content/ContentBox';
import { Title, Paragraph, Heading1 } from '@objects/typography/Typography';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
export default (props) => {
return (

View File

@ -22,14 +22,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Language from './../../../../language/Language';
import Page, { PageBoundary } from './../../Page';
import Section, { SplitSection, Split } from './../../../section/Section';
import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
import ContentBox from './../../../../objects/content/ContentBox';
import Video from './../../../../objects/video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
import Language from '@public/language/Language';
import Page, { PageBoundary } from '@components/page/Page';
import Section, { SplitSection, Split } from '@components/section/Section';
import FloatingContentBox from '@objects/content/FloatingContentBox';
import ContentBox from '@objects/content/ContentBox';
import Video from '@objects/video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from '@objects/typography/Typography';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
export default (props) => {

View File

@ -23,10 +23,10 @@
import React from 'react';
import { connect } from 'react-redux';
import Language from './../../../../language/Language';
import Language from '@public/language/Language';
import Page, { PageBoundary } from './../../Page';
import { BodySection, ClearSection } from './../../../section/Section';
import { Title } from './../../../../objects/typography/Typography';
import { BodySection, ClearSection } from '@components/section/Section';
import { Title } from '@objects/typography/Typography';
const PrivacyPolicyPage = (props) => {
return (

View File

@ -23,7 +23,7 @@
import React from 'react';
import Section from './../Section';
import { PageBoundary } from './../../page/Page';
import { PageBoundary } from '@components/page/Page';
const FeaturedArticle = function(props) {
let clazz = "c-featured-blog-section__article";

View File

@ -23,7 +23,7 @@
import React from 'react';
import Section from './../Section';
import Image from './../../../objects/image/Image';
import Image from '@objects/image/Image';
export default function(props) {
let image;

View File

@ -23,8 +23,8 @@
import React from 'react';
import Section from './../Section';
import Video from './../../../objects/video/Video';
import Loader from './../../../objects/loading/Loader';
import Video from '@objects/video/Video';
import Loader from '@objects/loading/Loader';
class VideoSection extends React.Component {
constructor(props) {

View File

@ -28,7 +28,7 @@ import ButtonGroup from './button/ButtonGroup';
import Form, { FormManager } from './form/Form';
import InputGroup from './group/InputGroup';
import Label from './label/Label';
import Keyboard from './../../keyboard/Keyboard';
import Keyboard from '@public/keyboard/Keyboard';
export default class Input extends React.Component {
constructor(props) {

View File

@ -22,7 +22,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react';
import Loader, { LoaderBackdrop } from './../../loading/Loader';
import Loader, { LoaderBackdrop } from '@objects/loading/Loader';
import Input, { InputGroup, TextArea } from './../Input';
export default class Form extends React.Component {

View File

@ -26,10 +26,10 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { CSSTransition, TransitionGroup } from 'react-transition-group';
import { Button } from './../input/Input';
import Language from './../../language/Language';
import { openModal, closeModal } from './../../actions/ModalActions';
import { Heading4 } from './../typography/Typography';
import Keyboard from './../../keyboard/Keyboard';
import Language from '@public/language/Language';
import { openModal, closeModal } from '@public/actions/ModalActions';
import { Heading4 } from '@objects/typography/Typography';
import Keyboard from '@public/keyboard/Keyboard';
class Modal extends React.Component {
constructor(props) {

View File

@ -1,7 +1,8 @@
const
webpack = require('webpack'),
HtmlWebpackPlugin = require('html-webpack-plugin'),
SharpLoader = require('responsive-loader/sharp')
SharpLoader = require('responsive-loader/sharp'),
path = require('path')
;
const HTMLWebpackPluginConfig = new HtmlWebpackPlugin({
@ -26,7 +27,13 @@ module.exports = {
resolve: {
modules: ['node_modules', './public'],
extensions: ['.js', '.jsx', '.css', '.scss' ]
extensions: ['.js', '.jsx', '.css', '.scss' ],
alias: {
'@public': path.resolve(__dirname, './public'),
'@objects': path.resolve(__dirname, './public/objects'),
'@components': path.resolve(__dirname, './public/components'),
'@assets': path.resolve(__dirname, './public/assets')
}
},
// declare loaders to be used in webpack