fix: rename and fix imports

.eslintrc.json

@@ -31,5 +31,8 @@
       "extends": ["plugin:@nrwl/nx/javascript"],
       "rules": {}
     }
-  ]
+  ],
+  "globals": {
+    "__DEV__": true
+  }
 }

apps/skolplattformen-sthlm/App.js

@@ -1,8 +1,8 @@
 import * as eva from '@eva-design/eva'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import CookieManager from '@react-native-community/cookies'
-import { ApiProvider } from '@skolplattformen/api-hooks'
-import init from '@skolplattformen/embedded-api'
+import init from '@skolplattformen/api-skolplattformen'
+import { ApiProvider } from '@skolplattformen/hooks'
 import { ApplicationProvider, IconRegistry } from '@ui-kitten/components'
 import { EvaIconsPack } from '@ui-kitten/eva-icons'
 import React from 'react'

apps/skolplattformen-sthlm/components/__tests__/Absence.test.js

@@ -1,15 +1,15 @@
+import AsyncStorage from '@react-native-async-storage/async-storage'
 import { useRoute } from '@react-navigation/native'
+import { useUser } from '@skolplattformen/hooks'
 import { fireEvent, waitFor } from '@testing-library/react-native'
 import Mockdate from 'mockdate'
 import React from 'react'
 import { useSMS } from '../../utils/SMS'
 import { render } from '../../utils/testHelpers'
 import Absence from '../absence.component'
-import { useUser } from '@skolplattformen/api-hooks'
-import AsyncStorage from '@react-native-async-storage/async-storage'
 
 jest.mock('@react-navigation/native')
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 jest.mock('../../utils/SMS')
 
 let sendSMS

apps/skolplattformen-sthlm/components/__tests__/Auth.test.js

@@ -1,9 +1,9 @@
-import { useApi } from '@skolplattformen/api-hooks'
-import { render } from '../../utils/testHelpers'
+import { useApi } from '@skolplattformen/hooks'
 import React from 'react'
+import { render } from '../../utils/testHelpers'
 import { Auth } from '../auth.component'
 
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 jest.mock('react-native-localize')
 
 const setup = () => {

apps/skolplattformen-sthlm/components/__tests__/Children.test.js

@@ -1,22 +1,22 @@
+import { useNavigation } from '@react-navigation/core'
 import {
   useApi,
-  useChildList,
   useCalendar,
+  useChildList,
+  useClassmates,
+  useMenu,
   useNews,
   useNotifications,
   useSchedule,
-  useMenu,
   useTimetable,
-  useClassmates,
-} from '@skolplattformen/api-hooks'
-import { render } from '../../utils/testHelpers'
+} from '@skolplattformen/hooks'
 import React from 'react'
-import { Children } from '../children.component'
-import { useNavigation } from '@react-navigation/core'
 import * as RNLocalize from 'react-native-localize'
+import { render } from '../../utils/testHelpers'
 import { translate } from '../../utils/translation'
