7 Commits

Author SHA1 Message Date
Primakov Alexandr Alexandrovich
a669e2af81 2.4.5
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-03 22:59:57 +03:00
Primakov Alexandr Alexandrovich
f093c0f3ad fix kc config -> bro-js 2024-08-03 22:59:49 +03:00
61cfd689f8 2.4.4
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-04-27 11:54:26 +03:00
82a54022b2 Merge pull request '#25 Отображение только времени в случае сгрупированных по дате лекций' (#26) from feature/lesson-date-time into master
All checks were successful
platform/bro/pipeline/head This commit looks good
Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/26
2024-04-15 13:48:39 +03:00
f28c644da5 #25 Отображение только времени в случае сгрупированных по дате лекций
All checks were successful
platform/bro/pipeline/head This commit looks good
platform/bro/pipeline/pr-master This commit looks good
2024-04-15 13:45:35 +03:00
50bf5b31b6 2.4.3
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-04-11 13:03:27 +03:00
5670a96696 check jenkins script
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-04-11 12:52:40 +03:00
5 changed files with 6 additions and 7 deletions

View File

@@ -12,7 +12,6 @@ module.exports = {
}, },
features: { features: {
journal: { journal: {
// add your features here in the format [featureName]: { value: string }
'lesson.bar': { 'lesson.bar': {
on: true, on: true,
value: '', value: '',

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.4.2", "version": "2.4.5",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "journal.pl", "name": "journal.pl",
"version": "2.4.2", "version": "2.4.5",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@chakra-ui/icons": "^2.1.1", "@chakra-ui/icons": "^2.1.1",

View File

@@ -1,6 +1,6 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.4.2", "version": "2.4.5",
"description": "inno-js platform journal ui repo", "description": "inno-js platform journal ui repo",
"main": "./src/index.tsx", "main": "./src/index.tsx",
"scripts": { "scripts": {

View File

@@ -1,8 +1,8 @@
import Keycloak from 'keycloak-js'; import Keycloak from 'keycloak-js';
export const keycloak = new Keycloak({ 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' clientId: 'journal'
}); });

View File

@@ -453,7 +453,7 @@ const LessonList = () => {
</Td> </Td>
)} )}
<Td textAlign="center"> <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>
<Td>{lesson.name}</Td> <Td>{lesson.name}</Td>
{isTeacher(user) && ( {isTeacher(user) && (