diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4afaca3..ad10e5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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: | @@ -30,7 +30,7 @@ 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 @@ -38,12 +38,12 @@ jobs: - 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: . diff --git a/assets/js/graphs.js b/assets/js/graphs.js index d509bf1..5cafba4 100644 --- a/assets/js/graphs.js +++ b/assets/js/graphs.js @@ -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]))