From: Max Value Date: Thu, 6 Mar 2025 22:39:15 +0000 (+0000) Subject: Visual changes prep for 7th X-Git-Url: https://git.ozva.co.uk/?a=commitdiff_plain;h=8e1e13504d3a0d90f9bea74c526ab87798f278a8;p=shopping-channel Visual changes prep for 7th + 2 more fonts + 3 more discounts + some test items ~ changed all colors --- diff --git a/data.db b/data.db index 6a23893..8921e71 100644 Binary files a/data.db and b/data.db differ diff --git a/schema b/schema index 24fac1c..13b859a 100644 --- a/schema +++ b/schema @@ -1,10 +1,10 @@ CREATE TABLE state ( id INTEGER PRIMARY KEY, item_id INTEGER, - discount_1 REAL, - discount_2 REAL, - discount_3 REAL, - discount_4 REAL, + discount_1 INTEGER, + discount_2 INTEGER, + discount_3 INTEGER, + discount_4 INTEGER, discount_change INTEGER, percent_remaining INTEGER, currency_symbol TEXT, diff --git a/static/assets/star.svg b/static/assets/star.svg deleted file mode 100644 index dab960a..0000000 --- a/static/assets/star.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - diff --git a/static/assets/star1.svg b/static/assets/star1.svg new file mode 100644 index 0000000..9f1a8f9 --- /dev/null +++ b/static/assets/star1.svg @@ -0,0 +1,54 @@ + + + + + + + + + + image/svg+xml + + + + + + diff --git a/static/assets/star2.svg b/static/assets/star2.svg new file mode 100644 index 0000000..23bc6aa --- /dev/null +++ b/static/assets/star2.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + diff --git a/static/assets/star3.svg b/static/assets/star3.svg new file mode 100644 index 0000000..925bb8d --- /dev/null +++ b/static/assets/star3.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + diff --git a/static/assets/star4.svg b/static/assets/star4.svg new file mode 100644 index 0000000..eacf030 --- /dev/null +++ b/static/assets/star4.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + diff --git a/static/fonts.css b/static/fonts.css index 08eb412..3ac9069 100644 --- a/static/fonts.css +++ b/static/fonts.css @@ -30,3 +30,24 @@ local("Archivo"), url("fonts/Archivo-SemiBoldItalic.woff") format("woff"), } + +@font-face { + font-family: 'Calculator'; + src: url('fonts/DSEG7ClassicMini-Italic.woff2') format('woff2'), + url('fonts/DSEG7ClassicMini-Italic.woff') format('woff'), + url('fonts/DSEG7ClassicMini-Italic.ttf') format('truetype'); + font-weight: normal; +} +@font-face { + font-family: 'Calculator'; + src: url('fonts/DSEG7ClassicMini-BoldItalic.woff2') format('woff2'), + url('fonts/DSEG7ClassicMini-BoldItalic.woff') format('woff'), + url('fonts/DSEG7ClassicMini-BoldItalic.ttf') format('truetype'); + font-weight: bold; +} +@font-face { + font-family: 'Pacifico'; + src: url('fonts/Pacifico-Regular.woff2') format('woff2'), + url('fonts/Pacifico-Regular.woff') format('woff'), + url('fonts/Pacifico-Regular.ttf') format('truetype'); +} diff --git a/static/fonts/DSEG7ClassicMini-BoldItalic.ttf b/static/fonts/DSEG7ClassicMini-BoldItalic.ttf new file mode 100644 index 0000000..b98a714 Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-BoldItalic.ttf differ diff --git a/static/fonts/DSEG7ClassicMini-BoldItalic.woff b/static/fonts/DSEG7ClassicMini-BoldItalic.woff new file mode 100644 index 0000000..1d1ed5f Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-BoldItalic.woff differ diff --git a/static/fonts/DSEG7ClassicMini-BoldItalic.woff2 b/static/fonts/DSEG7ClassicMini-BoldItalic.woff2 new file mode 100644 index 0000000..23fdc57 Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-BoldItalic.woff2 differ diff --git a/static/fonts/DSEG7ClassicMini-Italic.ttf b/static/fonts/DSEG7ClassicMini-Italic.ttf new file mode 100644 index 0000000..1defc9c Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-Italic.ttf differ diff --git a/static/fonts/DSEG7ClassicMini-Italic.woff b/static/fonts/DSEG7ClassicMini-Italic.woff new file mode 100644 index 0000000..7b16442 Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-Italic.woff differ diff --git a/static/fonts/DSEG7ClassicMini-Italic.woff2 b/static/fonts/DSEG7ClassicMini-Italic.woff2 new file mode 100644 index 0000000..83ea8b8 Binary files /dev/null and b/static/fonts/DSEG7ClassicMini-Italic.woff2 differ diff --git a/static/fonts/Pacifico-Regular.ttf b/static/fonts/Pacifico-Regular.ttf new file mode 100644 index 0000000..e7def95 Binary files /dev/null and b/static/fonts/Pacifico-Regular.ttf differ diff --git a/static/fonts/Pacifico-Regular.woff b/static/fonts/Pacifico-Regular.woff new file mode 100644 index 0000000..5b28909 Binary files /dev/null and b/static/fonts/Pacifico-Regular.woff differ diff --git a/static/fonts/Pacifico-Regular.woff2 b/static/fonts/Pacifico-Regular.woff2 new file mode 100644 index 0000000..b3972fd Binary files /dev/null and b/static/fonts/Pacifico-Regular.woff2 differ diff --git a/static/static.json b/static/static.json index 3e83cca..37f253d 100755 --- a/static/static.json +++ b/static/static.json @@ -1,29 +1,53 @@ { "text": { "crawler_top":[ - "Test top text 1", - "Test top text 2", + "Buy now!", + "XMDV Teleshopping!", + "Exciting products coming!", + "Plenty more coming to get you!", + "Imagine thinking on a piece of paper!", + "On Air 24/7!", + "Tick!", + "Anchor", + "Sale Sale Sale Sale Sale Sale Sale", + "Doomsday", "It's here!" ], "crawler_bottom":[ "Something bright and radiant for all of you at home!", "I take your life and raise you 10 over the hour!", "We grab the bullion counterweight and throw ourselves down!", - "We have been falling for a looong time people!", + "We have been falling for a looong time!", "Let me slip into something less spacious!", "Down the side of a large golden pyramid!", + "Get ahead of the drop!", "So we dress ourselves in your Ballast!", + "Whats the significance of callers?", + "Someone on the other end of the phone?", + "Sell you? On this?", + "All holding", + "THE THREAT", "I used to be so unimaginably tall!", + "Doomsday", "It's here!" ], "banner":[ "Buy XMDV!", "Discounts on XMDV!", - "Imagine thinking on a piece of paper!", - "Imagine thinking on a dime!", - "Imagine thinking on a dollar!", "The quant we created!", "The quant we fear!", + "Dynamite!", + "Suicidal price cuts!", + "Eyes on us!", + "We're all eyes!", + "Ending soon!", + "Closing down!", + "Sold!", + "Kill!", + "Oh", + "Anchor", + "Look", + "Doomsday", "It's here!" ], "sigil":[ @@ -82,34 +106,94 @@ }, "items": [ { - "code":"Placeholder item code", + "code":"XMDV", "rating":"★★★★★", - "subtext":"Test item name", - "description":"Test item description", - "origional_price":0, - "stock_count":0, + "subtext":"Starting soon!", + "description":"The show will be starting soon!", + "origional_price":1, + "stock_count":1, "notes":"

