From 6a8bd0e0f365bd63909d534b703e102f08ed468b Mon Sep 17 00:00:00 2001 From: Youssef Raafat Date: Wed, 30 Oct 2019 13:35:32 +0200 Subject: [PATCH] Use Tazkrtak API instead of Counterfeit --- _config.yml | 4 ++-- _data/counters.yml | 10 +++++----- _data/usage-charts.yml | 2 +- assets/js/buses-charts.js | 2 +- assets/js/counters.js | 2 +- assets/js/usage-charts.js | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index 9a3c6df..313a5c1 100644 --- a/_config.yml +++ b/_config.yml @@ -1,8 +1,8 @@ # Site settings title : تذكرتك description : متابعة برامج تذكرتك عن طريق متصفح الإنترنت -url : "https://tazkrtak-admin.web.app" -root-endpoint : "https://my-json-server.typicode.com/tazkrtak/counterfeit" +url : https://tazkrtak-admin.web.app +root-endpoint : https://tazkrtak-api.web.app # Build settings markdown : kramdown diff --git a/_data/counters.yml b/_data/counters.yml index 0812e68..3b72753 100644 --- a/_data/counters.yml +++ b/_data/counters.yml @@ -1,15 +1,15 @@ - name: المستخدمون id: users - endpoint: "/users-count" + endpoint: "/users/total" - name: الدخل id: income - endpoint: "/users-count" + endpoint: "/transactions/income" - name: الحافلات id: buses - endpoint: "/buses-count" + endpoint: "/buses/total" -- name: المفتشون +- name: الموظفون id: collectors - endpoint: "/buses-count" \ No newline at end of file + endpoint: "/staff/total" \ No newline at end of file diff --git a/_data/usage-charts.yml b/_data/usage-charts.yml index 04d5b18..44f78fd 100644 --- a/_data/usage-charts.yml +++ b/_data/usage-charts.yml @@ -1,5 +1,5 @@ title: الاستخدام -endpoint: "" +endpoint: "/transactions" intervals: - name: شهر id: months diff --git a/assets/js/buses-charts.js b/assets/js/buses-charts.js index 70f5b39..1dcaba9 100644 --- a/assets/js/buses-charts.js +++ b/assets/js/buses-charts.js @@ -14,7 +14,7 @@ fetchBusesData().then(data => { }); async function fetchBusesData() { - const root = "{{ site.root-endpoint }}"; + const root = "https://my-json-server.typicode.com/tazkrtak/counterfeit"; const endpoint = "{{ site.data.buses-charts.endpoint }}"; const response = await fetch(`${root}${endpoint}`); return await response.json(); diff --git a/assets/js/counters.js b/assets/js/counters.js index 988fbfc..9eda880 100644 --- a/assets/js/counters.js +++ b/assets/js/counters.js @@ -3,7 +3,7 @@ {% for counter in site.data.counters %} fetchCounterData("{{ counter.endpoint }}").then(data => { - new CountUp("{{ counter.id }}-counter", 0, data.value, 0, 1).start(); + new CountUp("{{ counter.id }}-counter", 0, data.total, 0, 1).start(); }); {% endfor %} diff --git a/assets/js/usage-charts.js b/assets/js/usage-charts.js index 5c3994e..fb66122 100644 --- a/assets/js/usage-charts.js +++ b/assets/js/usage-charts.js @@ -3,8 +3,8 @@ {% for interval in site.data.usage-charts.intervals %} fetchUsageData("{{ interval.endpoint }}").then(data => { - const x = data.map(month => month.number); - const y = data.map(month => month.usage); + const x = data.map(interval => interval.name); + const y = data.map(interval => interval.transactions); createUsageChart("{{ interval.id }}-chart", x, y); }); {% endfor %} @@ -12,7 +12,7 @@ fetchUsageData("{{ interval.endpoint }}").then(data => { async function fetchUsageData(interval) { const root = "{{ site.root-endpoint }}"; const endpoint = "{{ site.data.usage-charts.endpoint }}"; - const response = await fetch(`${root}${endpoint}/${interval}`); + const response = await fetch(`${root}${endpoint}${interval}`); return await response.json(); }