From 86cbc0498e5e975e725aa69870ab153b5290b873 Mon Sep 17 00:00:00 2001 From: syui Date: Tue, 30 Apr 2024 17:52:26 +0900 Subject: [PATCH] fix --- public | 2 +- scpt/ogimage.zsh | 2 +- src/App.vue | 84 +++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/public b/public index 3804fb2..fbb036c 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 3804fb2b8d0d7cba4c018c44ef4f45dc25c1bc1d +Subproject commit fbb036ce082fda6cb5ab9e73dd8a5fb649f95bf1 diff --git a/scpt/ogimage.zsh b/scpt/ogimage.zsh index d6816bb..d34cc1e 100755 --- a/scpt/ogimage.zsh +++ b/scpt/ogimage.zsh @@ -26,7 +26,7 @@ do if [ ! -f $oo ];then echo $oo - convert $o -gravity center -extent 8000x4000 $oo + magick convert $o -gravity center -extent 8000x4000 $oo fi # mkdir -p $o_dir/$id diff --git a/src/App.vue b/src/App.vue index a632773..6f612da 100755 --- a/src/App.vue +++ b/src/App.vue @@ -90,7 +90,7 @@ - +
@@ -152,8 +152,6 @@ {{ ii = cards.data.find((v) => v.id == user_fav) }} - - @@ -186,12 +184,56 @@
+
+ + + + + + + + + + + + + + + + + + + M {{ planet }} + + + + + + + +
+
+
-
ID {{ id }} {{ aiten }} {{ cards.data.filter((v) => v.skill == 'lost').length }} +
ID {{ id }} {{ aiten }} {{ cards.data.filter((v) => v.skill == 'lost').length }} {{ (cards.data.filter((v) => v.card >= 96 && v.card <= 121).length) }} {{ (cards.data.filter((v) => v.card >= 96 && v.card <= 121).length) }} + {{ planet }}
@@ -922,11 +964,14 @@ export default { bsky_mode: false, did: "", card_origin_status: false, + planet_status: false, + planet: 0, useragent: window.navigator.userAgent.toLowerCase(), iframe_status: false, term_status: false, sort_key: "", mount_google_md: false, + planet_url: "/planet/index.html", } }, filters: { @@ -944,6 +989,7 @@ export default { this.mount_google_md = false; if (window.location.host === "localhost:8080") { this.api_url = "/api/"; + //this.planet_url = "http://localhost:3000"; } else if (window.location.host === "192.168.11.12:8080"){ this.api_url = "/api/"; } else { @@ -980,6 +1026,7 @@ export default { this.record = response; this.username = this.record.data.find((v) => v.username == loc).username; this.id = this.record.data.find((v) => v.username == loc).id; + this.planet = this.record.data.find((v) => v.username == loc).planet; this.model = this.record.data.find((v) => v.username == loc).model; this.did = this.record.data.find((v) => v.username == loc).did; this.aiten = this.record.data.find((v) => v.username == loc).aiten; @@ -991,6 +1038,10 @@ export default { this.model_critical = this.record.data.find((v) => v.username == loc).model_critical; this.model_critical_d = this.record.data.find((v) => v.username == loc).model_critical_d; this.user_room = this.record.data.find((v) => v.username == loc).room; + + if (this.planet > 0){ + this.planet_status = true; + } let url = this.api_url + "users/" + this.id + "/card?itemsPerPage=4000"; axios .get("/json/card.json") @@ -1504,9 +1555,9 @@ span.reflection:after { } .viewer { - background-color: #fff; - margin: 10px 0px; - padding: 20px; + background-color: #fff; + margin: 10px 0px; + padding: 20px; } span.card-black p { @@ -1662,7 +1713,11 @@ button.unity i#vrm_button:hover { padding: 50px 0 50px 0; margin: 30px 0 30px 0; } - div#app{list-style:none;margin:0px} + div#app{ + list-style:none; + margin:0px auto; + text-align: center; + } .bluesky-avatar img{width:55px} span.time{color:#00f} span.name{background-color:rgba(163,195,255,.10196078431372549);padding:10px} @@ -1769,4 +1824,17 @@ blockquote.did { text-align: left; } +span.card-planet { + background-image: url(/card/card_0.webp); + background-size: cover; + background-position: center; + display: inline-block; + width: 200px; + border-radius: 3px; + padding: 23px 0; +} + +.card-planet table thead { + background-color: #fff; +}