Merge pull request #105 from lamn18/master

RC1 Release
SCCapstone · Apr 5, 2020 · 4dd3d95 · 4dd3d95
2 parents 85977b5 + 88e0a92
commit 4dd3d95
Show file tree

Hide file tree

Showing 12 changed files with 14,301 additions and 61 deletions.
diff --git a/client/src/CSS/Footer.css b/client/src/CSS/Footer.css
@@ -53,7 +53,7 @@ Lam Nguyen
     margin-bottom: 20px;
 }
 
-.inner-footer .footer-third a {
+.inner-footer .footer-third li a {
     font-family: Montserrat;
     font-size: 16px;
     font-weight: 200;

diff --git a/client/src/CSS/Home.css b/client/src/CSS/Home.css
@@ -51,4 +51,11 @@
 }
 .contactUs {
     text-align: center;
+}
+.MainBody-inner {
+    width: 60vw;
+    margin: auto;
+}
+.center {
+    text-align: center;
 }
diff --git a/client/src/CSS/ReqServer.css → client/src/CSS/obsolete/ReqServer.css b/client/src/CSS/ReqServer.css → client/src/CSS/obsolete/ReqServer.css
diff --git a/client/src/CSS/sheet.css b/client/src/CSS/sheet.css
@@ -70,4 +70,26 @@
     border-radius: .25rem;
     transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
 
+}
+
+#template-button {
+    display: inline-block;
+    font-weight: 400;
+    color: white;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    -webkit-user-select: none;
+    user-select: none;
+    background-color: orange;
+    border: 1px solid transparent;
+    padding: .375rem .75rem;
+    font-size: 1rem;
+    line-height: 1.5;
+    border-radius: .25rem;
+    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+
+}
+.template-cont {
+    overflow: hidden;
 }
diff --git a/client/src/components/RequestServer.js b/client/src/components/RequestServer.js
@@ -1,5 +1,4 @@
 import React, {Component} from 'react';
