Merge branch 'master' of https://github.com/atronchi/BeerSuggest

I don't even think this should require a merge...
atronchi · Sep 23, 2013 · 7e2fbb9 · 7e2fbb9
2 parents a07107e + f84630f
commit 7e2fbb9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/app/robots.txt b/app/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: 
diff --git a/app/static/googleanalytics.js b/app/static/googleanalytics.js
@@ -0,0 +1,8 @@
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-44257326-1', 'beerinsight.com');
+ga('send', 'pageview');
+
diff --git a/app/views.py b/app/views.py
@@ -10,6 +10,11 @@
 with gzip.open('app/gapi_key.pklz','rb') as f: gapi=cPickle.load(f)
 
 
+@app.route('/robots.txt')
+def robots():
+    with file('robots.txt') as f: return f.read()
+
+
 @app.route('/')
 @app.route('/home')
 def home():