updated project page

CHSCodeForChange · Sep 15, 2018 · 0ea1514 · 0ea1514
1 parent 35c4632
commit 0ea1514
Show file tree

Hide file tree

Showing 36 changed files with 206 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ClubWebsite_django/__init__.pyc b/ClubWebsite_django/__init__.pyc
diff --git a/ClubWebsite_django/settings.pyc b/ClubWebsite_django/settings.pyc
diff --git a/ClubWebsite_django/urls.pyc b/ClubWebsite_django/urls.pyc
diff --git a/ClubWebsite_django/wsgi.pyc b/ClubWebsite_django/wsgi.pyc
diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,20 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+djangorestframework = "==3.7.3"
+django-crispy-forms = "==1.7.0"
+gunicorn = "==19.7.1"
+whitenoise = "==3.3.1"
+dj-database-url = "==0.4.2"
+"psycopg2-binary" = "==2.7.4"
+"Jinja2" = "==2.10"
+Django = "==1.11.9"
+Pillow = "==5.1.0"
+
+[dev-packages]
+
+[requires]
+python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/form/__init__.pyc b/form/__init__.pyc
diff --git a/form/admin.pyc b/form/admin.pyc
diff --git a/form/forms.pyc b/form/forms.pyc
diff --git a/form/migrations/0001_initial.pyc b/form/migrations/0001_initial.pyc
diff --git a/form/migrations/__init__.pyc b/form/migrations/__init__.pyc
diff --git a/form/models.pyc b/form/models.pyc
diff --git a/form/urls.pyc b/form/urls.pyc
diff --git a/form/views.pyc b/form/views.pyc
diff --git a/resources/templates/projects.html b/resources/templates/projects.html
@@ -5,8 +5,20 @@
       <!-- Page Heading -->
       <h1 class="display-1 headline">Our Projects
       </h1>
+
+      <div class="row" style="margin-bottom: 5%">
+        <div class="col-md-7">
+          <a href="#">
+            <img class="img-thumbnail" src="/static/img/passmaster.png" alt="">
+          </a>
+        </div>
+        <div class="col-md-5">
+          <h3>PassMaster</h3>
+          <p>A versitile hall pass system designed in conjunction with <a href="https://www.exodusrefugee.org/">Carmel High School's</a> Administration. The school felt their previous hall pass method was combersome, inconsistant and inconvenient for students, teachers and administrators. Thus we created a comprehensive, cross-platform solution in order to assist the school. </p>
+          <a href="https://passmaster.herokuapp.com" class="btn btn-primary btn-xl rounded-pill mt-1">View Project</a>
+        </div>
+      </div>
 
-      <!-- Project One -->
       <div class="row" style="margin-bottom: 5%">
         <div class="col-md-7">
           <a href="#">
@@ -15,9 +27,9 @@ <h1 class="display-1 headline">Our Projects
         </div>
         <div class="col-md-5">
           <h3>Sapphire Volunteer Management</h3>
-          <p>A volunteer management and hour tracking system developed for Exodus Refugee Immigration Inc. This organization expressed that their current paper-and-pencil system for tracking volunteers is very labor intensive, requiring a staff member to pend hours a week crunching the numbers. Our solution not only makes it easier for volunteers to find potentinal opportunities, it also allows organizations to track the hours performed by each volunteer.</p>
+          <p>A volunteer management and hour tracking system developed for <a href="https://www.exodusrefugee.org/">Exodus Refugee Immigration Inc</a>. This organization expressed that their current paper-and-pencil system for tracking volunteers is very labor intensive, requiring a staff member to pend hours a week crunching the numbers. Our solution not only makes it easier for volunteers to find potentinal opportunities, it also allows organizations to track the hours performed by each volunteer.</p>
           <p></p>
-          <p>The site is currently in Beta mode, meaning it is only used by Exodus, but it will soon be available for any organization to use with only a minimal hosting and domain charge.</p>
+          <p>This project won the $12,000 <a href="https://www.lead2feed.org/updates/program-announcements/">Lead2Feed Grand Prize</a> in 2018, $10,000 of which was donated to Exodus.</p>
           <a href="https://sapphire-web.herokuapp.com" class="btn btn-primary btn-xl rounded-pill mt-1">View Project</a>
         </div>
       </div>
@@ -30,12 +42,25 @@ <h3>Sapphire Volunteer Management</h3>
         </div>
         <div class="col-md-5">
           <h3>HiLite Newspaper App</h3>
-          <p>An Android application that display stories from the HiLite, the official school Newspaper of Carmel High School. The app lets users view stories, search for content and browse the varoius sections available.</p>
+          <p>An iOS and Android application that display stories from the <a href="https://hilite.org/">HiLite Newspaper</a>, the official school Newspaper of Carmel High School. The app lets users view stories, search for content and browse the varoius categories of coverage available.</p>
           <p></p>
           <p>The app will soon be expanded to work for any newspaper using WordPress. Newspapers will be able to register their publication into the app through a simple web interface.</p>
           <a href="" class="btn btn-xl rounded-pill mt-1" style="background-color: #aaaaaa; color: #ffffff;">Project Not Yet Available</a>
         </div>
       </div>
+
+      <div class="row" style="margin-bottom: 5%">
+        <div class="col-md-7">
+          <a href="#">
+            <img class="img-thumbnail" src="/static/img/icrc.png" alt="">
+          </a>
+        </div>
+        <div class="col-md-5">
+          <h3>Indiana Civil Rights Commission Complaint Form</h3>
+          <p>An complaint form requrested by the <a href="https://www.in.gov/icrc/">Indiana Civil Rights Commission</a>. The organization stated that their current complaint form was very outdated and thus limited citizens ability to voice their concerns. This new version has a modern look and feel and gives citizens the flexibility to fill it out on their computer or mobile phone. </p>
+          <a href="https://icrc-complaints.herokuapp.com" style="margin: auto;" class="btn btn-primary btn-xl rounded-pill mt-1">View Project</a>
+        </div>
+      </div>
 
 
       <div class="row" style="margin-bottom: 5%">

diff --git a/static/.DS_Store b/static/.DS_Store
diff --git a/static/img/.DS_Store b/static/img/.DS_Store
diff --git a/static/img/01.jpg b/static/img/01.jpg
diff --git a/static/img/02.jpg b/static/img/02.jpg
diff --git a/static/img/03.jpg b/static/img/03.jpg
diff --git a/static/img/IMG_4168.JPG b/static/img/IMG_4168.JPG
diff --git a/static/img/hiliteapp.png b/static/img/hiliteapp.png
diff --git a/static/img/icrc.png b/static/img/icrc.png
diff --git a/static/img/old/hiliteapp-old.png b/static/img/old/hiliteapp-old.png
diff --git a/static/img/old/sapphire-old.png b/static/img/old/sapphire-old.png
diff --git a/static/img/old/sapphire-old2.png b/static/img/old/sapphire-old2.png
diff --git a/static/img/passmaster.png b/static/img/passmaster.png
diff --git a/static/img/rahul.jpg b/static/img/rahul.jpg
diff --git a/static/img/sapphire.png b/static/img/sapphire.png
diff --git a/website/__init__.pyc b/website/__init__.pyc
diff --git a/website/admin.pyc b/website/admin.pyc
diff --git a/website/migrations/__init__.pyc b/website/migrations/__init__.pyc
diff --git a/website/models.pyc b/website/models.pyc
diff --git a/website/urls.pyc b/website/urls.pyc
diff --git a/website/views.pyc b/website/views.pyc