better Jenkins file

Reviewed-on: #28

Jenkinsfile

@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-      image 'node:18'
+            image 'node:20'
         }
     }
 
@@ -10,10 +10,28 @@ pipeline {
             steps {
                 sh 'node -v'
                 sh 'npm -v'
+                script {
+                    String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
+                    String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
+                    String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
+                    String commitMsg = commit.substring(commit.indexOf(' ')).trim()
+
+                    if (tag) {
+                        currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
+                    } else {
+                        currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
+                    }
+
+                    String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
+                    currentBuild.description = "${author}<br />${commitMsg}"
+                    echo 'starting installing'
                     sh 'npm ci'
                 }
             }
+        }
 
+        stage('checks') {
+            parallel {
                 stage('eslint') {
                     steps {
                         sh 'npm run eslint'
@@ -25,6 +43,8 @@ pipeline {
                         sh 'npm run build'
                     }
                 }
+            }
+        }
 
         stage('clean-all') {
             steps {

README.md

@@ -19,7 +19,7 @@ npm install
 пропишите в hosts строку
 
 ```
-127.0.0.1 ift-b1.kc.inno-js.test
+127.0.0.1 journal.test
 ```
 
 ## Запуск
@@ -28,4 +28,4 @@ npm install
 npm start
 ```
 
-откройте в браузере [проект](http://ift-b1.kc.inno-js.test)
+откройте в браузере [проект](http://journal.test)

ijl.config.js

@@ -4,19 +4,28 @@ module.exports = {
   apiPath: 'stubs/api',
   webpackConfig: {
     output: {
-            publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`
+      publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
-        }
+    },
   },
   navigations: {
-        'journal.main': '/journal.pl'
+    'journal.main': '/journal.pl',
   },
   features: {
-        'journal': {
+    journal: {
-            // add your features here in the format [featureName]: { value: string }
+      'lesson.bar': {
+        on: true,
+        value: '',
+        key: 'lesson.bar',
+      },
+      'group.by.date': {
+        on: true,
+        value: '',
+        key: 'group.by.date',
+      },
     },
   },
   config: {
-    "journal.back.url": "/api",
+    'journal.back.url': '/api',
-    "journal.polling-interval": "10000"
+    'journal.polling-interval': '10000',
-  }
+  },
 }

package.json

@@ -1,51 +1,53 @@
 {
     "name": "journal.pl",
-    "version": "2.2.0",
+    "version": "2.4.5",
-    "description": "inno-js platform journal ui repo",
+    "description": "bro-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {
-        "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl & ijl-cli server --port=80",
+        "start": "brojs server --port=8099 --with-open-browser",
-        "build": "npm run clean && ijl-cli build --dev",
+        "build": "npm run clean && brojs build --dev",
-        "build:prod": "npm run clean && ijl-cli build",
+        "build:prod": "npm run clean && brojs build",
         "clean": "rimraf dist",
         "test": "echo ok",
         "eslint": "npx eslint ."
     },
     "repository": {
         "type": "git",
-        "url": "ssh://git@85.143.175.152:10022/omni-tech/journal.pl.git"
+        "url": "ssh://git@85.143.175.152:222/bro-js/journal.pl.git"
     },
     "keywords": [],
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@ijl/cli": "^5.0.3",
         "@typescript-eslint/eslint-plugin": "^7.4.0",
         "@typescript-eslint/parser": "^7.4.0",
         "eslint": "^8.57.0",
         "eslint-plugin-react": "^7.34.1"
     },
     "dependencies": {
+        "@brojs/cli": "^0.0.4-alpha.9",
         "@chakra-ui/icons": "^2.1.1",
         "@chakra-ui/react": "^2.8.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
+        "@nivo/bar": "^0.85.1",
         "@reduxjs/toolkit": "^2.2.1",
         "@types/react": "^18.2.60",
         "@types/react-dom": "^18.2.19",
         "dayjs": "^1.11.10",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "js-sha256": "^0.11.0",
         "keycloak-js": "^23.0.7",
         "prettier": "^3.2.5",
         "qrcode": "^1.5.3",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
-        "react-dom": "^18.2.0",
+        "react-dom": "^18.3.1",
         "react-helmet": "^6.1.0",
         "react-hook-form": "^7.51.2",
         "react-redux": "^9.1.0",
         "react-router-dom": "^6.22.1",
         "redux": "^5.0.1",
-        "typescript": "^5.3.3"
+        "typescript": "^5.3.3",
+        "webpack-hot-middleware": "^2.26.1"
     }
 }

