Restructure site and bug fixes

Fixes coala#44 Closes coala#1
ashwini0529 · Dec 14, 2017 · ec600af · ec600af
1 parent e9116e5
commit ec600af
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 55 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -103,3 +103,4 @@ ENV/
 _site/
 /public/
 org_name.txt
+.idea
diff --git a/community/urls.py b/community/urls.py
@@ -24,7 +24,7 @@ def get_index():
         distill_file='index.html',
     ),
     distill_url(
-        r'activity/', TemplateView.as_view(template_name='activity.html'),
+        r'activity/', TemplateView.as_view(template_name='index.html'),
         name='activity',
         distill_func=get_index,
         distill_file='activity/index.html',

diff --git a/static/.DS_Store b/static/.DS_Store
diff --git a/static/css/main.css b/static/css/main.css
@@ -0,0 +1,20 @@
+.student {
+    padding-bottom: 20px;
+}
+
+.students {
+    list-style: none;
+}
+nav {
+    background-color: #38474e !important;
+}
+
+.page-footer {
+    background-color: #37474f !important;
+}
+
+canvas {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}
diff --git a/static/charts.js → static/js/charts.js b/static/charts.js → static/js/charts.js
diff --git a/static/timeago.js → static/js/timeago.js b/static/timeago.js → static/js/timeago.js
diff --git a/static/main.css b/static/main.css
diff --git a/templates/activity.html b/templates/activity.html
@@ -1,41 +1,75 @@
-<!doctype html>
-<html>
-
-<head>
-    <title>Community Activity</title>
-    <style>
-    canvas {
-        -moz-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-    }
-    </style>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-</head>
-
-<body>
-    <h1>Community Activity</h1>
-    <br>
-    <br>
-    <div style="width:75%;">
-        <canvas id="canvas"></canvas>
+<!DOCTYPE html>
+  <html>
+    <head>
+      <!--Import Google Icon Font-->
+      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+      <!--Import materialize.css-->
+      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
+      <link rel="stylesheet" href="../static/css/main.css">
+      <!--Let browser know website is optimized for mobile-->
+      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    </head>
+
+    <body>
+
+    <nav>
+    <div class="nav-wrapper">
+      <a href="#" class="brand-logo">&nbsp;<img src="https://api.coala.io/en/latest/_static/images/coala_logo.svg"></a>
+      <ul id="nav-mobile" class="right hide-on-med-and-down">
+        <li><a href="/gci">GCI</a></li>
+        <li><a href="/activity">Github Activity{{ org_name }}</a></li>
+      </ul>
+    </div>
+  </nav>
+    <div class="section no-pad-bot" id="index-banner">
+        <div class="container">
+            <h1 class="header center  col-test">Welcome</h1>
+            <div class="row center">
+                <h5 class="header col s12 light">Hello, world. You are at the coala community GCI website.</h5>
+            </div>
+        </div>
+
+
+        <div class="row center">
+            <div class="input-field col s4">
+                    <select id="chartType">
+                        <option value="Month" selected>Year</option>
+                        <option value="Week">Month</option>
+                        <option value="Day">Week</option>
+                    </select>
+                    <label>Time Interval</label>
+                </div>
+        <div class="col s12 center">
+
+          <div class="card white darken-1">
+            <div class="card-content black-text">
+              <span class="card-title">Issues</span>
+
+              <div>
+                <canvas id="canvas"></canvas>
+              </div>
+            </div>
+
+          </div>
+        </div>
+        </div>
     </div>
-    <select id="chartType">
-        <option value="Month">Year</option>
-        <option value="Week">Month</option>
-        <option value="Day">Week</option>
-    </select>
-    <br>
-    <br>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-    <script src="/static/charts.js"></script>
-    <script>
-    $('#chartType').on('change', function(){
-        updateChart($('#chartType').val())
-    });
-    updateChart($('#chartType').val());
-    </script>
-</body>
-
-</html>
+
+    {% include 'footer.html' %}
+      <!--Import jQuery before materialize.js-->
+      <script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.js"></script>
+      <script src="../static/js/charts.js"></script>
+      <script>
+          $(document).ready(function() {
+              $('select').material_select();
+          });
+          $('#chartType').on('change', function(){
+              updateChart($('#chartType').val())
+          });
+          updateChart($('#chartType').val());
+      </script>
+
+    </body>
+  </html>
diff --git a/templates/footer.html b/templates/footer.html
@@ -0,0 +1,38 @@
+<footer class="page-footer">
+    <div class="container">
+        <div class="row">
+            <div class="col m3 s12">
+                <h5 class="white-text fine">coala</h5>
+                <ul>
+                    <li><a class="grey-text text-lighten-3" href="http://coala.io/docs">Documentation</a></li>
+                    <li><a class="grey-text text-lighten-3" href="http://coala.io/newcomer">Newcomer Docs</a></li>
+                    <li><a class="grey-text text-lighten-3" href="http://coala.io/coc">Code of Conduct</a></li>
+                    <li><a class="grey-text text-lighten-3" href="http://blog.coala.io/">Blog</a></li>
+                    <li><a class="grey-text text-lighten-3" href="mailto:[email protected]">Donate</a></li>
+                </ul>
+            </div>
+            <div class="col m9 s12">
+                <div class="row footer-btn-row">
+                    <div class="col m6 s12 center">
+                        <div class="twitter-btn center">
+                            <a href="https://twitter.com/coala_io" class="waves-effect waves-light btn-large"><i class="fa fa-twitter" aria-hidden="true"></i><span class="footer-btn-text">Follow Us On Twitter</span></a>
+                        </div>
+                        <br>
+                    </div>
+                    <div class="col m6 s12 center">
+                        <div class="gitter-btn center">
+                            <a class="waves-effect waves-light btn-large"><i class="fa fa-commenting-o" aria-hidden="true"></i><span class="footer-btn-text">Join Chat On Gitter</span></a>
+                        </div>
+                        <br>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="footer-copyright">
+        <div class="container">
+            <span class="left">© 2017 coala</span>
+            <a class="grey-text text-lighten-4 right" href="#!">GNU AGPL v3.0</a>
+        </div>
+    </div>
+</footer>
diff --git a/templates/index.html b/templates/index.html
@@ -1,7 +1 @@
-<title>Community website</title>
-<body>
-<ul>
-    <li><a href="/gci/">Google Code-in</a>
-    <li><a href="/activity/">GitHub activity</a>
-</ul>
-</body>
+{% include 'activity.html' %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,3 +103,4 @@ ENV/ @@
     _site/
     /public/
     org_name.txt
+    .idea