diff --git a/App.js b/App.js index 9037d53..2b7152a 100644 --- a/App.js +++ b/App.js @@ -2,19 +2,19 @@ import * as React from 'react'; import {Platform, StatusBar} from 'react-native'; -import LocaleManager from './managers/LocaleManager'; -import AsyncStorageManager from "./managers/AsyncStorageManager"; -import CustomIntroSlider from "./components/Custom/CustomIntroSlider"; +import LocaleManager from './src/managers/LocaleManager'; +import AsyncStorageManager from "./src/managers/AsyncStorageManager"; +import CustomIntroSlider from "./src/components/Custom/CustomIntroSlider"; import {SplashScreen} from 'expo'; -import ThemeManager from './managers/ThemeManager'; +import ThemeManager from './src/managers/ThemeManager'; import {NavigationContainer} from '@react-navigation/native'; import {createStackNavigator} from '@react-navigation/stack'; -import DrawerNavigator from './navigation/DrawerNavigator'; -import {initExpoToken} from "./utils/Notifications"; +import DrawerNavigator from './src/navigation/DrawerNavigator'; +import {initExpoToken} from "./src/utils/Notifications"; import {Provider as PaperProvider} from 'react-native-paper'; -import AprilFoolsManager from "./managers/AprilFoolsManager"; -import Update from "./constants/Update"; -import ConnectionManager from "./managers/ConnectionManager"; +import AprilFoolsManager from "./src/managers/AprilFoolsManager"; +import Update from "./src/constants/Update"; +import ConnectionManager from "./src/managers/ConnectionManager"; type Props = {}; diff --git a/__tests__/managers/ConnectionManager.test.js b/__tests__/managers/ConnectionManager.test.js index dcc1c28..024af03 100644 --- a/__tests__/managers/ConnectionManager.test.js +++ b/__tests__/managers/ConnectionManager.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import ConnectionManager, {ERROR_TYPE} from "../../managers/ConnectionManager"; +import ConnectionManager, {ERROR_TYPE} from "../../src/managers/ConnectionManager"; import * as SecureStore from 'expo-secure-store'; let fetch = require('isomorphic-fetch'); // fetch is not implemented in nodeJS but in react-native diff --git a/__tests__/utils/PlanningEventManager.test.js b/__tests__/utils/PlanningEventManager.test.js index 2970924..21d972a 100644 --- a/__tests__/utils/PlanningEventManager.test.js +++ b/__tests__/utils/PlanningEventManager.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import * as Planning from "../../utils/Planning"; +import * as Planning from "../../src/utils/Planning"; test('isDescriptionEmpty', () => { expect(Planning.isDescriptionEmpty("")).toBeTrue(); diff --git a/components/Amicale/AuthenticatedScreen.js b/src/components/Amicale/AuthenticatedScreen.js similarity index 100% rename from components/Amicale/AuthenticatedScreen.js rename to src/components/Amicale/AuthenticatedScreen.js diff --git a/components/Amicale/LogoutDialog.js b/src/components/Amicale/LogoutDialog.js similarity index 100% rename from components/Amicale/LogoutDialog.js rename to src/components/Amicale/LogoutDialog.js diff --git a/components/Custom/AlertDialog.js b/src/components/Custom/AlertDialog.js similarity index 100% rename from components/Custom/AlertDialog.js rename to src/components/Custom/AlertDialog.js diff --git a/components/Custom/BasicLoadingScreen.js b/src/components/Custom/BasicLoadingScreen.js similarity index 100% rename from components/Custom/BasicLoadingScreen.js rename to src/components/Custom/BasicLoadingScreen.js diff --git a/components/Custom/CustomAgenda.js b/src/components/Custom/CustomAgenda.js similarity index 100% rename from components/Custom/CustomAgenda.js rename to src/components/Custom/CustomAgenda.js diff --git a/components/Custom/CustomIntroSlider.js b/src/components/Custom/CustomIntroSlider.js similarity index 98% rename from components/Custom/CustomIntroSlider.js rename to src/components/Custom/CustomIntroSlider.js index 39e589e..9e4ace0 100644 --- a/components/Custom/CustomIntroSlider.js +++ b/src/components/Custom/CustomIntroSlider.js @@ -34,7 +34,7 @@ export default class CustomIntroSlider extends React.Component { key: '1', title: i18n.t('intro.slide1.title'), text: i18n.t('intro.slide1.text'), - image: require('../../assets/splash.png'), + image: require('../../../assets/splash.png'), colors: ['#e01928', '#be1522'], }, { diff --git a/components/Custom/CustomModal.js b/src/components/Custom/CustomModal.js similarity index 100% rename from components/Custom/CustomModal.js rename to src/components/Custom/CustomModal.js diff --git a/components/Custom/HeaderButton.js b/src/components/Custom/HeaderButton.js similarity index 100% rename from components/Custom/HeaderButton.js rename to src/components/Custom/HeaderButton.js diff --git a/components/Custom/NetworkErrorComponent.js b/src/components/Custom/NetworkErrorComponent.js similarity index 100% rename from components/Custom/NetworkErrorComponent.js rename to src/components/Custom/NetworkErrorComponent.js diff --git a/components/Home/ActionsDashboardItem.js b/src/components/Home/ActionsDashboardItem.js similarity index 100% rename from components/Home/ActionsDashboardItem.js rename to src/components/Home/ActionsDashboardItem.js diff --git a/components/Home/EventDashboardItem.js b/src/components/Home/EventDashboardItem.js similarity index 100% rename from components/Home/EventDashboardItem.js rename to src/components/Home/EventDashboardItem.js diff --git a/components/Home/FeedItem.js b/src/components/Home/FeedItem.js similarity index 97% rename from components/Home/FeedItem.js rename to src/components/Home/FeedItem.js index a4498c6..146611a 100644 --- a/components/Home/FeedItem.js +++ b/src/components/Home/FeedItem.js @@ -5,7 +5,7 @@ import Autolink from "react-native-autolink"; import i18n from "i18n-js"; import ImageModal from 'react-native-image-modal'; -const ICON_AMICALE = require('../../assets/amicale.png'); +const ICON_AMICALE = require('../../../assets/amicale.png'); /** * Component used to display a feed item diff --git a/components/Home/PreviewEventDashboardItem.js b/src/components/Home/PreviewEventDashboardItem.js similarity index 100% rename from components/Home/PreviewEventDashboardItem.js rename to src/components/Home/PreviewEventDashboardItem.js diff --git a/components/Home/SmallDashboardItem.js b/src/components/Home/SmallDashboardItem.js similarity index 100% rename from components/Home/SmallDashboardItem.js rename to src/components/Home/SmallDashboardItem.js diff --git a/components/Lists/ClubListHeader.js b/src/components/Lists/ClubListHeader.js similarity index 100% rename from components/Lists/ClubListHeader.js rename to src/components/Lists/ClubListHeader.js diff --git a/components/Lists/ClubListItem.js b/src/components/Lists/ClubListItem.js similarity index 100% rename from components/Lists/ClubListItem.js rename to src/components/Lists/ClubListItem.js diff --git a/components/Lists/ProximoListItem.js b/src/components/Lists/ProximoListItem.js similarity index 100% rename from components/Lists/ProximoListItem.js rename to src/components/Lists/ProximoListItem.js diff --git a/components/Lists/ProxiwashListItem.js b/src/components/Lists/ProxiwashListItem.js similarity index 100% rename from components/Lists/ProxiwashListItem.js rename to src/components/Lists/ProxiwashListItem.js diff --git a/components/Lists/WebSectionList.js b/src/components/Lists/WebSectionList.js similarity index 100% rename from components/Lists/WebSectionList.js rename to src/components/Lists/WebSectionList.js diff --git a/components/Screens/WebViewScreen.js b/src/components/Screens/WebViewScreen.js similarity index 100% rename from components/Screens/WebViewScreen.js rename to src/components/Screens/WebViewScreen.js diff --git a/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js similarity index 99% rename from components/Sidebar/Sidebar.js rename to src/components/Sidebar/Sidebar.js index 5b09fc6..f5ed66a 100644 --- a/components/Sidebar/Sidebar.js +++ b/src/components/Sidebar/Sidebar.js @@ -256,7 +256,7 @@ class SideBar extends React.Component { onPress={onPress} > diff --git a/constants/ProxiwashConstants.js b/src/constants/ProxiwashConstants.js similarity index 100% rename from constants/ProxiwashConstants.js rename to src/constants/ProxiwashConstants.js diff --git a/constants/Update.js b/src/constants/Update.js similarity index 100% rename from constants/Update.js rename to src/constants/Update.js diff --git a/managers/AprilFoolsManager.js b/src/managers/AprilFoolsManager.js similarity index 100% rename from managers/AprilFoolsManager.js rename to src/managers/AprilFoolsManager.js diff --git a/managers/AsyncStorageManager.js b/src/managers/AsyncStorageManager.js similarity index 100% rename from managers/AsyncStorageManager.js rename to src/managers/AsyncStorageManager.js diff --git a/managers/ConnectionManager.js b/src/managers/ConnectionManager.js similarity index 100% rename from managers/ConnectionManager.js rename to src/managers/ConnectionManager.js diff --git a/managers/DateManager.js b/src/managers/DateManager.js similarity index 100% rename from managers/DateManager.js rename to src/managers/DateManager.js diff --git a/managers/LocaleManager.js b/src/managers/LocaleManager.js similarity index 85% rename from managers/LocaleManager.js rename to src/managers/LocaleManager.js index 5b7b28d..15c5390 100644 --- a/managers/LocaleManager.js +++ b/src/managers/LocaleManager.js @@ -3,8 +3,8 @@ import i18n from 'i18n-js'; import * as Localization from 'expo-localization'; -import en from '../translations/en'; -import fr from '../translations/fr'; +import en from '../../translations/en'; +import fr from '../../translations/fr'; /** * Static class used to manage locales diff --git a/managers/ThemeManager.js b/src/managers/ThemeManager.js similarity index 100% rename from managers/ThemeManager.js rename to src/managers/ThemeManager.js diff --git a/navigation/DrawerNavigator.js b/src/navigation/DrawerNavigator.js similarity index 100% rename from navigation/DrawerNavigator.js rename to src/navigation/DrawerNavigator.js diff --git a/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js similarity index 100% rename from navigation/MainTabNavigator.js rename to src/navigation/MainTabNavigator.js diff --git a/screens/About/AboutDependenciesScreen.js b/src/screens/About/AboutDependenciesScreen.js similarity index 96% rename from screens/About/AboutDependenciesScreen.js rename to src/screens/About/AboutDependenciesScreen.js index 2b8f3ce..48cc2c8 100644 --- a/screens/About/AboutDependenciesScreen.js +++ b/src/screens/About/AboutDependenciesScreen.js @@ -2,7 +2,7 @@ import * as React from 'react'; import {FlatList} from "react-native"; -import packageJson from '../../package'; +import packageJson from '../../../package'; import {List} from 'react-native-paper'; type listItem = { diff --git a/screens/About/AboutScreen.js b/src/screens/About/AboutScreen.js similarity index 99% rename from screens/About/AboutScreen.js rename to src/screens/About/AboutScreen.js index ca7c942..4373db4 100644 --- a/screens/About/AboutScreen.js +++ b/src/screens/About/AboutScreen.js @@ -3,7 +3,7 @@ import * as React from 'react'; import {FlatList, Linking, Platform, View} from 'react-native'; import i18n from "i18n-js"; -import appJson from '../../app'; +import appJson from '../../../app'; import AsyncStorageManager from "../../managers/AsyncStorageManager"; import CustomModal from "../../components/Custom/CustomModal"; import {Avatar, Button, Card, List, Text, Title, withTheme} from 'react-native-paper'; @@ -213,7 +213,7 @@ class AboutScreen extends React.Component { return ( ); diff --git a/screens/About/DebugScreen.js b/src/screens/About/DebugScreen.js similarity index 100% rename from screens/About/DebugScreen.js rename to src/screens/About/DebugScreen.js diff --git a/screens/Amicale/Clubs/ClubAboutScreen.js b/src/screens/Amicale/Clubs/ClubAboutScreen.js similarity index 100% rename from screens/Amicale/Clubs/ClubAboutScreen.js rename to src/screens/Amicale/Clubs/ClubAboutScreen.js diff --git a/screens/Amicale/Clubs/ClubDisplayScreen.js b/src/screens/Amicale/Clubs/ClubDisplayScreen.js similarity index 100% rename from screens/Amicale/Clubs/ClubDisplayScreen.js rename to src/screens/Amicale/Clubs/ClubDisplayScreen.js diff --git a/screens/Amicale/Clubs/ClubListScreen.js b/src/screens/Amicale/Clubs/ClubListScreen.js similarity index 100% rename from screens/Amicale/Clubs/ClubListScreen.js rename to src/screens/Amicale/Clubs/ClubListScreen.js diff --git a/screens/Amicale/LoginScreen.js b/src/screens/Amicale/LoginScreen.js similarity index 99% rename from screens/Amicale/LoginScreen.js rename to src/screens/Amicale/LoginScreen.js index 6424f0e..b1086dd 100644 --- a/screens/Amicale/LoginScreen.js +++ b/src/screens/Amicale/LoginScreen.js @@ -23,7 +23,7 @@ type State = { dialogMessage: string, } -const ICON_AMICALE = require('../../assets/amicale.png'); +const ICON_AMICALE = require('../../../assets/amicale.png'); const RESET_PASSWORD_LINK = "https://www.amicale-insat.fr/password/reset"; diff --git a/screens/Amicale/ProfileScreen.js b/src/screens/Amicale/ProfileScreen.js similarity index 100% rename from screens/Amicale/ProfileScreen.js rename to src/screens/Amicale/ProfileScreen.js diff --git a/screens/HomeScreen.js b/src/screens/HomeScreen.js similarity index 100% rename from screens/HomeScreen.js rename to src/screens/HomeScreen.js diff --git a/screens/Planning/PlanningDisplayScreen.js b/src/screens/Planning/PlanningDisplayScreen.js similarity index 100% rename from screens/Planning/PlanningDisplayScreen.js rename to src/screens/Planning/PlanningDisplayScreen.js diff --git a/screens/Planning/PlanningScreen.js b/src/screens/Planning/PlanningScreen.js similarity index 100% rename from screens/Planning/PlanningScreen.js rename to src/screens/Planning/PlanningScreen.js diff --git a/screens/Proximo/ProximoAboutScreen.js b/src/screens/Proximo/ProximoAboutScreen.js similarity index 95% rename from screens/Proximo/ProximoAboutScreen.js rename to src/screens/Proximo/ProximoAboutScreen.js index 05a59d0..6615b72 100644 --- a/screens/Proximo/ProximoAboutScreen.js +++ b/src/screens/Proximo/ProximoAboutScreen.js @@ -26,7 +26,7 @@ export default class ProximoAboutScreen extends React.Component { alignItems: 'center' }}> diff --git a/screens/Proximo/ProximoListScreen.js b/src/screens/Proximo/ProximoListScreen.js similarity index 100% rename from screens/Proximo/ProximoListScreen.js rename to src/screens/Proximo/ProximoListScreen.js diff --git a/screens/Proximo/ProximoMainScreen.js b/src/screens/Proximo/ProximoMainScreen.js similarity index 100% rename from screens/Proximo/ProximoMainScreen.js rename to src/screens/Proximo/ProximoMainScreen.js diff --git a/screens/Proxiwash/ProxiwashAboutScreen.js b/src/screens/Proxiwash/ProxiwashAboutScreen.js similarity index 97% rename from screens/Proxiwash/ProxiwashAboutScreen.js rename to src/screens/Proxiwash/ProxiwashAboutScreen.js index 9c5a011..40a5e19 100644 --- a/screens/Proxiwash/ProxiwashAboutScreen.js +++ b/src/screens/Proxiwash/ProxiwashAboutScreen.js @@ -26,7 +26,7 @@ export default class ProxiwashAboutScreen extends React.Component { alignItems: 'center' }}> diff --git a/screens/Proxiwash/ProxiwashScreen.js b/src/screens/Proxiwash/ProxiwashScreen.js similarity index 100% rename from screens/Proxiwash/ProxiwashScreen.js rename to src/screens/Proxiwash/ProxiwashScreen.js diff --git a/screens/SelfMenuScreen.js b/src/screens/SelfMenuScreen.js similarity index 100% rename from screens/SelfMenuScreen.js rename to src/screens/SelfMenuScreen.js diff --git a/screens/SettingsScreen.js b/src/screens/SettingsScreen.js similarity index 100% rename from screens/SettingsScreen.js rename to src/screens/SettingsScreen.js diff --git a/screens/Tetris/GameLogic.js b/src/screens/Tetris/GameLogic.js similarity index 100% rename from screens/Tetris/GameLogic.js rename to src/screens/Tetris/GameLogic.js diff --git a/screens/Tetris/GridManager.js b/src/screens/Tetris/GridManager.js similarity index 100% rename from screens/Tetris/GridManager.js rename to src/screens/Tetris/GridManager.js diff --git a/screens/Tetris/Piece.js b/src/screens/Tetris/Piece.js similarity index 100% rename from screens/Tetris/Piece.js rename to src/screens/Tetris/Piece.js diff --git a/screens/Tetris/ScoreManager.js b/src/screens/Tetris/ScoreManager.js similarity index 100% rename from screens/Tetris/ScoreManager.js rename to src/screens/Tetris/ScoreManager.js diff --git a/screens/Tetris/Shapes/BaseShape.js b/src/screens/Tetris/Shapes/BaseShape.js similarity index 100% rename from screens/Tetris/Shapes/BaseShape.js rename to src/screens/Tetris/Shapes/BaseShape.js diff --git a/screens/Tetris/Shapes/ShapeI.js b/src/screens/Tetris/Shapes/ShapeI.js similarity index 100% rename from screens/Tetris/Shapes/ShapeI.js rename to src/screens/Tetris/Shapes/ShapeI.js diff --git a/screens/Tetris/Shapes/ShapeJ.js b/src/screens/Tetris/Shapes/ShapeJ.js similarity index 100% rename from screens/Tetris/Shapes/ShapeJ.js rename to src/screens/Tetris/Shapes/ShapeJ.js diff --git a/screens/Tetris/Shapes/ShapeL.js b/src/screens/Tetris/Shapes/ShapeL.js similarity index 100% rename from screens/Tetris/Shapes/ShapeL.js rename to src/screens/Tetris/Shapes/ShapeL.js diff --git a/screens/Tetris/Shapes/ShapeO.js b/src/screens/Tetris/Shapes/ShapeO.js similarity index 100% rename from screens/Tetris/Shapes/ShapeO.js rename to src/screens/Tetris/Shapes/ShapeO.js diff --git a/screens/Tetris/Shapes/ShapeS.js b/src/screens/Tetris/Shapes/ShapeS.js similarity index 100% rename from screens/Tetris/Shapes/ShapeS.js rename to src/screens/Tetris/Shapes/ShapeS.js diff --git a/screens/Tetris/Shapes/ShapeT.js b/src/screens/Tetris/Shapes/ShapeT.js similarity index 100% rename from screens/Tetris/Shapes/ShapeT.js rename to src/screens/Tetris/Shapes/ShapeT.js diff --git a/screens/Tetris/Shapes/ShapeZ.js b/src/screens/Tetris/Shapes/ShapeZ.js similarity index 100% rename from screens/Tetris/Shapes/ShapeZ.js rename to src/screens/Tetris/Shapes/ShapeZ.js diff --git a/screens/Tetris/TetrisScreen.js b/src/screens/Tetris/TetrisScreen.js similarity index 100% rename from screens/Tetris/TetrisScreen.js rename to src/screens/Tetris/TetrisScreen.js diff --git a/screens/Tetris/__tests__/GridManager.test.js b/src/screens/Tetris/__tests__/GridManager.test.js similarity index 100% rename from screens/Tetris/__tests__/GridManager.test.js rename to src/screens/Tetris/__tests__/GridManager.test.js diff --git a/screens/Tetris/__tests__/Piece.test.js b/src/screens/Tetris/__tests__/Piece.test.js similarity index 100% rename from screens/Tetris/__tests__/Piece.test.js rename to src/screens/Tetris/__tests__/Piece.test.js diff --git a/screens/Tetris/__tests__/ScoreManager.test.js b/src/screens/Tetris/__tests__/ScoreManager.test.js similarity index 100% rename from screens/Tetris/__tests__/ScoreManager.test.js rename to src/screens/Tetris/__tests__/ScoreManager.test.js diff --git a/screens/Tetris/__tests__/Shape.test.js b/src/screens/Tetris/__tests__/Shape.test.js similarity index 100% rename from screens/Tetris/__tests__/Shape.test.js rename to src/screens/Tetris/__tests__/Shape.test.js diff --git a/screens/Tetris/components/Cell.js b/src/screens/Tetris/components/Cell.js similarity index 100% rename from screens/Tetris/components/Cell.js rename to src/screens/Tetris/components/Cell.js diff --git a/screens/Tetris/components/Grid.js b/src/screens/Tetris/components/Grid.js similarity index 100% rename from screens/Tetris/components/Grid.js rename to src/screens/Tetris/components/Grid.js diff --git a/screens/Tetris/components/Preview.js b/src/screens/Tetris/components/Preview.js similarity index 100% rename from screens/Tetris/components/Preview.js rename to src/screens/Tetris/components/Preview.js diff --git a/screens/Websites/AvailableRoomScreen.js b/src/screens/Websites/AvailableRoomScreen.js similarity index 100% rename from screens/Websites/AvailableRoomScreen.js rename to src/screens/Websites/AvailableRoomScreen.js diff --git a/screens/Websites/BibScreen.js b/src/screens/Websites/BibScreen.js similarity index 100% rename from screens/Websites/BibScreen.js rename to src/screens/Websites/BibScreen.js diff --git a/screens/Websites/PlanexScreen.js b/src/screens/Websites/PlanexScreen.js similarity index 100% rename from screens/Websites/PlanexScreen.js rename to src/screens/Websites/PlanexScreen.js diff --git a/utils/Notifications.js b/src/utils/Notifications.js similarity index 99% rename from utils/Notifications.js rename to src/utils/Notifications.js index b179d3b..b0a4f06 100644 --- a/utils/Notifications.js +++ b/src/utils/Notifications.js @@ -4,7 +4,7 @@ import * as Permissions from 'expo-permissions'; import {Notifications} from 'expo'; import AsyncStorageManager from "../managers/AsyncStorageManager"; import LocaleManager from "../managers/LocaleManager"; -import passwords from "../passwords"; +import passwords from "../../passwords"; const EXPO_TOKEN_SERVER = 'https://etud.insa-toulouse.fr/~amicale_app/expo_notifications/save_token.php'; diff --git a/utils/Planning.js b/src/utils/Planning.js similarity index 100% rename from utils/Planning.js rename to src/utils/Planning.js diff --git a/utils/Search.js b/src/utils/Search.js similarity index 100% rename from utils/Search.js rename to src/utils/Search.js diff --git a/utils/WebBrowser.js b/src/utils/WebBrowser.js similarity index 100% rename from utils/WebBrowser.js rename to src/utils/WebBrowser.js diff --git a/utils/WebData.js b/src/utils/WebData.js similarity index 100% rename from utils/WebData.js rename to src/utils/WebData.js