Merge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/routes/awards.py

@@ -76,6 +76,7 @@ def shop(v):
 		if v.has_badge(badge): discount -= discounts[badge]
 
 	for val in AWARDS.values():
+		val["baseprice"] = int(val["price"])
 		val["price"] = int(val["price"]*discount)
 
 	sales = g.db.query(func.sum(User.coins_spent)).scalar()

files/templates/shop.html

@@ -60,7 +60,12 @@
 			<tr data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{a['description']}}">
 				<td><i class="{{a['icon']}} {{a['color']}}" style="font-size: 30px"></i></td>
 				<td style="font-weight: bold">{{a['title']}}</td>
+				{% if a['baseprice'] != a['price'] %}
+				<td style="font-weight: bold"><strike>{{a['baseprice']}}</strike> <em class="{{a['color']}}">{{a['price']}}</em></td>
+				{% endif %}
+				{% if a['baseprice'] == a['price'] %}
 				<td style="font-weight: bold">{{a['price']}}</td>
+				{% endif %}
 				<td style="font-weight: bold">{{a['owned']}}</td>
 				{% set kind = a['kind'] %}
 				<td style="font-weight: bold">

readme.md

@@ -17,11 +17,11 @@ Installing Drama locally is the fastest way to get the software up and running a
 ```
 git clone https://github.com/Aevann1/Drama/
 
-cd drama
+cd Drama
 
 docker-compose up
 ```
 
 3- That's it! Visit `localhost` in your browser.
 
-4- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app.
+4- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app.