diff --git a/src/navigation/MainNavigator.js b/src/navigation/MainNavigator.js index 531bfd1..f3f08d5 100644 --- a/src/navigation/MainNavigator.js +++ b/src/navigation/MainNavigator.js @@ -12,18 +12,18 @@ import TetrisScreen from "../screens/Tetris/TetrisScreen"; import VoteScreen from "../screens/Amicale/VoteScreen"; import LoginScreen from "../screens/Amicale/LoginScreen"; import {Platform} from "react-native"; -import AvailableRoomScreen from "../screens/Websites/AvailableRoomScreen"; -import BibScreen from "../screens/Websites/BibScreen"; +import AvailableRoomScreen from "../screens/Services/Websites/AvailableRoomScreen"; +import BibScreen from "../screens/Services/Websites/BibScreen"; import SelfMenuScreen from "../screens/Services/SelfMenuScreen"; -import ProximoMainScreen from "../screens/Proximo/ProximoMainScreen"; -import ProximoListScreen from "../screens/Proximo/ProximoListScreen"; -import ProximoAboutScreen from "../screens/Proximo/ProximoAboutScreen"; -import {AmicaleWebsiteScreen} from "../screens/Websites/AmicaleWebsiteScreen"; -import {ElusEtudiantsWebsiteScreen} from "../screens/Websites/ElusEtudiantsWebsiteScreen"; -import {WiketudWebsiteScreen} from "../screens/Websites/WiketudWebsiteScreen"; -import {TutorInsaWebsiteScreen} from "../screens/Websites/TutorInsaWebsiteScreen"; -import {ENTWebsiteScreen} from "../screens/Websites/ENTWebsiteScreen"; -import {BlueMindWebsiteScreen} from "../screens/Websites/BlueMindWebsiteScreen"; +import ProximoMainScreen from "../screens/Services/Proximo/ProximoMainScreen"; +import ProximoListScreen from "../screens/Services/Proximo/ProximoListScreen"; +import ProximoAboutScreen from "../screens/Services/Proximo/ProximoAboutScreen"; +import {AmicaleWebsiteScreen} from "../screens/Services/Websites/AmicaleWebsiteScreen"; +import {ElusEtudiantsWebsiteScreen} from "../screens/Services/Websites/ElusEtudiantsWebsiteScreen"; +import {WiketudWebsiteScreen} from "../screens/Services/Websites/WiketudWebsiteScreen"; +import {TutorInsaWebsiteScreen} from "../screens/Services/Websites/TutorInsaWebsiteScreen"; +import {ENTWebsiteScreen} from "../screens/Services/Websites/ENTWebsiteScreen"; +import {BlueMindWebsiteScreen} from "../screens/Services/Websites/BlueMindWebsiteScreen"; import ProfileScreen from "../screens/Amicale/ProfileScreen"; import ClubListScreen from "../screens/Amicale/Clubs/ClubListScreen"; import ClubAboutScreen from "../screens/Amicale/Clubs/ClubAboutScreen"; diff --git a/src/screens/Proximo/ProximoAboutScreen.js b/src/screens/Services/Proximo/ProximoAboutScreen.js similarity index 96% rename from src/screens/Proximo/ProximoAboutScreen.js rename to src/screens/Services/Proximo/ProximoAboutScreen.js index 2bb0099..ab824e3 100644 --- a/src/screens/Proximo/ProximoAboutScreen.js +++ b/src/screens/Services/Proximo/ProximoAboutScreen.js @@ -4,7 +4,7 @@ import * as React from 'react'; import {Image, ScrollView, View} from 'react-native'; import i18n from "i18n-js"; import {Card, List, Paragraph, Text} from 'react-native-paper'; -import CustomTabBar from "../../components/Tabbar/CustomTabBar"; +import CustomTabBar from "../../../components/Tabbar/CustomTabBar"; type Props = { navigation: Object, diff --git a/src/screens/Proximo/ProximoListScreen.js b/src/screens/Services/Proximo/ProximoListScreen.js similarity index 95% rename from src/screens/Proximo/ProximoListScreen.js rename to src/screens/Services/Proximo/ProximoListScreen.js index a59db43..7579266 100644 --- a/src/screens/Proximo/ProximoListScreen.js +++ b/src/screens/Services/Proximo/ProximoListScreen.js @@ -3,13 +3,13 @@ import * as React from 'react'; import {Animated, Image, Platform, ScrollView, View} from "react-native"; import i18n from "i18n-js"; -import CustomModal from "../../components/Overrides/CustomModal"; +import CustomModal from "../../../components/Overrides/CustomModal"; import {RadioButton, Searchbar, Subheading, Text, Title, withTheme} from "react-native-paper"; -import {stringMatchQuery} from "../../utils/Search"; -import ProximoListItem from "../../components/Lists/Proximo/ProximoListItem"; -import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton"; -import {withCollapsible} from "../../utils/withCollapsible"; -import CustomTabBar from "../../components/Tabbar/CustomTabBar"; +import {stringMatchQuery} from "../../../utils/Search"; +import ProximoListItem from "../../../components/Lists/Proximo/ProximoListItem"; +import MaterialHeaderButtons, {Item} from "../../../components/Overrides/CustomHeaderButton"; +import {withCollapsible} from "../../../utils/withCollapsible"; +import CustomTabBar from "../../../components/Tabbar/CustomTabBar"; function sortPrice(a, b) { return a.price - b.price; diff --git a/src/screens/Proximo/ProximoMainScreen.js b/src/screens/Services/Proximo/ProximoMainScreen.js similarity index 97% rename from src/screens/Proximo/ProximoMainScreen.js rename to src/screens/Services/Proximo/ProximoMainScreen.js index 7684a6a..423deb8 100644 --- a/src/screens/Proximo/ProximoMainScreen.js +++ b/src/screens/Services/Proximo/ProximoMainScreen.js @@ -3,9 +3,9 @@ import * as React from 'react'; import {View} from 'react-native' import i18n from "i18n-js"; -import WebSectionList from "../../components/Screens/WebSectionList"; +import WebSectionList from "../../../components/Screens/WebSectionList"; import {List, withTheme} from 'react-native-paper'; -import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton"; +import MaterialHeaderButtons, {Item} from "../../../components/Overrides/CustomHeaderButton"; const DATA_URL = "https://etud.insa-toulouse.fr/~proximo/data/stock-v2.json"; const LIST_ITEM_HEIGHT = 84; diff --git a/src/screens/Websites/AmicaleWebsiteScreen.js b/src/screens/Services/Websites/AmicaleWebsiteScreen.js similarity index 91% rename from src/screens/Websites/AmicaleWebsiteScreen.js rename to src/screens/Services/Websites/AmicaleWebsiteScreen.js index 6b13a34..9d63576 100644 --- a/src/screens/Websites/AmicaleWebsiteScreen.js +++ b/src/screens/Services/Websites/AmicaleWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; import {CommonActions} from "@react-navigation/native"; const URL = 'https://www.amicale-insat.fr/'; diff --git a/src/screens/Websites/AvailableRoomScreen.js b/src/screens/Services/Websites/AvailableRoomScreen.js similarity index 95% rename from src/screens/Websites/AvailableRoomScreen.js rename to src/screens/Services/Websites/AvailableRoomScreen.js index a43b8ca..425afd1 100644 --- a/src/screens/Websites/AvailableRoomScreen.js +++ b/src/screens/Services/Websites/AvailableRoomScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; type Props = { navigation: Object, diff --git a/src/screens/Websites/BibScreen.js b/src/screens/Services/Websites/BibScreen.js similarity index 96% rename from src/screens/Websites/BibScreen.js rename to src/screens/Services/Websites/BibScreen.js index 30eb0e6..9544a8f 100644 --- a/src/screens/Websites/BibScreen.js +++ b/src/screens/Services/Websites/BibScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; type Props = { navigation: Object, diff --git a/src/screens/Websites/BlueMindWebsiteScreen.js b/src/screens/Services/Websites/BlueMindWebsiteScreen.js similarity index 83% rename from src/screens/Websites/BlueMindWebsiteScreen.js rename to src/screens/Services/Websites/BlueMindWebsiteScreen.js index 933591f..c4dabf5 100644 --- a/src/screens/Websites/BlueMindWebsiteScreen.js +++ b/src/screens/Services/Websites/BlueMindWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; const URL = 'https://etud-mel.insa-toulouse.fr/webmail/'; /** diff --git a/src/screens/Websites/ENTWebsiteScreen.js b/src/screens/Services/Websites/ENTWebsiteScreen.js similarity index 82% rename from src/screens/Websites/ENTWebsiteScreen.js rename to src/screens/Services/Websites/ENTWebsiteScreen.js index 33fe886..8d79211 100644 --- a/src/screens/Websites/ENTWebsiteScreen.js +++ b/src/screens/Services/Websites/ENTWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; const URL = 'https://ent.insa-toulouse.fr/'; /** diff --git a/src/screens/Websites/ElusEtudiantsWebsiteScreen.js b/src/screens/Services/Websites/ElusEtudiantsWebsiteScreen.js similarity index 83% rename from src/screens/Websites/ElusEtudiantsWebsiteScreen.js rename to src/screens/Services/Websites/ElusEtudiantsWebsiteScreen.js index d51002e..367580a 100644 --- a/src/screens/Websites/ElusEtudiantsWebsiteScreen.js +++ b/src/screens/Services/Websites/ElusEtudiantsWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; const URL = 'https://etud.insa-toulouse.fr/~eeinsat/'; /** diff --git a/src/screens/Websites/TutorInsaWebsiteScreen.js b/src/screens/Services/Websites/TutorInsaWebsiteScreen.js similarity index 83% rename from src/screens/Websites/TutorInsaWebsiteScreen.js rename to src/screens/Services/Websites/TutorInsaWebsiteScreen.js index 5f7ed92..d78a4df 100644 --- a/src/screens/Websites/TutorInsaWebsiteScreen.js +++ b/src/screens/Services/Websites/TutorInsaWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; const URL = 'https://www.etud.insa-toulouse.fr/~tutorinsa/'; /** diff --git a/src/screens/Websites/WiketudWebsiteScreen.js b/src/screens/Services/Websites/WiketudWebsiteScreen.js similarity index 83% rename from src/screens/Websites/WiketudWebsiteScreen.js rename to src/screens/Services/Websites/WiketudWebsiteScreen.js index 6d3bd1b..d4eda67 100644 --- a/src/screens/Websites/WiketudWebsiteScreen.js +++ b/src/screens/Services/Websites/WiketudWebsiteScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../../components/Screens/WebViewScreen"; +import WebViewScreen from "../../../components/Screens/WebViewScreen"; const URL = 'https://wiki.etud.insa-toulouse.fr/'; /**