forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a6e6716b1 |
File diff suppressed because one or more lines are too long
@@ -42,7 +42,6 @@ def init_db():
|
|||||||
_index(db, "posts", "idx_posts_created_at", ["created_at"])
|
_index(db, "posts", "idx_posts_created_at", ["created_at"])
|
||||||
_index(db, "posts", "idx_posts_topic", ["topic"])
|
_index(db, "posts", "idx_posts_topic", ["topic"])
|
||||||
_index(db, "posts", "idx_posts_slug", ["slug"])
|
_index(db, "posts", "idx_posts_slug", ["slug"])
|
||||||
_index(db, "posts", "idx_posts_project_uid", ["project_uid"])
|
|
||||||
if "posts" in tables:
|
if "posts" in tables:
|
||||||
posts_table = get_table("posts")
|
posts_table = get_table("posts")
|
||||||
if not posts_table.has_column("tags"):
|
if not posts_table.has_column("tags"):
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ from devplacepy.utils import (
|
|||||||
track_action,
|
track_action,
|
||||||
build_achievements,
|
build_achievements,
|
||||||
)
|
)
|
||||||
|
from devplacepy.utils.rewards import LEVEL_XP
|
||||||
from devplacepy.responses import respond, action_result, wants_json
|
from devplacepy.responses import respond, action_result, wants_json
|
||||||
from devplacepy.schemas import ProfileOut
|
from devplacepy.schemas import ProfileOut
|
||||||
from devplacepy.avatar import avatar_url, avatar_seed
|
from devplacepy.avatar import avatar_url, avatar_seed
|
||||||
@@ -380,6 +381,10 @@ async def profile_page(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
xp = profile_user.get("xp") or 0
|
||||||
|
xp_progress_pct = xp % LEVEL_XP
|
||||||
|
xp_next_level = ((xp // LEVEL_XP) + 1) * LEVEL_XP
|
||||||
|
|
||||||
return respond(
|
return respond(
|
||||||
request,
|
request,
|
||||||
"profile.html",
|
"profile.html",
|
||||||
@@ -439,6 +444,8 @@ async def profile_page(
|
|||||||
"awards_pagination": awards_pagination,
|
"awards_pagination": awards_pagination,
|
||||||
"awards_count": awards_count,
|
"awards_count": awards_count,
|
||||||
"prominent_award": prominent_award,
|
"prominent_award": prominent_award,
|
||||||
|
"xp_progress_pct": xp_progress_pct,
|
||||||
|
"xp_next_level": xp_next_level,
|
||||||
"can_give_award": can_give,
|
"can_give_award": can_give,
|
||||||
},
|
},
|
||||||
model=ProfileOut,
|
model=ProfileOut,
|
||||||
|
|||||||
@@ -216,15 +216,6 @@ async def project_detail(request: Request, project_slug: str):
|
|||||||
if parent
|
if parent
|
||||||
else None
|
else None
|
||||||
)
|
)
|
||||||
posts_table = get_table("posts")
|
|
||||||
project_posts = list(
|
|
||||||
posts_table.find(
|
|
||||||
project_uid=project["uid"],
|
|
||||||
deleted_at=None,
|
|
||||||
order_by=["-created_at"],
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return respond(
|
return respond(
|
||||||
request,
|
request,
|
||||||
"project_detail.html",
|
"project_detail.html",
|
||||||
@@ -244,7 +235,6 @@ async def project_detail(request: Request, project_slug: str):
|
|||||||
"forked_from": forked_from,
|
"forked_from": forked_from,
|
||||||
"fork_count": count_forks(project["uid"]),
|
"fork_count": count_forks(project["uid"]),
|
||||||
"file_count": count_files(project["uid"]),
|
"file_count": count_files(project["uid"]),
|
||||||
"project_posts": project_posts,
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
model=ProjectDetailOut,
|
model=ProjectDetailOut,
|
||||||
|
|||||||
@@ -163,7 +163,6 @@ class ProjectDetailOut(_Out):
|
|||||||
forked_from: Optional[dict] = None
|
forked_from: Optional[dict] = None
|
||||||
fork_count: int = 0
|
fork_count: int = 0
|
||||||
file_count: int = 0
|
file_count: int = 0
|
||||||
project_posts: list[PostOut] = []
|
|
||||||
|
|
||||||
|
|
||||||
class GistsOut(_Out):
|
class GistsOut(_Out):
|
||||||
|
|||||||
@@ -80,6 +80,8 @@ class ProfileOut(_Out):
|
|||||||
awards_count: int = 0
|
awards_count: int = 0
|
||||||
prominent_award: Optional[AwardOut] = None
|
prominent_award: Optional[AwardOut] = None
|
||||||
can_give_award: bool = False
|
can_give_award: bool = False
|
||||||
|
xp_progress_pct: Optional[int] = None
|
||||||
|
xp_next_level: Optional[int] = None
|
||||||
|
|
||||||
|
|
||||||
class TelegramPairOut(_Out):
|
class TelegramPairOut(_Out):
|
||||||
|
|||||||
@@ -313,50 +313,3 @@
|
|||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-devlog {
|
|
||||||
margin-top: 2rem;
|
|
||||||
padding-top: 1.5rem;
|
|
||||||
border-top: 1px solid var(--border);
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-list {
|
|
||||||
list-style: none;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0.5rem 0;
|
|
||||||
border-bottom: 1px solid var(--border);
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-item:last-child {
|
|
||||||
border-bottom: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-link {
|
|
||||||
color: var(--text-primary);
|
|
||||||
text-decoration: none;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-link:hover {
|
|
||||||
color: var(--accent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-date {
|
|
||||||
font-size: 0.8125rem;
|
|
||||||
color: var(--text-muted);
|
|
||||||
white-space: nowrap;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.devlog-empty {
|
|
||||||
color: var(--text-muted);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -170,22 +170,6 @@
|
|||||||
{% endcall %}
|
{% endcall %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="project-devlog">
|
|
||||||
<h2 class="project-section-label">Devlog</h2>
|
|
||||||
{% if project_posts %}
|
|
||||||
<ul class="devlog-list">
|
|
||||||
{% for post in project_posts %}
|
|
||||||
<li class="devlog-item">
|
|
||||||
<a href="/posts/{{ post['slug'] }}" class="devlog-link">{{ render_title(post['title']) }}</a>
|
|
||||||
<span class="devlog-date">{{ local_dt(post['created_at'], 'date') }}</span>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
{% else %}
|
|
||||||
<p class="devlog-empty">No posts yet for this project.</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% with target_uid=project['uid'], target_type="project" %}
|
{% with target_uid=project['uid'], target_type="project" %}
|
||||||
{% include "_comment_section.html" %}
|
{% include "_comment_section.html" %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
|
|||||||
@@ -267,6 +267,37 @@ def test_activity_comment_card_renders_overlay_link(app_server):
|
|||||||
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
||||||
|
|
||||||
|
|
||||||
|
def test_profile_json_contains_xp_progress(app_server):
|
||||||
|
from devplacepy.database import get_table, refresh_snapshot
|
||||||
|
import time
|
||||||
|
|
||||||
|
name = f"xp{int(time.time() * 1000)}"
|
||||||
|
session = requests.Session()
|
||||||
|
session.post(
|
||||||
|
f"{BASE_URL}/auth/signup",
|
||||||
|
data={
|
||||||
|
"username": name,
|
||||||
|
"email": f"{name}@t.dev",
|
||||||
|
"password": "secret123",
|
||||||
|
"confirm_password": "secret123",
|
||||||
|
},
|
||||||
|
allow_redirects=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
user = get_table("users").find_one(username=name)
|
||||||
|
assert user is not None
|
||||||
|
get_table("users").update({"uid": user["uid"], "xp": 250}, ["uid"])
|
||||||
|
refresh_snapshot()
|
||||||
|
|
||||||
|
r = session.get(
|
||||||
|
f"{BASE_URL}/profile/{name}", headers={"Accept": "application/json"}
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, f"status {r.status_code}: {r.text[:200]}"
|
||||||
|
body = r.json()
|
||||||
|
assert body["xp_progress_pct"] == 50
|
||||||
|
assert body["xp_next_level"] == 300
|
||||||
|
|
||||||
|
|
||||||
def test_profile_json_exposes_online_presence(app_server):
|
def test_profile_json_exposes_online_presence(app_server):
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user