[autocue] Showing: test product.
Commencing shortly.

", - "crew_notes":"testing" + "crew_notes":"Test crew notes" + }, + { + "code":"526F74", + "rating":"★★★★★", + "subtext":"Hyperclean™! Teethpaste", + "description":"Hyperclean™! Professional Dentist-grade Teethpaste with a dark shine and a matte-finish. Dentists want it off the air!", + "origional_price":14.99, + "stock_count":230, + "notes":"", + "crew_notes":"Test crew notes" + }, + { + "code":"454747", + "rating":"★★★★★", + "subtext":"Is that a hairline fracture? A crack?", + "description":"Don't look too close! Detailed painting from a long time ago! Decades of a careful hand in observation of the bright and round moon.", + "origional_price":4500, + "stock_count":5, + "notes":"", + "crew_notes":"Test crew notes" + }, + { + "code":"434947", + "rating":"★★★★★", + "subtext":"Abundance Declared Cigarettes", + "description":"Smoke breaks too short? borrow the time! Try royal abundance.", + "origional_price":35, + "stock_count":111, + "notes":"", + "crew_notes":"Test crew notes" }, { - "code":"Item 1", - "rating":"✶✶✶✶✶", - "subtext":"Gold Stick-Strip™", - "description":"50m shiny gold Stick-Strip™! Origional beautiful formula! Cannot be broken! Too beautiful! Stuck!", - "origional_price":500, + "code":"435550", + "rating":"★★★★★", + "subtext":"Coffee. we killed the sheep!", + "description":"Bad dreams? Never sleep again. New formula, 100x strength", + "origional_price":12, "stock_count":100, - "notes":"

