From 23c003519a16e6dc9f5ec43b34aec221444fa067 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Wed, 31 Oct 2018 21:32:30 +1100
Subject: [PATCH] Updated contact page to be more new-code.

---
 public/components/page/Page.jsx            |  19 +++-
 public/components/page/Page.scss           |  12 +++
 public/pages/contact/ContactPage.jsx       | 110 +++++----------------
 public/pages/contact/ContactPage.scss      |  12 +++
 public/pages/contact/form/ContactForm.jsx  |  89 +++++++++++++++++
 public/pages/contact/form/ContactForm.scss |   0
 public/styles/common.scss                  |   1 -
 public/styles/pages/_contact-page.scss     |  25 -----
 8 files changed, 152 insertions(+), 116 deletions(-)
 create mode 100644 public/pages/contact/ContactPage.scss
 create mode 100644 public/pages/contact/form/ContactForm.jsx
 create mode 100644 public/pages/contact/form/ContactForm.scss
 delete mode 100644 public/styles/pages/_contact-page.scss

diff --git a/public/components/page/Page.jsx b/public/components/page/Page.jsx
index a807e3d..978bf4d 100644
--- a/public/components/page/Page.jsx
+++ b/public/components/page/Page.jsx
@@ -26,16 +26,19 @@ import { connect } from 'react-redux';
 import { Helmet } from "react-helmet";
 import { withLanguage } from '@public/language/Language';
 
-import Styles from './Page.scss';
+import Image from '@objects/image/Image';
 
-//Components
 import PageBoundary from './boundary/PageBoundary';
 
