Zuev/magistr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76 Commits 4 Branches 0 Tags
f3ea05cd174d0779b7891be4647d14cbc48f8c3c
Commit Graph

76 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ProstoDenya01
f3ea05cd17 Merge remote-tracking branch 'origin/personal-schedule'
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 15s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m38s
Details
2026-03-15 16:00:48 +03:00
ProstoDenya01
05fcf86e32 Поправил модалку с расписанием препода 2026-03-15 15:51:29 +03:00
Zuev
9f124c52a5 refactor: Integrate Flyway for database migrations and simplify Docker Compose and tenant configurations.
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 3m44s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m19s
Details
2026-03-13 04:35:50 +03:00
alekan
8df736ae36 Кривая модалка занятий по teacherId добавлена, требует доработки, также код users.js требует унификации+оптимизации(новая модалка вкинута в конец) 2026-03-13 03:12:48 +03:00
Zuev
10c06e726a Update tenant data source configuration.
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 28s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m19s
Details
2026-03-13 02:48:03 +03:00
Zuev
9d2de1faaf feat: Configure and route multi-tenant data sources using an interceptor.
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Failing after 22s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Has been skipped
Details
2026-03-13 02:36:01 +03:00
alekan
24caa148e1 Модалка перенесена в шапку, частично настроены стили 2026-03-13 02:00:49 +03:00
Zuev
59caa9d6cc feat: Implement dynamic tenant configuration watching and updating.
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 5m59s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 12s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 44s
Details
2026-03-13 02:00:24 +03:00
Zuev
bad1215341 баг
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 38s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 20s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m8s
Details
2026-03-13 01:04:26 +03:00
Zuev
ccdc371c3a баг
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 30s
Details
Build and Push Docker Images / build-and-push-frontend (push) Failing after 20s
Details
Build and Push Docker Images / deploy-to-k8s (push) Has been skipped
Details
2026-03-13 00:56:49 +03:00
Zuev
4c2293b620 feat: Implement database initialization using init.sql and update DataInitializer.
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 34s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 45s
Details
2026-03-13 00:21:06 +03:00
Zuev
6ea420e529 1
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 29s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 30s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 50s
Details
2026-03-13 00:07:54 +03:00
Zuev
75b1ad166e refactor: update tenant data source configuration and routing logic.
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 31s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 46s
Details
2026-03-12 23:53:20 +03:00
Zuev
abad3776db feat: Add H2 in-memory database dependency for fallback scenarios.
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 3m11s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Details
Build and Push Docker Images / deploy-to-k8s (push) Failing after 5m32s
Details
2026-03-12 22:42:57 +03:00
Zuev
13b3a5c481 refactor: Directly configure LocalContainerEntityManagerFactoryBean with HibernateJpaVendorAdapter and rename the primary data source bean.
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 29s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 12s
Details
Build and Push Docker Images / deploy-to-k8s (push) Has been cancelled
Details
2026-03-12 22:38:00 +03:00
Zuev
3579ef9f1c config: Exclude DataSourceAutoConfiguration and update tenant database connection URL in tenants.json.
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 29s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Has been cancelled
Details
2026-03-12 22:31:09 +03:00
Zuev
14cc006f06 feat: Implement multi-tenancy with dynamic data source routing and introduce a database management UI.
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 33s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 16s
Details
Build and Push Docker Images / deploy-to-k8s (push) Failing after 5m31s
Details
2026-03-12 22:15:28 +03:00
Denis
9e55472de7 Merge pull request 'Добавил для групп поле численности.' (#7) from personal-schedule into main
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 32s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Failing after 5m32s
Details 
Reviewed-on: #7
 2026-03-12 14:20:33 +00:00
ProstoDenya01
03eaf6ab13 Добавил для групп поле численности. 
В модалку на UI добавил отображение численности групп и вместимости аудиторий, проверку на доступность и вместимость.
 2026-03-12 14:45:25 +03:00
Denis
1b0a6c86ff Merge pull request 'Доделал модалку на создание занятий. Добавил поля выбора аудитории, типа и формата занятий.' (#6) from Create-Lesson into main
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 12s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m13s
Details 
Reviewed-on: #6
 2026-03-11 09:45:46 +00:00
ProstoDenya01
0216dfaa40 Доделал модалку на создание занятий. Добавил поля выбора аудитории, типа и формата занятий. 2026-03-11 12:43:42 +03:00
Zuev
7e0e2cdfc5 fix: increase rollout timeout for backend to 300s
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 11s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m15s
Details
2026-03-11 02:58:49 +03:00
Zuev
a6ee024935 Merge pull request 'Create-Lesson' (#5) from Create-Lesson into main
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 27s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Details
Build and Push Docker Images / deploy-to-k8s (push) Failing after 2m6s
Details 
Reviewed-on: #5
 2026-03-10 23:51:53 +00:00
Zuev
6d003f5fa8 fix: install kubectl in deploy-to-k8s job
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 10s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Details
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m12s
Details
2026-03-11 02:49:33 +03:00
Zuev
8deba5cc3d Merge pull request 'feat: add CD step to docker-build workflow' (#4) from Zuev into main
Some checks failed
Build and Push Docker Images / build-and-push-backend (push) Successful in 13s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 16s
Details
Build and Push Docker Images / deploy-to-k8s (push) Failing after 1s
Details 
Reviewed-on: #4
 2026-03-10 23:30:16 +00:00
Zuev
11ef481269 feat: add CD step to docker-build workflow 2026-03-11 02:28:52 +03:00
Zuev
494a671c3d Merge pull request 'fix: resolve labels property issue in docker-build workflow' (#3) from Zuev into main
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 15s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Details 
Reviewed-on: #3
 2026-03-10 22:12:01 +00:00
Zuev
c8570d3cf8 fix: resolve labels property issue in docker-build workflow 2026-03-11 01:10:00 +03:00
Zuev
5104e36d7d Merge pull request 'Update GitHub Actions versions to latest' (#2) from Zuev into main
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 2m29s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Details 
Reviewed-on: #2
 2026-03-09 23:23:50 +00:00
Zuev
8e540940f7 Update GitHub Actions versions to latest 2026-03-10 02:22:48 +03:00
Zuev
e8b1d77117 Merge pull request 'Zuev' (#1) from Zuev into main
All checks were successful
Build and Push Docker Images / build-and-push-backend (push) Successful in 7m10s
Details
Build and Push Docker Images / build-and-push-frontend (push) Successful in 15s
Details 
Reviewed-on: #1
 2026-03-09 22:56:57 +00:00
Zuev
41dec9c772 update docker-build.yaml 2026-03-10 01:51:33 +03:00
ProstoDenya01
01ea7a8dc1 Обновил init.sql, добавил одного преподавателя и несколько занятий при инициализации БД 
Добавил методы на удаление и обновления занятий
 2026-03-06 17:14:29 +03:00
ProstoDenya01
9bd21757d6 Доделал таблицу вывода занятий на FE 2026-03-04 23:31:42 +03:00
ProstoDenya01
7a729a782d тест 2026-03-04 22:57:56 +03:00
ProstoDenya01
be35733e4d Merge remote-tracking branch 'origin/Zuev' into Create-Lesson 2026-03-04 22:57:08 +03:00
ProstoDenya01
169f7435b1 Добавил новые поля в создание занятия и получение общего списка 2026-03-04 22:49:58 +03:00
Zuev
2563c769de Реализована фильтрация столбцов и улучшена сортировка в расписании 2026-03-04 22:46:36 +03:00
ProstoDenya01
47039ee878 Изменил метод на получение общего списка занятий. Внёс небольшие правки в FE для странички с расписанием 2026-03-03 17:28:20 +03:00
alekan
88f1abfe25 Создание вкладки "Расписание занятий" 2026-03-03 00:02:07 +03:00
alekan
2004766855 Создание кнопки "Добавить занятие" с модальным окном с выбором дня,недели и тд. 2026-03-02 23:27:20 +03:00
ProstoDenya01
0e03dcb2d6 Поправил комментарий в application.properties 2026-03-02 16:27:20 +03:00
ProstoDenya01
438a16c383 Исправил все известные баги в запросе на создание занятия для пользователя. 
Написал запрос на получение списка занятий по конкретному ID пользователя.
Добавил логирование для LessonsController
 2026-03-02 16:24:22 +03:00
Zuev
9d06c69e2b chore: update .gitignore 2026-02-26 01:29:13 +03:00
Zuev
684273de50 Fix CSS appearance warning and format JS 2026-02-26 00:39:48 +03:00
Zuev
772b110762 Refactor admin frontend into modular SPA 2026-02-26 00:27:10 +03:00
Zuev
18f47c6d3d fix: adapt init.sql lessons table to match Create-Lesson branch entity 2026-02-25 23:27:17 +03:00
ProstoDenya01
007b4fb619 Поправил id дисциплины 2026-02-25 23:13:49 +03:00
ProstoDenya01
678cf94ad3 Merge remote-tracking branch 'refs/remotes/origin/main' into Create-Lesson 
# Conflicts:
#	db/init/init.sql
 2026-02-25 22:57:32 +03:00
ProstoDenya01
94aa164930 Добавил еще немного 2026-02-25 22:56:44 +03:00