-import '../CSS/ReqServer.css';
 
 class RequestServer extends Component  {
     state = {

diff --git a/client/src/components/TemplateDownload.js b/client/src/components/TemplateDownload.js
@@ -1,4 +1,7 @@
 import React from "react";
+import "../CSS/sheet.css";
+import "../CSS/DataPanel.css";
+
 /**
  * this class for grabbing templated files
  * from the backend server. The downloaded
@@ -35,9 +38,11 @@ class TemplateDownload extends React.Component {
   render() {
     return (
       //download
-      <button className="tmpltDown" onClick={this.downloadTemplateFile}>
-        Download Template File
-      </button>
+      <div className="template-cont">
+        <button id="template-button" onClick={this.downloadTemplateFile}>
+          Download {this.props.scheduleType} Template File
+        </button>
+      </div>
     );
   }
 }

diff --git a/client/src/components/sitewide/Footer.js b/client/src/components/sitewide/Footer.js
@@ -57,10 +57,15 @@ class Footer extends Component {
             </li>
           </div>
           <div class="footer-third">
+            <h1>Links</h1>
             <li>
-              <h1>
                 <a href="https://github.com/SCCapstone/WebEvents">Our Github</a>
-              </h1>
+            </li><br/>
+            <li>
+                <a href="https://github.com/SCCapstone/WebEvents/wiki">Visit our Wiki</a>
+            </li>
+            <li>
+                <a href="https://github.com/SCCapstone/WebEvents/wiki/Legal-Issues">Legal Issues</a>
             </li>
           </div>
         </div>

diff --git a/client/src/views/About.js b/client/src/views/About.js
@@ -22,33 +22,28 @@ class About extends Component {
                />
             </div>
 
-            <div id="MainBody-Left"></div>
-               <div id="MainBody-Center">
-                  <div id="padded-container-center">
-
-                  <h1>About US</h1>
-                  <h4>        
-                           Nate Zajac: Team Captain, Editor, Frontend Support <br/>
-                           Steven Edwards: coordinates with customer, Frontend Support <br/>
-                           Justin Greer: Editor, Optimist <br/>
-                           Luke Whittle: Editor, Backend Support <br/>
-                           Jesse Estry (Fall Semester): Backend Support, Github Repo. Master <br/>
-                           Lam Nguyen (Spring Semester): Visual Support, Editor <br/>
-                           <br/>
-                  </h4>
-                     <p>
-                           We are a group of five seniors studying Computer Science, Computer Engineering and Computer Information Systems at the University of South Carolina.<br/> 
-                           <br/>
-                        We have created an app that will provide an optimal schedule for event attendees based on their mutual
-                        preferences for dates and times. <br/>
-                        The app user would be the event organizer. Our app will have a web-page take an input of an excel file that has scheduling preferences <br/>
-                        and output a schedule that has scheduled clients based on their preferences. The target audience is event organizers who need to schedule <br/> a lot of people in a set period of time while attempting to make event speakers happy with
-                        their scheduled times.<br/>
-                     </p>
-                     <div className="column-padding"></div>
-                  </div>
-               </div>
-               <div id="MainBody-Right"></div>
+            <div class="MainBody-inner">
+               <h1>About US</h1>
+               <h4>        
+                        Nate Zajac: Team Captain, Editor, Frontend Support <br/>
+                        Steven Edwards: coordinates with customer, Frontend Support <br/>
+                        Justin Greer: Editor, Optimist <br/>
+                        Luke Whittle: Editor, Backend Support <br/>
+                        Jesse Estry (Fall Semester): Backend Support, Github Repo. Master <br/>
+                        Lam Nguyen (Spring Semester): Visual Support, Editor <br/>
+                        <br/>
+               </h4>
+               <p>
+                  We are a group of five seniors studying Computer Science, Computer Engineering 
+                  and Computer Information Systems at the University of South Carolina. We have created 
+                  an app that will provide an optimal schedule for event attendees based on their mutual
+                  preferences for dates and times. The app user would be the event organizer. Our app will
+                  have a web-page take an input of an excel file that has scheduling preferences and output 
+                  a schedule that has scheduled clients based on their preferences. The target audience is 
+                  event organizers who need to schedule a lot of people in a set period of time while 
+                  attempting to make event speakers happy with their scheduled times.
+               </p>
+            </div>
          </div>
       );
    }

diff --git a/client/src/views/ContactUs.js b/client/src/views/ContactUs.js
@@ -12,18 +12,25 @@ class ContactUs extends Component {
 
    render() {
       return (
-         <div id="contactUs">
-
-                  <h1>Contact Us</h1>
-                     <p>
-                        If you have any issues, contact us at <h6>[email protected] </h6>
-                        and we will respond as soon as possible
-                     </p>
-                     <div class = "links">
-                     <li><a href="https://github.com/SCCapstone/WebEvents">Our Github</a></li>
-                     <li><a href="https://capstone.cse.sc.edu/">USC Capstone Website</a></li>
-                     </div>
-
+         <div>
+            <div class="intro-banner img-cont">
+               <img
+               class="object-fit_cover"
+               src="homepageBanner.jpg"
+               alt="home-major-image-1"
+               />
+            </div>
+            <div class="MainBody-inner center">
+               <h1>Contact Us</h1>
+               <p>
+                  If you have any issues, contact us at <h6>[email protected] </h6>
+                  and we will respond as soon as possible
+               </p>
+               <div class = "links">
+               <li><a href="https://github.com/SCCapstone/WebEvents">Our Github</a></li>
+               <li><a href="https://capstone.cse.sc.edu/">USC Capstone Website</a></li>
+               </div>
+            </div>
          </div>
       );
    }

diff --git a/client/src/views/Home.js b/client/src/views/Home.js
@@ -92,22 +92,27 @@ class home extends Component {
       />
     );
   }
-
+  renderSchedulerTemplate() {
+    return (
+      <div>
+        <TemplateDownload scheduleType={this.state.scheduleType} />
+        <RequestServer />
+      </div>
+    ); 
+  }
   renderDataPanel() {
     return (
       <div id="DataPanel-Container">
         <div id="Excel-Container">
           <div id="padded-text">
             <h1>Upload your Spreadsheet</h1>
             <p>File extensions supported: .xls, .xlsx, .xlsm, .xltx, xltm</p>
-                    <SheetJSApp
-                        groupSize={this.state.groupSize}
-                        uploadFile={this.state.uploadFile}
-                        processFile={file => this.processFile(file)}
-                        scheduleType={this.state.scheduleType}          
+            <SheetJSApp
+                groupSize={this.state.groupSize}
+                uploadFile={this.state.uploadFile}
+                processFile={file => this.processFile(file)}
+                scheduleType={this.state.scheduleType}          
             />
-            <TemplateDownload scheduleType={this.state.scheduleType} />
-            <RequestServer />
           </div>
         </div>
 
@@ -185,6 +190,12 @@ class home extends Component {
               {this.renderScheduleOptions()}
             </div>
 
+            {/* This is for the template downloads*/}
+            <div>
+              <h1>Need a scheduler template?</h1>
+              {this.renderSchedulerTemplate()}
+            </div>
+
             {/* This is for the excel file input*/}
             <div>{this.renderDataPanel()}</div>
           </div>

diff --git a/client/src/views/UserInstructions.js b/client/src/views/UserInstructions.js
@@ -14,14 +14,14 @@ class Instructions extends Component {
         return (
             <div id="MainBody">
               <div class="intro-banner img-cont">
-          <img
-            class="object-fit_cover"
-            src="homepageBanner.jpg"
-            alt="home-major-image-1"
-          />
-        </div>
+                <img
+                  class="object-fit_cover"
+                  src="homepageBanner.jpg"
+                  alt="home-major-image-1"
+                />
+              </div>
 
-               <div id="MainBody-Center">
+               <div class="MainBody-inner">
                   <div id="padded-container-center">
 
                   <h1>Instructions how to use Web Events</h1>