3.1.1

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,24 +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': {
-            "lesson.bar": {
+        on: true,
-              "on": true,
+        value: '',
-              "value": "",
+        key: 'lesson.bar',
-              "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',
-  }
+  },
 }

index.d.ts

@@ -2,3 +2,5 @@ declare module '*.svg' {
     const src: string;
     export default src;
 }
+
+declare const __webpack_public_path__: string;

package.json

@@ -1,31 +1,31 @@
 {
     "name": "journal.pl",
-    "version": "2.3.0",
+    "version": "3.1.1",
-    "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",
@@ -35,18 +35,19 @@
         "@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/app.tsx

@@ -10,8 +10,7 @@ import { Dashboard } from './dashboard';
 
 dayjs.locale('ru', ruLocale);
 
-const App = ({ store }) => {
+const App = ({ store }) => (
-    return(
     <ChakraProvider>
         <BrowserRouter>
             <Helmet>
@@ -81,7 +80,6 @@ const App = ({ store }) => {
         </BrowserRouter>
     </ChakraProvider>
 )
-}
 
 export default App;
 

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/index.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
   
 import App from './app';
+import './ym';
 import { keycloak } from "./__data__/kc";
 import { createStore } from "./__data__/store";
 
@@ -12,7 +13,7 @@ let rootElement: ReactDOM.Root
 export const mount = async (Сomponent, element = document.getElementById('app')) => {
   let user = null;
   try {
-    await keycloak.init({ onLoad: "login-required" }); // 'login-required' });
+    await keycloak.init({ onLoad: "login-required" });
     user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
   } catch (error) {
     console.error("Failed to initialize adapter:", error);

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,8 +1,13 @@
-import React, { 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, getFeatures } from '@ijl/cli'
+import { getNavigationsValue, getFeatures } from '@brojs/cli'
 import { useForm, Controller } from 'react-hook-form'
 import {
   Breadcrumb,
@@ -52,13 +57,13 @@ import { api } from '../__data__/api/api'
 import { isTeacher } from '../utils/user'
 import { qrCode } from '../assets'
 import { Lesson } from '../__data__/model'
-import pkg from '../../package.json'
 
 import { ErrorSpan, BreadcrumbsWrapper } from './style'
 
 const features = getFeatures('journal')
 
 const barFeature = features?.['lesson.bar']
+const groupByDate = features?.['group.by.date']
 
 interface NewLessonForm {
   name: string
@@ -178,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()
@@ -189,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({
@@ -369,10 +405,10 @@ const LessonList = () => {
             )}
           </Box>
         )}
-        {barFeature && (
+        {barFeature && sorted?.length && (
           <Box height="300">
             <Bar
-              data={data?.body.map((lesson, index) => ({
+              data={sorted.map((lesson, index) => ({
                 lessonIndex: `#${index + 1}`,
                 count: lesson.students.length,
               }))}
@@ -397,7 +433,10 @@ const LessonList = () => {
               </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>
@@ -414,7 +453,7 @@ 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) && (
@@ -432,7 +471,9 @@ const LessonList = () => {
                               >
                                 Edit
                               </MenuItem>
-                          <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                              <MenuItem
+                                onClick={() => setlessonToDelete(lesson)}
+                              >
                                 Delete
                               </MenuItem>
                             </MenuList>
@@ -442,6 +483,8 @@ const LessonList = () => {
                       <Td isNumeric>{lesson.students.length}</Td>
                     </Tr>
                   ))}
+                </React.Fragment>
+              ))}
             </Tbody>
           </Table>
         </TableContainer>
@@ -452,7 +495,7 @@ const LessonList = () => {
 
 export default LessonList
 
-const Bar = ({ data /* see data tab */ }) => (
+const Bar = ({ data }) => (
   <ResponsiveBar
     data={data}
     keys={['count']}

src/ym.ts

@@ -0,0 +1,15 @@
+(function (m, e, t, r, i, k, a) {
+    m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
+    // @ts-ignore
+    m[i].l = 1 * new Date();
+    for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
+    k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
+})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+// @ts-ignore
+ym(98045358, "init", {
+    clickmap: true,
+    trackLinks: true,
+    accurateTrackBounce: true,
+    webvisor: true
+});