-export default withLanguage(props => {
-  let { title, style, className, lang, children } = props;
+import Styles from './Page.scss';
 
+export default withLanguage(props => {
+  let { title, style, className, lang, children, background } = props;
+
+  //Switch classes
   let clazzes = `c-page ${className||""}`;
 
+  //Setup page title
   let titleHelmet;
   if((!title || !title.length) && style != "home-page") {
     console.exception(`This page (${style||className}) does not have a title!`);
@@ -43,11 +46,19 @@ export default withLanguage(props => {
     titleHelmet = <title>{ title }</title>
   }
 
+  //Extras
+  let bg;
+  if(background) {
+    bg = <Image src={ background } className="c-page__background" loadable />;
+    clazzes += ' has-background';
+  }
+
   return (
     <div className={clazzes}>
       <Helmet defaultTitle={ lang.site.title } titleTemplate={ lang.site.titleTemplate }>
         { titleHelmet }
       </Helmet>
+      { bg }
       { children }
     </div>
   );
diff --git a/public/components/page/Page.scss b/public/components/page/Page.scss
index 08cc2f5..6c31d42 100644
--- a/public/components/page/Page.scss
+++ b/public/components/page/Page.scss
@@ -13,6 +13,10 @@
 .c-page {
   flex-grow: 1;
 
+  &.has-background {
+    position: relative;
+  }
+
   &__boundary {
     max-width: $s-screen-boundary;
     margin: 0 auto;
@@ -26,4 +30,12 @@
       max-width: $s-screen-boundary / 2;
     }
   }
+
+  &__background {
+    position: absolute;
+    z-index: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
 }
diff --git a/public/pages/contact/ContactPage.jsx b/public/pages/contact/ContactPage.jsx
index 13ac2f7..d553b9a 100644
--- a/public/pages/contact/ContactPage.jsx
+++ b/public/pages/contact/ContactPage.jsx
@@ -25,34 +25,24 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
-import Forms from '@common/Forms';
-
 //Actions
 import { openModal } from '@public/actions/ModalActions';
 
 //Components
 import Page, { PageBoundary } from '@components/page/Page';
 import { withLanguage } from '@public/language/Language';
-import Section, {
-  BodySection,
-  ClearSection,
-  SplitSection,
-  Split
-} from '@components/section/Section';
+import { ClearSection } from '@components/section/Section';
 
 //Objects
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
 import ContentBox from '@objects/content/box/ContentBox';
 import { Title, Heading1, Paragraph } from '@objects/typography/Typography';
-import Input, {
-  Form,
-  FormManager,
-  FormGroup,
-  TextArea,
-  Label,
-  ButtonGroup
-} from '@objects/input/Input';
 import Modal from '@objects/modal/Modal';
+import { FormManager } from '@objects/input/Input';
+
+import ContactForm from './form/ContactForm';
+
+import Styles from './ContactPage.scss';
 
 class ContactPage extends React.Component {
   constructor(props) {
@@ -61,16 +51,12 @@ class ContactPage extends React.Component {
     //Form Manager (For the form and elements)
     this.manager = new FormManager();
 
-    this.state = {
-      sent: false
-    };
+    this.state = { sent: false };
   }
 
   onSuccess(data) {
     if(data !== true) return this.onError(data);
-    this.setState({
-      sent: true
-    });
+    this.setState({ sent: true });
   }
 
   onError(e, a, b) {
@@ -83,16 +69,17 @@ class ContactPage extends React.Component {
 
   render() {
     let { lang } = this.props;
+    let { sent } = this.state;
 
     //Form
     let inners;
-    if(this.state.sent) {
+    if(sent) {
       //Sent Display
       inners = (
         <ElementScrollFader from="bottom">
           <ContentBox box className="u-text-center">
-            <Heading1>{ lang.pages.contact.success.heading }</Heading1>
-            <Paragraph>{ lang.pages.contact.success.paragraph }</Paragraph>
+            <Heading1 children={ lang.pages.contact.success.heading } />
+            <Paragraph children={ lang.pages.contact.success.paragraph } />
           </ContentBox>
         </ElementScrollFader>
       );
@@ -100,73 +87,27 @@ class ContactPage extends React.Component {
       //Form
       inners = (
         <ElementScrollFader from="right">
-          <BodySection>
-            <Form
-              post="/api/contact/send"
-              contentType="application/json"
-              ajax
-              loader
+          <ContentBox box>
+            <ContactForm
               onSuccess={ (e) => this.onSuccess(e) }
               onError={ (e) => this.onError(e) }
               manager={ this.manager }
-            >
-              <FormGroup>
-                <Label htmlFor="name">
-                  { lang.pages.contact.name.label }
-                </Label>
-                <Input
-                  name="name"
-                  type="text"
-                  placeholder={ lang.pages.contact.name.placeholder }
-                  required={ Forms.contact.name.required }
-                  maxLength={ Forms.contact.name.maxLength }
-                  manager={ this.manager }
-                />
-              </FormGroup>
-
-              <FormGroup >
-                <Label htmlFor="email">
-                  { lang.pages.contact.email.label }
-                </Label>
-                <Input
-                  name="email"
-                  type="email"
-                  placeholder={ lang.pages.contact.email.placeholder }
-                  required={ Forms.contact.email.required }
-                  maxLength={ Forms.contact.email.maxLength }
-                  manager={ this.manager }
-                />
-              </FormGroup>
-
-              <FormGroup>
-                <Label> htmlFor="message">
-                  { lang.pages.contact.message.label }
-                </Label>
-                <TextArea
-                  name="message"
-                  placeholder={ lang.pages.contact.message.placeholder }
-                  rows="8"
-                  className="p-contact-page__message"
-                  required={ Forms.contact.message.required }
-                  maxLength={ Forms.contact.message.maxLength }
-                  manager={ this.manager }
-                />
-              </FormGroup>
-
-              <ButtonGroup>
-                <Input type="submit" value={ lang.pages.contact.send } primary="true" />
-                <Input type="reset" value={ lang.pages.contact.reset } />
-              </ButtonGroup>
-            </Form>
-          </BodySection>
+            />
+          </ContentBox>
         </ElementScrollFader>
       );
     }
 
     return (
-      <Page style="contact-page" className="p-contact-page" title={ lang.pages.contact.title }>
+      <Page
+        style="contact-page"
+        className="p-contact-page"
+        title={ lang.pages.contact.title }
+        background={ require('@assets/images/patterns/lemon-triangle.svg') }
+      >
         <ClearSection />
         <PageBoundary small>
+
           <ElementScrollFader from="left">
             <ContentBox box className="u-text-center">
               <Title>{ lang.pages.contact.heading }</Title>
@@ -175,11 +116,8 @@ class ContactPage extends React.Component {
               </Paragraph>
             </ContentBox>
           </ElementScrollFader>
-
-          <br />
-          <br />
-
           { inners }
+
         </PageBoundary>
         <ClearSection />
       </Page>
diff --git a/public/pages/contact/ContactPage.scss b/public/pages/contact/ContactPage.scss
new file mode 100644
index 0000000..e92271e
--- /dev/null
+++ b/public/pages/contact/ContactPage.scss
@@ -0,0 +1,12 @@
+/*
+ *  Contact Page
+ *    Contact Page specific styles and designs
+ *
+ *  Dependencies:
+ *
+ *  Version:
+ *    1.0.0 - 2018/05/28
+ */
+@import '~@styles/global';
+.p-contact-page {
+}
diff --git a/public/pages/contact/form/ContactForm.jsx b/public/pages/contact/form/ContactForm.jsx
new file mode 100644
index 0000000..1ca1627
--- /dev/null
+++ b/public/pages/contact/form/ContactForm.jsx
@@ -0,0 +1,89 @@
+// Copyright (c) 2018 Dominic Masters
+//
+// MIT License
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import React from 'react';
+
+import Forms from '@common/Forms';
+
+import { withLanguage } from '@public/language/Language';
+
+import Input, {
+  Form, FormManager, FormGroup,
+  TextArea, Label, ButtonGroup
+} from '@objects/input/Input';
+
+import Styles from './ContactForm.scss';
+
+export default withLanguage(props => {
+  let newProps = {...props};
+  let { className, lang, manager } = props;
+
+  ["setLanguage"].forEach(e => delete newProps[e]);
+
+  return (
+    <Form
+      {...newProps}
+      className={ `c-contact-form ${className||""}` }
+      post="/api/contact/send" contentType="application/json" ajax loader
+    >
+      <FormGroup>
+        <Label htmlFor="name" children={ lang.pages.contact.name.label } />
+        <Input
+          name="name" type="text"
+          placeholder={ lang.pages.contact.name.placeholder }
+          required={ Forms.contact.name.required }
+          maxLength={ Forms.contact.name.maxLength }
+          manager={ manager }
+        />
+      </FormGroup>
+
+      <FormGroup >
+        <Label htmlFor="email" children={ lang.pages.contact.email.label } />
+        <Input
+          name="email" type="email"
+          placeholder={ lang.pages.contact.email.placeholder }
+          required={ Forms.contact.email.required }
+          maxLength={ Forms.contact.email.maxLength }
+          manager={ manager }
+        />
+      </FormGroup>
+
+      <FormGroup>
+        <Label htmlFor="message" children={ lang.pages.contact.message.label } />
+        <TextArea
+          className="p-contact-page__message"
+          name="message" rows="8"
+          placeholder={ lang.pages.contact.message.placeholder }
+          required={ Forms.contact.message.required }
+          maxLength={ Forms.contact.message.maxLength }
+          manager={ manager }
+        />
+      </FormGroup>
+
+      <ButtonGroup>
+        <Input type="submit" value={ lang.pages.contact.send } primary="true" />
+        <Input type="reset" value={ lang.pages.contact.reset } />
+      </ButtonGroup>
+    </Form>
+  );
+});
diff --git a/public/pages/contact/form/ContactForm.scss b/public/pages/contact/form/ContactForm.scss
new file mode 100644
index 0000000..e69de29
diff --git a/public/styles/common.scss b/public/styles/common.scss
index 6289dbb..fe49237 100644
--- a/public/styles/common.scss
+++ b/public/styles/common.scss
@@ -46,7 +46,6 @@
 
 //TEMP
 @import './objects/_page-transition.scss';
-@import './pages/_contact-page.scss';
 @import './pages/_privacy-policy-page.scss';
 
 //Utilities
diff --git a/public/styles/pages/_contact-page.scss b/public/styles/pages/_contact-page.scss
deleted file mode 100644
index 3ecbf49..0000000
--- a/public/styles/pages/_contact-page.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Contact Page
- *    Contact Page specific styles and designs
- *
- *  Dependencies:
- *
- *  Version:
- *    1.0.0 - 2018/05/28
- */
-.p-contact-page {
-  background-color: #37085E;
-  background-image: url($s-asset--directory+'images/patterns/lemon-triangle.svg');
-  background-size: 75% auto;
-
-  &__message-element {
-    resize: none;
-  }
-
-  &__floppy {
-    width: 80%;
-    display: block;
-    margin: auto;
-    max-width: 320px;
-  }
-}