fix register page, it makes possible Registration in one page

appleparan · Oct 25, 2016 · 569b9d3 · 569b9d3
1 parent 36e2748
commit 569b9d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/imports/startup/client/index.jsx b/imports/startup/client/index.jsx
@@ -16,9 +16,7 @@ import { Program } from  '/imports/ui/pages/Program.jsx';
 import { Schedule } from  '/imports/ui/pages/Schedule.jsx';
 import { Venue } from  '/imports/ui/pages/Venue.jsx';
 
-import { RegisterIntro } from '/imports/ui/pages/RegisterIntro.jsx'
-// import { LoginContents } from  '/imports/ui/pages/Login.jsx';
-// import { SignupContents } from  '/imports/ui/pages/Signup.jsx';
+import { Register } from '/imports/ui/pages/Register.jsx'
 
 Meteor.startup( () => {
   render(
@@ -28,7 +26,7 @@ Meteor.startup( () => {
         <Route path="program" component={ Program } />
         <Route path="schedule" component={ Schedule } />
         <Route path="venue" component={ Venue } />
-        <Route path="registernow" component={ RegisterIntro } />
+        <Route path="register" component={ Register } />
       </Route>
     </Router>,
     document.getElementById( 'react-root' )

diff --git a/imports/ui/pages/RegisterIntro.jsx → imports/ui/pages/Register.jsx b/imports/ui/pages/RegisterIntro.jsx → imports/ui/pages/Register.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { Grid, Row, Col, Table, Button, ButtonToolbar } from 'react-bootstrap';
+import { RegisterPoll } from './Registerpoll.jsx';
 
-export class RegisterIntro extends React.Component {
+export class Register extends React.Component {
   render() {
     const wellStyles = {maxWidth: 400, margin: '0 auto 10px'};
     return (
@@ -22,6 +23,7 @@ export class RegisterIntro extends React.Component {
               <li>Registration fee for foreign A3 participants will be exempted.</li>
             </ul>
           </Col></Row>
+          /*
           <Row><Col xs={12}>
             <span className="hidden">
               <h2 className="section-subheader">준비물</h2>
@@ -33,8 +35,10 @@ export class RegisterIntro extends React.Component {
               </ul>
             </span>
           </Col></Row>
+          */
           <div className="well" style={wellStyles}>
-           <Button bsStyle="primary" href="https://goo.gl/forms/DdbIepxJOGShQ7j32" bsSize="large" block> Online  Registration </Button>
+           // <Button bsStyle="primary" href="https://goo.gl/forms/DdbIepxJOGShQ7j32" bsSize="large" block> Online Registration </Button>
+           { RegisterPoll }
            <Button bsSize="large" block> Go Payment </Button>
          </div>
         </section>