From fd7a55f626879d85b2110064d6037745e669b887 Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Thu, 23 Oct 2025 02:48:42 +0500 Subject: [PATCH] rename long name to short name --- {serv_nginx => main_dc}/.env | 0 {serv_nginx => main_dc}/Makefile | 0 {serv_nginx => main_dc}/api_bb/.env | 0 {serv_nginx => main_dc}/api_bb/Dockerfile | 0 {serv_nginx => main_dc}/api_bb/bin/bb_api | Bin {serv_nginx => main_dc}/api_bb/cmd/main.go | 0 {serv_nginx => main_dc}/api_bb/go.mod | 0 {serv_nginx => main_dc}/api_bb/go.sum | 0 {serv_nginx => main_dc}/api_bb/go_bbb.mod | 0 .../api_bb/internal/app/app.go | 0 .../api_bb/internal/config/config.go | 0 .../api_bb/internal/database/database.go | 0 .../api_bb/internal/database/migrate.go | 0 .../api_bb/internal/handlers/auth.go | 0 .../api_bb/internal/handlers/avatar.go | 0 .../api_bb/internal/handlers/email_handler.go | 0 .../api_bb/internal/handlers/event_handler.go | 0 .../handlers/event_registration_handler.go | 0 .../api_bb/internal/handlers/handler_util.go | 0 .../api_bb/internal/handlers/handlers.go | 0 .../api_bb/internal/handlers/health.go | 0 .../api_bb/internal/handlers/news_handler.go | 0 .../internal/handlers/personal_best_handler.go | 0 .../api_bb/internal/handlers/review_handler.go | 0 .../internal/handlers/training_plan_handler.go | 0 .../api_bb/internal/handlers/user.go | 0 .../handlers/user_achievement_handler.go | 0 .../internal/handlers/user_stats_handler.go | 0 .../internal/handlers/user_workout_handler.go | 0 .../api_bb/internal/models/achievement.go | 0 .../api_bb/internal/models/common.go | 0 .../api_bb/internal/models/email.go | 0 .../api_bb/internal/models/event.go | 0 .../api_bb/internal/models/gallery.go | 0 .../api_bb/internal/models/news.go | 0 .../api_bb/internal/models/personal_best.go | 0 .../api_bb/internal/models/review.go | 0 .../api_bb/internal/models/training_plan.go | 0 .../api_bb/internal/models/user.go | 0 .../api_bb/internal/models/user_stats.go | 0 .../api_bb/internal/models/workout.go | 0 .../repository/achievement_repository.go | 0 .../internal/repository/comment_repository.go | 0 .../internal/repository/email_repository.go | 0 .../repository/event_registration_repository.go | 0 .../internal/repository/event_repository.go | 0 .../internal/repository/gallery_repository.go | 0 .../internal/repository/news_repository.go | 0 .../repository/personal_best_repository.go | 0 .../internal/repository/review_repository.go | 0 .../repository/training_plan_repository.go | 0 .../internal/repository/user_repository.go | 0 .../internal/repository/user_stats_repository.go | 0 .../internal/repository/workout_repository.go | 0 .../api_bb/internal/routes/routes.go | 0 .../internal/scripts/migrate_existing_users.go | 0 .../internal/service/achievement_service.go | 0 .../api_bb/internal/service/auth_service.go | 0 .../api_bb/internal/service/avatar_service.go | 0 .../api_bb/internal/service/email_service.go | 0 .../service/event_registration_service.go | 0 .../api_bb/internal/service/event_service.go | 0 .../api_bb/internal/service/jwt_service.go | 0 .../api_bb/internal/service/news_service.go | 0 .../internal/service/personal_best_service.go | 0 .../api_bb/internal/service/review_service.go | 0 .../internal/service/training_plan_service.go | 0 .../api_bb/internal/service/user_service.go | 0 .../internal/service/user_stats_service.go | 0 .../internal/service/user_workout_service.go | 0 .../api_bb/pkg/database/database.go | 0 .../api_bb/pkg/email/email.go | 0 .../api_bb/pkg/logger/helpers.go | 0 .../api_bb/pkg/logger/interface.go | 0 .../api_bb/pkg/logger/logger.go | 0 .../api_bb/pkg/logger/route_logger.go | 0 .../api_bb/pkg/middleware/admin_middleware.go | 0 .../api_bb/pkg/middleware/auth.go | 0 .../api_bb/pkg/middleware/cors.go | 0 .../api_bb/pkg/middleware/logger.go | 0 .../api_bb/pkg/middleware/middleware.go | 0 .../api_bb/pkg/middleware/options.go | 0 .../api_bb/pkg/utils/formatTime.go | 0 .../api_bb/pkg/utils/response.go | 0 .../api_bb/pkg/utils/utils.go | 0 .../api_bb/pkg/utils/validation.go | 0 {serv_nginx => main_dc}/api_bb/readme.md | 0 {serv_nginx => main_dc}/api_bb/sqlite | 0 .../serv_golang_rest_api => main_dc/api_tp}/.env | 0 .../api_tp}/Dockerfile | 0 .../api_tp}/Makefile | 0 .../api_tp}/cmd/api/main.go | 6 +++--- .../api_tp}/go.mod | 15 +++++++-------- .../api_tp}/go.sum | 12 ++++++------ .../api_tp}/internal/config/config.go | 0 .../api_tp}/internal/config/oauth.go | 0 .../api_tp}/internal/handlers/auth.go | 4 ++-- .../api_tp}/internal/handlers/middleware.go | 0 .../api_tp}/internal/handlers/oauth.go | 6 +++--- .../api_tp}/internal/handlers/oauth_VK.go | 4 ++-- .../api_tp}/internal/handlers/oauth_yandex.go | 6 +++--- .../api_tp}/internal/handlers/user_handler.go | 4 ++-- .../api_tp}/internal/middleware/auth.go | 2 +- .../api_tp}/internal/models/o_auth_provider.go | 0 .../api_tp}/internal/models/user.go | 0 .../internal/repository/user_repository.go | 2 +- .../api_tp}/internal/server/server.go | 8 ++++---- .../api_tp}/internal/service/user_service.go | 4 ++-- .../api_tp}/internal/utils/errors.go | 0 .../api_tp}/internal/utils/json.go | 0 .../api_tp}/internal/utils/jwt.go | 0 .../api_tp}/internal/utils/oauth_utils.go | 2 +- .../api_tp}/internal/utils/password.go | 0 .../serv_golang_rest_api => main_dc/api_tp}/main | Bin .../api_tp}/migrations/001_create_users.sql | 0 .../api_tp}/pkg/database/postgres.go | 4 ++-- {serv_nginx => main_dc}/bbvue/.editorconfig | 0 {serv_nginx => main_dc}/bbvue/.env | 0 {serv_nginx => main_dc}/bbvue/.gitattributes | 0 {serv_nginx => main_dc}/bbvue/.prettierrc.json | 0 .../bbvue/.vscode/extensions.json | 0 .../bbvue/.vscode/settings.json | 0 {serv_nginx => main_dc}/bbvue/README.md | 0 {serv_nginx => main_dc}/bbvue/eslint.config.js | 0 {serv_nginx => main_dc}/bbvue/index.html | 0 {serv_nginx => main_dc}/bbvue/jsconfig.json | 0 {serv_nginx => main_dc}/bbvue/package-lock.json | 0 {serv_nginx => main_dc}/bbvue/package.json | 0 .../bbvue/public/documents/privacy-policy.pdf | Bin .../bbvue/public/documents/terms-of-service.pdf | Bin .../bbvue/public/images/FastRun.jpg | Bin .../bbvue/public/images/Roshim2025_3.png | Bin .../bbvue/public/images/UMM2025.png | Bin .../bbvue/public/images/UfaWhiteRiver.jpg | Bin .../bbvue/public/images/VoronkyRunBB.jpg | Bin .../bbvue/public/images/ZagirTrainer3.jpg | Bin .../bbvue/public/images/dinamo.jpg | Bin .../images/homePagePhoto/JumpVoronkyRun.jpg | Bin .../public/images/homePagePhoto/fullPhotoBB.jpg | Bin .../bbvue/public/images/i.webp | Bin .../bbvue/public/images/locations/1mayPark.webp | Bin .../bbvue/public/images/locations/dinamo.jpg | Bin .../bbvue/public/images/locations/riverSide.jpeg | Bin .../bbvue/public/images/slider/slider1.jpg | Bin .../bbvue/public/images/slider/slider10.jpg | Bin .../bbvue/public/images/slider/slider11.jpg | Bin .../bbvue/public/images/slider/slider12.jpg | Bin .../bbvue/public/images/slider/slider13.jpg | Bin .../bbvue/public/images/slider/slider14.jpg | Bin .../bbvue/public/images/slider/slider15.jpg | Bin .../bbvue/public/images/slider/slider16.jpg | Bin .../bbvue/public/images/slider/slider17.jpg | Bin .../bbvue/public/images/slider/slider18.jpg | Bin .../bbvue/public/images/slider/slider19.jpg | Bin .../bbvue/public/images/slider/slider2.jpg | Bin .../bbvue/public/images/slider/slider20.jpg | Bin .../bbvue/public/images/slider/slider21.jpg | Bin .../bbvue/public/images/slider/slider22.jpg | Bin .../bbvue/public/images/slider/slider23.png | Bin .../bbvue/public/images/slider/slider24.jpg | Bin .../bbvue/public/images/slider/slider4.jpg | Bin .../bbvue/public/images/slider/slider5.jpg | Bin .../bbvue/public/images/slider/slider6.jpg | Bin .../bbvue/public/images/slider/slider7.jpg | Bin .../bbvue/public/images/slider/slider8.jpg | Bin .../bbvue/public/images/slider/slider9.jpg | Bin .../bbvue/public/images/slider/workout1.jpg | Bin .../bbvue/public/images/slider/workout2.jpg | Bin .../bbvue/public/images/slider/workout3.jpg | Bin {serv_nginx => main_dc}/bbvue/src/App.vue | 0 .../bbvue/src/assets/base.css | 0 .../bbvue/src/assets/fonts.css | 0 .../bbvue/src/assets/fonts/FugazOne-Regular.ttf | Bin .../bbvue/src/assets/fonts/Lobster-Regular.ttf | Bin .../fonts/Montserrat-VariableFont_wght.ttf | Bin .../fonts/VictorMono-VariableFont_wght.ttf | Bin .../bbvue/src/assets/logo/Logo.png | Bin .../bbvue/src/assets/logo/LogoNew.png | Bin .../bbvue/src/assets/logo/WritedLogo.png | Bin .../bbvue/src/assets/main.css | 0 .../bbvue/src/components/AvatarUpload.vue | 0 .../bbvue/src/components/NavigationMenu.vue | 0 .../bbvue/src/components/writeLogo.vue | 0 {serv_nginx => main_dc}/bbvue/src/main.js | 0 .../bbvue/src/router/index.js | 0 {serv_nginx => main_dc}/bbvue/src/stores/auth.js | 0 .../bbvue/src/stores/helpers/api.js | 0 .../bbvue/src/stores/index.js | 0 .../bbvue/src/stores/plugins/persistence.js | 0 {serv_nginx => main_dc}/bbvue/src/stores/user.js | 0 .../bbvue/src/views/About.vue | 0 .../bbvue/src/views/Achievements.vue | 0 .../bbvue/src/views/ForgotPassword.vue | 0 .../bbvue/src/views/Gallery.vue | 0 {serv_nginx => main_dc}/bbvue/src/views/Home.vue | 0 .../bbvue/src/views/Login.vue | 0 .../bbvue/src/views/Logout.vue | 0 .../bbvue/src/views/Members.vue | 0 {serv_nginx => main_dc}/bbvue/src/views/News.vue | 0 .../bbvue/src/views/PasswordReset.vue | 0 .../bbvue/src/views/PrivacyPolicy.vue | 0 .../bbvue/src/views/Profile.vue | 0 .../bbvue/src/views/ProfileEdit.vue | 0 .../bbvue/src/views/Register.vue | 0 .../bbvue/src/views/Reviews.vue | 0 .../bbvue/src/views/TermsOfService.vue | 0 .../bbvue/src/views/Training.vue | 0 .../bbvue/src/views/VerifayEmail.vue | 0 {serv_nginx => main_dc}/bbvue/vite.config.js | 0 {serv_nginx => main_dc}/certbot/Dockerfile | 0 .../certbot/config/certbot.ini | 0 .../certbot/scripts/checkRenewCerts.sh | 0 .../certbot/scripts/crontab.txt | 0 .../certbot/scripts/init-certbot.sh | 0 .../certbot/scripts/renewBegushiyBAshkirLatin.sh | 0 .../certbot/scripts/renewBegushiyBashkir.sh | 0 .../certbot/scripts/renewEasysite102.sh | 0 .../certbot/scripts/renewValitovGazizCert.sh | 0 .../certbot/scripts/renewYalarbaCert.sh | 0 {serv_nginx => main_dc}/docker-compose.yml | 0 {serv_nginx => main_dc}/keycloak/.env.keycloak | 0 {serv_nginx => main_dc}/keycloak/Dockerfile | 0 {serv_nginx => main_dc}/keycloak/keycloak.conf | 0 .../keycloak/realm-config/setup-realm.json | 0 {serv_nginx => main_dc}/nginx/Dockerfile | 0 {serv_nginx => main_dc}/nginx/nginx-http.conf | 0 {serv_nginx => main_dc}/nginx/nginx-ssl.conf | 0 {serv_nginx => main_dc}/nginx/switch-config.sh | 0 {serv_nginx => main_dc}/stubSite/index.html | 0 229 files changed, 39 insertions(+), 40 deletions(-) rename {serv_nginx => main_dc}/.env (100%) rename {serv_nginx => main_dc}/Makefile (100%) rename {serv_nginx => main_dc}/api_bb/.env (100%) rename {serv_nginx => main_dc}/api_bb/Dockerfile (100%) rename {serv_nginx => main_dc}/api_bb/bin/bb_api (100%) rename {serv_nginx => main_dc}/api_bb/cmd/main.go (100%) rename {serv_nginx => main_dc}/api_bb/go.mod (100%) rename {serv_nginx => main_dc}/api_bb/go.sum (100%) rename {serv_nginx => main_dc}/api_bb/go_bbb.mod (100%) rename {serv_nginx => main_dc}/api_bb/internal/app/app.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/config/config.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/database/database.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/database/migrate.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/auth.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/avatar.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/email_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/event_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/event_registration_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/handler_util.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/handlers.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/health.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/news_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/personal_best_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/review_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/training_plan_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/user.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/user_achievement_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/user_stats_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/handlers/user_workout_handler.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/achievement.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/common.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/email.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/event.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/gallery.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/news.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/personal_best.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/review.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/training_plan.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/user.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/user_stats.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/models/workout.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/achievement_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/comment_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/email_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/event_registration_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/event_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/gallery_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/news_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/personal_best_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/review_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/training_plan_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/user_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/user_stats_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/repository/workout_repository.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/routes/routes.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/scripts/migrate_existing_users.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/achievement_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/auth_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/avatar_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/email_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/event_registration_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/event_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/jwt_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/news_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/personal_best_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/review_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/training_plan_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/user_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/user_stats_service.go (100%) rename {serv_nginx => main_dc}/api_bb/internal/service/user_workout_service.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/database/database.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/email/email.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/logger/helpers.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/logger/interface.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/logger/logger.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/logger/route_logger.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/admin_middleware.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/auth.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/cors.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/logger.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/middleware.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/middleware/options.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/utils/formatTime.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/utils/response.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/utils/utils.go (100%) rename {serv_nginx => main_dc}/api_bb/pkg/utils/validation.go (100%) rename {serv_nginx => main_dc}/api_bb/readme.md (100%) rename {serv_nginx => main_dc}/api_bb/sqlite (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/.env (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/Dockerfile (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/Makefile (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/cmd/api/main.go (81%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/go.mod (73%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/go.sum (88%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/config/config.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/config/oauth.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/auth.go (97%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/middleware.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/oauth.go (97%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/oauth_VK.go (98%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/oauth_yandex.go (96%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/handlers/user_handler.go (95%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/middleware/auth.go (96%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/models/o_auth_provider.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/models/user.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/repository/user_repository.go (95%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/server/server.go (94%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/service/user_service.go (95%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/utils/errors.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/utils/json.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/utils/jwt.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/utils/oauth_utils.go (97%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/internal/utils/password.go (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/main (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/migrations/001_create_users.sql (100%) rename {serv_nginx/serv_golang_rest_api => main_dc/api_tp}/pkg/database/postgres.go (91%) rename {serv_nginx => main_dc}/bbvue/.editorconfig (100%) rename {serv_nginx => main_dc}/bbvue/.env (100%) rename {serv_nginx => main_dc}/bbvue/.gitattributes (100%) rename {serv_nginx => main_dc}/bbvue/.prettierrc.json (100%) rename {serv_nginx => main_dc}/bbvue/.vscode/extensions.json (100%) rename {serv_nginx => main_dc}/bbvue/.vscode/settings.json (100%) rename {serv_nginx => main_dc}/bbvue/README.md (100%) rename {serv_nginx => main_dc}/bbvue/eslint.config.js (100%) rename {serv_nginx => main_dc}/bbvue/index.html (100%) rename {serv_nginx => main_dc}/bbvue/jsconfig.json (100%) rename {serv_nginx => main_dc}/bbvue/package-lock.json (100%) rename {serv_nginx => main_dc}/bbvue/package.json (100%) rename {serv_nginx => main_dc}/bbvue/public/documents/privacy-policy.pdf (100%) rename {serv_nginx => main_dc}/bbvue/public/documents/terms-of-service.pdf (100%) rename {serv_nginx => main_dc}/bbvue/public/images/FastRun.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/Roshim2025_3.png (100%) rename {serv_nginx => main_dc}/bbvue/public/images/UMM2025.png (100%) rename {serv_nginx => main_dc}/bbvue/public/images/UfaWhiteRiver.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/VoronkyRunBB.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/ZagirTrainer3.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/dinamo.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/homePagePhoto/JumpVoronkyRun.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/homePagePhoto/fullPhotoBB.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/i.webp (100%) rename {serv_nginx => main_dc}/bbvue/public/images/locations/1mayPark.webp (100%) rename {serv_nginx => main_dc}/bbvue/public/images/locations/dinamo.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/locations/riverSide.jpeg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider1.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider10.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider11.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider12.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider13.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider14.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider15.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider16.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider17.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider18.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider19.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider2.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider20.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider21.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider22.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider23.png (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider24.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider4.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider5.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider6.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider7.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider8.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/slider9.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/workout1.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/workout2.jpg (100%) rename {serv_nginx => main_dc}/bbvue/public/images/slider/workout3.jpg (100%) rename {serv_nginx => main_dc}/bbvue/src/App.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/base.css (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/fonts.css (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/fonts/FugazOne-Regular.ttf (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/fonts/Lobster-Regular.ttf (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/fonts/Montserrat-VariableFont_wght.ttf (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/fonts/VictorMono-VariableFont_wght.ttf (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/logo/Logo.png (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/logo/LogoNew.png (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/logo/WritedLogo.png (100%) rename {serv_nginx => main_dc}/bbvue/src/assets/main.css (100%) rename {serv_nginx => main_dc}/bbvue/src/components/AvatarUpload.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/components/NavigationMenu.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/components/writeLogo.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/main.js (100%) rename {serv_nginx => main_dc}/bbvue/src/router/index.js (100%) rename {serv_nginx => main_dc}/bbvue/src/stores/auth.js (100%) rename {serv_nginx => main_dc}/bbvue/src/stores/helpers/api.js (100%) rename {serv_nginx => main_dc}/bbvue/src/stores/index.js (100%) rename {serv_nginx => main_dc}/bbvue/src/stores/plugins/persistence.js (100%) rename {serv_nginx => main_dc}/bbvue/src/stores/user.js (100%) rename {serv_nginx => main_dc}/bbvue/src/views/About.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Achievements.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/ForgotPassword.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Gallery.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Home.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Login.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Logout.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Members.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/News.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/PasswordReset.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/PrivacyPolicy.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Profile.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/ProfileEdit.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Register.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Reviews.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/TermsOfService.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/Training.vue (100%) rename {serv_nginx => main_dc}/bbvue/src/views/VerifayEmail.vue (100%) rename {serv_nginx => main_dc}/bbvue/vite.config.js (100%) rename {serv_nginx => main_dc}/certbot/Dockerfile (100%) rename {serv_nginx => main_dc}/certbot/config/certbot.ini (100%) rename {serv_nginx => main_dc}/certbot/scripts/checkRenewCerts.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/crontab.txt (100%) rename {serv_nginx => main_dc}/certbot/scripts/init-certbot.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/renewBegushiyBAshkirLatin.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/renewBegushiyBashkir.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/renewEasysite102.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/renewValitovGazizCert.sh (100%) rename {serv_nginx => main_dc}/certbot/scripts/renewYalarbaCert.sh (100%) rename {serv_nginx => main_dc}/docker-compose.yml (100%) rename {serv_nginx => main_dc}/keycloak/.env.keycloak (100%) rename {serv_nginx => main_dc}/keycloak/Dockerfile (100%) rename {serv_nginx => main_dc}/keycloak/keycloak.conf (100%) rename {serv_nginx => main_dc}/keycloak/realm-config/setup-realm.json (100%) rename {serv_nginx => main_dc}/nginx/Dockerfile (100%) rename {serv_nginx => main_dc}/nginx/nginx-http.conf (100%) rename {serv_nginx => main_dc}/nginx/nginx-ssl.conf (100%) rename {serv_nginx => main_dc}/nginx/switch-config.sh (100%) rename {serv_nginx => main_dc}/stubSite/index.html (100%) diff --git a/serv_nginx/.env b/main_dc/.env similarity index 100% rename from serv_nginx/.env rename to main_dc/.env diff --git a/serv_nginx/Makefile b/main_dc/Makefile similarity index 100% rename from serv_nginx/Makefile rename to main_dc/Makefile diff --git a/serv_nginx/api_bb/.env b/main_dc/api_bb/.env similarity index 100% rename from serv_nginx/api_bb/.env rename to main_dc/api_bb/.env diff --git a/serv_nginx/api_bb/Dockerfile b/main_dc/api_bb/Dockerfile similarity index 100% rename from serv_nginx/api_bb/Dockerfile rename to main_dc/api_bb/Dockerfile diff --git a/serv_nginx/api_bb/bin/bb_api b/main_dc/api_bb/bin/bb_api similarity index 100% rename from serv_nginx/api_bb/bin/bb_api rename to main_dc/api_bb/bin/bb_api diff --git a/serv_nginx/api_bb/cmd/main.go b/main_dc/api_bb/cmd/main.go similarity index 100% rename from serv_nginx/api_bb/cmd/main.go rename to main_dc/api_bb/cmd/main.go diff --git a/serv_nginx/api_bb/go.mod b/main_dc/api_bb/go.mod similarity index 100% rename from serv_nginx/api_bb/go.mod rename to main_dc/api_bb/go.mod diff --git a/serv_nginx/api_bb/go.sum b/main_dc/api_bb/go.sum similarity index 100% rename from serv_nginx/api_bb/go.sum rename to main_dc/api_bb/go.sum diff --git a/serv_nginx/api_bb/go_bbb.mod b/main_dc/api_bb/go_bbb.mod similarity index 100% rename from serv_nginx/api_bb/go_bbb.mod rename to main_dc/api_bb/go_bbb.mod diff --git a/serv_nginx/api_bb/internal/app/app.go b/main_dc/api_bb/internal/app/app.go similarity index 100% rename from serv_nginx/api_bb/internal/app/app.go rename to main_dc/api_bb/internal/app/app.go diff --git a/serv_nginx/api_bb/internal/config/config.go b/main_dc/api_bb/internal/config/config.go similarity index 100% rename from serv_nginx/api_bb/internal/config/config.go rename to main_dc/api_bb/internal/config/config.go diff --git a/serv_nginx/api_bb/internal/database/database.go b/main_dc/api_bb/internal/database/database.go similarity index 100% rename from serv_nginx/api_bb/internal/database/database.go rename to main_dc/api_bb/internal/database/database.go diff --git a/serv_nginx/api_bb/internal/database/migrate.go b/main_dc/api_bb/internal/database/migrate.go similarity index 100% rename from serv_nginx/api_bb/internal/database/migrate.go rename to main_dc/api_bb/internal/database/migrate.go diff --git a/serv_nginx/api_bb/internal/handlers/auth.go b/main_dc/api_bb/internal/handlers/auth.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/auth.go rename to main_dc/api_bb/internal/handlers/auth.go diff --git a/serv_nginx/api_bb/internal/handlers/avatar.go b/main_dc/api_bb/internal/handlers/avatar.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/avatar.go rename to main_dc/api_bb/internal/handlers/avatar.go diff --git a/serv_nginx/api_bb/internal/handlers/email_handler.go b/main_dc/api_bb/internal/handlers/email_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/email_handler.go rename to main_dc/api_bb/internal/handlers/email_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/event_handler.go b/main_dc/api_bb/internal/handlers/event_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/event_handler.go rename to main_dc/api_bb/internal/handlers/event_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/event_registration_handler.go b/main_dc/api_bb/internal/handlers/event_registration_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/event_registration_handler.go rename to main_dc/api_bb/internal/handlers/event_registration_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/handler_util.go b/main_dc/api_bb/internal/handlers/handler_util.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/handler_util.go rename to main_dc/api_bb/internal/handlers/handler_util.go diff --git a/serv_nginx/api_bb/internal/handlers/handlers.go b/main_dc/api_bb/internal/handlers/handlers.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/handlers.go rename to main_dc/api_bb/internal/handlers/handlers.go diff --git a/serv_nginx/api_bb/internal/handlers/health.go b/main_dc/api_bb/internal/handlers/health.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/health.go rename to main_dc/api_bb/internal/handlers/health.go diff --git a/serv_nginx/api_bb/internal/handlers/news_handler.go b/main_dc/api_bb/internal/handlers/news_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/news_handler.go rename to main_dc/api_bb/internal/handlers/news_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/personal_best_handler.go b/main_dc/api_bb/internal/handlers/personal_best_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/personal_best_handler.go rename to main_dc/api_bb/internal/handlers/personal_best_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/review_handler.go b/main_dc/api_bb/internal/handlers/review_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/review_handler.go rename to main_dc/api_bb/internal/handlers/review_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/training_plan_handler.go b/main_dc/api_bb/internal/handlers/training_plan_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/training_plan_handler.go rename to main_dc/api_bb/internal/handlers/training_plan_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/user.go b/main_dc/api_bb/internal/handlers/user.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/user.go rename to main_dc/api_bb/internal/handlers/user.go diff --git a/serv_nginx/api_bb/internal/handlers/user_achievement_handler.go b/main_dc/api_bb/internal/handlers/user_achievement_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/user_achievement_handler.go rename to main_dc/api_bb/internal/handlers/user_achievement_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/user_stats_handler.go b/main_dc/api_bb/internal/handlers/user_stats_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/user_stats_handler.go rename to main_dc/api_bb/internal/handlers/user_stats_handler.go diff --git a/serv_nginx/api_bb/internal/handlers/user_workout_handler.go b/main_dc/api_bb/internal/handlers/user_workout_handler.go similarity index 100% rename from serv_nginx/api_bb/internal/handlers/user_workout_handler.go rename to main_dc/api_bb/internal/handlers/user_workout_handler.go diff --git a/serv_nginx/api_bb/internal/models/achievement.go b/main_dc/api_bb/internal/models/achievement.go similarity index 100% rename from serv_nginx/api_bb/internal/models/achievement.go rename to main_dc/api_bb/internal/models/achievement.go diff --git a/serv_nginx/api_bb/internal/models/common.go b/main_dc/api_bb/internal/models/common.go similarity index 100% rename from serv_nginx/api_bb/internal/models/common.go rename to main_dc/api_bb/internal/models/common.go diff --git a/serv_nginx/api_bb/internal/models/email.go b/main_dc/api_bb/internal/models/email.go similarity index 100% rename from serv_nginx/api_bb/internal/models/email.go rename to main_dc/api_bb/internal/models/email.go diff --git a/serv_nginx/api_bb/internal/models/event.go b/main_dc/api_bb/internal/models/event.go similarity index 100% rename from serv_nginx/api_bb/internal/models/event.go rename to main_dc/api_bb/internal/models/event.go diff --git a/serv_nginx/api_bb/internal/models/gallery.go b/main_dc/api_bb/internal/models/gallery.go similarity index 100% rename from serv_nginx/api_bb/internal/models/gallery.go rename to main_dc/api_bb/internal/models/gallery.go diff --git a/serv_nginx/api_bb/internal/models/news.go b/main_dc/api_bb/internal/models/news.go similarity index 100% rename from serv_nginx/api_bb/internal/models/news.go rename to main_dc/api_bb/internal/models/news.go diff --git a/serv_nginx/api_bb/internal/models/personal_best.go b/main_dc/api_bb/internal/models/personal_best.go similarity index 100% rename from serv_nginx/api_bb/internal/models/personal_best.go rename to main_dc/api_bb/internal/models/personal_best.go diff --git a/serv_nginx/api_bb/internal/models/review.go b/main_dc/api_bb/internal/models/review.go similarity index 100% rename from serv_nginx/api_bb/internal/models/review.go rename to main_dc/api_bb/internal/models/review.go diff --git a/serv_nginx/api_bb/internal/models/training_plan.go b/main_dc/api_bb/internal/models/training_plan.go similarity index 100% rename from serv_nginx/api_bb/internal/models/training_plan.go rename to main_dc/api_bb/internal/models/training_plan.go diff --git a/serv_nginx/api_bb/internal/models/user.go b/main_dc/api_bb/internal/models/user.go similarity index 100% rename from serv_nginx/api_bb/internal/models/user.go rename to main_dc/api_bb/internal/models/user.go diff --git a/serv_nginx/api_bb/internal/models/user_stats.go b/main_dc/api_bb/internal/models/user_stats.go similarity index 100% rename from serv_nginx/api_bb/internal/models/user_stats.go rename to main_dc/api_bb/internal/models/user_stats.go diff --git a/serv_nginx/api_bb/internal/models/workout.go b/main_dc/api_bb/internal/models/workout.go similarity index 100% rename from serv_nginx/api_bb/internal/models/workout.go rename to main_dc/api_bb/internal/models/workout.go diff --git a/serv_nginx/api_bb/internal/repository/achievement_repository.go b/main_dc/api_bb/internal/repository/achievement_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/achievement_repository.go rename to main_dc/api_bb/internal/repository/achievement_repository.go diff --git a/serv_nginx/api_bb/internal/repository/comment_repository.go b/main_dc/api_bb/internal/repository/comment_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/comment_repository.go rename to main_dc/api_bb/internal/repository/comment_repository.go diff --git a/serv_nginx/api_bb/internal/repository/email_repository.go b/main_dc/api_bb/internal/repository/email_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/email_repository.go rename to main_dc/api_bb/internal/repository/email_repository.go diff --git a/serv_nginx/api_bb/internal/repository/event_registration_repository.go b/main_dc/api_bb/internal/repository/event_registration_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/event_registration_repository.go rename to main_dc/api_bb/internal/repository/event_registration_repository.go diff --git a/serv_nginx/api_bb/internal/repository/event_repository.go b/main_dc/api_bb/internal/repository/event_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/event_repository.go rename to main_dc/api_bb/internal/repository/event_repository.go diff --git a/serv_nginx/api_bb/internal/repository/gallery_repository.go b/main_dc/api_bb/internal/repository/gallery_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/gallery_repository.go rename to main_dc/api_bb/internal/repository/gallery_repository.go diff --git a/serv_nginx/api_bb/internal/repository/news_repository.go b/main_dc/api_bb/internal/repository/news_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/news_repository.go rename to main_dc/api_bb/internal/repository/news_repository.go diff --git a/serv_nginx/api_bb/internal/repository/personal_best_repository.go b/main_dc/api_bb/internal/repository/personal_best_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/personal_best_repository.go rename to main_dc/api_bb/internal/repository/personal_best_repository.go diff --git a/serv_nginx/api_bb/internal/repository/review_repository.go b/main_dc/api_bb/internal/repository/review_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/review_repository.go rename to main_dc/api_bb/internal/repository/review_repository.go diff --git a/serv_nginx/api_bb/internal/repository/training_plan_repository.go b/main_dc/api_bb/internal/repository/training_plan_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/training_plan_repository.go rename to main_dc/api_bb/internal/repository/training_plan_repository.go diff --git a/serv_nginx/api_bb/internal/repository/user_repository.go b/main_dc/api_bb/internal/repository/user_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/user_repository.go rename to main_dc/api_bb/internal/repository/user_repository.go diff --git a/serv_nginx/api_bb/internal/repository/user_stats_repository.go b/main_dc/api_bb/internal/repository/user_stats_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/user_stats_repository.go rename to main_dc/api_bb/internal/repository/user_stats_repository.go diff --git a/serv_nginx/api_bb/internal/repository/workout_repository.go b/main_dc/api_bb/internal/repository/workout_repository.go similarity index 100% rename from serv_nginx/api_bb/internal/repository/workout_repository.go rename to main_dc/api_bb/internal/repository/workout_repository.go diff --git a/serv_nginx/api_bb/internal/routes/routes.go b/main_dc/api_bb/internal/routes/routes.go similarity index 100% rename from serv_nginx/api_bb/internal/routes/routes.go rename to main_dc/api_bb/internal/routes/routes.go diff --git a/serv_nginx/api_bb/internal/scripts/migrate_existing_users.go b/main_dc/api_bb/internal/scripts/migrate_existing_users.go similarity index 100% rename from serv_nginx/api_bb/internal/scripts/migrate_existing_users.go rename to main_dc/api_bb/internal/scripts/migrate_existing_users.go diff --git a/serv_nginx/api_bb/internal/service/achievement_service.go b/main_dc/api_bb/internal/service/achievement_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/achievement_service.go rename to main_dc/api_bb/internal/service/achievement_service.go diff --git a/serv_nginx/api_bb/internal/service/auth_service.go b/main_dc/api_bb/internal/service/auth_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/auth_service.go rename to main_dc/api_bb/internal/service/auth_service.go diff --git a/serv_nginx/api_bb/internal/service/avatar_service.go b/main_dc/api_bb/internal/service/avatar_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/avatar_service.go rename to main_dc/api_bb/internal/service/avatar_service.go diff --git a/serv_nginx/api_bb/internal/service/email_service.go b/main_dc/api_bb/internal/service/email_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/email_service.go rename to main_dc/api_bb/internal/service/email_service.go diff --git a/serv_nginx/api_bb/internal/service/event_registration_service.go b/main_dc/api_bb/internal/service/event_registration_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/event_registration_service.go rename to main_dc/api_bb/internal/service/event_registration_service.go diff --git a/serv_nginx/api_bb/internal/service/event_service.go b/main_dc/api_bb/internal/service/event_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/event_service.go rename to main_dc/api_bb/internal/service/event_service.go diff --git a/serv_nginx/api_bb/internal/service/jwt_service.go b/main_dc/api_bb/internal/service/jwt_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/jwt_service.go rename to main_dc/api_bb/internal/service/jwt_service.go diff --git a/serv_nginx/api_bb/internal/service/news_service.go b/main_dc/api_bb/internal/service/news_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/news_service.go rename to main_dc/api_bb/internal/service/news_service.go diff --git a/serv_nginx/api_bb/internal/service/personal_best_service.go b/main_dc/api_bb/internal/service/personal_best_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/personal_best_service.go rename to main_dc/api_bb/internal/service/personal_best_service.go diff --git a/serv_nginx/api_bb/internal/service/review_service.go b/main_dc/api_bb/internal/service/review_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/review_service.go rename to main_dc/api_bb/internal/service/review_service.go diff --git a/serv_nginx/api_bb/internal/service/training_plan_service.go b/main_dc/api_bb/internal/service/training_plan_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/training_plan_service.go rename to main_dc/api_bb/internal/service/training_plan_service.go diff --git a/serv_nginx/api_bb/internal/service/user_service.go b/main_dc/api_bb/internal/service/user_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/user_service.go rename to main_dc/api_bb/internal/service/user_service.go diff --git a/serv_nginx/api_bb/internal/service/user_stats_service.go b/main_dc/api_bb/internal/service/user_stats_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/user_stats_service.go rename to main_dc/api_bb/internal/service/user_stats_service.go diff --git a/serv_nginx/api_bb/internal/service/user_workout_service.go b/main_dc/api_bb/internal/service/user_workout_service.go similarity index 100% rename from serv_nginx/api_bb/internal/service/user_workout_service.go rename to main_dc/api_bb/internal/service/user_workout_service.go diff --git a/serv_nginx/api_bb/pkg/database/database.go b/main_dc/api_bb/pkg/database/database.go similarity index 100% rename from serv_nginx/api_bb/pkg/database/database.go rename to main_dc/api_bb/pkg/database/database.go diff --git a/serv_nginx/api_bb/pkg/email/email.go b/main_dc/api_bb/pkg/email/email.go similarity index 100% rename from serv_nginx/api_bb/pkg/email/email.go rename to main_dc/api_bb/pkg/email/email.go diff --git a/serv_nginx/api_bb/pkg/logger/helpers.go b/main_dc/api_bb/pkg/logger/helpers.go similarity index 100% rename from serv_nginx/api_bb/pkg/logger/helpers.go rename to main_dc/api_bb/pkg/logger/helpers.go diff --git a/serv_nginx/api_bb/pkg/logger/interface.go b/main_dc/api_bb/pkg/logger/interface.go similarity index 100% rename from serv_nginx/api_bb/pkg/logger/interface.go rename to main_dc/api_bb/pkg/logger/interface.go diff --git a/serv_nginx/api_bb/pkg/logger/logger.go b/main_dc/api_bb/pkg/logger/logger.go similarity index 100% rename from serv_nginx/api_bb/pkg/logger/logger.go rename to main_dc/api_bb/pkg/logger/logger.go diff --git a/serv_nginx/api_bb/pkg/logger/route_logger.go b/main_dc/api_bb/pkg/logger/route_logger.go similarity index 100% rename from serv_nginx/api_bb/pkg/logger/route_logger.go rename to main_dc/api_bb/pkg/logger/route_logger.go diff --git a/serv_nginx/api_bb/pkg/middleware/admin_middleware.go b/main_dc/api_bb/pkg/middleware/admin_middleware.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/admin_middleware.go rename to main_dc/api_bb/pkg/middleware/admin_middleware.go diff --git a/serv_nginx/api_bb/pkg/middleware/auth.go b/main_dc/api_bb/pkg/middleware/auth.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/auth.go rename to main_dc/api_bb/pkg/middleware/auth.go diff --git a/serv_nginx/api_bb/pkg/middleware/cors.go b/main_dc/api_bb/pkg/middleware/cors.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/cors.go rename to main_dc/api_bb/pkg/middleware/cors.go diff --git a/serv_nginx/api_bb/pkg/middleware/logger.go b/main_dc/api_bb/pkg/middleware/logger.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/logger.go rename to main_dc/api_bb/pkg/middleware/logger.go diff --git a/serv_nginx/api_bb/pkg/middleware/middleware.go b/main_dc/api_bb/pkg/middleware/middleware.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/middleware.go rename to main_dc/api_bb/pkg/middleware/middleware.go diff --git a/serv_nginx/api_bb/pkg/middleware/options.go b/main_dc/api_bb/pkg/middleware/options.go similarity index 100% rename from serv_nginx/api_bb/pkg/middleware/options.go rename to main_dc/api_bb/pkg/middleware/options.go diff --git a/serv_nginx/api_bb/pkg/utils/formatTime.go b/main_dc/api_bb/pkg/utils/formatTime.go similarity index 100% rename from serv_nginx/api_bb/pkg/utils/formatTime.go rename to main_dc/api_bb/pkg/utils/formatTime.go diff --git a/serv_nginx/api_bb/pkg/utils/response.go b/main_dc/api_bb/pkg/utils/response.go similarity index 100% rename from serv_nginx/api_bb/pkg/utils/response.go rename to main_dc/api_bb/pkg/utils/response.go diff --git a/serv_nginx/api_bb/pkg/utils/utils.go b/main_dc/api_bb/pkg/utils/utils.go similarity index 100% rename from serv_nginx/api_bb/pkg/utils/utils.go rename to main_dc/api_bb/pkg/utils/utils.go diff --git a/serv_nginx/api_bb/pkg/utils/validation.go b/main_dc/api_bb/pkg/utils/validation.go similarity index 100% rename from serv_nginx/api_bb/pkg/utils/validation.go rename to main_dc/api_bb/pkg/utils/validation.go diff --git a/serv_nginx/api_bb/readme.md b/main_dc/api_bb/readme.md similarity index 100% rename from serv_nginx/api_bb/readme.md rename to main_dc/api_bb/readme.md diff --git a/serv_nginx/api_bb/sqlite b/main_dc/api_bb/sqlite similarity index 100% rename from serv_nginx/api_bb/sqlite rename to main_dc/api_bb/sqlite diff --git a/serv_nginx/serv_golang_rest_api/.env b/main_dc/api_tp/.env similarity index 100% rename from serv_nginx/serv_golang_rest_api/.env rename to main_dc/api_tp/.env diff --git a/serv_nginx/serv_golang_rest_api/Dockerfile b/main_dc/api_tp/Dockerfile similarity index 100% rename from serv_nginx/serv_golang_rest_api/Dockerfile rename to main_dc/api_tp/Dockerfile diff --git a/serv_nginx/serv_golang_rest_api/Makefile b/main_dc/api_tp/Makefile similarity index 100% rename from serv_nginx/serv_golang_rest_api/Makefile rename to main_dc/api_tp/Makefile diff --git a/serv_nginx/serv_golang_rest_api/cmd/api/main.go b/main_dc/api_tp/cmd/api/main.go similarity index 81% rename from serv_nginx/serv_golang_rest_api/cmd/api/main.go rename to main_dc/api_tp/cmd/api/main.go index 799d08f..4bfe475 100644 --- a/serv_nginx/serv_golang_rest_api/cmd/api/main.go +++ b/main_dc/api_tp/cmd/api/main.go @@ -2,9 +2,9 @@ package main import ( "log" - "serv_golang_rest_api/internal/config" - "serv_golang_rest_api/internal/server" - "serv_golang_rest_api/pkg/database" + "api_tp/internal/config" + "api_tp/internal/server" + "api_tp/pkg/database" ) func main() { diff --git a/serv_nginx/serv_golang_rest_api/go.mod b/main_dc/api_tp/go.mod similarity index 73% rename from serv_nginx/serv_golang_rest_api/go.mod rename to main_dc/api_tp/go.mod index 1846b3a..8312445 100644 --- a/serv_nginx/serv_golang_rest_api/go.mod +++ b/main_dc/api_tp/go.mod @@ -1,26 +1,25 @@ -module serv_golang_rest_api +module api_tp go 1.25.1 require ( + github.com/go-chi/chi/v5 v5.2.3 + github.com/go-chi/cors v1.2.2 github.com/golang-jwt/jwt/v4 v4.5.2 - golang.org/x/oauth2 v0.31.0 + golang.org/x/crypto v0.43.0 + golang.org/x/oauth2 v0.32.0 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.0 ) -require cloud.google.com/go/compute/metadata v0.3.0 // indirect - require ( - github.com/go-chi/chi/v5 v5.2.3 - github.com/go-chi/cors v1.2.2 + cloud.google.com/go/compute/metadata v0.3.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.6.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - golang.org/x/crypto v0.42.0 golang.org/x/sync v0.17.0 // indirect - golang.org/x/text v0.29.0 // indirect + golang.org/x/text v0.30.0 // indirect ) diff --git a/serv_nginx/serv_golang_rest_api/go.sum b/main_dc/api_tp/go.sum similarity index 88% rename from serv_nginx/serv_golang_rest_api/go.sum rename to main_dc/api_tp/go.sum index 138e72d..5a82eee 100644 --- a/serv_nginx/serv_golang_rest_api/go.sum +++ b/main_dc/api_tp/go.sum @@ -28,14 +28,14 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= -golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= -golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo= -golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= +golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= +golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/serv_nginx/serv_golang_rest_api/internal/config/config.go b/main_dc/api_tp/internal/config/config.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/config/config.go rename to main_dc/api_tp/internal/config/config.go diff --git a/serv_nginx/serv_golang_rest_api/internal/config/oauth.go b/main_dc/api_tp/internal/config/oauth.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/config/oauth.go rename to main_dc/api_tp/internal/config/oauth.go diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/auth.go b/main_dc/api_tp/internal/handlers/auth.go similarity index 97% rename from serv_nginx/serv_golang_rest_api/internal/handlers/auth.go rename to main_dc/api_tp/internal/handlers/auth.go index cb967e3..bb8bc03 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/auth.go +++ b/main_dc/api_tp/internal/handlers/auth.go @@ -3,8 +3,8 @@ package handlers import ( "net/http" - "serv_golang_rest_api/internal/models" - "serv_golang_rest_api/internal/utils" + "api_tp/internal/models" + "api_tp/internal/utils" "gorm.io/gorm" ) diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go b/main_dc/api_tp/internal/handlers/middleware.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go rename to main_dc/api_tp/internal/handlers/middleware.go diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth.go b/main_dc/api_tp/internal/handlers/oauth.go similarity index 97% rename from serv_nginx/serv_golang_rest_api/internal/handlers/oauth.go rename to main_dc/api_tp/internal/handlers/oauth.go index df89843..2a17b23 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth.go +++ b/main_dc/api_tp/internal/handlers/oauth.go @@ -4,9 +4,9 @@ package handlers import ( "encoding/json" "net/http" - "serv_golang_rest_api/internal/config" - "serv_golang_rest_api/internal/models" - "serv_golang_rest_api/internal/utils" + "api_tp/internal/config" + "api_tp/internal/models" + "api_tp/internal/utils" "golang.org/x/oauth2" "gorm.io/gorm" diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_VK.go b/main_dc/api_tp/internal/handlers/oauth_VK.go similarity index 98% rename from serv_nginx/serv_golang_rest_api/internal/handlers/oauth_VK.go rename to main_dc/api_tp/internal/handlers/oauth_VK.go index 41bc963..6ed24a9 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_VK.go +++ b/main_dc/api_tp/internal/handlers/oauth_VK.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" "net/http" - "serv_golang_rest_api/internal/config" - "serv_golang_rest_api/internal/utils" + "api_tp/internal/config" + "api_tp/internal/utils" ) // VKUserInfo представляет данные пользователя от VK diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_yandex.go b/main_dc/api_tp/internal/handlers/oauth_yandex.go similarity index 96% rename from serv_nginx/serv_golang_rest_api/internal/handlers/oauth_yandex.go rename to main_dc/api_tp/internal/handlers/oauth_yandex.go index 83aa6e3..367b5bb 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_yandex.go +++ b/main_dc/api_tp/internal/handlers/oauth_yandex.go @@ -3,9 +3,9 @@ package handlers import ( "encoding/json" "net/http" - "serv_golang_rest_api/internal/config" - "serv_golang_rest_api/internal/models" - "serv_golang_rest_api/internal/utils" + "api_tp/internal/config" + "api_tp/internal/models" + "api_tp/internal/utils" "golang.org/x/oauth2" ) diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/user_handler.go b/main_dc/api_tp/internal/handlers/user_handler.go similarity index 95% rename from serv_nginx/serv_golang_rest_api/internal/handlers/user_handler.go rename to main_dc/api_tp/internal/handlers/user_handler.go index 09dc033..8bf0f3f 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/user_handler.go +++ b/main_dc/api_tp/internal/handlers/user_handler.go @@ -6,8 +6,8 @@ import ( "strconv" "github.com/go-chi/chi/v5" - "serv_golang_rest_api/internal/models" - "serv_golang_rest_api/internal/service" + "api_tp/internal/models" + "api_tp/internal/service" ) type UserHandler struct { diff --git a/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go b/main_dc/api_tp/internal/middleware/auth.go similarity index 96% rename from serv_nginx/serv_golang_rest_api/internal/middleware/auth.go rename to main_dc/api_tp/internal/middleware/auth.go index 822d330..4bd3307 100644 --- a/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go +++ b/main_dc/api_tp/internal/middleware/auth.go @@ -4,7 +4,7 @@ package middleware import ( "context" "net/http" - "serv_golang_rest_api/internal/utils" + "api_tp/internal/utils" "strings" ) diff --git a/serv_nginx/serv_golang_rest_api/internal/models/o_auth_provider.go b/main_dc/api_tp/internal/models/o_auth_provider.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/models/o_auth_provider.go rename to main_dc/api_tp/internal/models/o_auth_provider.go diff --git a/serv_nginx/serv_golang_rest_api/internal/models/user.go b/main_dc/api_tp/internal/models/user.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/models/user.go rename to main_dc/api_tp/internal/models/user.go diff --git a/serv_nginx/serv_golang_rest_api/internal/repository/user_repository.go b/main_dc/api_tp/internal/repository/user_repository.go similarity index 95% rename from serv_nginx/serv_golang_rest_api/internal/repository/user_repository.go rename to main_dc/api_tp/internal/repository/user_repository.go index 8db3404..6bb379f 100644 --- a/serv_nginx/serv_golang_rest_api/internal/repository/user_repository.go +++ b/main_dc/api_tp/internal/repository/user_repository.go @@ -1,7 +1,7 @@ package repository import ( - "serv_golang_rest_api/internal/models" + "api_tp/internal/models" "gorm.io/gorm" ) diff --git a/serv_nginx/serv_golang_rest_api/internal/server/server.go b/main_dc/api_tp/internal/server/server.go similarity index 94% rename from serv_nginx/serv_golang_rest_api/internal/server/server.go rename to main_dc/api_tp/internal/server/server.go index 58a71df..cfb9cbe 100644 --- a/serv_nginx/serv_golang_rest_api/internal/server/server.go +++ b/main_dc/api_tp/internal/server/server.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" "net/http" - "serv_golang_rest_api/internal/handlers" - "serv_golang_rest_api/internal/middleware" - "serv_golang_rest_api/internal/repository" - "serv_golang_rest_api/internal/service" + "api_tp/internal/handlers" + "api_tp/internal/middleware" + "api_tp/internal/repository" + "api_tp/internal/service" "time" "github.com/go-chi/chi/v5" diff --git a/serv_nginx/serv_golang_rest_api/internal/service/user_service.go b/main_dc/api_tp/internal/service/user_service.go similarity index 95% rename from serv_nginx/serv_golang_rest_api/internal/service/user_service.go rename to main_dc/api_tp/internal/service/user_service.go index ec20773..367baa2 100644 --- a/serv_nginx/serv_golang_rest_api/internal/service/user_service.go +++ b/main_dc/api_tp/internal/service/user_service.go @@ -2,8 +2,8 @@ package service import ( "errors" - "serv_golang_rest_api/internal/models" - "serv_golang_rest_api/internal/repository" + "api_tp/internal/models" + "api_tp/internal/repository" "golang.org/x/crypto/bcrypt" ) diff --git a/serv_nginx/serv_golang_rest_api/internal/utils/errors.go b/main_dc/api_tp/internal/utils/errors.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/utils/errors.go rename to main_dc/api_tp/internal/utils/errors.go diff --git a/serv_nginx/serv_golang_rest_api/internal/utils/json.go b/main_dc/api_tp/internal/utils/json.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/utils/json.go rename to main_dc/api_tp/internal/utils/json.go diff --git a/serv_nginx/serv_golang_rest_api/internal/utils/jwt.go b/main_dc/api_tp/internal/utils/jwt.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/utils/jwt.go rename to main_dc/api_tp/internal/utils/jwt.go diff --git a/serv_nginx/serv_golang_rest_api/internal/utils/oauth_utils.go b/main_dc/api_tp/internal/utils/oauth_utils.go similarity index 97% rename from serv_nginx/serv_golang_rest_api/internal/utils/oauth_utils.go rename to main_dc/api_tp/internal/utils/oauth_utils.go index 643f584..aa41676 100644 --- a/serv_nginx/serv_golang_rest_api/internal/utils/oauth_utils.go +++ b/main_dc/api_tp/internal/utils/oauth_utils.go @@ -4,7 +4,7 @@ package utils import ( "crypto/rand" "fmt" - "serv_golang_rest_api/internal/models" + "api_tp/internal/models" "golang.org/x/oauth2" "gorm.io/gorm" diff --git a/serv_nginx/serv_golang_rest_api/internal/utils/password.go b/main_dc/api_tp/internal/utils/password.go similarity index 100% rename from serv_nginx/serv_golang_rest_api/internal/utils/password.go rename to main_dc/api_tp/internal/utils/password.go diff --git a/serv_nginx/serv_golang_rest_api/main b/main_dc/api_tp/main similarity index 100% rename from serv_nginx/serv_golang_rest_api/main rename to main_dc/api_tp/main diff --git a/serv_nginx/serv_golang_rest_api/migrations/001_create_users.sql b/main_dc/api_tp/migrations/001_create_users.sql similarity index 100% rename from serv_nginx/serv_golang_rest_api/migrations/001_create_users.sql rename to main_dc/api_tp/migrations/001_create_users.sql diff --git a/serv_nginx/serv_golang_rest_api/pkg/database/postgres.go b/main_dc/api_tp/pkg/database/postgres.go similarity index 91% rename from serv_nginx/serv_golang_rest_api/pkg/database/postgres.go rename to main_dc/api_tp/pkg/database/postgres.go index 92c8dee..bba69f4 100644 --- a/serv_nginx/serv_golang_rest_api/pkg/database/postgres.go +++ b/main_dc/api_tp/pkg/database/postgres.go @@ -3,8 +3,8 @@ package database import ( "fmt" "log" - "serv_golang_rest_api/internal/config" - "serv_golang_rest_api/internal/models" + "api_tp/internal/config" + "api_tp/internal/models" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/serv_nginx/bbvue/.editorconfig b/main_dc/bbvue/.editorconfig similarity index 100% rename from serv_nginx/bbvue/.editorconfig rename to main_dc/bbvue/.editorconfig diff --git a/serv_nginx/bbvue/.env b/main_dc/bbvue/.env similarity index 100% rename from serv_nginx/bbvue/.env rename to main_dc/bbvue/.env diff --git a/serv_nginx/bbvue/.gitattributes b/main_dc/bbvue/.gitattributes similarity index 100% rename from serv_nginx/bbvue/.gitattributes rename to main_dc/bbvue/.gitattributes diff --git a/serv_nginx/bbvue/.prettierrc.json b/main_dc/bbvue/.prettierrc.json similarity index 100% rename from serv_nginx/bbvue/.prettierrc.json rename to main_dc/bbvue/.prettierrc.json diff --git a/serv_nginx/bbvue/.vscode/extensions.json b/main_dc/bbvue/.vscode/extensions.json similarity index 100% rename from serv_nginx/bbvue/.vscode/extensions.json rename to main_dc/bbvue/.vscode/extensions.json diff --git a/serv_nginx/bbvue/.vscode/settings.json b/main_dc/bbvue/.vscode/settings.json similarity index 100% rename from serv_nginx/bbvue/.vscode/settings.json rename to main_dc/bbvue/.vscode/settings.json diff --git a/serv_nginx/bbvue/README.md b/main_dc/bbvue/README.md similarity index 100% rename from serv_nginx/bbvue/README.md rename to main_dc/bbvue/README.md diff --git a/serv_nginx/bbvue/eslint.config.js b/main_dc/bbvue/eslint.config.js similarity index 100% rename from serv_nginx/bbvue/eslint.config.js rename to main_dc/bbvue/eslint.config.js diff --git a/serv_nginx/bbvue/index.html b/main_dc/bbvue/index.html similarity index 100% rename from serv_nginx/bbvue/index.html rename to main_dc/bbvue/index.html diff --git a/serv_nginx/bbvue/jsconfig.json b/main_dc/bbvue/jsconfig.json similarity index 100% rename from serv_nginx/bbvue/jsconfig.json rename to main_dc/bbvue/jsconfig.json diff --git a/serv_nginx/bbvue/package-lock.json b/main_dc/bbvue/package-lock.json similarity index 100% rename from serv_nginx/bbvue/package-lock.json rename to main_dc/bbvue/package-lock.json diff --git a/serv_nginx/bbvue/package.json b/main_dc/bbvue/package.json similarity index 100% rename from serv_nginx/bbvue/package.json rename to main_dc/bbvue/package.json diff --git a/serv_nginx/bbvue/public/documents/privacy-policy.pdf b/main_dc/bbvue/public/documents/privacy-policy.pdf similarity index 100% rename from serv_nginx/bbvue/public/documents/privacy-policy.pdf rename to main_dc/bbvue/public/documents/privacy-policy.pdf diff --git a/serv_nginx/bbvue/public/documents/terms-of-service.pdf b/main_dc/bbvue/public/documents/terms-of-service.pdf similarity index 100% rename from serv_nginx/bbvue/public/documents/terms-of-service.pdf rename to main_dc/bbvue/public/documents/terms-of-service.pdf diff --git a/serv_nginx/bbvue/public/images/FastRun.jpg b/main_dc/bbvue/public/images/FastRun.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/FastRun.jpg rename to main_dc/bbvue/public/images/FastRun.jpg diff --git a/serv_nginx/bbvue/public/images/Roshim2025_3.png b/main_dc/bbvue/public/images/Roshim2025_3.png similarity index 100% rename from serv_nginx/bbvue/public/images/Roshim2025_3.png rename to main_dc/bbvue/public/images/Roshim2025_3.png diff --git a/serv_nginx/bbvue/public/images/UMM2025.png b/main_dc/bbvue/public/images/UMM2025.png similarity index 100% rename from serv_nginx/bbvue/public/images/UMM2025.png rename to main_dc/bbvue/public/images/UMM2025.png diff --git a/serv_nginx/bbvue/public/images/UfaWhiteRiver.jpg b/main_dc/bbvue/public/images/UfaWhiteRiver.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/UfaWhiteRiver.jpg rename to main_dc/bbvue/public/images/UfaWhiteRiver.jpg diff --git a/serv_nginx/bbvue/public/images/VoronkyRunBB.jpg b/main_dc/bbvue/public/images/VoronkyRunBB.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/VoronkyRunBB.jpg rename to main_dc/bbvue/public/images/VoronkyRunBB.jpg diff --git a/serv_nginx/bbvue/public/images/ZagirTrainer3.jpg b/main_dc/bbvue/public/images/ZagirTrainer3.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/ZagirTrainer3.jpg rename to main_dc/bbvue/public/images/ZagirTrainer3.jpg diff --git a/serv_nginx/bbvue/public/images/dinamo.jpg b/main_dc/bbvue/public/images/dinamo.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/dinamo.jpg rename to main_dc/bbvue/public/images/dinamo.jpg diff --git a/serv_nginx/bbvue/public/images/homePagePhoto/JumpVoronkyRun.jpg b/main_dc/bbvue/public/images/homePagePhoto/JumpVoronkyRun.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/homePagePhoto/JumpVoronkyRun.jpg rename to main_dc/bbvue/public/images/homePagePhoto/JumpVoronkyRun.jpg diff --git a/serv_nginx/bbvue/public/images/homePagePhoto/fullPhotoBB.jpg b/main_dc/bbvue/public/images/homePagePhoto/fullPhotoBB.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/homePagePhoto/fullPhotoBB.jpg rename to main_dc/bbvue/public/images/homePagePhoto/fullPhotoBB.jpg diff --git a/serv_nginx/bbvue/public/images/i.webp b/main_dc/bbvue/public/images/i.webp similarity index 100% rename from serv_nginx/bbvue/public/images/i.webp rename to main_dc/bbvue/public/images/i.webp diff --git a/serv_nginx/bbvue/public/images/locations/1mayPark.webp b/main_dc/bbvue/public/images/locations/1mayPark.webp similarity index 100% rename from serv_nginx/bbvue/public/images/locations/1mayPark.webp rename to main_dc/bbvue/public/images/locations/1mayPark.webp diff --git a/serv_nginx/bbvue/public/images/locations/dinamo.jpg b/main_dc/bbvue/public/images/locations/dinamo.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/locations/dinamo.jpg rename to main_dc/bbvue/public/images/locations/dinamo.jpg diff --git a/serv_nginx/bbvue/public/images/locations/riverSide.jpeg b/main_dc/bbvue/public/images/locations/riverSide.jpeg similarity index 100% rename from serv_nginx/bbvue/public/images/locations/riverSide.jpeg rename to main_dc/bbvue/public/images/locations/riverSide.jpeg diff --git a/serv_nginx/bbvue/public/images/slider/slider1.jpg b/main_dc/bbvue/public/images/slider/slider1.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider1.jpg rename to main_dc/bbvue/public/images/slider/slider1.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider10.jpg b/main_dc/bbvue/public/images/slider/slider10.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider10.jpg rename to main_dc/bbvue/public/images/slider/slider10.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider11.jpg b/main_dc/bbvue/public/images/slider/slider11.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider11.jpg rename to main_dc/bbvue/public/images/slider/slider11.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider12.jpg b/main_dc/bbvue/public/images/slider/slider12.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider12.jpg rename to main_dc/bbvue/public/images/slider/slider12.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider13.jpg b/main_dc/bbvue/public/images/slider/slider13.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider13.jpg rename to main_dc/bbvue/public/images/slider/slider13.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider14.jpg b/main_dc/bbvue/public/images/slider/slider14.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider14.jpg rename to main_dc/bbvue/public/images/slider/slider14.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider15.jpg b/main_dc/bbvue/public/images/slider/slider15.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider15.jpg rename to main_dc/bbvue/public/images/slider/slider15.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider16.jpg b/main_dc/bbvue/public/images/slider/slider16.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider16.jpg rename to main_dc/bbvue/public/images/slider/slider16.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider17.jpg b/main_dc/bbvue/public/images/slider/slider17.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider17.jpg rename to main_dc/bbvue/public/images/slider/slider17.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider18.jpg b/main_dc/bbvue/public/images/slider/slider18.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider18.jpg rename to main_dc/bbvue/public/images/slider/slider18.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider19.jpg b/main_dc/bbvue/public/images/slider/slider19.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider19.jpg rename to main_dc/bbvue/public/images/slider/slider19.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider2.jpg b/main_dc/bbvue/public/images/slider/slider2.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider2.jpg rename to main_dc/bbvue/public/images/slider/slider2.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider20.jpg b/main_dc/bbvue/public/images/slider/slider20.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider20.jpg rename to main_dc/bbvue/public/images/slider/slider20.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider21.jpg b/main_dc/bbvue/public/images/slider/slider21.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider21.jpg rename to main_dc/bbvue/public/images/slider/slider21.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider22.jpg b/main_dc/bbvue/public/images/slider/slider22.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider22.jpg rename to main_dc/bbvue/public/images/slider/slider22.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider23.png b/main_dc/bbvue/public/images/slider/slider23.png similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider23.png rename to main_dc/bbvue/public/images/slider/slider23.png diff --git a/serv_nginx/bbvue/public/images/slider/slider24.jpg b/main_dc/bbvue/public/images/slider/slider24.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider24.jpg rename to main_dc/bbvue/public/images/slider/slider24.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider4.jpg b/main_dc/bbvue/public/images/slider/slider4.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider4.jpg rename to main_dc/bbvue/public/images/slider/slider4.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider5.jpg b/main_dc/bbvue/public/images/slider/slider5.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider5.jpg rename to main_dc/bbvue/public/images/slider/slider5.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider6.jpg b/main_dc/bbvue/public/images/slider/slider6.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider6.jpg rename to main_dc/bbvue/public/images/slider/slider6.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider7.jpg b/main_dc/bbvue/public/images/slider/slider7.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider7.jpg rename to main_dc/bbvue/public/images/slider/slider7.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider8.jpg b/main_dc/bbvue/public/images/slider/slider8.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider8.jpg rename to main_dc/bbvue/public/images/slider/slider8.jpg diff --git a/serv_nginx/bbvue/public/images/slider/slider9.jpg b/main_dc/bbvue/public/images/slider/slider9.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/slider9.jpg rename to main_dc/bbvue/public/images/slider/slider9.jpg diff --git a/serv_nginx/bbvue/public/images/slider/workout1.jpg b/main_dc/bbvue/public/images/slider/workout1.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/workout1.jpg rename to main_dc/bbvue/public/images/slider/workout1.jpg diff --git a/serv_nginx/bbvue/public/images/slider/workout2.jpg b/main_dc/bbvue/public/images/slider/workout2.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/workout2.jpg rename to main_dc/bbvue/public/images/slider/workout2.jpg diff --git a/serv_nginx/bbvue/public/images/slider/workout3.jpg b/main_dc/bbvue/public/images/slider/workout3.jpg similarity index 100% rename from serv_nginx/bbvue/public/images/slider/workout3.jpg rename to main_dc/bbvue/public/images/slider/workout3.jpg diff --git a/serv_nginx/bbvue/src/App.vue b/main_dc/bbvue/src/App.vue similarity index 100% rename from serv_nginx/bbvue/src/App.vue rename to main_dc/bbvue/src/App.vue diff --git a/serv_nginx/bbvue/src/assets/base.css b/main_dc/bbvue/src/assets/base.css similarity index 100% rename from serv_nginx/bbvue/src/assets/base.css rename to main_dc/bbvue/src/assets/base.css diff --git a/serv_nginx/bbvue/src/assets/fonts.css b/main_dc/bbvue/src/assets/fonts.css similarity index 100% rename from serv_nginx/bbvue/src/assets/fonts.css rename to main_dc/bbvue/src/assets/fonts.css diff --git a/serv_nginx/bbvue/src/assets/fonts/FugazOne-Regular.ttf b/main_dc/bbvue/src/assets/fonts/FugazOne-Regular.ttf similarity index 100% rename from serv_nginx/bbvue/src/assets/fonts/FugazOne-Regular.ttf rename to main_dc/bbvue/src/assets/fonts/FugazOne-Regular.ttf diff --git a/serv_nginx/bbvue/src/assets/fonts/Lobster-Regular.ttf b/main_dc/bbvue/src/assets/fonts/Lobster-Regular.ttf similarity index 100% rename from serv_nginx/bbvue/src/assets/fonts/Lobster-Regular.ttf rename to main_dc/bbvue/src/assets/fonts/Lobster-Regular.ttf diff --git a/serv_nginx/bbvue/src/assets/fonts/Montserrat-VariableFont_wght.ttf b/main_dc/bbvue/src/assets/fonts/Montserrat-VariableFont_wght.ttf similarity index 100% rename from serv_nginx/bbvue/src/assets/fonts/Montserrat-VariableFont_wght.ttf rename to main_dc/bbvue/src/assets/fonts/Montserrat-VariableFont_wght.ttf diff --git a/serv_nginx/bbvue/src/assets/fonts/VictorMono-VariableFont_wght.ttf b/main_dc/bbvue/src/assets/fonts/VictorMono-VariableFont_wght.ttf similarity index 100% rename from serv_nginx/bbvue/src/assets/fonts/VictorMono-VariableFont_wght.ttf rename to main_dc/bbvue/src/assets/fonts/VictorMono-VariableFont_wght.ttf diff --git a/serv_nginx/bbvue/src/assets/logo/Logo.png b/main_dc/bbvue/src/assets/logo/Logo.png similarity index 100% rename from serv_nginx/bbvue/src/assets/logo/Logo.png rename to main_dc/bbvue/src/assets/logo/Logo.png diff --git a/serv_nginx/bbvue/src/assets/logo/LogoNew.png b/main_dc/bbvue/src/assets/logo/LogoNew.png similarity index 100% rename from serv_nginx/bbvue/src/assets/logo/LogoNew.png rename to main_dc/bbvue/src/assets/logo/LogoNew.png diff --git a/serv_nginx/bbvue/src/assets/logo/WritedLogo.png b/main_dc/bbvue/src/assets/logo/WritedLogo.png similarity index 100% rename from serv_nginx/bbvue/src/assets/logo/WritedLogo.png rename to main_dc/bbvue/src/assets/logo/WritedLogo.png diff --git a/serv_nginx/bbvue/src/assets/main.css b/main_dc/bbvue/src/assets/main.css similarity index 100% rename from serv_nginx/bbvue/src/assets/main.css rename to main_dc/bbvue/src/assets/main.css diff --git a/serv_nginx/bbvue/src/components/AvatarUpload.vue b/main_dc/bbvue/src/components/AvatarUpload.vue similarity index 100% rename from serv_nginx/bbvue/src/components/AvatarUpload.vue rename to main_dc/bbvue/src/components/AvatarUpload.vue diff --git a/serv_nginx/bbvue/src/components/NavigationMenu.vue b/main_dc/bbvue/src/components/NavigationMenu.vue similarity index 100% rename from serv_nginx/bbvue/src/components/NavigationMenu.vue rename to main_dc/bbvue/src/components/NavigationMenu.vue diff --git a/serv_nginx/bbvue/src/components/writeLogo.vue b/main_dc/bbvue/src/components/writeLogo.vue similarity index 100% rename from serv_nginx/bbvue/src/components/writeLogo.vue rename to main_dc/bbvue/src/components/writeLogo.vue diff --git a/serv_nginx/bbvue/src/main.js b/main_dc/bbvue/src/main.js similarity index 100% rename from serv_nginx/bbvue/src/main.js rename to main_dc/bbvue/src/main.js diff --git a/serv_nginx/bbvue/src/router/index.js b/main_dc/bbvue/src/router/index.js similarity index 100% rename from serv_nginx/bbvue/src/router/index.js rename to main_dc/bbvue/src/router/index.js diff --git a/serv_nginx/bbvue/src/stores/auth.js b/main_dc/bbvue/src/stores/auth.js similarity index 100% rename from serv_nginx/bbvue/src/stores/auth.js rename to main_dc/bbvue/src/stores/auth.js diff --git a/serv_nginx/bbvue/src/stores/helpers/api.js b/main_dc/bbvue/src/stores/helpers/api.js similarity index 100% rename from serv_nginx/bbvue/src/stores/helpers/api.js rename to main_dc/bbvue/src/stores/helpers/api.js diff --git a/serv_nginx/bbvue/src/stores/index.js b/main_dc/bbvue/src/stores/index.js similarity index 100% rename from serv_nginx/bbvue/src/stores/index.js rename to main_dc/bbvue/src/stores/index.js diff --git a/serv_nginx/bbvue/src/stores/plugins/persistence.js b/main_dc/bbvue/src/stores/plugins/persistence.js similarity index 100% rename from serv_nginx/bbvue/src/stores/plugins/persistence.js rename to main_dc/bbvue/src/stores/plugins/persistence.js diff --git a/serv_nginx/bbvue/src/stores/user.js b/main_dc/bbvue/src/stores/user.js similarity index 100% rename from serv_nginx/bbvue/src/stores/user.js rename to main_dc/bbvue/src/stores/user.js diff --git a/serv_nginx/bbvue/src/views/About.vue b/main_dc/bbvue/src/views/About.vue similarity index 100% rename from serv_nginx/bbvue/src/views/About.vue rename to main_dc/bbvue/src/views/About.vue diff --git a/serv_nginx/bbvue/src/views/Achievements.vue b/main_dc/bbvue/src/views/Achievements.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Achievements.vue rename to main_dc/bbvue/src/views/Achievements.vue diff --git a/serv_nginx/bbvue/src/views/ForgotPassword.vue b/main_dc/bbvue/src/views/ForgotPassword.vue similarity index 100% rename from serv_nginx/bbvue/src/views/ForgotPassword.vue rename to main_dc/bbvue/src/views/ForgotPassword.vue diff --git a/serv_nginx/bbvue/src/views/Gallery.vue b/main_dc/bbvue/src/views/Gallery.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Gallery.vue rename to main_dc/bbvue/src/views/Gallery.vue diff --git a/serv_nginx/bbvue/src/views/Home.vue b/main_dc/bbvue/src/views/Home.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Home.vue rename to main_dc/bbvue/src/views/Home.vue diff --git a/serv_nginx/bbvue/src/views/Login.vue b/main_dc/bbvue/src/views/Login.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Login.vue rename to main_dc/bbvue/src/views/Login.vue diff --git a/serv_nginx/bbvue/src/views/Logout.vue b/main_dc/bbvue/src/views/Logout.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Logout.vue rename to main_dc/bbvue/src/views/Logout.vue diff --git a/serv_nginx/bbvue/src/views/Members.vue b/main_dc/bbvue/src/views/Members.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Members.vue rename to main_dc/bbvue/src/views/Members.vue diff --git a/serv_nginx/bbvue/src/views/News.vue b/main_dc/bbvue/src/views/News.vue similarity index 100% rename from serv_nginx/bbvue/src/views/News.vue rename to main_dc/bbvue/src/views/News.vue diff --git a/serv_nginx/bbvue/src/views/PasswordReset.vue b/main_dc/bbvue/src/views/PasswordReset.vue similarity index 100% rename from serv_nginx/bbvue/src/views/PasswordReset.vue rename to main_dc/bbvue/src/views/PasswordReset.vue diff --git a/serv_nginx/bbvue/src/views/PrivacyPolicy.vue b/main_dc/bbvue/src/views/PrivacyPolicy.vue similarity index 100% rename from serv_nginx/bbvue/src/views/PrivacyPolicy.vue rename to main_dc/bbvue/src/views/PrivacyPolicy.vue diff --git a/serv_nginx/bbvue/src/views/Profile.vue b/main_dc/bbvue/src/views/Profile.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Profile.vue rename to main_dc/bbvue/src/views/Profile.vue diff --git a/serv_nginx/bbvue/src/views/ProfileEdit.vue b/main_dc/bbvue/src/views/ProfileEdit.vue similarity index 100% rename from serv_nginx/bbvue/src/views/ProfileEdit.vue rename to main_dc/bbvue/src/views/ProfileEdit.vue diff --git a/serv_nginx/bbvue/src/views/Register.vue b/main_dc/bbvue/src/views/Register.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Register.vue rename to main_dc/bbvue/src/views/Register.vue diff --git a/serv_nginx/bbvue/src/views/Reviews.vue b/main_dc/bbvue/src/views/Reviews.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Reviews.vue rename to main_dc/bbvue/src/views/Reviews.vue diff --git a/serv_nginx/bbvue/src/views/TermsOfService.vue b/main_dc/bbvue/src/views/TermsOfService.vue similarity index 100% rename from serv_nginx/bbvue/src/views/TermsOfService.vue rename to main_dc/bbvue/src/views/TermsOfService.vue diff --git a/serv_nginx/bbvue/src/views/Training.vue b/main_dc/bbvue/src/views/Training.vue similarity index 100% rename from serv_nginx/bbvue/src/views/Training.vue rename to main_dc/bbvue/src/views/Training.vue diff --git a/serv_nginx/bbvue/src/views/VerifayEmail.vue b/main_dc/bbvue/src/views/VerifayEmail.vue similarity index 100% rename from serv_nginx/bbvue/src/views/VerifayEmail.vue rename to main_dc/bbvue/src/views/VerifayEmail.vue diff --git a/serv_nginx/bbvue/vite.config.js b/main_dc/bbvue/vite.config.js similarity index 100% rename from serv_nginx/bbvue/vite.config.js rename to main_dc/bbvue/vite.config.js diff --git a/serv_nginx/certbot/Dockerfile b/main_dc/certbot/Dockerfile similarity index 100% rename from serv_nginx/certbot/Dockerfile rename to main_dc/certbot/Dockerfile diff --git a/serv_nginx/certbot/config/certbot.ini b/main_dc/certbot/config/certbot.ini similarity index 100% rename from serv_nginx/certbot/config/certbot.ini rename to main_dc/certbot/config/certbot.ini diff --git a/serv_nginx/certbot/scripts/checkRenewCerts.sh b/main_dc/certbot/scripts/checkRenewCerts.sh similarity index 100% rename from serv_nginx/certbot/scripts/checkRenewCerts.sh rename to main_dc/certbot/scripts/checkRenewCerts.sh diff --git a/serv_nginx/certbot/scripts/crontab.txt b/main_dc/certbot/scripts/crontab.txt similarity index 100% rename from serv_nginx/certbot/scripts/crontab.txt rename to main_dc/certbot/scripts/crontab.txt diff --git a/serv_nginx/certbot/scripts/init-certbot.sh b/main_dc/certbot/scripts/init-certbot.sh similarity index 100% rename from serv_nginx/certbot/scripts/init-certbot.sh rename to main_dc/certbot/scripts/init-certbot.sh diff --git a/serv_nginx/certbot/scripts/renewBegushiyBAshkirLatin.sh b/main_dc/certbot/scripts/renewBegushiyBAshkirLatin.sh similarity index 100% rename from serv_nginx/certbot/scripts/renewBegushiyBAshkirLatin.sh rename to main_dc/certbot/scripts/renewBegushiyBAshkirLatin.sh diff --git a/serv_nginx/certbot/scripts/renewBegushiyBashkir.sh b/main_dc/certbot/scripts/renewBegushiyBashkir.sh similarity index 100% rename from serv_nginx/certbot/scripts/renewBegushiyBashkir.sh rename to main_dc/certbot/scripts/renewBegushiyBashkir.sh diff --git a/serv_nginx/certbot/scripts/renewEasysite102.sh b/main_dc/certbot/scripts/renewEasysite102.sh similarity index 100% rename from serv_nginx/certbot/scripts/renewEasysite102.sh rename to main_dc/certbot/scripts/renewEasysite102.sh diff --git a/serv_nginx/certbot/scripts/renewValitovGazizCert.sh b/main_dc/certbot/scripts/renewValitovGazizCert.sh similarity index 100% rename from serv_nginx/certbot/scripts/renewValitovGazizCert.sh rename to main_dc/certbot/scripts/renewValitovGazizCert.sh diff --git a/serv_nginx/certbot/scripts/renewYalarbaCert.sh b/main_dc/certbot/scripts/renewYalarbaCert.sh similarity index 100% rename from serv_nginx/certbot/scripts/renewYalarbaCert.sh rename to main_dc/certbot/scripts/renewYalarbaCert.sh diff --git a/serv_nginx/docker-compose.yml b/main_dc/docker-compose.yml similarity index 100% rename from serv_nginx/docker-compose.yml rename to main_dc/docker-compose.yml diff --git a/serv_nginx/keycloak/.env.keycloak b/main_dc/keycloak/.env.keycloak similarity index 100% rename from serv_nginx/keycloak/.env.keycloak rename to main_dc/keycloak/.env.keycloak diff --git a/serv_nginx/keycloak/Dockerfile b/main_dc/keycloak/Dockerfile similarity index 100% rename from serv_nginx/keycloak/Dockerfile rename to main_dc/keycloak/Dockerfile diff --git a/serv_nginx/keycloak/keycloak.conf b/main_dc/keycloak/keycloak.conf similarity index 100% rename from serv_nginx/keycloak/keycloak.conf rename to main_dc/keycloak/keycloak.conf diff --git a/serv_nginx/keycloak/realm-config/setup-realm.json b/main_dc/keycloak/realm-config/setup-realm.json similarity index 100% rename from serv_nginx/keycloak/realm-config/setup-realm.json rename to main_dc/keycloak/realm-config/setup-realm.json diff --git a/serv_nginx/nginx/Dockerfile b/main_dc/nginx/Dockerfile similarity index 100% rename from serv_nginx/nginx/Dockerfile rename to main_dc/nginx/Dockerfile diff --git a/serv_nginx/nginx/nginx-http.conf b/main_dc/nginx/nginx-http.conf similarity index 100% rename from serv_nginx/nginx/nginx-http.conf rename to main_dc/nginx/nginx-http.conf diff --git a/serv_nginx/nginx/nginx-ssl.conf b/main_dc/nginx/nginx-ssl.conf similarity index 100% rename from serv_nginx/nginx/nginx-ssl.conf rename to main_dc/nginx/nginx-ssl.conf diff --git a/serv_nginx/nginx/switch-config.sh b/main_dc/nginx/switch-config.sh similarity index 100% rename from serv_nginx/nginx/switch-config.sh rename to main_dc/nginx/switch-config.sh diff --git a/serv_nginx/stubSite/index.html b/main_dc/stubSite/index.html similarity index 100% rename from serv_nginx/stubSite/index.html rename to main_dc/stubSite/index.html