carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fd

master
Aevann1 2022-02-05 19:51:42 +02:00
parent 6977c0fe56
commit 6101e01688
13 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/classes/comment.py
View File

@ -169,16 +169,10 @@ class Comment(Base):
years = int(months / 12)
return f"{years}yr ago"
if SITE_NAME == 'Too4You':
@property
@lazy
def score(self):
return self.upvotes
else:
@property
@lazy
def score(self):
return self.upvotes - self.downvotes
@property
@lazy
def score(self):
return self.upvotes - self.downvotes
@property
@lazy

14
files/classes/submission.py
View File

@ -180,16 +180,10 @@ class Submission(Base):
return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.edited_utc)))
if SITE_NAME == 'Too4You':
@property
@lazy
def score(self):
return self.upvotes
else:
@property
@lazy
def score(self):
return self.upvotes - self.downvotes
@property
@lazy
def score(self):
return self.upvotes - self.downvotes
@property
@lazy

2
files/helpers/const.py
View File

@ -230,7 +230,7 @@ else:
PUSHER_ID = environ.get("PUSHER_ID", "").strip()
PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip()
COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58', DEFAULT_COLOR}
COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR}
AWARDS = {
"snow": {

4
files/templates/authforms.html
View File

@ -15,7 +15,7 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% if v.agendaposter %}
<style>
html {
@ -39,7 +39,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
{% endif %}
</head>

6
files/templates/default.html
View File

@ -7,8 +7,8 @@
<script src="/static/assets/js/bootstrap.js?a=240"></script>
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108">
<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109">
<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% if v.agendaposter %}
<style>
html {
@ -32,7 +32,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
{% endif %}
<meta charset="utf-8">

4
files/templates/log.html
View File

@ -6,7 +6,7 @@
{% block content %}
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% if v.agendaposter %}
<style>
html {
@ -30,7 +30,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
{% endif %}
<div class="row justify-content-around">

4
files/templates/login.html
View File

@ -18,8 +18,8 @@
{% endblock %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
</head>

2
files/templates/login_2fa.html
View File

@ -14,7 +14,7 @@
<title>2-Step Login - {{SITE_NAME}}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
</head>

2
files/templates/settings.html
View File

@ -34,7 +34,7 @@
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% if v.agendaposter %}
<style>
html {

4
files/templates/settings2.html
View File

@ -39,10 +39,10 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
{% endif %}
</head>

2
files/templates/sign_up.html
View File

@ -31,7 +31,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
</head>

2
files/templates/sign_up_failed_ref.html
View File

@ -32,7 +32,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
</head>

6
files/templates/submit.html
View File

@ -26,7 +26,7 @@
{% block stylesheets %}
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=16">
{% if v.agendaposter %}
<style>
html {
@ -50,8 +50,8 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=108">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
<link rel="stylesheet" href="/static/assets/css/main.css?a=109">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=16">
{% endif %}
{% endblock %}