Commit Graph

107 Commits

Author SHA1 Message Date
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m13s
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m15s
2026-03-11 02:58:49 +03:00
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Build and Push Docker Images / deploy-to-k8s (push) Failing after 2m6s
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
Build and Push Docker Images / deploy-to-k8s (push) Successful in 1m12s
2026-03-11 02:49:33 +03:00
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 16s
Build and Push Docker Images / deploy-to-k8s (push) Failing after 1s
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
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 11s
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
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 10s
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
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
Build and Push Docker Images / build-and-push-frontend (push) Successful in 15s
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
Zuev
9776f4a56f chore: stop tracking .agent folder 2026-02-25 17:38:14 +03:00
Zuev
df6ddeecd5 feat: add subjects & teacher-subjects management tab in admin panel 2026-02-25 17:34:01 +03:00
ProstoDenya01
e44ac04cac Добавил еще немного 2026-02-25 14:35:20 +03:00
Zuev
0ac81284fa chore: проброс порта БД для DBeaver 2026-02-24 20:14:47 +03:00
Zuev
74d937f6dc feat: complete UI redesign with glassmorphism and custom multi-select equipment dropdown 2026-02-21 01:35:56 +03:00
Zuev
eea444409e docs(rules): update database rules to match init.sql 2026-02-20 02:59:10 +03:00
Zuev
c552d14909 feat(backend): implement equipments entities and modify db 2026-02-20 02:53:47 +03:00
Zuev
be46fa2be2 fix(deploy): update workflow with escaped bash string 2026-02-20 02:52:43 +03:00
Zuev
6993ac29d5 feat(admin): add classroom edit modal 2026-02-20 02:49:51 +03:00
Zuev
07419d541e feat(db): update init.sql with subjects, lesson types, classrooms, and schedules tables 2026-02-20 01:56:05 +03:00
Zuev
86a29f6419 feat(frontend): add dynamic animations to login and admin panel 2026-02-20 00:48:03 +03:00
Zuev
e9c08b4c75 chore(git): update git-push skill and script with SSH info 2026-02-19 20:42:25 +03:00
Zuev
ed8668c599 chore: update agent rules, skills and workflows 2026-02-19 20:33:47 +03:00
EgorZuev
64d85eab55 docs(agent): add rules and skills 2026-02-18 21:56:57 +00:00
ProstoDenya01
c3d5246874 Написал запрос на создание занятия 2026-02-18 18:46:24 +03:00
alekan
bcabb560a4 Merge remote-tracking branch 'origin/main' 2026-02-16 23:03:21 +03:00
alekan
24f8c4d518 Добавил кнопку для преподов 2026-02-16 23:02:46 +03:00
ProstoDenya01
7815f3ed91 Тестовый коммит1 2026-02-16 21:45:30 +03:00
ProstoDenya01
99556ae3e6 Тестовый коммит1 2026-02-16 21:34:19 +03:00