Merge branch 'master' of bitbucket.org:jrand0m/flashcrowdapp

jrand0m · Jun 3, 2016 · d698c7f · d698c7f
2 parents d13d3be + e109a7b
commit d698c7f
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 12 deletions.
diff --git a/etc/app/index.js b/etc/app/index.js
@@ -1,9 +1,11 @@
-import jQuery from 'lib/jquery'
+import $ from 'lib/jquery'
 
 import Layout from 'templates/layout.jade'
 
-jQuery(() => {
+$(() => {
     "use strict";
 
-    jQuery.parseHTML(Layout({})).appendTo('body');
+    var data = JSON.parse($('#profile').text());
+
+    $($.parseHTML(Layout(data))).appendTo('body');
 });
diff --git a/etc/app/sass/index.sass b/etc/app/sass/index.sass
@@ -1,4 +1,30 @@
 @import "../bower/bootstrap-sass/assets/stylesheets/bootstrap"
 
+header
+  position: fixed
+  top: 0
+  left: 0
+  right: 0
+  height: 100px
+  background: transparentize(lime, .9)
 
+  img
+    border-radius: 25%
+    overflow: hidden
+    background: #ddd
 
+footer
+  position: fixed
+  bottom: 0
+  left: 0
+  right: 0
+  height: 50px
+
+  background: transparentize(red, .9)
+
+#page-cnt
+  overflow: scroll
+  margin-top: 100px
+  margin-bottom: 50px
+  background: #fafafa
+  height: calc(100vh - 150px)
diff --git a/etc/app/templates/layout.jade b/etc/app/templates/layout.jade
@@ -1,9 +1,9 @@
 header.header.container-fluid
     .row
-        .col-xs-3
-            img(width=100 height=100 src="about:_blank")
-        .col-xs-9
-            | John Doe
+        .col-xs-6
+            img(width=100 height=100 src=avatar)
+        .col-xs-6
+            | #{username} (#{points})
 
 #page-cnt.container-fluid
 

diff --git a/etc/package.json b/etc/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "babel-core": "^6.3.13",
     "babel-loader": "^6.2.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-es2015": "^6.3.13",
     "bower": "^1.7.9",
     "cpx": "^1.3.1",

diff --git a/etc/webpack.config.js b/etc/webpack.config.js
@@ -10,7 +10,7 @@
             {
                 test: /\.js$/,
                 exclude: /(node_modules|bower)/,
-                loader: "babel?presets[]=es2015"
+                loader: "babel?presets[]=es2015&plugins[]=babel-plugin-transform-decorators-legacy"
             }
         ]
     },

diff --git a/flashcrowd/core/templates/index.html b/flashcrowd/core/templates/index.html
@@ -3,16 +3,18 @@
 
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Flashcrowd index</title>
+    <link href="/static/index.css" rel="stylesheet" type="text/css" >
+    <script src="/static/jquery.min.js"></script>
+    <script src="/static/app.compiled.js"></script>
 </head>
 <body>
-<h1>Hello world</h1>
-<script type="application/json">
+<script type="application/json" id="profile">
     {%autoescape off%}
     {{bootstrap_json}}
     {%endautoescape%}
 </script>
-
 </body>
 </html>
 
diff --git a/manage.py b/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import os
 import sys