From 10c9aee6f2b146d9fb14656b494082142c72aca2 Mon Sep 17 00:00:00 2001 From: Tomasz Golinski Date: Fri, 1 Sep 2023 14:47:34 +0200 Subject: [PATCH] Rearange geofriends output --- common.cpp | 2 +- geo.css | 12 +++++++++++- geofriends.cpp | 29 +++++++++++++++++------------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/common.cpp b/common.cpp index 4dd1bb5..38839d3 100644 --- a/common.cpp +++ b/common.cpp @@ -329,7 +329,7 @@ void header_html() { std::cout << "\n"; std::cout << " \n"; std::cout << " \n"; - std::cout << " \n"; + std::cout << " \n"; std::cout << " Geocaching stats\n"; std::cout << "\n"; std::cout << "\n"; diff --git a/geo.css b/geo.css index f1be0c4..c8d5d5e 100644 --- a/geo.css +++ b/geo.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Lato|Special+Elite|Averia+Serif+Libre'); +@import url('https://fonts.googleapis.com/css?family=Lato|Averia+Serif+Libre'); body { padding: 0px; @@ -352,3 +352,13 @@ details.histogram_others > summary { font-weight: bold; color: #48B; } + +/* geofriends */ + +div.users { + display: flex; +} + +div.user { + flex: 1; +} diff --git a/geofriends.cpp b/geofriends.cpp index 418fd74..d0c0cf4 100644 --- a/geofriends.cpp +++ b/geofriends.cpp @@ -46,21 +46,18 @@ int main(int argc, char** argv) { user2.header(); std::cout << "\n"; - std::cout << "
\n"; - - std::cout << "Number of caches created by " << user1.ocpl_user << " found by " << user2.ocpl_user << ": " << caches_by_user1.size() << "
\n"; - std::cout << "Number of recommendations given: " << std::count_if(user2.cc.begin(), user2.cc.end(), [user1](const auto& c) { return (c.recommended && c.owner_uuid == user1.ocpl_user_uuid); }) << "
\n"; - - std::cout << "Number of caches created by " << user2.ocpl_user << " found by " << user1.ocpl_user << ": " << caches_by_user2.size() << "
\n"; - std::cout << "Number of recommendations given: " << std::count_if(user1.cc.begin(), user1.cc.end(), [user2](const auto& c) { return (c.recommended && c.owner_uuid == user2.ocpl_user_uuid); }) << "
\n"; - - std::cout << "
\n"; + std::cout << "
\n"; + std::cout << "
\n"; // const int LIST_MAX = 100; short int n = 1; + std::cout << "

Caches created by " << user1.ocpl_user << " found by " << user2.ocpl_user << "

\n"; + std::cout << "
\n"; + std::cout << "Number of caches found: " << caches_by_user1.size() << "
\n"; + std::cout << "Number of recommendations given: " << std::count_if(user2.cc.begin(), user2.cc.end(), [user1](const auto& c) { return (c.recommended && c.owner_uuid == user1.ocpl_user_uuid); }) << "
\n"; + std::cout << "
\n"; if (cc_no1 > 0) { - std::cout << "

Caches created by " << user1.ocpl_user << " found by " << user2.ocpl_user << "

\n"; std::cout << "
\n"; std::cout << "
" << 100 * caches_by_user1.size() / cc_no1 << "%
\n"; std::cout << "
\n"; @@ -86,10 +83,16 @@ int main(int argc, char** argv) { } std::cout << "\n"; } + std::cout << "
\n"; + std::cout << "
\n"; + n = 1; + std::cout << "

Caches created by " << user2.ocpl_user << " found by " << user1.ocpl_user << "

\n"; + std::cout << "
\n"; + std::cout << "Number of caches found: " << caches_by_user2.size() << "
\n"; + std::cout << "Number of recommendations given: " << std::count_if(user1.cc.begin(), user1.cc.end(), [user2](const auto& c) { return (c.recommended && c.owner_uuid == user2.ocpl_user_uuid); }) << "
\n"; + std::cout << "
\n"; if (cc_no2 > 0) { - n = 1; - std::cout << "

Caches created by " << user2.ocpl_user << " found by " << user1.ocpl_user << "

\n"; std::cout << "
\n"; std::cout << "
" << 100 * caches_by_user2.size() / cc_no2 << "%
\n"; std::cout << "
\n"; @@ -115,6 +118,8 @@ int main(int argc, char** argv) { } } std::cout << "\n"; + std::cout << "
\n"; + std::cout << "
\n"; footer_html(); }