Bläddra i källkod

Merge branch 'feature/seo' into develop

Add search-engine files, a favicon, and 404 page. Close #70, #71.
tags/v1.0^2
Severyn Kozak 10 år sedan
förälder
incheckning
5ba1738965
9 ändrade filer med 53 tillägg och 9 borttagningar
  1. +4
    -6
      app.py
  2. +2
    -2
      bitshift/assets.py
  3. +0
    -0
      static/favicon.ico
  4. +1
    -0
      static/google10335120a3066831.html
  5. +6
    -0
      static/js/main.js
  6. +23
    -0
      static/sass/error404.sass
  7. +2
    -0
      static/sass/main.sass
  8. +14
    -0
      templates/error404.html
  9. +1
    -1
      templates/layout.html

+ 4
- 6
app.py Visa fil

@@ -12,7 +12,7 @@ from bitshift.database import Database
from bitshift.languages import LANGS
from bitshift.query import parse_query, QueryParseException

app = Flask(__name__)
app = Flask(__name__, static_folder="static", static_url_path="")
app.config.from_object("bitshift.config")
app.jinja_env.globals.update(year=datetime.datetime.now().year)

@@ -56,11 +56,9 @@ def about():
def developers():
return render_template("developers.html")

@app.route("/robots.txt")
@app.route("/sitemap.xml")
@app.route("/favicon.ico")
def static_from_root():
return flask.send_from_directory(app.static_folder, request.path[1:])
@app.errorhandler(404)
def error404(error):
return render_template("error404.html"), 404

if __name__ == "__main__":
app.run(debug=True)

+ 2
- 2
bitshift/assets.py Visa fil

@@ -5,8 +5,8 @@
from flask import Markup

ASSET_HTML_TEMPLATES = {
'css': "<link rel='stylesheet' type='text/css' href='/static/css/%s'>",
'js': "<script src='/static/js/%s'></script>"
'css': "<link rel='stylesheet' type='text/css' href='/css/%s'>",
'js': "<script src='/js/%s'></script>"
}

def tag(filename):


static/img/favicon.ico → static/favicon.ico Visa fil


+ 1
- 0
static/google10335120a3066831.html Visa fil

@@ -0,0 +1 @@
google-site-verification: google10335120a3066831.html

+ 6
- 0
static/js/main.js Visa fil

@@ -0,0 +1,6 @@
(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-51910807-1', 'bitshift.it');
ga('send', 'pageview');

+ 23
- 0
static/sass/error404.sass Visa fil

@@ -0,0 +1,23 @@
@import variables

div#message
color: $baseColor1
font-family: monospace
font-size: 700%
font-weight: normal
margin-top: 8%
text-align: center

span
&#error-num
font-size: 170%
vertical-align: middle

&.c1
color: $baseColor1

&.c2
color: $baseColor2

&.c3
color: $baseColor3

+ 2
- 0
static/sass/main.sass Visa fil

@@ -35,10 +35,12 @@ div#container
background-color: $baseColor1
bottom: -30px
height: 60px
padding-bottom: 5px
padding-top: 15px
position: fixed
text-align: center
width: 100%
z-index: 100

&:hover
@include delay(0s)


+ 14
- 0
templates/error404.html Visa fil

@@ -0,0 +1,14 @@
= extends "layout.html"

= block head
{{ assets.tag("error404.css") }}
= endblock

= block body
<div id="message">
<span class="c1">puts</span
><span class="c3">(</span><span class=c2>"</span
><span id="error-num">404</span><span class=c2>"</span><span class=c3
>)</span><span class="c3">;</span>
</div>
= endblock

+ 1
- 1
templates/layout.html Visa fil

@@ -16,8 +16,8 @@
<meta name="keywords" content="source code language search engine"/>
<meta name="author" content="Benjamin Attal Ben Kurtovic Severyn Kozak"/>

<link rel="shortcut icon" href="static/img/favicon.ico">
{{ assets.tag("main.css") }}
{{ assets.tag("main.js") }}

= block head
= endblock


Laddar…
Avbryt
Spara