remove CARD_VIEW env var

pull/83/head
Aevann1 2022-12-21 15:04:45 +02:00
parent 3ae5292ce4
commit 1d3fa2f93f
4 changed files with 5 additions and 7 deletions

1
env
View File

@ -24,7 +24,6 @@ export DEFAULT_TIME_FILTER="all"
export GUMROAD_TOKEN="blahblahblah"
export GUMROAD_LINK="blahblahblah"
export GUMROAD_ID="blahblahblah"
export CARD_VIEW="0"
export DISABLE_DOWNVOTES="0"
export DEFAULT_THEME="midnight"
export DEFAULT_COLOR="805ad5"

View File

@ -47,7 +47,7 @@ class User(Base):
titlecolor = Column(String, default=DEFAULT_COLOR)
theme = Column(String, default=DEFAULT_THEME)
themecolor = Column(String, default=DEFAULT_COLOR)
cardview = Column(Boolean, default=CARD_VIEW)
cardview = Column(Boolean, default=False)
song = Column(String)
highres = Column(String)
profileurl = Column(String)

View File

@ -30,7 +30,6 @@ GUMROAD_ID = environ.get("GUMROAD_ID", DEFAULT_CONFIG_VALUE).strip()
DISABLE_DOWNVOTES = bool(int(environ.get("DISABLE_DOWNVOTES", "0").strip()))
DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip()
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip()
CARD_VIEW = bool(int(environ.get("CARD_VIEW", "0").strip()))
EMAIL = environ.get("EMAIL", "blahblahblah@gmail.com").strip()
MAILGUN_KEY = environ.get("MAILGUN_KEY", DEFAULT_CONFIG_VALUE).strip()
DESCRIPTION = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip()

View File

@ -235,24 +235,24 @@
</div>
{% endif %}
{% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %}
{% if p.is_image and not p.over_18 and ((v and v.cardview)) %}
<div class="ml-5 mt-3 mb-4">
<a {% if v and v.newtab %}data-target="t" target="_blank"{% endif %} rel="nofollow noopener" href="{{p.realurl(v)}}">
<img loading="lazy" data-src="{{p.realurl(v)}}" src="/i/l.webp" class="img-fluid" style="max-height:20rem" alt="Unable to load image">
</a>
</div>
{% elif p.is_video %}
<div id="video-{{p.id}}" class="ml-5 {% if p.over_18 or not ((v and v.cardview) or (not v and CARD_VIEW)) %}d-none{% endif %} mt-4">
<div id="video-{{p.id}}" class="ml-5 {% if p.over_18 or not ((v and v.cardview)) %}d-none{% endif %} mt-4">
<p class="resizable">
<video {% if p.thumburl %}poster="{{p.thumb_url}}"{% endif %} id="video2-{{p.id}}" controls preload="none" src="{{p.realurl(v)}}"></video>
</p>
</div>
{% elif p.is_audio %}
<div id="video-{{p.id}}" class="ml-5 {% if p.over_18 or not ((v and v.cardview) or (not v and CARD_VIEW)) %}d-none{% endif %} mt-4">
<div id="video-{{p.id}}" class="ml-5 {% if p.over_18 or not ((v and v.cardview)) %}d-none{% endif %} mt-4">
<audio id="video2-{{p.id}}" controls preload="none" src="{{p.realurl(v)}}"></audio>
</div>
{% elif p.is_youtube %}
<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and CARD_VIEW)) %}d-none{% endif %} mt-3 mb-4 youtube_embed">
<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview)) %}d-none{% endif %} mt-3 mb-4 youtube_embed">
{{p.embed_url | safe}}
</div>
{% endif %}