src/__data__/api/api.ts

@@ -1,5 +1,5 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import { getConfigValue } from '@ijl/cli'
+import { getConfigValue } from '@brojs/cli'
 
 import { keycloak } from '../kc'
 import {

src/__data__/kc.ts

@@ -1,8 +1,8 @@
 import Keycloak from 'keycloak-js';
 
 export const keycloak = new Keycloak({
-  url: 'https://kc.inno-js.ru',
+  url: 'https://kc.bro-js.ru',
-  realm: 'inno-js',
+  realm: 'bro-js',
   clientId: 'journal'
 });
 

src/dashboard.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, Suspense } from 'react'
 import { Routes, Route, useNavigate } from 'react-router-dom'
 import { Provider } from 'react-redux'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue } from '@brojs/cli'
 import { Box, Container, Spinner, VStack } from '@chakra-ui/react'
 
 import {

src/pages/course-list.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import dayjs from 'dayjs'
 import { Link as ConnectedLink } from 'react-router-dom'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue } from '@brojs/cli'
 import {
   Box,
   CardHeader,

src/pages/lesson-details.tsx

@@ -3,7 +3,7 @@ import { useParams, Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import QRCode from 'qrcode'
 import { sha256 } from 'js-sha256'
-import { getConfigValue, getNavigationsValue } from '@ijl/cli'
+import { getConfigValue, getNavigationsValue } from '@brojs/cli'
 import {
   Box,
   Breadcrumb,

src/pages/lesson-list.tsx

@@ -1,7 +1,13 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import { ResponsiveBar } from '@nivo/bar'
 import dayjs from 'dayjs'
 import { Link, useParams } from 'react-router-dom'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue, getFeatures } from '@brojs/cli'
 import { useForm, Controller } from 'react-hook-form'
 import {
   Breadcrumb,
@@ -54,6 +60,11 @@ import { Lesson } from '../__data__/model'
 
 import { ErrorSpan, BreadcrumbsWrapper } from './style'
 
+const features = getFeatures('journal')
+
+const barFeature = features?.['lesson.bar']
+const groupByDate = features?.['group.by.date']
+
 interface NewLessonForm {
   name: string
   date: string
@@ -65,6 +76,8 @@ interface LessonFormProps {
   onCancel: () => void
   onSubmit: (lesson: Lesson) => void
   error?: string
+  title: string
+  nameButton: string
 }
 
 const LessonForm = ({
@@ -73,6 +86,8 @@ const LessonForm = ({
   onCancel,
   onSubmit,
   error,
+  title,
+  nameButton,
 }: LessonFormProps) => {
   const {
     control,
@@ -90,7 +105,7 @@ const LessonForm = ({
     <Card align="left">
       <CardHeader display="flex">
         <Heading as="h2" mt="0">
-          Создание лекции
+          {title}
         </Heading>
         <CloseButton
           ml="auto"
@@ -153,7 +168,7 @@ const LessonForm = ({
                 colorScheme="blue"
                 isLoading={isLoading}
               >
-                Создать
+                {nameButton}
               </Button>
             </Box>
           </VStack>
@@ -168,7 +183,7 @@ const LessonForm = ({
 const LessonList = () => {
   const { courseId } = useParams()
   const user = useAppSelector((s) => s.user)
-  const { data, isLoading, error } = api.useLessonListQuery(courseId)
+  const { data, isLoading, error, isSuccess } = api.useLessonListQuery(courseId)
   const [createLesson, crLQuery] = api.useCreateLessonMutation()
   const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
   const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
@@ -179,6 +194,37 @@ const LessonList = () => {
   const toastRef = useRef(null)
   const createdLessonRef = useRef(null)
   const [editLesson, setEditLesson] = useState<Lesson>(null)
+  const sorted = useMemo(() => [...(data?.body || [])]?.sort((a, b) => a.date > b.date ? 1 : -1), [data, data?.body])
+
+  const lessonCalc = useMemo(() => {
+    if (!isSuccess) {
+      return []
+    }
+
+
+    if (!groupByDate) {
+      return [{ date: '', data: sorted }]
+    }
+
+    const lessonsData = []
+    for (let i = 0; i < sorted.length; i++) {
+      const element = sorted[i]
+      const find = lessonsData.find(
+        (item) => dayjs(element.date).diff(dayjs(item.date), 'day') === 0,
+      )
+
+      if (find) {
+        find.data.push(element)
+      } else {
+        lessonsData.push({
+          date: element.date,
+          data: [element],
+        })
+      }
+    }
+
+    return lessonsData.sort((a, b) => a.date < b.date? 1 : -1)
+  }, [groupByDate, isSuccess, sorted])
 
   const onSubmit = (lessonData) => {
     toastRef.current = toast({
@@ -329,7 +375,7 @@ const LessonList = () => {
           </BreadcrumbItem>
         </Breadcrumb>
       </BreadcrumbsWrapper>
-      <Container maxW="container.xl">
+      <Container maxW="container.xl" position="relative">
         {isTeacher(user) && (
           <Box mt="15" mb="15">
             {showForm ? (
@@ -343,6 +389,8 @@ const LessonList = () => {
                 }}
                 error={(crLQuery.error as any)?.error}
                 lesson={editLesson}
+                title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
+                nameButton={editLesson ? 'Редактировать' : 'Создать'}
               />
             ) : (
               <Box p="2" m="2">
@@ -357,7 +405,17 @@ const LessonList = () => {
             )}
           </Box>
         )}
-        <TableContainer whiteSpace="wrap">
+        {barFeature && sorted?.length && (
+          <Box height="300">
+            <Bar
+              data={sorted.map((lesson, index) => ({
+                lessonIndex: `#${index + 1}`,
+                count: lesson.students.length,
+              }))}
+            />
+          </Box>
+        )}
+        <TableContainer whiteSpace="wrap" pb={13}>
           <Table variant="striped" colorScheme="cyan">
             <Thead>
               <Tr>
@@ -370,12 +428,15 @@ const LessonList = () => {
                   Дата
                 </Th>
                 <Th>Название</Th>
-                <Th>action</Th>
+                {isTeacher(user) && <Th>action</Th>}
                 <Th isNumeric>Отмечено</Th>
               </Tr>
             </Thead>
             <Tbody>
-              {data?.body?.map((lesson) => (
+              {lessonCalc?.map(({ data: lessons, date }) => (
+                <React.Fragment key={date}>
+                  {date && <Tr><Td colSpan={isTeacher(user) ? 5 : 3}>{dayjs(date).format('DD MMMM YYYY')}</Td></Tr>}
+                  {lessons.map((lesson) => (
                     <Tr key={lesson._id}>
                       {isTeacher(user) && (
                         <Td>
@@ -392,9 +453,10 @@ const LessonList = () => {
                         </Td>
                       )}
                       <Td textAlign="center">
-                    {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                        {dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
                       </Td>
                       <Td>{lesson.name}</Td>
+                      {isTeacher(user) && (
                         <Td>
                           <Menu>
                             <MenuButton as={Button}>
@@ -409,15 +471,20 @@ const LessonList = () => {
                               >
                                 Edit
                               </MenuItem>
-                        <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                              <MenuItem
+                                onClick={() => setlessonToDelete(lesson)}
+                              >
                                 Delete
                               </MenuItem>
                             </MenuList>
                           </Menu>
                         </Td>
+                      )}
                       <Td isNumeric>{lesson.students.length}</Td>
                     </Tr>
                   ))}
+                </React.Fragment>
+              ))}
             </Tbody>
           </Table>
         </TableContainer>
@@ -427,3 +494,29 @@ const LessonList = () => {
 }
 
 export default LessonList
+
+const Bar = ({ data }) => (
+  <ResponsiveBar
+    data={data}
+    keys={['count']}
+    indexBy="lessonIndex"
+    margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
+    padding={0.3}
+    valueScale={{ type: 'linear' }}
+    indexScale={{ type: 'band', round: true }}
+    colors={{ scheme: 'set3' }}
+    axisTop={null}
+    axisRight={null}
+    labelSkipWidth={12}
+    labelSkipHeight={12}
+    labelTextColor={{
+      from: 'color',
+      modifiers: [['brighter', 1.4]],
+    }}
+    role="application"
+    ariaLabel="График посещаемости лекций"
+    barAriaLabel={(e) =>
+      e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
+    }
+  />
+)

stubs/mocks/lessons/list/success.json

@@ -144,7 +144,6 @@
           "family_name": "Шарова",
           "email": "sharova@mail.ru"
         }
-              
       ],
       "date": "2024-03-02T08:40:27.390Z",
       "created": "2024-03-02T08:40:27.390Z",
@@ -154,16 +153,6 @@
       "_id": "65e301c4ec37fec650f2aafe",
       "name": "НАСТРОЙКА ОКРУЖЕНИЯ (GIT + VSCODE + NODEJS)",
       "students": [
-            {
-                "sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
-                "email_verified": true,
-                "name": "Мария Капитанова",
-                "preferred_username": "maryaKapitan@gmail.com",
-                "given_name": "Мария",
-                "family_name": "Капитанова",
-                "email": "maryaKapitan@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
-            },
         {
           "sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
           "email_verified": true,
@@ -184,16 +173,7 @@
           "email": "irign@gmailcom",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
         },
-            {
+
-                "sub": "95ccc005-95b9-4305-9447-364a32033911",
-                "email_verified": true,
-                "name": "Иван Петров",
-                "preferred_username": "petrov@mail.ru",
-                "given_name": "Иван",
-                "family_name": "Петров",
-                "email": "petrov@mail.ru",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
-            },
         {
           "sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
           "email_verified": true,
@@ -214,16 +194,7 @@
           "email": "piteralex@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
         },
-            {
+
-                "sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
-                "email_verified": true,
-                "name": "Анастасия Светлых",
-                "preferred_username": "anastasya@gmail.ocm",
-                "given_name": "Анастасия",
-                "family_name": "Светлых",
-                "email": "anastasya@gmail.ocm",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
-            },
         {
           "sub": "b4634921-00b3-4082-9284-8ac47f269394",
           "email_verified": true,
@@ -264,16 +235,7 @@
           "email": "zhuzhova@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
         },
-            {
+
-                "sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
-                "email_verified": true,
-                "name": "Эдгар Петренко",
-                "preferred_username": "petrenk@mail.ru",
-                "given_name": "Эдгар",
-                "family_name": "Петренко",
-                "email": "petrenk@mail.ru",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
-            },
         {
           "sub": "4082b72a-4730-4841-ad68-06a0e19263df",
           "email_verified": true,
@@ -293,7 +255,6 @@
           "family_name": "Шарова",
           "email": "sharova@mail.ru"
         }
-            
       ],
       "date": "2024-03-02T10:39:00.718Z",
       "created": "2024-03-02T10:39:00.718Z",
@@ -323,16 +284,7 @@
           "email": "koren@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
         },
-            {
+
-                "sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
-                "email_verified": true,
-                "name": "Ирина Игнатьева",
-                "preferred_username": "irign@gmailcom",
-                "given_name": "Ирина",
-                "family_name": "Игнатьева",
-                "email": "irign@gmailcom",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
-            },
         {
           "sub": "95ccc005-95b9-4305-9447-364a32033911",
           "email_verified": true,
@@ -363,16 +315,7 @@
           "email": "piteralex@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
         },
-            {
+
-                "sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
-                "email_verified": true,
-                "name": "Анастасия Светлых",
-                "preferred_username": "anastasya@gmail.ocm",
-                "given_name": "Анастасия",
-                "family_name": "Светлых",
-                "email": "anastasya@gmail.ocm",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
-            },
         {
           "sub": "b4634921-00b3-4082-9284-8ac47f269394",
           "email_verified": true,
@@ -442,7 +385,6 @@
           "family_name": "Шарова",
           "email": "sharova@mail.ru"
         }
-            
       ],
       "date": "2024-03-08T21:17:31.401Z",
       "created": "2024-03-05T21:17:31.401Z",
@@ -462,66 +404,7 @@
           "email": "maryaKapitan@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
         },
-            {
+
-                "sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
-                "email_verified": true,
-                "name": "Евгений Кореной",
-                "preferred_username": "koren@gmail.com",
-                "given_name": "Кореной",
-                "family_name": "Евгений",
-                "email": "koren@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
-            },
-            {
-                "sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
-                "email_verified": true,
-                "name": "Ирина Игнатьева",
-                "preferred_username": "irign@gmailcom",
-                "given_name": "Ирина",
-                "family_name": "Игнатьева",
-                "email": "irign@gmailcom",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
-            },
-            {
-                "sub": "95ccc005-95b9-4305-9447-364a32033911",
-                "email_verified": true,
-                "name": "Иван Петров",
-                "preferred_username": "petrov@mail.ru",
-                "given_name": "Иван",
-                "family_name": "Петров",
-                "email": "petrov@mail.ru",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
-            },
-            {
-                "sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
-                "email_verified": true,
-                "name": "Константин Тимуров",
-                "preferred_username": "konstantK@gmail.com",
-                "given_name": "Константин",
-                "family_name": "Тимуров",
-                "email": "konstantK@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
-            },
-            {
-                "sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
-                "email_verified": true,
-                "name": "Александра Питерская",
-                "preferred_username": "piteralex@gmail.com",
-                "given_name": "Александра",
-                "family_name": "Питерская",
-                "email": "piteralex@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
-            },
-            {
-                "sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
-                "email_verified": true,
-                "name": "Анастасия Светлых",
-                "preferred_username": "anastasya@gmail.ocm",
-                "given_name": "Анастасия",
-                "family_name": "Светлых",
-                "email": "anastasya@gmail.ocm",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
-            },
         {
           "sub": "b4634921-00b3-4082-9284-8ac47f269394",
           "email_verified": true,
@@ -581,17 +464,7 @@
           "family_name": "Вавилон",
           "email": "elenvavil@mail.ru",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
-            },
-            {
-                "sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
-                "email_verified": true,
-                "name": "Ольга Шарова",
-                "preferred_username": "julyashap",
-                "given_name": "Ольга",
-                "family_name": "Шарова",
-                "email": "sharova@mail.ru"
         }
-            
       ],
       "date": "2024-03-08T21:18:07.033Z",
       "created": "2024-03-05T21:18:07.033Z",
@@ -691,36 +564,6 @@
           "email": "bobova@gmail.com",
           "picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
         },
-            {
-                "sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
-                "email_verified": true,
-                "name": "Анна Самоварова",
-                "preferred_username": "samovar@gmail.com",
-                "given_name": "Анна",
-                "family_name": "Самоварова",
-                "email": "samovar@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
-            },
-            {
-                "sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
-                "email_verified": true,
-                "name": "Евгения Жужова",
-                "preferred_username": "zhuzhova@gmail.com",
-                "given_name": "Евгения",
-                "family_name": "Жужова",
-                "email": "zhuzhova@gmail.com",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
-            },
-            {
-                "sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
-                "email_verified": true,
-                "name": "Эдгар Петренко",
-                "preferred_username": "petrenk@mail.ru",
-                "given_name": "Эдгар",
-                "family_name": "Петренко",
-                "email": "petrenk@mail.ru",
-                "picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
-            },
         {
           "sub": "4082b72a-4730-4841-ad68-06a0e19263df",
           "email_verified": true,
@@ -740,7 +583,6 @@
           "family_name": "Шарова",
           "email": "sharova@mail.ru"
         }
-            
       ],
       "date": "2024-03-08T21:18:07.033Z",
       "created": "2024-03-05T21:18:07.033Z",
@@ -748,4 +590,3 @@
     }
   ]
 }
-