Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -18,7 +18,7 @@ jobs:
- name: Build
run: npm run build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: script
path: |
Expand All @@ -30,20 +30,20 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Install dependencies
run: composer install --prefer-dist --no-progress

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: script
path: public

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build
path: .
7 changes: 7 additions & 0 deletions assets/js/graphs.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ async function displayData(site, time) {
const pages = await fetch(`/api/sites/${site}/pages?from=${from}`).then(x => x.json())
const referrers = await fetch(`/api/sites/${site}/referrers?from=${from}`).then(x => x.json())

const pageCount = pages.map(x => x.count).reduce((a, b) => a + b, 0)
const referrerCount = referrers.map(x => x.count).reduce((a, b) => a + b, 0)
if (pageCount > referrerCount) {
referrers.push({ referrer: "direct / unknown", count: pageCount - referrerCount })
referrers.sort((a, b) => { return b.count - a.count })
}

// Display the charts
pagesChart = displayLineChart("pages", pages.map(x => [x.path, x.count]))
referrersChart = displayLineChart("referrers", referrers.map(x => [x.referrer, x.count]))
Expand Down