Change folder structure (#161)

Changed the folder structure to meet the implementation chapter in the report
cs-24-sw-8-04 · May 22, 2024 · 8ab55d6 · 8ab55d6
1 parent d0398b6
commit 8ab55d6
Show file tree

Hide file tree

Showing 54 changed files with 213 additions and 183 deletions.
diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt
@@ -19,15 +19,15 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import dk.scheduling.schedulingfrontend.pages.AccountPage
-import dk.scheduling.schedulingfrontend.pages.CreateDevicePage
-import dk.scheduling.schedulingfrontend.pages.CreateTaskPage
-import dk.scheduling.schedulingfrontend.pages.HomePage
-import dk.scheduling.schedulingfrontend.pages.LoginPage
-import dk.scheduling.schedulingfrontend.pages.Page
-import dk.scheduling.schedulingfrontend.pages.SignUpPage
-import dk.scheduling.schedulingfrontend.pages.TaskOverviewPage
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.gui.pages.AccountPage
+import dk.scheduling.schedulingfrontend.gui.pages.CreateDevicePage
+import dk.scheduling.schedulingfrontend.gui.pages.CreateTaskPage
+import dk.scheduling.schedulingfrontend.gui.pages.HomePage
+import dk.scheduling.schedulingfrontend.gui.pages.LoginPage
+import dk.scheduling.schedulingfrontend.gui.pages.Page
+import dk.scheduling.schedulingfrontend.gui.pages.SignUpPage
+import dk.scheduling.schedulingfrontend.gui.pages.TaskOverviewPage
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import kotlinx.coroutines.runBlocking
 
 class MainActivity : ComponentActivity() {
@@ -96,7 +96,11 @@ class MainActivity : ComponentActivity() {
                             CreateDevicePage(
                                 deviceRepository = App.appModule.deviceRepo,
                                 navigateOnValidCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
-                                navigateOnCancelCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
+                                navigateOnCancelCreation = {
+                                    appState.navHostController.navigate(
+                                        Page.DeviceOverview.route,
+                                    )
+                                },
                             )
                         }
                         composable(
@@ -107,7 +111,11 @@ class MainActivity : ComponentActivity() {
                                 deviceRepository = App.appModule.deviceRepo,
                                 taskRepository = App.appModule.taskRepo,
                                 navigateOnValidCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
-                                navigateOnCancelCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
+                                navigateOnCancelCreation = {
+                                    appState.navHostController.navigate(
+                                        Page.TaskOverview.route,
+                                    )
+                                },
                             )
                         }
                         composable(Page.Account.route) {

diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainLayout.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainLayout.kt
@@ -11,7 +11,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
-import dk.scheduling.schedulingfrontend.pages.Page
+import dk.scheduling.schedulingfrontend.gui.pages.Page
 
 @Composable
 fun BottomNavigationBar(

diff --git a/...uling/schedulingfrontend/api/ApiClient.kt → ...lingfrontend/datasources/api/ApiClient.kt b/...uling/schedulingfrontend/api/ApiClient.kt → ...lingfrontend/datasources/api/ApiClient.kt
@@ -1,8 +1,8 @@
-package dk.scheduling.schedulingfrontend.api
+package dk.scheduling.schedulingfrontend.datasources.api
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import dk.scheduling.schedulingfrontend.api.typeadapters.LocalDateTimeTypeAdapter
+import dk.scheduling.schedulingfrontend.datasources.api.typeadapters.LocalDateTimeTypeAdapter
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

diff --git a/...ling/schedulingfrontend/api/ApiService.kt → ...ingfrontend/datasources/api/ApiService.kt b/...ling/schedulingfrontend/api/ApiService.kt → ...ingfrontend/datasources/api/ApiService.kt
@@ -1,13 +1,13 @@
-package dk.scheduling.schedulingfrontend.api
-import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceRequest
-import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceResponse
-import dk.scheduling.schedulingfrontend.api.protocol.CreateTaskRequest
-import dk.scheduling.schedulingfrontend.api.protocol.GetDevicesResponse
-import dk.scheduling.schedulingfrontend.api.protocol.GetEventsResponse
-import dk.scheduling.schedulingfrontend.api.protocol.GetTasksResponse
-import dk.scheduling.schedulingfrontend.api.protocol.RegisterOrLoginRequest
-import dk.scheduling.schedulingfrontend.api.protocol.RegisterOrLoginResponse
-import dk.scheduling.schedulingfrontend.api.protocol.Task
+package dk.scheduling.schedulingfrontend.datasources.api
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceResponse
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateTaskRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetDevicesResponse
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetEventsResponse
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetTasksResponse
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.RegisterOrLoginRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.RegisterOrLoginResponse
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Task
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE

diff --git a/...hedulingfrontend/api/protocol/Accounts.kt → ...tend/datasources/api/protocol/Accounts.kt b/...hedulingfrontend/api/protocol/Accounts.kt → ...tend/datasources/api/protocol/Accounts.kt
@@ -1,6 +1,6 @@
 @file:Suppress("PropertyName")
 
-package dk.scheduling.schedulingfrontend.api.protocol
+package dk.scheduling.schedulingfrontend.datasources.api.protocol
 
 import java.util.UUID
 

diff --git a/...chedulingfrontend/api/protocol/Devices.kt → ...ntend/datasources/api/protocol/Devices.kt b/...chedulingfrontend/api/protocol/Devices.kt → ...ntend/datasources/api/protocol/Devices.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.api.protocol
+package dk.scheduling.schedulingfrontend.datasources.api.protocol
 
 data class Device(
     val id: Long,

diff --git a/...schedulingfrontend/api/protocol/Events.kt → ...ontend/datasources/api/protocol/Events.kt b/...schedulingfrontend/api/protocol/Events.kt → ...ontend/datasources/api/protocol/Events.kt
@@ -1,6 +1,6 @@
 @file:Suppress("PropertyName")
 
-package dk.scheduling.schedulingfrontend.api.protocol
+package dk.scheduling.schedulingfrontend.datasources.api.protocol
 
 import java.time.LocalDateTime
 

diff --git a/.../schedulingfrontend/api/protocol/Tasks.kt → ...rontend/datasources/api/protocol/Tasks.kt b/.../schedulingfrontend/api/protocol/Tasks.kt → ...rontend/datasources/api/protocol/Tasks.kt
@@ -1,6 +1,6 @@
 @file:Suppress("PropertyName")
 
-package dk.scheduling.schedulingfrontend.api.protocol
+package dk.scheduling.schedulingfrontend.datasources.api.protocol
 
 data class Task(
     val id: Long,

diff --git a/...hedulingfrontend/api/protocol/Timespan.kt → ...tend/datasources/api/protocol/Timespan.kt b/...hedulingfrontend/api/protocol/Timespan.kt → ...tend/datasources/api/protocol/Timespan.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.api.protocol
+package dk.scheduling.schedulingfrontend.datasources.api.protocol
 
 import java.time.LocalDateTime
 

diff --git a/.../typeadapters/LocalDateTimeTypeAdapter.kt → .../typeadapters/LocalDateTimeTypeAdapter.kt b/.../typeadapters/LocalDateTimeTypeAdapter.kt → .../typeadapters/LocalDateTimeTypeAdapter.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.api.typeadapters
+package dk.scheduling.schedulingfrontend.datasources.api.typeadapters
 
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer

diff --git a/...pp/src/main/java/dk/scheduling/schedulingfrontend/eventnotification/EventAlarmReceiver.kt b/...pp/src/main/java/dk/scheduling/schedulingfrontend/eventnotification/EventAlarmReceiver.kt
@@ -7,8 +7,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat.getString
 import dk.scheduling.schedulingfrontend.App
 import dk.scheduling.schedulingfrontend.R
-import dk.scheduling.schedulingfrontend.components.DATE_AND_TIME_FORMAT
 import dk.scheduling.schedulingfrontend.database.EventAlarm
+import dk.scheduling.schedulingfrontend.gui.components.DATE_AND_TIME_FORMAT
 import java.time.Duration
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit

diff --git a/.../schedulingfrontend/components/Buttons.kt → ...edulingfrontend/gui/components/Buttons.kt b/.../schedulingfrontend/components/Buttons.kt → ...edulingfrontend/gui/components/Buttons.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth

diff --git a/...frontend/components/ConfirmAlertDialog.kt → ...tend/gui/components/ConfirmAlertDialog.kt b/...frontend/components/ConfirmAlertDialog.kt → ...tend/gui/components/ConfirmAlertDialog.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.AlertDialog

diff --git a/...ingfrontend/components/DateRangePicker.kt → ...rontend/gui/components/DateRangePicker.kt b/...ingfrontend/components/DateRangePicker.kt → ...rontend/gui/components/DateRangePicker.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -27,8 +27,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.window.DialogProperties
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import dk.scheduling.schedulingfrontend.model.Status
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.LocalTime

diff --git a/...hedulingfrontend/components/Dateformat.kt → ...lingfrontend/gui/components/Dateformat.kt b/...hedulingfrontend/components/Dateformat.kt → ...lingfrontend/gui/components/Dateformat.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import java.time.format.DateTimeFormatter
 import java.util.Locale

diff --git a/.../schedulingfrontend/components/Heading.kt → ...edulingfrontend/gui/components/Heading.kt b/.../schedulingfrontend/components/Heading.kt → ...edulingfrontend/gui/components/Heading.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/.../schedulingfrontend/components/Loading.kt → ...edulingfrontend/gui/components/Loading.kt b/.../schedulingfrontend/components/Loading.kt → ...edulingfrontend/gui/components/Loading.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import kotlinx.coroutines.delay
 
 @Composable

diff --git a/...ontend/components/StandardDropDownMenu.kt → ...nd/gui/components/StandardDropDownMenu.kt b/...ontend/components/StandardDropDownMenu.kt → ...nd/gui/components/StandardDropDownMenu.kt
@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -22,7 +22,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 
 @Composable
 fun <T> StandardDropDownMenu(

diff --git a/...hedulingfrontend/components/TextFields.kt → ...lingfrontend/gui/components/TextFields.kt b/...hedulingfrontend/components/TextFields.kt → ...lingfrontend/gui/components/TextFields.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.KeyboardOptions

diff --git a/...hedulingfrontend/components/TimePicker.kt → ...lingfrontend/gui/components/TimePicker.kt b/...hedulingfrontend/components/TimePicker.kt → ...lingfrontend/gui/components/TimePicker.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.components
+package dk.scheduling.schedulingfrontend.gui.components
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...g/schedulingfrontend/pages/AccountPage.kt → ...hedulingfrontend/gui/pages/AccountPage.kt b/...g/schedulingfrontend/pages/AccountPage.kt → ...hedulingfrontend/gui/pages/AccountPage.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -21,10 +21,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.components.FilledButton
-import dk.scheduling.schedulingfrontend.components.OutlinedButton
+import dk.scheduling.schedulingfrontend.gui.components.FilledButton
+import dk.scheduling.schedulingfrontend.gui.components.OutlinedButton
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import dk.scheduling.schedulingfrontend.repositories.account.IAccountRepository
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
 import kotlinx.coroutines.launch
 import testdata.DummyAccountRepository
 

diff --git a/...edulingfrontend/pages/CreateDevicePage.kt → ...ingfrontend/gui/pages/CreateDevicePage.kt b/...edulingfrontend/pages/CreateDevicePage.kt → ...ingfrontend/gui/pages/CreateDevicePage.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -23,10 +23,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
-import dk.scheduling.schedulingfrontend.api.protocol.Device
-import dk.scheduling.schedulingfrontend.components.FilledButton
-import dk.scheduling.schedulingfrontend.components.OutlinedButton
-import dk.scheduling.schedulingfrontend.components.StandardTextField
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
+import dk.scheduling.schedulingfrontend.gui.components.FilledButton
+import dk.scheduling.schedulingfrontend.gui.components.OutlinedButton
+import dk.scheduling.schedulingfrontend.gui.components.StandardTextField
 import dk.scheduling.schedulingfrontend.repositories.device.IDeviceRepository
 import kotlinx.coroutines.launch
 import testdata.DummyDeviceRepository

diff --git a/...chedulingfrontend/pages/CreateTaskPage.kt → ...ulingfrontend/gui/pages/CreateTaskPage.kt b/...chedulingfrontend/pages/CreateTaskPage.kt → ...ulingfrontend/gui/pages/CreateTaskPage.kt
@@ -2,7 +2,7 @@
     ExperimentalMaterial3Api::class,
 )
 
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
@@ -32,20 +32,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.api.protocol.Device
-import dk.scheduling.schedulingfrontend.api.protocol.Timespan
-import dk.scheduling.schedulingfrontend.components.DateRange
-import dk.scheduling.schedulingfrontend.components.FilledButton
-import dk.scheduling.schedulingfrontend.components.Loading
-import dk.scheduling.schedulingfrontend.components.StandardDateRangePicker
-import dk.scheduling.schedulingfrontend.components.StandardDropDownMenu
-import dk.scheduling.schedulingfrontend.components.StandardTimePickerDialog
-import dk.scheduling.schedulingfrontend.components.Title
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Timespan
+import dk.scheduling.schedulingfrontend.gui.components.DateRange
+import dk.scheduling.schedulingfrontend.gui.components.FilledButton
+import dk.scheduling.schedulingfrontend.gui.components.Loading
+import dk.scheduling.schedulingfrontend.gui.components.StandardDateRangePicker
+import dk.scheduling.schedulingfrontend.gui.components.StandardDropDownMenu
+import dk.scheduling.schedulingfrontend.gui.components.StandardTimePickerDialog
+import dk.scheduling.schedulingfrontend.gui.components.Title
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import dk.scheduling.schedulingfrontend.model.Duration
 import dk.scheduling.schedulingfrontend.model.TaskForm
 import dk.scheduling.schedulingfrontend.repositories.device.IDeviceRepository
 import dk.scheduling.schedulingfrontend.repositories.task.ITaskRepository
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
 import kotlinx.coroutines.launch
 import testdata.DummyDeviceRepository
 import testdata.DummyTaskRepository

diff --git a/...ling/schedulingfrontend/pages/HomePage.kt → .../schedulingfrontend/gui/pages/HomePage.kt b/...ling/schedulingfrontend/pages/HomePage.kt → .../schedulingfrontend/gui/pages/HomePage.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.animateFloatAsState
@@ -44,19 +44,19 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.api.protocol.Device
-import dk.scheduling.schedulingfrontend.components.ConfirmAlertDialog
-import dk.scheduling.schedulingfrontend.components.DATE_FORMATTER
-import dk.scheduling.schedulingfrontend.components.Loading
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
+import dk.scheduling.schedulingfrontend.gui.components.ConfirmAlertDialog
+import dk.scheduling.schedulingfrontend.gui.components.DATE_FORMATTER
+import dk.scheduling.schedulingfrontend.gui.components.Loading
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.gui.theme.scheduled
+import dk.scheduling.schedulingfrontend.gui.theme.success
 import dk.scheduling.schedulingfrontend.model.DeviceOverview
 import dk.scheduling.schedulingfrontend.model.DeviceState
 import dk.scheduling.schedulingfrontend.model.getDeviceState
 import dk.scheduling.schedulingfrontend.repositories.device.IDeviceRepository
 import dk.scheduling.schedulingfrontend.repositories.overviews.IOverviewsRepository
 import dk.scheduling.schedulingfrontend.repositories.overviews.OverviewRepository
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
-import dk.scheduling.schedulingfrontend.ui.theme.scheduled
-import dk.scheduling.schedulingfrontend.ui.theme.success
 import kotlinx.coroutines.launch
 import testdata.DummyDeviceRepository
 import testdata.DummyEventRepository

diff --git a/...ing/schedulingfrontend/pages/LoginPage.kt → ...schedulingfrontend/gui/pages/LoginPage.kt b/...ing/schedulingfrontend/pages/LoginPage.kt → ...schedulingfrontend/gui/pages/LoginPage.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -20,12 +20,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import dk.scheduling.schedulingfrontend.components.FilledButton
-import dk.scheduling.schedulingfrontend.components.PasswordTextField
-import dk.scheduling.schedulingfrontend.components.StandardTextField
-import dk.scheduling.schedulingfrontend.components.Title
+import dk.scheduling.schedulingfrontend.gui.components.FilledButton
+import dk.scheduling.schedulingfrontend.gui.components.PasswordTextField
+import dk.scheduling.schedulingfrontend.gui.components.StandardTextField
+import dk.scheduling.schedulingfrontend.gui.components.Title
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
 import dk.scheduling.schedulingfrontend.repositories.account.IAccountRepository
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
 import kotlinx.coroutines.launch
 import testdata.DummyAccountRepository
 

diff --git a/...heduling/schedulingfrontend/pages/Page.kt → ...ling/schedulingfrontend/gui/pages/Page.kt b/...heduling/schedulingfrontend/pages/Page.kt → ...ling/schedulingfrontend/gui/pages/Page.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.pages
+package dk.scheduling.schedulingfrontend.gui.pages
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Login