diff --git a/docs/docusaurus/docusaurus.config.js b/docs/docusaurus/docusaurus.config.js index 9963a0c0ed..0feac1eeba 100644 --- a/docs/docusaurus/docusaurus.config.js +++ b/docs/docusaurus/docusaurus.config.js @@ -42,6 +42,10 @@ const config = { theme: { customCss: './src/css/custom.css', }, + + docs: { + sidebarPath: './sidebars.js', + }, }), ], ], @@ -64,6 +68,11 @@ const config = { /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ ({ // Replace with your project's social card + docs:{ + sidebar:{ + autoCollapseCategories: true + } + }, colorMode: { defaultMode: 'light', @@ -80,7 +89,7 @@ const config = { items: [ { type: 'docSidebar', - sidebarId: 'defaultSidebar', + sidebarId: 'docs', position: 'left', label: 'Описания методов', }, @@ -99,7 +108,7 @@ const config = { items: [ { label: 'Описания методов', - to: '/docs/Start', + to: '/docs/Instructions/Start', }, ], }, diff --git a/docs/docusaurus/sidebars.js b/docs/docusaurus/sidebars.js index 3327580322..6603aab810 100644 --- a/docs/docusaurus/sidebars.js +++ b/docs/docusaurus/sidebars.js @@ -1,33 +1,68 @@ -/** - * Creating a sidebar enables you to: - - create an ordered group of docs - - render a sidebar for each doc of that group - - provide next/previous navigation +export default { + docs: [ + + { + type: 'category', + label: 'Добро пожаловать!', + link: {type: 'doc', id:'Instructions/Start'}, + className: 'Start', + items:[{type: 'autogenerated', dirName: 'Start'}] + }, - The sidebars can be generated from the filesystem, or explicitly defined here. - - Create as many sidebars as you want. - */ - -// @ts-check - -/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ -const sidebars = { - // By default, Docusaurus generates a sidebar from the docs folder structure - tutorialSidebar: [{type: 'autogenerated', dirName: '.'}], - - // But you can create a sidebar manually - /* - tutorialSidebar: [ - 'intro', - 'hello', - { - type: 'category', - label: 'Tutorial', - items: ['tutorial-basics/create-a-document'], - }, - ], - */ -}; - -export default sidebars; + { + type: 'category', + label: 'Мессенджеры', + className: 'Messenger', + items: [ + { type: 'category', link: {type: 'doc', id:'Instructions/Telegram'}, label: 'Telegram', className: 'Telegram', items:[{type: 'autogenerated', dirName: 'Telegram'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/Viber'}, label: 'Viber', className: 'Viber', items:[{type: 'autogenerated', dirName: 'Viber'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/Slack'}, label: 'Slack', className: 'Slack', items:[{type: 'autogenerated', dirName: 'Slack'}]}, + ], + }, + { + type: 'category', + label: 'Социальные сети', + className: 'Social', + items:[ + { type: 'category', link: {type: 'doc', id:'Instructions/VK'}, label: 'VK', className: 'VK', items:[{type: 'autogenerated', dirName: 'VK'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/Twitter'}, label: 'Twitter', className: 'Twitter', items:[{type: 'autogenerated', dirName: 'Twitter'}]}, + ], + }, + { + type: 'category', + label: 'Базы данных и электронные таблицы', + className: 'Database', + items:[ + { type: 'category', link: {type: 'doc', id:'Instructions/Airtable'}, label: 'Airtable', className: 'Airtable', items:[{type: 'autogenerated', dirName: 'Airtable'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/GoogleSheets'}, label: 'Google Sheets', className: 'GoogleSheets', items:[{type: 'autogenerated', dirName: 'Google_Sheets'}]}, + ], + }, + { + type: 'category', + label: 'Файловые хостинги', + className: 'Folder', + items:[ + { type: 'category', link: {type: 'doc', id:'Instructions/GoogleDrive'}, label: 'Google Drive', className: 'GoogleDrive', items:[{type: 'autogenerated', dirName: 'Google_Drive'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/YandexDisk'}, label: 'Yandex Disk', className: 'YandexDisk', items:[{type: 'autogenerated', dirName: 'Yandex_Disk'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/Dropbox'}, label: 'Dropbox', className: 'Dropbox', items:[{type: 'autogenerated', dirName: 'Dropbox'}]}, + ], + }, + { + type: 'category', + label: 'Комплексные решения (CMS, CRM)', + className: 'CRM', + items:[ + { type: 'category', link: {type: 'doc', id:'Instructions/Bitrix24'}, label: 'Bitrix24', className: 'Bitrix24', items:[{type: 'autogenerated', dirName: 'Bitrix24'}]}, + ], + }, + { + type: 'category', + label: 'Планирование и управление проектами ', + className: 'Calendar', + items:[ + { type: 'category', link: {type: 'doc', id:'Instructions/GoogleCalendar'}, label: 'Google Calendar', className: 'GoogleCalendar', items:[{type: 'autogenerated', dirName: 'Google_Calendar'}]}, + { type: 'category', link: {type: 'doc', id:'Instructions/Notion'}, label: 'Notion', className: 'Notion', items:[{type: 'autogenerated', dirName: 'Notion'}]}, + ], + }, + ], +}; \ No newline at end of file diff --git a/docs/docusaurus/src/components/HomepageFeatures/index.js b/docs/docusaurus/src/components/HomepageFeatures/index.js index 29335335d6..c9bb4671a1 100644 --- a/docs/docusaurus/src/components/HomepageFeatures/index.js +++ b/docs/docusaurus/src/components/HomepageFeatures/index.js @@ -61,35 +61,35 @@ export default function HomepageFeatures() {
- - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + +
diff --git a/docs/docusaurus/src/css/custom.css b/docs/docusaurus/src/css/custom.css index 6af6c00c78..59b8c60237 100644 --- a/docs/docusaurus/src/css/custom.css +++ b/docs/docusaurus/src/css/custom.css @@ -93,7 +93,9 @@ li > a.menu__link { .Airtable a::before , .Telegram a::before, .VK a::before, .Viber a::before, .Twitter a::before, .Notion a::before, .GoogleCalendar a::before, .GoogleDrive a::before, .GoogleSheets a::before, -.Slack a::before, .YandexDisk a::before, .Dropbox a::before, .Bitrix24 a::before{ +.Slack a::before, .YandexDisk a::before, .Dropbox a::before, .Bitrix24 a::before, .Messenger a::before, +.Social a::before, .Database a::before, .Folder a::before, .Calendar a::before, .CRM a::before, +.Start a::before{ padding-right: 0.7rem; padding-top: 0.4rem; } @@ -150,6 +152,34 @@ li > a.menu__link { content: url(../../static/img/APIs/small/Bitrix24.png); } +.Messenger > div > a::before{ + content: url(../../static/img/Categories/chat.png); +} + +.Social > div > a::before{ + content: url(../../static/img/Categories/social-media.png); +} + +.Database > div > a::before{ + content: url(../../static/img/Categories/database.png); +} + +.Calendar > div > a::before{ + content: url(../../static/img/Categories/calendar.png); +} + +.CRM > div > a::before{ + content: url(../../static/img/Categories/crm.png); +} + +.Folder > div > a::before{ + content: url(../../static/img/Categories/folder.png); +} + +.Start > div > a::before{ + content: url(../../static/img/Categories/welcome.png); +} + /* CSS */ .button { appearance: none; diff --git a/docs/docusaurus/src/pages/index.js b/docs/docusaurus/src/pages/index.js index d9855276bb..f096aa9351 100644 --- a/docs/docusaurus/src/pages/index.js +++ b/docs/docusaurus/src/pages/index.js @@ -23,7 +23,7 @@ function HomepageHeader() {
+ to="/docs/Instructions/Start"> Документация
diff --git a/docs/docusaurus/static/img/Categories/calendar.png b/docs/docusaurus/static/img/Categories/calendar.png new file mode 100644 index 0000000000..c74950e224 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/calendar.png differ diff --git a/docs/docusaurus/static/img/Categories/chat.png b/docs/docusaurus/static/img/Categories/chat.png new file mode 100644 index 0000000000..8dc7b3dd9c Binary files /dev/null and b/docs/docusaurus/static/img/Categories/chat.png differ diff --git a/docs/docusaurus/static/img/Categories/crm.png b/docs/docusaurus/static/img/Categories/crm.png new file mode 100644 index 0000000000..601f36df40 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/crm.png differ diff --git a/docs/docusaurus/static/img/Categories/database.png b/docs/docusaurus/static/img/Categories/database.png new file mode 100644 index 0000000000..b9041556b2 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/database.png differ diff --git a/docs/docusaurus/static/img/Categories/folder.png b/docs/docusaurus/static/img/Categories/folder.png new file mode 100644 index 0000000000..aed79166d9 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/folder.png differ diff --git a/docs/docusaurus/static/img/Categories/full/calendar.png b/docs/docusaurus/static/img/Categories/full/calendar.png new file mode 100644 index 0000000000..1452bb8ca2 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/calendar.png differ diff --git a/docs/docusaurus/static/img/Categories/full/chat.png b/docs/docusaurus/static/img/Categories/full/chat.png new file mode 100644 index 0000000000..023f63e1da Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/chat.png differ diff --git a/docs/docusaurus/static/img/Categories/full/crm.png b/docs/docusaurus/static/img/Categories/full/crm.png new file mode 100644 index 0000000000..dbd1c28dfc Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/crm.png differ diff --git a/docs/docusaurus/static/img/Categories/full/database.png b/docs/docusaurus/static/img/Categories/full/database.png new file mode 100644 index 0000000000..58ac3cf072 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/database.png differ diff --git a/docs/docusaurus/static/img/Categories/full/folder.png b/docs/docusaurus/static/img/Categories/full/folder.png new file mode 100644 index 0000000000..cbb0cffd6b Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/folder.png differ diff --git a/docs/docusaurus/static/img/Categories/full/social-media.png b/docs/docusaurus/static/img/Categories/full/social-media.png new file mode 100644 index 0000000000..0b04f582ea Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/social-media.png differ diff --git a/docs/docusaurus/static/img/Categories/full/welcome.png b/docs/docusaurus/static/img/Categories/full/welcome.png new file mode 100644 index 0000000000..7287a9a04f Binary files /dev/null and b/docs/docusaurus/static/img/Categories/full/welcome.png differ diff --git a/docs/docusaurus/static/img/Categories/social-media.png b/docs/docusaurus/static/img/Categories/social-media.png new file mode 100644 index 0000000000..8034427175 Binary files /dev/null and b/docs/docusaurus/static/img/Categories/social-media.png differ diff --git a/docs/docusaurus/static/img/Categories/welcome.png b/docs/docusaurus/static/img/Categories/welcome.png new file mode 100644 index 0000000000..8e85e6d87e Binary files /dev/null and b/docs/docusaurus/static/img/Categories/welcome.png differ diff --git a/docs/ru/md/Airtable/_category_.json b/docs/ru/md/Airtable/_category_.json deleted file mode 100644 index 8975594d6d..0000000000 --- a/docs/ru/md/Airtable/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Airtable", - "position": 11, - "link": { - "type": "doc", - "id": "Airtable" - } -} diff --git a/docs/ru/md/Bitrix24/_category_.json b/docs/ru/md/Bitrix24/_category_.json deleted file mode 100644 index 2b6255da84..0000000000 --- a/docs/ru/md/Bitrix24/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Bitrix24", - "position": 5, - "link": { - "type": "doc", - "id": "Bitrix24" - } -} diff --git a/docs/ru/md/Dropbox/_category_.json b/docs/ru/md/Dropbox/_category_.json deleted file mode 100644 index c76d929dde..0000000000 --- a/docs/ru/md/Dropbox/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Dropbox", - "position": 12, - "link": { - "type": "doc", - "id": "Dropbox" - } -} diff --git a/docs/ru/md/Google_Calendar/_category_.json b/docs/ru/md/Google_Calendar/_category_.json deleted file mode 100644 index dc31538b5a..0000000000 --- a/docs/ru/md/Google_Calendar/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Google Calendar", - "position": 7, - "link": { - "type": "doc", - "id": "GoogleCalendar" - } -} diff --git a/docs/ru/md/Google_Drive/_category_.json b/docs/ru/md/Google_Drive/_category_.json deleted file mode 100644 index b08b67577d..0000000000 --- a/docs/ru/md/Google_Drive/_category_.json +++ /dev/null @@ -1,10 +0,0 @@ - -{ - "label": "Google Drive", - "position": 8, - "link": { - "type": "doc", - "id": "GoogleDrive" - } -} - diff --git a/docs/ru/md/Google_Sheets/_category_.json b/docs/ru/md/Google_Sheets/_category_.json deleted file mode 100644 index bdd5fb0824..0000000000 --- a/docs/ru/md/Google_Sheets/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Google Sheets", - "position": 9, - "link": { - "type": "doc", - "id": "GoogleSheets" - } -} \ No newline at end of file diff --git a/docs/ru/md/Airtable/Airtable.md b/docs/ru/md/Instructions/Airtable.md similarity index 100% rename from docs/ru/md/Airtable/Airtable.md rename to docs/ru/md/Instructions/Airtable.md diff --git a/docs/ru/md/Bitrix24/Bitrix24.md b/docs/ru/md/Instructions/Bitrix24.md similarity index 100% rename from docs/ru/md/Bitrix24/Bitrix24.md rename to docs/ru/md/Instructions/Bitrix24.md diff --git a/docs/ru/md/Dropbox/Dropbox.md b/docs/ru/md/Instructions/Dropbox.md similarity index 100% rename from docs/ru/md/Dropbox/Dropbox.md rename to docs/ru/md/Instructions/Dropbox.md diff --git a/docs/ru/md/Google_Calendar/Google_Calendar.md b/docs/ru/md/Instructions/Google_Calendar.md similarity index 100% rename from docs/ru/md/Google_Calendar/Google_Calendar.md rename to docs/ru/md/Instructions/Google_Calendar.md diff --git a/docs/ru/md/Google_Drive/Google_Drive.md b/docs/ru/md/Instructions/Google_Drive.md similarity index 100% rename from docs/ru/md/Google_Drive/Google_Drive.md rename to docs/ru/md/Instructions/Google_Drive.md diff --git a/docs/ru/md/Google_Sheets/Google_Sheets.md b/docs/ru/md/Instructions/Google_Sheets.md similarity index 100% rename from docs/ru/md/Google_Sheets/Google_Sheets.md rename to docs/ru/md/Instructions/Google_Sheets.md diff --git a/docs/ru/md/Notion/Notion.md b/docs/ru/md/Instructions/Notion.md similarity index 100% rename from docs/ru/md/Notion/Notion.md rename to docs/ru/md/Instructions/Notion.md diff --git a/docs/ru/md/Slack/Slack.md b/docs/ru/md/Instructions/Slack.md similarity index 100% rename from docs/ru/md/Slack/Slack.md rename to docs/ru/md/Instructions/Slack.md diff --git a/docs/ru/md/Start/Start.md b/docs/ru/md/Instructions/Start.md similarity index 100% rename from docs/ru/md/Start/Start.md rename to docs/ru/md/Instructions/Start.md diff --git a/docs/ru/md/Telegram/Telegram.md b/docs/ru/md/Instructions/Telegram.md similarity index 100% rename from docs/ru/md/Telegram/Telegram.md rename to docs/ru/md/Instructions/Telegram.md diff --git a/docs/ru/md/Twitter/Twitter.md b/docs/ru/md/Instructions/Twitter.md similarity index 100% rename from docs/ru/md/Twitter/Twitter.md rename to docs/ru/md/Instructions/Twitter.md diff --git a/docs/ru/md/VK/VK.md b/docs/ru/md/Instructions/VK.md similarity index 100% rename from docs/ru/md/VK/VK.md rename to docs/ru/md/Instructions/VK.md diff --git a/docs/ru/md/Viber/Viber.md b/docs/ru/md/Instructions/Viber.md similarity index 100% rename from docs/ru/md/Viber/Viber.md rename to docs/ru/md/Instructions/Viber.md diff --git a/docs/ru/md/Yandex_Disk/Yandex_Disk.md b/docs/ru/md/Instructions/Yandex_Disk.md similarity index 100% rename from docs/ru/md/Yandex_Disk/Yandex_Disk.md rename to docs/ru/md/Instructions/Yandex_Disk.md diff --git a/docs/ru/md/Notion/_category_.json b/docs/ru/md/Notion/_category_.json deleted file mode 100644 index 84df294635..0000000000 --- a/docs/ru/md/Notion/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Notion", - "position": 6, - "link": { - "type": "doc", - "id": "Notion" - } -} diff --git a/docs/ru/md/Slack/_category_.json b/docs/ru/md/Slack/_category_.json deleted file mode 100644 index beb5d69a1b..0000000000 --- a/docs/ru/md/Slack/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Slack", - "position": 9, - "link": { - "type": "doc", - "id": "Slack" - } -} diff --git a/docs/ru/md/Telegram/_category_.json b/docs/ru/md/Telegram/_category_.json deleted file mode 100644 index a2917ded75..0000000000 --- a/docs/ru/md/Telegram/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Telegram", - "position": 2, - "link": { - "type": "doc", - "id": "Telegram" - } -} diff --git a/docs/ru/md/Twitter/_category_.json b/docs/ru/md/Twitter/_category_.json deleted file mode 100644 index ec287980ab..0000000000 --- a/docs/ru/md/Twitter/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Twitter", - "position": 4, - "link": { - "type": "doc", - "id": "Twitter" - } -} diff --git a/docs/ru/md/VK/_category_.json b/docs/ru/md/VK/_category_.json deleted file mode 100644 index 13bb948612..0000000000 --- a/docs/ru/md/VK/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "VK", - "position": 3, - "link": { - "type": "doc", - "id": "VK" - } -} diff --git a/docs/ru/md/Viber/_category_.json b/docs/ru/md/Viber/_category_.json deleted file mode 100644 index 302de2e37c..0000000000 --- a/docs/ru/md/Viber/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Viber", - "position": 3, - "link": { - "type": "doc", - "id": "Viber" - } -} diff --git a/docs/ru/md/Yandex_Disk/_category_.json b/docs/ru/md/Yandex_Disk/_category_.json deleted file mode 100644 index e4a627327a..0000000000 --- a/docs/ru/md/Yandex_Disk/_category_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "label": "Yandex Disk", - "position": 13, - "link": { - "type": "doc", - "id": "YandexDisk" - } -} diff --git a/src/ru/OPI/src/CommonModules/OPI_Тесты/Module.bsl b/src/ru/OPI/src/CommonModules/OPI_Тесты/Module.bsl index 61541e7bf1..0089784f5c 100644 --- a/src/ru/OPI/src/CommonModules/OPI_Тесты/Module.bsl +++ b/src/ru/OPI/src/CommonModules/OPI_Тесты/Module.bsl @@ -3261,7 +3261,7 @@ OPI_ПолучениеДанныхТестов.ПараметрВКоллекцию("Bitrix24_ClientID" , ПараметрыТеста); OPI_ПолучениеДанныхТестов.ПараметрВКоллекцию("Bitrix24_ClientSecret", ПараметрыТеста); - Bitrix24_ПолучитьСсылкуАвторизации(ПараметрыТеста); + Bitrix24_ПолучитьСсылкуАвторизацииПриложения(ПараметрыТеста); OPI_ПолучениеДанныхТестов.ПараметрВКоллекцию("Bitrix24_Code", ПараметрыТеста); @@ -5515,7 +5515,7 @@ #Область Bitrix24 -Процедура Bitrix24_ПолучитьСсылкуАвторизации(ПараметрыФункции) +Процедура Bitrix24_ПолучитьСсылкуАвторизацииПриложения(ПараметрыФункции) Домен = ПараметрыФункции["Bitrix24_Domain"]; ClientID = ПараметрыФункции["Bitrix24_ClientID"];