Merge branch 'multi-deployment' of dl6tom.de:public/ticketfrei into multi-deployment

This commit is contained in:
Thomas L 2018-03-25 23:42:45 +02:00
commit cb764f2ec3
4 changed files with 56 additions and 40 deletions

View file

@ -10,8 +10,8 @@ contact = "b3yond@riseup.net"
[mail] [mail]
mailserver = "smtp.riseup.net" mailserver = "smtp.riseup.net"
user = "nbgticketfrei" user = "user"
passphrase = "5MUIGw,GmSj)t@xW!jixq=b0U+@SJ{K{" passphrase = "sup3rs3cur3"
[logging] [logging]
# The directory where logs should be stored. # The directory where logs should be stored.

View file

@ -115,8 +115,8 @@ def twitter_callback(user):
""" """
# twitter passes the verifier/oauth token secret in a GET request. # twitter passes the verifier/oauth token secret in a GET request.
verifier = request.query('oauth_verifier') verifier = request.query('oauth_verifier')
consumer_key = config["tapp"]["consumer_key"] consumer_key = config["twitter"]["consumer_key"]
consumer_secret = config["tapp"]["consumer_secret"] consumer_secret = config["twitter"]["consumer_secret"]
auth = tweepy.OAuthHandler(consumer_key, consumer_secret) auth = tweepy.OAuthHandler(consumer_key, consumer_secret)
request_token = user.get_request_token request_token = user.get_request_token
auth.request_token = {"oauth_token": request_token, auth.request_token = {"oauth_token": request_token,

View file

@ -1,42 +1,58 @@
% rebase('template/wrapper.tpl') % rebase('template/wrapper.tpl')
% include('template/login-plain.tpl') % include('template/login-plain.tpl')
<h1>Features</h1> <h1>Features</h1>
<p>sum is simply dummy text of the printing and typesetting <p>
industry. Lorem Ipsum has been the industry's standard Don't pay for public transport. Instead, warn each other
dummy text ever since the 1500s, when an unknown printer from ticket controllers! With Ticketfrei, you can turn
took a galley of type and scrambled it to make a type your city into a paradise for fare dodgers.
specimen book. It has survived not only five centuries, </p>
but also the leap into electronic typesetting, remaining <p>
essentially unchanged. It was popularised in the 1960s Ticketfrei is a Twitter, Mastodon, and E-Mail bot. Users
with the release of Letraset sheets containing Lorem can help each other by tweeting, tooting, or mailing,
Ipsum passages, and more recently with desktop publishing when and where they spot a ticket controller.
software like Aldus PageMaker including versions of Lorem </p>
Ipsum.</p> <p>
Ticketfrei automatically retweets, boosts, and remails
those controller reports, so others can see them. If there
are ticket controllers around, they can still buy a ticket
- but if the coast is clear, they can save the money.
</p>
<h2>How to get Ticketfrei to my city?</h2> <h2>How to get Ticketfrei to my city?</h2>
<p>sum is simply dummy text of the printing and typesetting <p>
industry. Lorem Ipsum has been the industry's standard We try to make it as easy as possible to spread Ticketfrei
dummy text ever since the 1500s, when an unknown printer to other citys. There are four basic steps:
took a galley of type and scrambled it to make a type </p>
specimen book. It has survived not only five centuries, <ul>
but also the leap into electronic typesetting, remaining <li>Create a Twitter and/or a Mastodon account.</li>
essentially unchanged. It was popularised in the 1960s <li>Register on this website to create a bot for your city.</li>
with the release of Letraset sheets containing Lorem <li>Log in with the social media accounts you want to
Ipsum passages, and more recently with desktop publishing use for Ticketfrei.</li>
software like Aldus PageMaker including versions of Lorem <li>Promote the service! Ticketfrei only works if there is
Ipsum.</p> a community for it. Fortunately, we prepared some material
you can use:
<a href="https://github.com/b3yond/ticketfrei/tree/master/promotion" target="_blank">https://github.com/b3yond/ticketfrei/tree/master/promotion</a></li>
</ul>
% include('template/register-plain.tpl') % include('template/register-plain.tpl')
<h2>Our Mission</h2> <h2>Our Mission</h2>
<p>Contrary to popular belief, Lorem Ipsum is not simply random <p>
text. It has roots in a piece of classical Latin literature Public transportation is meant to provide an easy and
from 45 BC, making it over 2000 years old. Richard time-saving way to move within a region while being
McClintock, a Latin professor at Hampden-Sydney College in affordable for everybody. Unfortunately, this is not the
Virginia, looked up one of the more obscure Latin words, case. Ticketfrei's approach is to enable people to
consectetur, from a Lorem Ipsum passage, and going through reclaim public transportation.
the cites of the word in classical literature, discovered </p>
the undoubtable source. Lorem Ipsum comes from sections <p>
1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" On short term we want to do this by helping users to avoid
(The Extremes of Good and Evil) by Cicero, written in 45 controllers and fines - on long term by pressuring public
BC. This book is a treatise on the theory of ethics, very transportation companies to offer their services free of
popular during the Renaissance. The first line of Lorem charge, financed by the public.
Ipsum, "Lorem ipsum dolor sit amet..", comes from a line </p>
in section 1.10.32.</p> <p>
Because with Ticketfrei you're able to use trains and
subways for free anyway. Take part and create a new
understanding of what public transportation should look
like!
</p>