Merge branch 'master' of https://github.com/HackMerced/website-2017t

this is the newly updated version with spreadsheet.py gspread sheets API working (without UI implementation)

Author: JanTanja

py_deps.txt

@@ -1,3 +1,4 @@
 Flask==0.10.1
 virtualenv
 json
+python-dotenv

serve/css/general/index.scss

@@ -1,6 +1,6 @@
 aside{
-  width: 50%;
-  min-width: 200px;
+  width: calc(100% - 600px);
+  max-width: 50%;
   height: 100%;
   position: fixed;
 }
@@ -10,6 +10,7 @@ aside{
   min-width: 600px;
   position: absolute;
   right: 0px;
+  max-width: 50%;
 }
 
 .image-element {

src/__init__.py

@@ -7,9 +7,9 @@
 def index():
     return render_template('general/index.html', jobs = 0)
 
-@app.route('/jobs')
+@app.route('/work')
 def jobs():
-    return render_template('general/jobs.html', jobs = 1)
+    return render_template('general/work.html', jobs = 1)
 
 
 #hello

src/templates/general/jobs.html

@@ -0,0 +1,55 @@
+{% extends "layout.html" %}
+{% block body %}
+  <div class='information'>
+    <h1>Build HackMerced</h1>
+    <section>
+      <article>
+        <h4>We’re looking for people like you!</h4>
+        <p>
+          HackMerced is looking for a wide range of skilled engineers, designers, leaders, and creatives. This year, we created not just leadership roles, but also constructive and career-focused jobs for those with a strict schedule or the ambition to learn new skills.
+          <br>
+          We also have an FAQ for you below the job listings!
+        </p>
+      </article>
+      <article>
+        <h4>HackMerced Leadership Information</h4>
+        <h5>Filter Role</h5>
+        <div id='filter-jobs'></div>
+        <h5>Role Listings</h5>
+        <div id='job-listing'></div>
+      </article>
+      <article>
+        <h4>FAQ</h4>
+        <h5>Are these positions paid?</h5>
+        <p>
+          No, we are wholley a school organization that is run entirely by volunteers.
+        </p>
+        <h5>Why should I contribute?</h5>
+        <p>
+          If you have a strong desire to help the Merced community as well well as want to experience working in a professional environment, we recommend working with us!
+        </p>
+        <h5>Do I need to be a programmer?</h5>
+        <p>
+          No, most of our roles are actually non-programming positions that are open to a wide skillset of students, including Finance, Administration, Product Management, Human Resources and Education.
+        </p>
+        <h5>Is it hard to get in?</h5>
+        <p>
+          No, we are very accepting to all ranges of skill level and offer a variety of positions to accomidate all.
+        </p>
+        <h5>Do I need to work a lot?</h5>
+        <p>
+          We believe that as long as you have the desire and drive to make HackMerced amazing, you won't even notice how much you work! That being said, HackMerced is not usually a low-commitment position, and since we want to train you for real life employment we will try to engage you for at least 3-7 hours a week.
+        </p>
+        <h5>Can I still participate in HackMerced if I work here?</h5>
+        <p>
+          Yes, as long as you are not a Director.
+        </p>
+        <h5>What happened to the students last year?</h5>
+        <p>
+          In the last two years, we've worked with a small cohort of students that have excelled tremendously both in school and in real life. They have taken what they've learned in leading HackMerced to positons and offers at companies include: Google, Pandora, PayPal, Sony, Lockheed Martin, Goldman Sachs, Qualcomm, Esri, and much much more!
+        </p>
+      </article>
+
+    </section>
+  </div>
+{% endblock %}

src/templates/general/work.html

@@ -2,7 +2,7 @@
   <div class='logo'></div>
   <nav>
     <li><a fakelink href='/'>Home</a></li>
-    <li><a fakelink href='/jobs'>Jobs</a></li>
+    <li><a fakelink href='/jobs'>Work with us!</a></li>
     <li><a href='https://github.com/HackMerced'>Open Source</a></li>
     <li><a href='https://www.facebook.com/hackmerced/messages/?initialClientFilter=unanswered&threadid=1695866600&timestamp=1487195154514#'>Contact</a></li>
   </nav>