Merge branch 'develop' of https://github.com/finocd2la/TSUDesk into feature/news-ui

This commit is contained in:
Shcherbatykh Oleg
2026-02-27 11:32:55 +03:00
3 changed files with 4 additions and 4 deletions

View File

@@ -14,7 +14,7 @@ private const val BASE_TIMEOUT = 30L
@InstallIn(SingletonComponent::class)
object AppConfigModule {
private const val BASE_URL_PROD = "https://tulsu.ru/schedule/queries/"
private const val BASE_URL_PROD = "https://tulsu.ru/"
private const val BASE_URL_DEVELOP = "https://scherbatykh.ru/app/tsudesk/"
@Provides

View File

@@ -9,7 +9,7 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import ru.fincode.tsudesk.core.navigation.AppRoute
import ru.fincode.tsudesk.core.navigation.navigateRoute
import ru.fincode.tsudesk.feature.news.presentation.screen.NewsRoute
//import ru.fincode.tsudesk.feature.news.presentation.screen.NewsRoute
import ru.fincode.tsudesk.presentation.main.MainScaffold
import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute
import ru.fincode.tsudesk.feature.splash.presentation.screen.SplashRoute
@@ -63,7 +63,7 @@ private fun MainTabsNavHost(
}
composable<AppRoute.News> {
NewsRoute(modifier = Modifier.fillMaxSize())
// NewsRoute(modifier = Modifier.fillMaxSize())
}
composable<AppRoute.Progress> {

View File

@@ -3,7 +3,7 @@ package ru.fincode.tsudesk.feature.schedule.data.remote
object ScheduleApiContract {
object Path {
const val GET_SCHEDULE_METHOD = "GetSchedule.php"
const val GET_SCHEDULE_METHOD = "schedule/queries/GetSchedule.php"
}
object Query {