ITEM IS A REEL OF GOLDEN TAPE THAT CANNOT BE TORN

", - "crew_notes":"testing" + "notes":"", + "crew_notes":"Test crew notes" + }, + { + "code":"594F55", + "rating":"★★★★★", + "subtext":"The replacement mirror", + "description":"Ready to move on? Look over your shoulder to the person replacing you when you go.", + "origional_price":2000, + "stock_count":40, + "notes":"", + "crew_notes":"Test crew notes" }, { - "code":"Item 2", - "rating":"✦✦✦", - "subtext":"Item subtext", - "description":"Product 2 description. It's really long to see if the badge element moves down the page at all. I f**king hate CSS positioning. Oops family show.", - "origional_price":170, - "stock_count":200, - "notes":"Some more notes...", - "crew_notes":"testing" + "code":"777777", + "rating":"★★★★★", + "subtext":"The number previously known as 7", + "description":"Ready to move on? Look over your shoulder to the person replacing you when you go.", + "origional_price":823543, + "stock_count":7, + "notes":"", + "crew_notes":"Test crew notes" + }, + { + "code":"424F58", + "rating":"★★★★★", + "subtext":"Supprise jack-in-the-box, shock your friends!", + "description":"Suprise-Box™ Limited edition, only 100 EVER made!. Beautiful handpainted sides.", + "origional_price":45, + "stock_count":99, + "notes":"", + "crew_notes":"Test crew notes" + }, + { + "code":"422657", + "rating":"★★★★★", + "subtext":"Black and White Blood Chocolate Sauce", + "description":"The perfect topping for noir detectives in ice-cream bars! Sweet and thick chocolate, made from all natural ingredients.", + "origional_price":8, + "stock_count":300, + "notes":"", + "crew_notes":"Test crew notes" } ] } diff --git a/teleshopping.py b/teleshopping.py index 686e1fb..fd65974 100755 --- a/teleshopping.py +++ b/teleshopping.py @@ -189,9 +189,10 @@ if __name__ == "__main__": pass except sqlite3.OperationalError: print("Table missing or corrupt...") - cursor.execute("DROP TABLE state;") + try: cursor.execute("DROP TABLE state;") # catch if there is no table "state" + except: pass cursor.execute(schema) cursor.execute(load) connection.commit() - app.run(host='192.168.8.143', port=5080, debug=True) + app.run(host='127.0.0.1', port=8000, debug=True) diff --git a/templates/gfx.html b/templates/gfx.html index a80f848..775e336 100644 --- a/templates/gfx.html +++ b/templates/gfx.html @@ -6,18 +6,9 @@