Show receiver bio, handle really long user content, minor style tweaks

master
Skylar Ittner 5 years ago
parent e0fda5fd41
commit 8e1952e3b4

@ -154,4 +154,14 @@ html.md .navbar .link {
.card-opened .navbar { .card-opened .navbar {
display: block; display: block;
}
#person-name {
overflow-wrap: break-word;
}
#person-bio {
border-top: 1px solid var(--f7-card-footer-border-color);
padding-top: var(--f7-card-footer-padding-vertical);
overflow-wrap: break-word;
} }

@ -83,7 +83,7 @@ function updateMap() {
if (data.type == "FeatureCollection") { if (data.type == "FeatureCollection") {
leafletpeoplelayer.clearLayers(); leafletpeoplelayer.clearLayers();
data.features.forEach(function (item) { data.features.forEach(function (item) {
item.properties.popupContent = "<i class=\"fas fa-user\"></i> " + item.properties.name + "<br><br><a class=\"button button-small button-fill text-color-white card-prevent-open\" href=\"/sendmoney/" + item.properties.id + "\">Send Money</a>"; item.properties.popupContent = "<i class=\"fas fa-user\"></i> " + (item.properties.name.length > 50 ? item.properties.name.substring(0,50) + "..." : item.properties.name) + "<br><br><a class=\"button button-small button-fill text-color-white card-prevent-open\" href=\"/sendmoney/" + item.properties.id + "\">Send Money</a>";
leafletpeoplelayer.addData(item); leafletpeoplelayer.addData(item);
}); });
leafletmap.addLayer(leafletpeoplelayer); leafletmap.addLayer(leafletpeoplelayer);

@ -45,7 +45,7 @@ $("#scanqrcodebtn").on("click", function () {
app.dialog.alert(error, "Scan Error"); app.dialog.alert(error, "Scan Error");
}, },
{ {
showTorchButton : true, showTorchButton: true,
prompt: "Scan a code to send money", prompt: "Scan a code to send money",
resultDisplayDuration: 0, resultDisplayDuration: 0,
disableSuccessBeep: true disableSuccessBeep: true
@ -92,6 +92,10 @@ function loadSendMoneyPage() {
app.preloader.hide(); app.preloader.hide();
console.log("Profile", data.profile); console.log("Profile", data.profile);
$("#person-name").text(data.profile.name); $("#person-name").text(data.profile.name);
if (data.profile.bio != "") {
$("#person-bio").text(data.profile.bio);
$("#person-bio").removeClass("display-none");
}
if (data.profile.verified) { if (data.profile.verified) {
$("#verified-badge").removeClass("display-none"); $("#verified-badge").removeClass("display-none");
} else { } else {

@ -56,8 +56,8 @@
<button class="button button-round preset-amount-button" data-target="#amount-box" data-amount="20.00">$20</button> <button class="button button-round preset-amount-button" data-target="#amount-box" data-amount="20.00">$20</button>
</p> </p>
</div> </div>
<div class="card-footer display-block"> <div class="card-footer display-block padding-vertical">
<div class="button button-large button-fill button-round" id="sendbtn"> <div class="button button-large button-fill button-round button-raised" id="sendbtn">
<i class="fas fa-arrow-up"></i> Send <i class="fas fa-arrow-up"></i> Send
</div> </div>
</div> </div>
@ -67,7 +67,7 @@
<div class="col-100 tablet-50 desktop-25"> <div class="col-100 tablet-50 desktop-25">
<div class="card"> <div class="card">
<div class="card-content card-content-padding"> <div class="card-content card-content-padding">
<h3><i class="fas fa-user"></i> <span id="person-name"></span></h3> <h3 class="no-margin-top"><i class="fas fa-user"></i> <span id="person-name"></span></h3>
<div> <div>
<a id="verified-badge-container" class="link popup-open" href="#" data-popup="#verification-popup"> <a id="verified-badge-container" class="link popup-open" href="#" data-popup="#verification-popup">
<span id="verified-badge" class="display-none"> <span id="verified-badge" class="display-none">
@ -78,6 +78,9 @@
</span> </span>
</a> </a>
</div> </div>
<div id="person-bio" class="display-none padding-top-half margin-top-half">
</div>
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save