+import { Children } from '../children.component'
 
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 jest.mock('@react-navigation/core')
 jest.mock('react-native-localize')
 const setup = () => {

apps/skolplattformen-sthlm/components/__tests__/Classmates.test.js

@@ -1,11 +1,11 @@
-import { useClassmates } from '@skolplattformen/api-hooks'
+import { useClassmates } from '@skolplattformen/hooks'
 import React from 'react'
 import { render } from '../../utils/testHelpers'
 import { ChildProvider } from '../childContext.component'
 import { Classmates } from '../classmates.component'
 
 jest.mock('@react-navigation/native')
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 
 const defaultClassmates = [
   {

apps/skolplattformen-sthlm/components/__tests__/Menu.test.js

@@ -1,10 +1,10 @@
+import { useMenu } from '@skolplattformen/hooks'
 import React from 'react'
 import { render } from '../../utils/testHelpers'
-import { Menu } from '../menu.component'
-import { useMenu } from '@skolplattformen/api-hooks'
 import { translate } from '../../utils/translation'
+import { Menu } from '../menu.component'
 
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 
 const defaultItemList = [
   {

apps/skolplattformen-sthlm/components/__tests__/NewsItem.test.js

@@ -1,9 +1,9 @@
-import { useApi, useNewsDetails } from '@skolplattformen/api-hooks'
+import { useApi, useNewsDetails } from '@skolplattformen/hooks'
 import React from 'react'
 import { render } from '../../utils/testHelpers'
 import { NewsItem } from '../newsItem.component'
 
-jest.mock('@skolplattformen/api-hooks')
+jest.mock('@skolplattformen/hooks')
 
 const defaultNewsItem = {
   author: 'Köket',

apps/skolplattformen-sthlm/components/__tests__/NewsListItem.test.js

@@ -1,13 +1,13 @@
+import { useNavigation } from '@react-navigation/native'
+import { fireEvent } from '@testing-library/react-native'
+import MockDate from 'mockdate'
 import React from 'react'
 import { render } from '../../utils/testHelpers'
-import { NewsListItem } from '../newsListItem.component'
-import MockDate from 'mockdate'
-import { fireEvent } from '@testing-library/react-native'
-import { useNavigation } from '@react-navigation/native'
 import { ChildProvider } from '../childContext.component'
+import { NewsListItem } from '../newsListItem.component'
 
 jest.mock('@react-navigation/native')
-jest.mock('@skolplattformen/api-hooks', () => ({
+jest.mock('@skolplattformen/hooks', () => ({
   useApi: jest.fn().mockReturnValue({ api: { getSessionCookie: jest.fn() } }),
 }))
 

apps/skolplattformen-sthlm/components/absence.component.tsx

@@ -1,4 +1,5 @@
 import { RouteProp, useRoute } from '@react-navigation/native'
+import { useUser } from '@skolplattformen/hooks'
 import {
   Button,
   CheckBox,
@@ -16,15 +17,14 @@ import DateTimePickerModal from 'react-native-modal-datetime-picker'
 import { NativeStackNavigationOptions } from 'react-native-screens/native-stack'
 import * as Yup from 'yup'
 import { defaultStackStyling } from '../design/navigationThemes'
+import usePersonalStorage from '../hooks/usePersonalStorage'
 import { Layout as LayoutStyle, Sizing, Typography } from '../styles'
 import { studentName } from '../utils/peopleHelpers'
 import { useSMS } from '../utils/SMS'
 import { translate } from '../utils/translation'
 import { AlertIcon } from './icon.component'
 import { RootStackParamList } from './navigation.component'
 import { NavigationTitle } from './navigationTitle.component'
-import { useUser } from '@skolplattformen/api-hooks'
-import usePersonalStorage from '../hooks/usePersonalStorage'
 
 type AbsenceRouteProps = RouteProp<RootStackParamList, 'Absence'>
 

apps/skolplattformen-sthlm/components/calendar.component.tsx

@@ -1,11 +1,11 @@
-import { useCalendar } from '@skolplattformen/api-hooks'
-import { CalendarItem } from '@skolplattformen/embedded-api'
+import { CalendarItem } from '@skolplattformen/api-skolplattformen'
+import { useCalendar } from '@skolplattformen/hooks'
 import {
   Divider,
   List,
   ListItem,
-  Text,
   StyleService,
+  Text,
   useStyleSheet,
 } from '@ui-kitten/components'
 import moment from 'moment'

apps/skolplattformen-sthlm/components/childContext.component.tsx

@@ -1,4 +1,4 @@
-import { Child } from '@skolplattformen/embedded-api'
+import { Child } from '@skolplattformen/api-skolplattformen'
 import React, { createContext, useContext } from 'react'
 
 interface ChildProviderProps {

apps/skolplattformen-sthlm/components/childListItem.component.tsx

@@ -1,15 +1,15 @@
 /* eslint-disable react-native-a11y/has-accessibility-hint */
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
+import { Child } from '@skolplattformen/api-skolplattformen'
 import {
   useCalendar,
   useClassmates,
   useMenu,
   useNews,
   useNotifications,
   useSchedule,
-} from '@skolplattformen/api-hooks'
-import { Child } from '@skolplattformen/embedded-api'
+} from '@skolplattformen/hooks'
 import {
   Button,
   StyleService,
@@ -19,9 +19,9 @@ import {
 import moment from 'moment'
 import React from 'react'
 import { TouchableOpacity, useColorScheme, View } from 'react-native'
+import { useTranslation } from '../hooks/useTranslation'
 import { Colors, Layout, Sizing } from '../styles'
 import { studentName } from '../utils/peopleHelpers'
-import { useTranslation } from '../hooks/useTranslation'
 import { DaySummary } from './daySummary.component'
 import { AlertIcon, RightArrowIcon } from './icon.component'
 import { RootStackParamList } from './navigation.component'

apps/skolplattformen-sthlm/components/children.component.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/core'
-import { useApi, useChildList } from '@skolplattformen/api-hooks'
-import { Child } from '@skolplattformen/embedded-api'
+import { Child } from '@skolplattformen/api-skolplattformen'
+import { useApi, useChildList } from '@skolplattformen/hooks'
 import {
   Button,
   List,
@@ -44,7 +44,7 @@ export const Children = () => {
   const navigation = useNavigation()
 
   const { api } = useApi()
-  let { data: childList, status, reload } = useChildList()
+  const { data: childList, status, reload } = useChildList()
   const reloadChildren = () => {
     reload()
   }

apps/skolplattformen-sthlm/components/classmates.component.tsx

@@ -1,19 +1,19 @@
-import React from 'react'
-import { StyleSheet, ListRenderItemInfo } from 'react-native'
+import { Classmate } from '@skolplattformen/api-skolplattformen'
+import { useClassmates } from '@skolplattformen/hooks'
 import {
   Divider,
-  List,
-  ListItem,
   Icon,
   IconProps,
+  List,
+  ListItem,
   Text,
 } from '@ui-kitten/components'
+import React from 'react'
+import { ListRenderItemInfo, StyleSheet } from 'react-native'
 import { fullName, guardians, sortByFirstName } from '../utils/peopleHelpers'
+import { translate } from '../utils/translation'
 import { useChild } from './childContext.component'
-import { useClassmates } from '@skolplattformen/api-hooks'
 import { ContactMenu } from './contactMenu.component'
-import { Classmate } from '@skolplattformen/embedded-api'
-import { translate } from '../utils/translation'
 
 interface ClassmatesProps {
   setSelected: (value?: number | null) => void

apps/skolplattformen-sthlm/components/contactMenu.component.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react-native-a11y/has-accessibility-hint */
-import { Classmate } from '@skolplattformen/embedded-api'
+import { Classmate } from '@skolplattformen/api-skolplattformen'
 import {
   Button,
   MenuGroup,
@@ -9,14 +9,14 @@ import {
 import React from 'react'
 import { Linking, StyleSheet } from 'react-native'
 import { fullName } from '../utils/peopleHelpers'
+import { translate } from '../utils/translation'
 import {
   CallIcon,
   EmailIcon,
   MapIcon,
   MoreIcon,
   SMSIcon,
 } from './icon.component'
-import { translate } from '../utils/translation'
 
 interface ContactMenuProps {
   contact: Classmate

apps/skolplattformen-sthlm/components/daySummary.component.tsx

@@ -1,5 +1,5 @@
-import { useTimetable } from '@skolplattformen/api-hooks'
-import { Child } from '@skolplattformen/embedded-api'
+import { Child } from '@skolplattformen/api-skolplattformen'
+import { useTimetable } from '@skolplattformen/hooks'
 import { StyleService, Text, useStyleSheet } from '@ui-kitten/components'
 import moment, { Moment } from 'moment'
 import React from 'react'

apps/skolplattformen-sthlm/components/image.component.tsx

@@ -1,4 +1,4 @@
-import { useApi } from '@skolplattformen/api-hooks'
+import { useApi } from '@skolplattformen/hooks'
 import React, { useEffect, useState } from 'react'
 import { Image as ImageBase, ImageStyle, StyleProp } from 'react-native'
 

apps/skolplattformen-sthlm/components/login.component.tsx

@@ -1,4 +1,4 @@
-import { useApi } from '@skolplattformen/api-hooks'
+import { useApi } from '@skolplattformen/hooks'
 import {
   Button,
   ButtonGroup,

apps/skolplattformen-sthlm/components/menu.component.tsx

@@ -1,5 +1,5 @@
-import { useMenu } from '@skolplattformen/api-hooks'
-import { MenuItem } from '@skolplattformen/embedded-api'
+import { MenuItem } from '@skolplattformen/api-skolplattformen'
+import { useMenu } from '@skolplattformen/hooks'
 import {
   Divider,
   List,

apps/skolplattformen-sthlm/components/menuListItem.component.tsx

@@ -1,4 +1,4 @@
-import { MenuItem } from '@skolplattformen/embedded-api'
+import { MenuItem } from '@skolplattformen/api-skolplattformen'
 import { StyleService, Text, useStyleSheet } from '@ui-kitten/components'
 import React from 'react'
 import { View } from 'react-native'

apps/skolplattformen-sthlm/components/modalWebView.component.tsx

@@ -1,4 +1,4 @@
-import { useApi } from '@skolplattformen/api-hooks'
+import { useApi } from '@skolplattformen/hooks'
 import { StyleService, Text, useStyleSheet } from '@ui-kitten/components'
 import React, { useEffect, useState } from 'react'
 import { Linking, Modal, TouchableOpacity, View } from 'react-native'

apps/skolplattformen-sthlm/components/navigation.component.tsx

@@ -1,9 +1,9 @@
 import { NavigationContainer } from '@react-navigation/native'
-import { useApi } from '@skolplattformen/api-hooks'
 import {
   Child as ChildType,
   NewsItem as NewsItemType,
-} from '@skolplattformen/embedded-api'
+} from '@skolplattformen/api-skolplattformen'
+import { useApi } from '@skolplattformen/hooks'
 import { useTheme } from '@ui-kitten/components'
 import { Library } from 'libraries.json'
 import React, { useEffect } from 'react'
@@ -153,9 +153,7 @@ export const AppNavigator = () => {
             />
           </>
         ) : (
-          <>
-            <Screen name="Login" component={Auth} options={authRouteOptions} />
-          </>
+          <Screen name="Login" component={Auth} options={authRouteOptions} />
         )}
         <Screen
           name="SetLanguage"

apps/skolplattformen-sthlm/components/newsItem.component.tsx

@@ -1,6 +1,6 @@
 import { RouteProp } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
-import { useNewsDetails } from '@skolplattformen/api-hooks'
+import { useNewsDetails } from '@skolplattformen/hooks'
 import { StyleService, Text, useStyleSheet } from '@ui-kitten/components'
 import moment from 'moment'
 import 'moment/locale/sv'

apps/skolplattformen-sthlm/components/newsList.component.tsx

@@ -1,4 +1,4 @@
-import { useNews } from '@skolplattformen/api-hooks'
+import { useNews } from '@skolplattformen/hooks'
 import { Input, List, StyleService, useStyleSheet } from '@ui-kitten/components'
 import React, { useMemo, useState } from 'react'
 import { TouchableOpacity, View } from 'react-native'

apps/skolplattformen-sthlm/components/newsListItem.component.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
-import { NewsItem } from '@skolplattformen/embedded-api'
+import { NewsItem } from '@skolplattformen/api-skolplattformen'
 import { StyleService, useStyleSheet } from '@ui-kitten/components'
 import moment from 'moment'
 import React, { ReactNode } from 'react'

apps/skolplattformen-sthlm/components/notification.component.tsx

@@ -1,4 +1,4 @@
-import { Notification as NotificationType } from '@skolplattformen/embedded-api'
+import { Notification as NotificationType } from '@skolplattformen/api-skolplattformen'
 import { StyleService, Text, useStyleSheet } from '@ui-kitten/components'
 import moment from 'moment'
 import React from 'react'

apps/skolplattformen-sthlm/components/notificationsList.component.tsx

@@ -1,4 +1,4 @@
-import { useNotifications } from '@skolplattformen/api-hooks'
+import { useNotifications } from '@skolplattformen/hooks'
 import { List, StyleService, useStyleSheet } from '@ui-kitten/components'
 import React from 'react'
 import { Sizing } from '../styles'

apps/skolplattformen-sthlm/components/saveToCalendar.component.tsx

@@ -1,4 +1,4 @@
-import { CalendarItem } from '@skolplattformen/embedded-api'
+import { CalendarItem } from '@skolplattformen/api-skolplattformen'
 import { Button, MenuItem, OverflowMenu, Text } from '@ui-kitten/components'
 import React from 'react'
 import RNCalendarEvents from 'react-native-calendar-events'

apps/skolplattformen-sthlm/components/settings.component.tsx

@@ -1,5 +1,5 @@
 import { NavigationProp, useNavigation } from '@react-navigation/core'
-import { useApi } from '@skolplattformen/api-hooks'
+import { useApi } from '@skolplattformen/hooks'
 import React, { useCallback } from 'react'
 import { ScrollView } from 'react-native'
 import { NativeStackNavigationOptions } from 'react-native-screens/native-stack'