diff --git a/README.md b/README.md index a8922d8..bf99f89 100644 --- a/README.md +++ b/README.md @@ -106,3 +106,13 @@ pm2 logs ```bash docker-compose up -d ``` + +## Notes to self +Making changes is currently hard. +I don't have time to set up a local environment - it's not easy enough. +So I'm Cowboy-programming. +And another issue: My regular yochayco linux user has no permissions to edit files. +So I'm either using vim, or doing 'save as' in `/tmp` folder and then copying from `mn__` user. +And the worst part: This `mn__` user can't push to remote git. +I've cloned the project and I can update it with `yochayco` but the local repo is out of sync since `yochayco` won't write to `.git` folder. +From the cloned project I'm making PRs to yonatanmil but there is no real reason to do that I guess. \ No newline at end of file diff --git a/app/lib/db.js b/app/lib/db.js index 6c79d1c..67ec8c1 100644 --- a/app/lib/db.js +++ b/app/lib/db.js @@ -38,10 +38,9 @@ function generateAppGlamFromDb(element) { } async function getAllGlams() { - const result = await query(SQL`SELECT * FROM glams`); + const result = await query(SQL`SELECT * FROM glams ORDER BY fullname`); return result.rows.map(generateAppGlamFromDb); } - exports.getAllGlams = getAllGlams; async function getGlamByName(name) { diff --git a/app/pages/assets/icons/countries/Australia.png b/app/pages/assets/icons/countries/Australia.png new file mode 100644 index 0000000..882b64d Binary files /dev/null and b/app/pages/assets/icons/countries/Australia.png differ diff --git a/app/pages/assets/icons/countries/Netherlands.png b/app/pages/assets/icons/countries/Netherlands.png new file mode 100644 index 0000000..ce64c8a Binary files /dev/null and b/app/pages/assets/icons/countries/Netherlands.png differ diff --git a/app/pages/assets/icons/countries/Poland.png b/app/pages/assets/icons/countries/Poland.png new file mode 100644 index 0000000..0ac3927 Binary files /dev/null and b/app/pages/assets/icons/countries/Poland.png differ diff --git a/app/pages/assets/icons/countries/Spain.png b/app/pages/assets/icons/countries/Spain.png new file mode 100644 index 0000000..2f96319 Binary files /dev/null and b/app/pages/assets/icons/countries/Spain.png differ diff --git a/app/pages/assets/icons/countries/Uruguay.png b/app/pages/assets/icons/countries/Uruguay.png new file mode 100644 index 0000000..06dda3e Binary files /dev/null and b/app/pages/assets/icons/countries/Uruguay.png differ diff --git a/app/pages/index.hbs b/app/pages/index.hbs index 7b500c5..d455391 100644 --- a/app/pages/index.hbs +++ b/app/pages/index.hbs @@ -6,7 +6,7 @@ } .header { - margin-bottom: 30px; + margin-bottom: 20px; display: flex; justify-content: space-between; } @@ -112,6 +112,21 @@ margin-bottom: 16px; text-align: left; } + .paginator { + display: flex; + margin-bottom: 1rem; + column-gap: 0.75rem; + align-items: center; + } + .paginator>a { + display: flex; + padding: 0 0.5rem; + font-weight: bold; + font-size: 1.5rem; + cursor: pointer; + align-items: center; + justify-content: center; + }
{{> sidebar}} @@ -126,64 +141,89 @@ {{> langSelect}}
-
- {{#*inline "glamLink"}} -
- -
- {{glam.country}} -
- -
- {{/inline}} - - {{#each glams}} - {{> glamLink glam=this}} - {{/each}} +
+ + « + + + »
+
{{/mainWrapper}} \ No newline at end of file diff --git a/app/pages/views/index.hbs b/app/pages/views/index.hbs index 7ce7a6f..1b8f96f 100644 --- a/app/pages/views/index.hbs +++ b/app/pages/views/index.hbs @@ -128,6 +128,10 @@ flex-direction: column; } + .data-card.hover, .data-card:hover { + background-color:#2687ff; + } + .data-card-title { font-size: 17px; color: inherit; @@ -332,15 +336,15 @@ }); -
+
{{langDict.views.index.report.viewsDate}}
{{toLocaleString data.yesterdayMediacount}}
-
+
{{langDict.views.index.report.viewsThisMonth}}
{{toLocaleString data.thisMonthMediacount}}
-
+
{{langDict.views.index.report.monthlyAvgViews}}
{{toLocaleString data.thisYearMonthlyAvg}}
@@ -349,11 +353,11 @@ class="data-card-title">{{langDict.views.index.report.relatedCategories}}
{{toLocaleString data.categoriesCount}}
-
+
{{langDict.views.index.report.articleUsage}}
{{toLocaleString data.articlesCount}}
-
+
{{langDict.views.index.report.projectsUsage}}
{{toLocaleString data.projectsCount}}
@@ -564,5 +568,27 @@ window.location.href += "/search/" + inputVal; } }); + + const pageViewsCards = document.querySelectorAll('.data-card.page-views'); + + pageViewsCards.forEach(card => { + card.addEventListener('mouseenter', () => { + pageViewsCards.forEach(c => c.classList.add('hover')); + }); + card.addEventListener('mouseleave', () => { + pageViewsCards.forEach(c => c.classList.remove('hover')); + }); + }); + + const usageCards = document.querySelectorAll('.data-card.usage'); + + usageCards.forEach(card => { + card.addEventListener('mouseenter', () => { + usageCards.forEach(c => c.classList.add('hover')); + }); + card.addEventListener('mouseleave', () => { + usageCards.forEach(c => c.classList.remove('hover')); + }); + }); -{{/mainWrapper}} \ No newline at end of file +{{/mainWrapper}} diff --git a/app/pages/views/recommender-page/index.hbs b/app/pages/views/recommender-page/index.hbs index 6e99e57..1ae8251 100644 --- a/app/pages/views/recommender-page/index.hbs +++ b/app/pages/views/recommender-page/index.hbs @@ -58,11 +58,11 @@
{{langDict.views.index.chart}}
@@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/app/pages/views/usage/index.hbs b/app/pages/views/usage/index.hbs index 0ab9f32..9daa008 100644 --- a/app/pages/views/usage/index.hbs +++ b/app/pages/views/usage/index.hbs @@ -59,9 +59,9 @@
{{langDict.views.index.chart}}
@@ -158,4 +158,4 @@ - \ No newline at end of file + diff --git a/app/stats.js b/app/stats.js new file mode 100644 index 0000000..a4b5821 --- /dev/null +++ b/app/stats.js @@ -0,0 +1,17 @@ +process.env.ENV = "production"; + +const { getAllGlams } = require("./lib/db"); + +async function stats() { + const glams = await getAllGlams(); + let total = 0; + for (const glam of glams) { + const { rows } = await glam.connection.query(`SELECT COUNT(*) as value from images WHERE img_timestamp between '2022-01-01' AND '2023-12-31'`); + const [{ value }] = rows; + console.log(glam.name, value); + total += +value; + } + console.log(total); +} + +stats();