Skip to content

Period6 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kuroshii wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Period6 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
804cece
Add image route and template
busmith Oct 11, 2016
5e3937b
Added image and random colors
busmith Oct 11, 2016
72bcff1
<Added Bronco and Random colors>
busmith Oct 12, 2016
2f8d649
Added Rainbow Kitten
busmith Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from jinja2 import Environment, FileSystemLoader
from bottle import route, run
import bottle

import random

@Kuroshii Kuroshii Oct 11, 2016

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want this line back


JINJA_ENV = Environment(
loader=FileSystemLoader('templates/'),
Expand All @@ -15,6 +15,15 @@ def say_hi(name):
'name': name
})

@route('/image')
def show_image():
return respond('image.html',
{
'red': random.randint(0,255),
'green': random.randint(0,255),
'blue': random.randint(0,255)
})


@route('/static/<asset:path>')
def serve_asset(asset):
Expand Down
Binary file added static/bronco.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/rainbowkitten.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions templates/image.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<body bgcolor="rgb({{red}}, {{green}}, {{blue}})">
<img src="/static/hand_sanitizer.png" />
<img src="/static/bronco.png" />
<img src="/static/rainbowkitten.jpg" />
</body>

@Kuroshii Kuroshii Oct 11, 2016

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github wants a newline