Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a669e2af81 | ||
|
|
f093c0f3ad | ||
| 61cfd689f8 | |||
| 82a54022b2 | |||
| f28c644da5 | |||
| 50bf5b31b6 | |||
| 5670a96696 |
@@ -12,7 +12,6 @@ module.exports = {
|
||||
},
|
||||
features: {
|
||||
journal: {
|
||||
// add your features here in the format [featureName]: { value: string }
|
||||
'lesson.bar': {
|
||||
on: true,
|
||||
value: '',
|
||||
|
||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.2",
|
||||
"version": "2.4.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.2",
|
||||
"version": "2.4.5",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@chakra-ui/icons": "^2.1.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.2",
|
||||
"version": "2.4.5",
|
||||
"description": "inno-js platform journal ui repo",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import Keycloak from 'keycloak-js';
|
||||
|
||||
export const keycloak = new Keycloak({
|
||||
url: 'https://kc.inno-js.ru',
|
||||
realm: 'inno-js',
|
||||
url: 'https://kc.bro-js.ru',
|
||||
realm: 'bro-js',
|
||||
clientId: 'journal'
|
||||
});
|
||||
|
||||
|
||||
@@ -453,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) && (
|
||||
|
||||
Reference in New Issue
Block a user