From 569b9d3988ac1c81c72d1e76285b1c22f01820f1 Mon Sep 17 00:00:00 2001
From: Liam Jongsu Kim <appleparan@gmail.com>
Date: Wed, 26 Oct 2016 07:43:35 +0900
Subject: [PATCH] fix register page, it makes possible Registration in one page

---
 imports/startup/client/index.jsx                     | 6 ++----
 imports/ui/pages/{RegisterIntro.jsx => Register.jsx} | 8 ++++++--
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename imports/ui/pages/{RegisterIntro.jsx => Register.jsx} (87%)

diff --git a/imports/startup/client/index.jsx b/imports/startup/client/index.jsx
index ec410f5..4baac38 100644
--- 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 b/imports/ui/pages/Register.jsx
similarity index 87%
rename from imports/ui/pages/RegisterIntro.jsx
rename to imports/ui/pages/Register.jsx
index f59614f..a168e97 100644
--- a/imports/ui/pages/RegisterIntro.jsx
+++ b/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>