commit 537a3ffea71014be70b8aaee61f14a1067d789e5
parent fd9d0cc89b47d512a6bd9be35b332268e724447d
Author: rob <rob@tarina.org>
Date: Thu, 20 Feb 2025 11:40:41 +0200
yes
Diffstat:
6 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/public_html/static/robstyle.css b/public_html/static/robstyle.css
@@ -175,11 +175,23 @@ button:hover
background-color: #ff0000;
}
+
+.introtext img
+{
+ width: auto;
+}
+
img
{
border-radius: 3px;
width: 90%;
- max-width: 900px;
+ max-width: 600px;
+}
+
+.introtext img
+{
+ width: auto;
+ word-wrap:break-word;
}
#visitors img
@@ -195,6 +207,7 @@ img
height: auto;
width: 450px;
text-align: center;
+ word-wrap:break-word;
}
#propaganda-container
@@ -203,6 +216,7 @@ img
height: auto;
max-width: 1500px;
text-align: center;
+ word-wrap:break-word;
}
.promopic {
diff --git a/public_html/static/splash.css b/public_html/static/splash.css
@@ -181,7 +181,12 @@ img
{
border-radius: 30px;
width: 100%;
- max-width: 900px;
+ max-width: 600px;
+}
+
+.introtext img
+{
+ width: 200px;
}
#visitors img
diff --git a/public_html/templates/almost.html b/public_html/templates/almost.html
@@ -54,6 +54,8 @@ unique visits since December 9 2024: $unique <br>
<br>
$#<h1>$siteconfig.name</h1>
$#$:markdown.markdown(siteconfig.description)
+<h1>$siteconfig.name</h1>
+$:markdown.markdown(siteconfig.description)
$:markdown.markdown(siteconfig.description2)
<code>~</code>
<br>
diff --git a/public_html/templates/base.html b/public_html/templates/base.html
@@ -2,8 +2,13 @@ $def with (content)
<!doctype html>
<HEAD>
<meta charset="utf-8">
+<<<<<<< HEAD
<title>Robin Bäckman | Inventor, filmmaker, gardener</title>
<link rel="stylesheet" href="/static/robstyle.css?v=168" type="text/css" rel="stylesheet"/>
+=======
+ <title>Gonzo Pi | free your filmmaking</title>
+ <link rel="stylesheet" href="/static/robstyle.css?v=185" type="text/css" rel="stylesheet"/>
+>>>>>>> de0b8739608fc1940a7923e5ce4111faffee6cdc
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="cache-control" content="no-cache">
</HEAD>
diff --git a/public_html/templates/pending.html b/public_html/templates/pending.html
@@ -31,7 +31,7 @@ $if totsats > 0:
Order is only reserved once paid.
<br>
$if ordertype() == 'digital':
- <h2>Digital goods will be shipped to your email once invoice paid..</h2>
+ <h2>Digital goods if any will be shipped to your email once invoice paid..</h2>
$else:
$ shippinginfo = db.select('shipping', where="country='" + pendinginfo.country + "'", what='price, days')[0]
Shipping cost to $pendinginfo.country is $eur_to_sat(shippinginfo.price) Satoshi $(shippinginfo.price/100)€ <br>
diff --git a/server.py b/server.py
@@ -252,13 +252,16 @@ def checkforoldbags():
print(datetime.timedelta(hours=1))
print("Fuck")
product = getproduct(bag.product)
- print('found a bag at door! goddamit, got to put ' + str(bag.quantity) + ' x ' + product.name + ' back on the shelf')
- if product.available > 1:
- q = product.available + bag.quantity
- else:
- q = bag.quantity
- db.update('products', where="id='"+str(bag.product)+"'", available=str(q))
- db.query("DELETE FROM customerbag WHERE sessionkey='" + bag.sessionkey + "'")
+ try:
+ print('found a bag at door! goddamit, got to put ' + str(bag.quantity) + ' x ' + product.name + ' back on the shelf')
+ if product.available > 1:
+ q = product.available + bag.quantity
+ else:
+ q = bag.quantity
+ db.update('products', where="id='"+str(bag.product)+"'", available=str(q))
+ db.query("DELETE FROM customerbag WHERE sessionkey='" + bag.sessionkey + "'")
+ except:
+ pass
def checkavailable():
print('check items from availability')
@@ -503,10 +506,10 @@ class checkout():
db.insert('pending', invoice_key=session.sessionkey, country=i.country, firstname=i.firstname, lastname=i.lastname, address=i.address, town=i.town, postalcode=str(i.postalcode), email=i.email, dateadded=datetime.datetime.now())
else:
db.insert('pending', invoice_key=session.sessionkey, email=i.email, dateadded=datetime.datetime.now())
- if not checkoutform.validates():
- return web.seeother('/checkout?error=shipping')
if '@' not in i.email:
web.seeother('/checkout?error=mail')
+ elif not checkoutform.validates():
+ return web.seeother('/checkout?error=shipping')
else:
return web.seeother('/pending')
