diff --git a/css/style.css b/css/style.css index 612b861..7b5cd75 100644 --- a/css/style.css +++ b/css/style.css @@ -10,5 +10,27 @@ body { } table { - + width: 100%; +} + +td { + padding: 5px 10px; +} + +.none { + display: none; +} + +#loader span { + animation: 1500ms infinite loader; + animation-delay: calc(var(--i) * 500ms); +} + +@keyframes loader { + from { + opacity: 1; + } + to { + opacity: 0; + } } diff --git a/index.html b/index.html index 7fbd406..5aad9bb 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,7 @@ - id, название сделки, бюджет, название контакта номер телефона. - +
@@ -16,15 +15,12 @@ -
-
- - - - - - -
ID НазваниеКонтакт Телефон
1111НазваниеБюджетКонтактТелефон
+ +
+ * + * + * +
diff --git a/index.html.save b/index.html.save new file mode 100644 index 0000000..a18f353 --- /dev/null +++ b/index.html.save @@ -0,0 +1,33 @@ + + + + + + + + + + id, название сделки, бюджет, название контакта номер телефона. + + + + + + + + +
+
+ + + + + + + +
IDНазваниеБюджетКонтактТелефон
1111НазваниеБюджетКонтактТелефон
+ +
+ + + diff --git a/js/index.js b/js/index.js index 69d8a3b..eaedae2 100644 --- a/js/index.js +++ b/js/index.js @@ -57,14 +57,14 @@ const getContact = async id => { return data } catch (error) { - console.error('Ошибка при получении токенов:', error) + console.error('Ошибка при получении контактов:', error) throw error } } const getLeads = async (page = 1, limit = 2) => { try { - const response = await fetch(`https://${DOMAIN}/api/v4/leads?page=${page}&limit=${limit}&with=contacts`, { + const response = await fetch(`https://${DOMAIN}/api/v4/leads?page=${page}&limit=${limit}&with=contacts&order[id]=desc`, { method: 'GET', headers: { 'Authorization': `Bearer ${ACCESS_TOKEN}`, @@ -78,22 +78,21 @@ const getLeads = async (page = 1, limit = 2) => { const data = await response.json() - const leads = [] - data._embedded.leads.forEach(async lead => { - const contact = - lead._embedded.contacts.length - ? await getContact(lead._embedded.contacts[0].id) - : null + const leads = await Promise.all(data._embedded.leads.map(async lead => { + const contact = + lead._embedded.contacts.length + ? await getContact(lead._embedded.contacts[0].id) + : null - leads.push({ + return { lead: lead, contact: contact - }) - }) + } + })) return leads } catch (error) { - console.error('Ошибка при получении токенов:', error) + console.error('Заявок больше нет') throw error } } @@ -103,7 +102,29 @@ const getAllLeads = async () => { while (true) { try { const leads = await getLeads(page++) + console.log(leads) + for (const lead of leads) { + console.log(lead) + const row = document.getElementById('table').insertRow() + + const cell1 = row.insertCell() + const cell2 = row.insertCell() + const cell3 = row.insertCell() + const cell4 = row.insertCell() + const cell5 = row.insertCell() + + cell1.textContent = lead.lead.id + cell2.textContent = lead.lead.name + cell3.textContent = lead.lead.price + cell4.textContent = lead.contact?.name + cell5.textContent = lead.contact + ?.custom_fields_values[0] + ?.values[0]?.value + } } catch (error) { + document.getElementById('loader').classList.add('none') + console.log(error) + throw error break } await sleep(1000) @@ -112,5 +133,5 @@ const getAllLeads = async () => { (async () => { - + await getAllLeads() })()