YourWishes/domsPlace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more components fixed... definitely need an @root resolver.

Browse Source
This commit is contained in:
Dominic Masters
2018-10-22 17:35:44 +11:00
parent f8e76e72c0
commit 1f5a3fc563
14 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/components/nav/menu/HamburgerMenu.jsx
View File

@ -24,8 +24,8 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import Language from './../../language/Language'; import Language from './../../../language/Language';
import * as MenuActions from './../../actions/MenuActions'; import * as MenuActions from './../../../actions/MenuActions';
const HamburerMenuItem = function(props) { const HamburerMenuItem = function(props) {
return ( return (
@ -55,7 +55,7 @@ class HamburgerMenu extends React.Component {
onClick={this.props.toggleMenu} onClick={this.props.toggleMenu}
> >
<img <img
src={ require('./../../images/icons/hamburger.svg') } src={ require('./../../../assets/images/icons/hamburger.svg') }
className="c-hamburger-menu__icon" className="c-hamburger-menu__icon"
/> />
</button> </button>

6
public/components/nav/navbar/Navbar.jsx
View File

@ -26,9 +26,9 @@ import { withRouter } from 'react-router';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom' import { NavLink } from 'react-router-dom'
import PageBoundary from './../../page/PageBoundary'; import PageBoundary from './../../page/PageBoundary';
import Language from './../../language/Language'; import Language from './../../../language/Language';
import HamburgerMenu from './../menu/HamburgerMenu'; import HamburgerMenu from './../menu/HamburgerMenu';
import Image from './../../image/Image'; import Image from './../../../objects/image/Image';
const NavbarLink = function(props) { const NavbarLink = function(props) {
return ( return (
@ -53,7 +53,7 @@ class Navbar extends React.Component {
{/* Logo */} {/* Logo */}
<NavLink to="/" className="c-navbar__logo-container" activeClassName="is-active"> <NavLink to="/" className="c-navbar__logo-container" activeClassName="is-active">
<Image <Image
src={ require('./../../images/logo.svg') } src={ require('./../../../assets/images/logo.svg') }
className="c-navbar__logo" className="c-navbar__logo"
alt={ Language.get("site.name") } alt={ Language.get("site.name") }
title={ Language.get("site.name") } title={ Language.get("site.name") }

18
public/components/page/contact/ContactPage.jsx
View File

@ -24,11 +24,15 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
//Components
import Page, { PageBoundary } from './../Page'; import Page, { PageBoundary } from './../Page';
import Language from './../../language/Language'; import Language from './../../../language/Language';
import ElementScrollFader from './../../animation/fade/ElementScrollFader';
import ContentBox from './../../content/ContentBox'; //Objects
import { Title, Heading1, Paragraph } from './../../typography/Typography'; import ElementScrollFader from './../../../objects/animation/fade/ElementScrollFader';
import ContentBox from './../../../objects/content/ContentBox';
import { Title, Heading1, Paragraph } from './../../../objects/typography/Typography';
import Forms from './../../../common/Forms'; import Forms from './../../../common/Forms';
import Input, { import Input, {
Form, Form,
@ -37,15 +41,15 @@ import Input, {
TextArea, TextArea,
Label, Label,
ButtonGroup ButtonGroup
} from './../../input/Input'; } from './../../../input/Input';
import Section, { import Section, {
BodySection, BodySection,
ClearSection, ClearSection,
SplitSection, SplitSection,
Split Split
} from './../../section/Section'; } from './../../section/Section';
import { openModal } from './../../actions/ModalActions'; import { openModal } from './../../../actions/ModalActions';
import Modal from './../../modal/Modal'; import Modal from './../../../objects/modal/Modal';
class ContactPage extends React.Component { class ContactPage extends React.Component {
constructor(props) { constructor(props) {

2
public/components/page/home/HomePage.jsx
View File

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

4
public/components/page/home/sections/BannerSection.jsx
View File

@ -26,8 +26,8 @@ import Language from './../../../language/Language';
import { PageBoundary } from './../../Page'; import { PageBoundary } from './../../Page';
import { ImageSection } from './../../../section/Section'; import { ImageSection } from './../../../section/Section';
import FloatingContentBox from './../../../content/FloatingContentBox'; import FloatingContentBox from './../../../content/FloatingContentBox';
import { Title, Subtitle } from './../../../typography/Typography'; import { Title, Subtitle } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
export default (props) => { export default (props) => {

4
public/components/page/home/sections/ExistingWorkSection.jsx
View File

@ -26,7 +26,7 @@ import Language from './../../../language/Language';
import { PageBoundary } from './../../Page'; import { PageBoundary } from './../../Page';
import { ImageSection, SplitSection, Split, ClearSection } from './../../../section/Section'; import { ImageSection, SplitSection, Split, ClearSection } from './../../../section/Section';
import ContentBox from './../../../content/ContentBox'; import ContentBox from './../../../content/ContentBox';
import { Title, Subtitle, Paragraph, Heading1, Heading2 } from './../../../typography/Typography'; import { Title, Subtitle, Paragraph, Heading1, Heading2 } from './../../../../objects/typography/Typography';
import { Button } from './../../../input/Input'; import { Button } from './../../../input/Input';
import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
import Image from './../../../image/Image'; import Image from './../../../image/Image';
@ -37,7 +37,7 @@ import Window95, {
ContextMenu, ContextMenuOption, ContextMenu, ContextMenuOption,
Frame, Frame,
AddressBar AddressBar
} from './../../../window/Window95'; } from './../../../../object/window/Window95';
const ExistingWorkFrame = (props) => { const ExistingWorkFrame = (props) => {
let fakeURL = props.href; let fakeURL = props.href;

4
public/components/page/home/sections/PlatformsSection.jsx
View File

@ -28,8 +28,8 @@ import { ImageSection, SplitSection, Split } from './../../../section/Section';
import FloatingContentBox from './../../../content/FloatingContentBox'; import FloatingContentBox from './../../../content/FloatingContentBox';
import ContentBox from './../../../content/ContentBox'; import ContentBox from './../../../content/ContentBox';
import Image from './../../../image/Image'; import Image from './../../../image/Image';
import Video from './../../../video/Video'; import Video from './../../../../video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography'; import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
const Platform = (props) => { const Platform = (props) => {

2
public/components/page/home/sections/ProgrammingSection.jsx
View File

@ -27,7 +27,7 @@ import Language from './../../../language/Language';
import { PageBoundary } from './../../Page'; import { PageBoundary } from './../../Page';
import { ImageSection } from './../../../section/Section'; import { ImageSection } from './../../../section/Section';
import ContentBox from './../../../content/ContentBox'; import ContentBox from './../../../content/ContentBox';
import { Title, Paragraph, Heading1 } from './../../../typography/Typography'; import { Title, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
export default (props) => { export default (props) => {

8
public/components/page/home/sections/PromoVideoSection.jsx
View File

@ -27,8 +27,8 @@ import Page, { PageBoundary } from './../../Page';
import Section, { SplitSection, Split } from './../../../section/Section'; import Section, { SplitSection, Split } from './../../../section/Section';
import FloatingContentBox from './../../../content/FloatingContentBox'; import FloatingContentBox from './../../../content/FloatingContentBox';
import ContentBox from './../../../content/ContentBox'; import ContentBox from './../../../content/ContentBox';
import Video from './../../../video/Video'; import Video from './../../../../objects/video/Video';
import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography'; import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
@ -41,8 +41,8 @@ export default (props) => {
<Split className="u-text-center" padded> <Split className="u-text-center" padded>
<ElementScrollFader> <ElementScrollFader>
<Video <Video
image={ require('./../../../videos/bunny/big_buck_bunny.jpg') } image={ require('./../../../../assets/videos/bunny/big_buck_bunny.jpg') }
mp4={ require('./../../../videos/bunny/big_buck_bunny.mp4') } mp4={ require('./../../../assets/videos/bunny/big_buck_bunny.mp4') }
controls controls
/> />
</ElementScrollFader> </ElementScrollFader>

4
public/components/page/legal/privacy/PrivacyPolicyPage.jsx
View File

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

2
public/components/section/image/ImageSection.jsx
View File

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

4
public/components/section/video/VideoSection.jsx
View File

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

2
public/objects/input/Input.jsx
View File

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

6
public/objects/modal/Modal.jsx
View File

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