Изменение структуры документации

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',
               },
             ],
           },

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'}]},
+          ],
+        },
+      ],
+};

docs/docusaurus/src/components/HomepageFeatures/index.js

@@ -61,35 +61,35 @@ export default function HomepageFeatures() {
         <br/>
         <section className={styles.container}>
           <span className={styles.looptext}>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/VK/"><img src={require('../../../static/img/APIs/VK.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Viber/"><img src={require('../../../static/img/APIs/Viber.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Twitter/"><img src={require('../../../static/img/APIs/Twitter.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Notion/"><img src={require('../../../static/img/APIs/Notion.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Yandex_Disk/"><img src={require('../../../static/img/APIs/YandexDisk.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Calendar/"><img src={require('../../../static/img/APIs/GoogleCalendar.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Drive/"><img src={require('../../../static/img/APIs/GoogleDrive.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Sheets/"> <img src={require('../../../static/img/APIs/GoogleSheets.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Slack/"> <img src={require('../../../static/img/APIs/Slack.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Airtable/"> <img src={require('../../../static/img/APIs/Airtable.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Dropbox.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/VK/"><img src={require('../../../static/img/APIs/VK.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Viber/"><img src={require('../../../static/img/APIs/Viber.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Twitter/"><img src={require('../../../static/img/APIs/Twitter.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Notion/"><img src={require('../../../static/img/APIs/Notion.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Yandex_Disk/"><img src={require('../../../static/img/APIs/YandexDisk.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Calendar/"><img src={require('../../../static/img/APIs/GoogleCalendar.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Drive/"><img src={require('../../../static/img/APIs/GoogleDrive.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Sheets/"> <img src={require('../../../static/img/APIs/GoogleSheets.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Slack/"> <img src={require('../../../static/img/APIs/Slack.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Airtable/"> <img src={require('../../../static/img/APIs/Airtable.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Dropbox.png').default} width='32px' /></a>
 
           </span>
           <span className={styles.looptext}>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/VK/"><img src={require('../../../static/img/APIs/VK.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Viber/"><img src={require('../../../static/img/APIs/Viber.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Twitter/"><img src={require('../../../static/img/APIs/Twitter.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Notion/"><img src={require('../../../static/img/APIs/Notion.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Yandex_Disk/"><img src={require('../../../static/img/APIs/YandexDisk.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Calendar/"><img src={require('../../../static/img/APIs/GoogleCalendar.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Drive/"><img src={require('../../../static/img/APIs/GoogleDrive.png').default} width='32px'/> </a>
-            <a  className={styles.ico} href="/docs/Google_Sheets/"> <img src={require('../../../static/img/APIs/GoogleSheets.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Slack/"> <img src={require('../../../static/img/APIs/Slack.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Airtable/"> <img src={require('../../../static/img/APIs/Airtable.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
-            <a  className={styles.ico} href="/docs/Telegram/"> <img src={require('../../../static/img/APIs/Dropbox.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/VK/"><img src={require('../../../static/img/APIs/VK.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Viber/"><img src={require('../../../static/img/APIs/Viber.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Twitter/"><img src={require('../../../static/img/APIs/Twitter.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Notion/"><img src={require('../../../static/img/APIs/Notion.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Yandex_Disk/"><img src={require('../../../static/img/APIs/YandexDisk.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Calendar/"><img src={require('../../../static/img/APIs/GoogleCalendar.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Drive/"><img src={require('../../../static/img/APIs/GoogleDrive.png').default} width='32px'/> </a>
+            <a  className={styles.ico} href="/docs/Instructions/Google_Sheets/"> <img src={require('../../../static/img/APIs/GoogleSheets.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Slack/"> <img src={require('../../../static/img/APIs/Slack.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Airtable/"> <img src={require('../../../static/img/APIs/Airtable.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Telegram.png').default} width='32px' /></a>
+            <a  className={styles.ico} href="/docs/Instructions/Telegram/"> <img src={require('../../../static/img/APIs/Dropbox.png').default} width='32px' /></a>
 
           </span>
         </section>

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;

docs/docusaurus/src/pages/index.js

@@ -23,7 +23,7 @@ function HomepageHeader() {
         <div className={styles.buttons}>
           <div className={styles.button}><Link
             className="button button--secondary button--bg" 
-            to="/docs/Start">
+            to="/docs/Instructions/Start">
             Документация
           </Link>
           </div>

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"];