Skip to content

2
240
Commit a9219204 authored by Malsha Rathnasiri's avatar Malsha Rathnasiri
Browse files
Options

integrate components

parent b50bc385
Show whitespace changes
Inline Side-by-side
Showing with 682 additions and 8 deletions
MobileApp/api/constants.js
View file @ a9219204
// export const BACKEND_URL = "http://192.168.8.103:8000" // export const BACKEND_URL = "http://192.168.8.103:8000"
import { Platform } from 'react-native' import { Platform } from 'react-native'
export const BACKEND_ADDRESS = Platform.OS == 'web' ? "http://127.0.0.1:8000" : "https://c881-2402-4000-2280-1401-f8b7-3e41-83a-2250.in.ngrok.io" export const BACKEND_ADDRESS = Platform.OS == 'web' ? "http://127.0.0.1:8000" : "https://438c-2401-dd00-10-20-ccb8-3726-acbd-ade4.ap.ngrok.io"
export const BACKEND_URL = `${BACKEND_ADDRESS}` export const BACKEND_URL = `${BACKEND_ADDRESS}`
MobileApp/navigation/index.jsx
View file @ a9219204
...@@ -27,6 +27,7 @@ import LinkingConfiguration from './LinkingConfiguration'; ...@@ -27,6 +27,7 @@ import LinkingConfiguration from './LinkingConfiguration';
import Small_logo from '../assets/images/Logo_small.jpeg' import Small_logo from '../assets/images/Logo_small.jpeg'
import { PRIMARY_COLOR } from '../util/styles'; import { PRIMARY_COLOR } from '../util/styles';
import InnerNavigator from '../screens/InnerNavigator';
export default function Navigation({ colorScheme }) { export default function Navigation({ colorScheme }) {
return ( return (
...@@ -73,10 +74,8 @@ function RootNavigator() { ...@@ -73,10 +74,8 @@ function RootNavigator() {
<Stack.Navigator > <Stack.Navigator >
{isAuthenticated ? <Stack.Screen name="Root" options={{ headerShown: false }}>{(props) => <BottomTabNavigator {...props} onLogout={onLogout} />}</Stack.Screen> : {isAuthenticated ? <Stack.Screen name="Root" options={{ headerShown: false }}>{(props) => <BottomTabNavigator {...props} onLogout={onLogout} />}</Stack.Screen> :
<Stack.Screen name='Root' options={{ headerShown: false }}>{(props) => <LoginScreen {...props} onLogin={onLogin} />}</Stack.Screen>} <Stack.Screen name='Root' options={{ headerShown: false }}>{(props) => <LoginScreen {...props} onLogin={onLogin} />}</Stack.Screen>}
<Stack.Screen name='Signup' component={SignupScreen} options={{ headerShown: false, title: 'Sign up' }} /> <Stack.Screen name='Signup' component={SignupScreen} options={{ headerShown: false, title: 'Sign up' }} />
<Stack.Screen name="NotFound" component={NotFoundScreen} options={{ title: 'Oops!' }} /> <Stack.Screen name="NotFound" component={NotFoundScreen} options={{ title: 'Oops!' }} />
<Stack.Group screenOptions={{ presentation: 'modal' }}> <Stack.Group screenOptions={{ presentation: 'modal' }}>
<Stack.Screen name="Modal" component={ModalScreen} /> <Stack.Screen name="Modal" component={ModalScreen} />
</Stack.Group> </Stack.Group>
...@@ -102,10 +101,30 @@ function BottomTabNavigator({ onLogout }) { ...@@ -102,10 +101,30 @@ function BottomTabNavigator({ onLogout }) {
}}> }}>
<BottomTab.Screen <BottomTab.Screen
name="TabTwo" name="TabTwo"
component={TabTwoScreen} component={InnerNavigator}
hide
options={{ options={{
title: 'Map', title: 'Journey',
headerShown: true,
headerTitle: '',
tabBarIcon: ({ color }) => <TabBarIcon name="map" color={color} />, tabBarIcon: ({ color }) => <TabBarIcon name="map" color={color} />,
headerLeft: () => (<Image source={Small_logo} style={{ height: 40, width: 70, marginLeft: 20 }} />),
headerRight: () => (
<Pressable
// onPress={() => navigation.navigate('Modal')}
onPress={onLogout}
style={({ pressed }) => ({
opacity: pressed ? 0.5 : 1,
})}>
{/* <Text>Logout</Text> */}
<FontAwesome
name="info-circle"
size={25}
// color={Colors[colorScheme].text}
style={{ marginRight: 15 }}
/>
</Pressable>
),
}} }}
/> />
<BottomTab.Screen <BottomTab.Screen
......
MobileApp/package.json
View file @ a9219204
...@@ -38,10 +38,12 @@ ...@@ -38,10 +38,12 @@
"react": "17.0.1", "react": "17.0.1",
"react-dom": "17.0.1", "react-dom": "17.0.1",
"react-native": "0.64.3", "react-native": "0.64.3",
"react-native-multi-selectbox": "^1.5.0",
"react-native-safe-area-context": "3.3.2", "react-native-safe-area-context": "3.3.2",
"react-native-screens": "~3.10.1", "react-native-screens": "~3.10.1",
"react-native-svg": "12.1.1", "react-native-svg": "12.1.1",
"react-native-web": "0.17.1" "react-native-web": "0.17.1",
"styled-system": "^5.1.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.9", "@babel/core": "^7.12.9",
......
MobileApp/screens/Home.js 0 → 100644
View file @ a9219204
import { StatusBar } from 'expo-status-bar';
import React from 'react';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from 'native-base';
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native';
import { alignContent, flex, flexDirection, width } from 'styled-system';
import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR, BORDER_COLOR } = colors
function Home() {
const navigation = useNavigation();
return (
<View style={styles.container}>
<View style={styles.TopView}>
<Image style={styles.imageStyle} source={require('../assets/logo.jpg')} alt="image" />
</View>
<View style={styles.Info} >
<Text style={{ fontSize: 20, marginTop: 20, color: '#8e8e8e' }}>Keep a safe distance from vehicles!</Text>
</View>
<View style={styles.weatherDetails}>
<View style={styles.weatherDetailsRow}>
<View style={{ ...styles.weatherDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.weatherDetailsRow}>
<View style={styles.weatherDetailsItems}>
<MaterialCommunityIcons name="seatbelt" size={30} color='#3366ff' />
<TouchableOpacity onPress={() => navigation.navigate("RegInfo")} >
<Text style={styles.textSecondary}>Seat Reservation</Text>
</TouchableOpacity>
</View>
</View>
</View>
<View style={styles.weatherDetailsBox}>
<View style={styles.weatherDetailsRow}>
<View style={styles.weatherDetailsItems}>
<FontAwesome5 name="route" size={25} color='#3366ff' />
<TouchableOpacity onPress={() => navigation.navigate("RouteInfo")} >
<Text style={styles.textSecondary}>Route Info</Text>
</TouchableOpacity>
</View>
</View>
</View>
</View>
<View style={{ ...styles.weatherDetailsRow, borderTopWidth: 1, borderTopColor: BORDER_COLOR }}>
<View style={{ ...styles.weatherDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.weatherDetailsRow}>
<View style={styles.weatherDetailsItems}>
<MaterialCommunityIcons name="comment-account-outline" size={30} color='#3366ff' />
<TouchableOpacity onPress={() => navigation.navigate("#")} >
<Text style={styles.textSecondary}>Driver feedback</Text>
</TouchableOpacity>
</View>
</View>
</View>
<View style={styles.weatherDetailsBox}>
<View style={styles.weatherDetailsRow}>
<View style={styles.weatherDetailsItems}>
<MaterialCommunityIcons name="map-marker-radius-outline" size={30} color='#3366ff' />
<TouchableOpacity onPress={() => navigation.navigate("#")} >
<Text style={styles.textSecondary}>Find Vehicle</Text>
</TouchableOpacity>
</View>
</View>
</View>
</View>
</View>
</View>
);
}
export default () => {
return (
<NativeBaseProvider>
<Home />
</NativeBaseProvider>
)
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
main: {
marginTop: 200,
justifyContent: 'center',
},
Icon: {
width: 100,
height: 100,
},
Info: {
alignItems: 'center',
},
weatherDetails: {
marginTop: 100,
margin: 15,
borderWidth: 1,
borderColor: BORDER_COLOR,
borderRadius: 10,
},
weatherDetailsRow: {
flexDirection: 'row',
alignItems: 'stretch'
},
weatherDetailsBox: {
flex: 1,
padding: 20,
},
weatherDetailsItems: {
alignItems: 'center',
alignItems: 'stretch',
},
textSecondary: {
fontSize: 15,
color: SECONDARY_COLOR,
fontWeight: '700',
margin: 7,
alignItems: 'center',
},
buttonStyleX: {
marginTop: 12,
marginLeft: 15,
marginRight: 15
},
buttonDesign: {
backgroundColor: '#026efd'
},
buttonStyle: {
marginTop: 30,
marginLeft: 15,
marginRight: 15
},
TopView: {
width: '100%',
height: '30%',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
},
imageStyle: {
width: '60%',
resizeMode: 'contain',
alignItems: 'center',
top: 100,
},
})
\ No newline at end of file
MobileApp/screens/InnerNavigator.js 0 → 100644
View file @ a9219204
import React from 'react';
import RegInfo from './RegInfo';
import RouteInfo from './RouteInfo';
import Home from './Home';
import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
const Stack = createNativeStackNavigator();
function App() {
return (
<Stack.Navigator screenOptions={{headerShown: false}}>
<Stack.Screen name="Root" component={Home} />
<Stack.Screen name="RegInfo" component={RegInfo} />
<Stack.Screen name="RouteInfo" component={RouteInfo} />
</Stack.Navigator>
);
}
export default () => {
return (
<NavigationContainer independent>
<App />
</NavigationContainer>
)
}
MobileApp/screens/RegInfo.js 0 → 100644
View file @ a9219204
import { StatusBar } from 'expo-status-bar';
import React from 'react';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from 'native-base';
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native';
import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR, BORDER_COLOR } = colors
function RegInfo() {
const navigation = useNavigation();
return (
<View style={styles.container}>
<View style={styles.main}>
<View style={styles.Info} >
<Image style={styles.Icon} source={require('../assets/successful.jpg')} alt="image" />
<Text style={{ fontSize: 20, marginTop: 20, color: 'green' }}>Seat Reservation completed</Text>
<Text style={{ fontSize: 12, marginTop: 10, color: '#8e8e8e' }}>Ref# 837110243</Text>
<Text style={{ fontSize: 20, fontWeight: 'bold', marginTop: 30, color: 'green' }}>Your Seat Number</Text>
<Text style={{ fontSize: 45, fontWeight: 'bold', marginTop: 5, color: '#ff304f' }}>25</Text>
</View>
</View>
<View style={styles.weatherDetails}>
<View style={styles.weatherDetailsRow}>
<View style={{ ...styles.weatherDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.weatherDetailsRow}>
<FontAwesome5 name="car" size={25} color={PRIMARY_COLOR} />
<View style={styles.weatherDetailsItems}>
<Text>Vehicle Number</Text>
<Text style={styles.textSecondary}>BDA - 0713</Text>
</View>
</View>
</View>
<View style={styles.weatherDetailsBox}>
<View style={styles.weatherDetailsRow}>
<FontAwesome5 name="user-secret" size={25} color={PRIMARY_COLOR} />
<View style={styles.weatherDetailsItems}>
<Text>Driver name</Text>
<Text style={styles.textSecondary}>Anura Kumara</Text>
</View>
</View>
</View>
</View>
<View style={{ ...styles.weatherDetailsRow, borderTopWidth: 1, borderTopColor: BORDER_COLOR }}>
<View style={{ ...styles.weatherDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.weatherDetailsRow}>
<MaterialCommunityIcons name="message-star-outline" size={30} color={PRIMARY_COLOR} />
<View style={styles.weatherDetailsItems}>
<Text>Rating</Text>
<Text style={styles.textSecondary}>4.5/5</Text>
</View>
</View>
</View>
<View style={styles.weatherDetailsBox}>
<View style={styles.weatherDetailsRow}>
<MaterialCommunityIcons name="cellphone" size={30} color={PRIMARY_COLOR} />
<View style={styles.weatherDetailsItems}>
<Text>Call </Text>
<Text style={styles.textSecondary}>077 567 6002</Text>
</View>
</View>
</View>
</View>
</View>
<View style={styles.buttonStyle}>
<Button style={styles.buttonDesign} onPress={() => navigation.navigate("Root")}>
Home
</Button>
</View>
</View>
);
}
export default () => {
return (
<NativeBaseProvider>
<RegInfo />
</NativeBaseProvider>
)
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
main: {
marginTop: 10,
justifyContent: 'center',
},
Icon: {
width: 100,
height: 100,
},
Info: {
alignItems: 'center',
},
weatherDetails: {
marginTop: 60,
margin: 15,
borderWidth: 1,
borderColor: BORDER_COLOR,
borderRadius: 10,
},
weatherDetailsRow: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
},
weatherDetailsBox: {
flex: 1,
padding: 20,
},
weatherDetailsItems: {
alignItems: 'flex-end',
justifyContent: 'flex-end',
},
textSecondary: {
fontSize: 15,
color: SECONDARY_COLOR,
fontWeight: '700',
margin: 7,
},
buttonStyleX: {
marginTop: 12,
marginLeft: 15,
marginRight: 15
},
buttonDesign: {
backgroundColor: '#026efd'
},
buttonStyle: {
marginTop: 30,
marginLeft: 15,
marginRight: 15
},
})
\ No newline at end of file
MobileApp/screens/RouteInfo.js 0 → 100644
View file @ a9219204
import { StatusBar } from 'expo-status-bar';
import React, {useState} from 'react';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from 'native-base';
import { useNavigation } from '@react-navigation/native';
import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors
function RouteInfo() {
const navigation = useNavigation();
return (
<View style={styles.container}>
<View style={styles.Head}>
<Text style={styles.HeadText}>Journey</Text>
</View>
<View style={styles.lineStyle}>
<View style={{flex: 1, height: 1, backgroundColor: 'black'}} />
<View>
<Text style={{width: 120, textAlign: 'right', fontWeight:'bold', fontSize:15}}>Travel History</Text>
</View>
</View>
<View style={styles.summeryDetails}>
<View style={styles.summeryDetailsRow}>
<View style={{ ...styles.summeryDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.summeryDetailsRow}>
<View style={styles.summeryDetailsItems}>
<Text style={{color:'#8e8e8e',fontWeight: '700'}}>This Week</Text>
<Text style={{ fontSize: 15,color: 'orange',fontWeight: '700', margin: 7}}>4 Days</Text>
</View>
</View>
</View>
<View style={{...styles.summeryDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR}}>
<View style={styles.summeryDetailsRow}>
<View style={styles.summeryDetailsItems}>
<Text style={{color:'#8e8e8e',fontWeight: '700'}}>Last Week</Text>
<Text style={{fontSize: 15,color: 'green',fontWeight: '700', margin: 7}}>3 Days</Text>
</View>
</View>
</View>
<View style={styles.summeryDetailsBox}>
<View style={styles.summeryDetailsRow}>
<View style={styles.summeryDetailsItems}>
<Text style={{color:'#8e8e8e',fontWeight: '700'}}>Last Month</Text>
<Text style={{fontSize: 15,color: 'purple',fontWeight: '700', margin: 7}}>15 Days</Text>
</View>
</View>
</View>
</View>
</View>
<View style={styles.lineStyle}>
<View style={{flex: 1, height: 1, backgroundColor: 'black'}} />
<View>
<Text style={{width: 110, textAlign: 'right', fontWeight:'bold', fontSize:15}}>Travel Details</Text>
</View>
</View>
<View style={styles.summeryDetails}>
<View style={styles.summeryDetailsRow}>
<View style={{ ...styles.summeryDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.summeryDetailsRow}>
<View>
<Text style={{color:'#8e8e8e',textAlign: 'left', fontWeight:'bold' }}>Route: From Malabe to Colombo</Text>
<Text style={{color:'#8e8e8e',textAlign: 'left', fontWeight:'bold',marginTop: 7}}>Type: Return</Text>
<Text style={{color:'blue', textAlign: 'left',fontSize: 15, fontWeight: '700', marginTop: 7}}>You have used our service for 4 days for this week.</Text>
</View>
</View>
</View>
</View>
</View>
<View style={styles.lineStyle}>
<View style={{flex: 1, height: 1, backgroundColor: 'black'}} />
<View>
<Text style={{width: 75, textAlign: 'right', fontWeight:'bold', fontSize:15}}>Total Fee</Text>
</View>
</View>
<View style={styles.summeryDetails}>
<View style={styles.summeryDetailsRow}>
<View style={{ ...styles.summeryDetailsBox, borderRightWidth: 1, borderRightColor: BORDER_COLOR }}>
<View style={styles.summeryDetailsRow}>
<View style={styles.row}>
<View style={{ margin: 20}}>
<Text style={{color:'#8e8e8e',fontSize: 15 , textAlign: 'left',fontWeight:'bold',marginTop: 3}}>Fee per Trip :</Text>
</View>
<View style={{ margin: 20, marginVertical: 20 }}>
<Text style={{color:'#8e8e8e',fontSize: 15 ,textAlign: 'right',fontWeight:'bold', marginTop: 3}}>500.00 LKR</Text>
</View>
</View>
</View>
<View style={styles.row}>
<View style={{ margin: 20}}>
<Text style={{color:'#8e8e8e',fontSize: 15 , textAlign: 'left',fontWeight:'bold',marginTop: 3}}>Total Trips :</Text>
</View>
<View style={{ margin: 20, marginVertical: 20 }}>
<Text style={{color:'#8e8e8e',fontSize: 15 ,textAlign: 'right',fontWeight:'bold', marginTop: 3}}>16</Text>
</View>
</View>
<View style={styles.row}>
<View style={{ margin: 20}}>
<Text style={{color:'#8e8e8e',fontSize: 15 , textAlign: 'left',fontWeight:'bold',marginTop: 3}}>Total Fee :</Text>
</View>
<View style={{ margin: 20, marginVertical: 20 }}>
<Text style={{color:'#8e8e8e',fontSize: 15 ,textAlign: 'right',fontWeight:'bold', marginTop: 3}}>8000.00 LKR</Text>
</View>
</View>
</View>
</View>
</View>
{/* Button */}
<View style={styles.buttonStyle}>
<Button style={styles.buttonDesign} onPress={() => navigation.navigate("Root")}>
Home
</Button>
</View>
<StatusBar style="auto" />
</View>
);
}
export default () => {
return (
<NativeBaseProvider>
<RouteInfo />
</NativeBaseProvider>
)
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
HeadText: {
marginTop:10,
fontSize:30,
fontWeight:'bold',
},
Head:{
// alignItems:'left',
justifyContent:'center',
marginLeft:15,
},
lineStyle:{
flexDirection:'row',
marginTop:15,
marginLeft:15,
marginRight:15,
alignItems:'center'
},
summeryDetails: {
marginTop: 15,
margin: 15,
borderWidth: 1,
borderColor: BORDER_COLOR,
borderRadius: 10,
},
summeryDetailsRow: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
},
summeryDetailsBox: {
flex: 1,
padding: 10,
},
summeryDetailsItems: {
alignItems: 'flex-end',
justifyContent: 'flex-end',
},
textSecondary: {
fontSize: 15,
color: SECONDARY_COLOR,
fontWeight: '700',
margin: 7,
},
row: {
flexDirection: "row",
paddingRight: 12,
},
buttonStyleX:{
marginTop:12,
marginLeft:15,
marginRight:15
},
buttonDesign:{
backgroundColor:'#026efd'
},
buttonStyle:{
marginTop:20,
marginLeft:15,
marginRight:15
},
})
\ No newline at end of file
MobileApp/util/index.js 0 → 100644
View file @ a9219204
export const colors = {
PRIMARY_COLOR: '#ff304f',
SECONDARY_COLOR: '#002651',
BORDER_COLOR: '#dbdbdb',
}
\ No newline at end of file
MobileApp/yarn.lock
View file @ a9219204
...@@ -2621,6 +2621,96 @@ ...@@ -2621,6 +2621,96 @@
dependencies: dependencies:
"@sinonjs/commons" "^1.7.0" "@sinonjs/commons" "^1.7.0"
"@styled-system/background@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/background/-/background-5.1.2.tgz#75c63d06b497ab372b70186c0bf608d62847a2ba"
integrity sha512-jtwH2C/U6ssuGSvwTN3ri/IyjdHb8W9X/g8Y0JLcrH02G+BW3OS8kZdHphF1/YyRklnrKrBT2ngwGUK6aqqV3A==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/border@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@styled-system/border/-/border-5.1.5.tgz#0493d4332d2b59b74bb0d57d08c73eb555761ba6"
integrity sha512-JvddhNrnhGigtzWRCVuAHepniyVi6hBlimxWDVAdcTuk7aRn9BYJUwfHslURtwYFsF5FoEs8Zmr1oZq2M1AP0A==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/color@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/color/-/color-5.1.2.tgz#b8d6b4af481faabe4abca1a60f8daa4ccc2d9f43"
integrity sha512-1kCkeKDZkt4GYkuFNKc7vJQMcOmTl3bJY3YBUs7fCNM6mMYJeT1pViQ2LwBSBJytj3AB0o4IdLBoepgSgGl5MA==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/core@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/core/-/core-5.1.2.tgz#b8b7b86455d5a0514f071c4fa8e434b987f6a772"
integrity sha512-XclBDdNIy7OPOsN4HBsawG2eiWfCcuFt6gxKn1x4QfMIgeO6TOlA2pZZ5GWZtIhCUqEPTgIBta6JXsGyCkLBYw==
dependencies:
object-assign "^4.1.1"
"@styled-system/css@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@styled-system/css/-/css-5.1.5.tgz#0460d5f3ff962fa649ea128ef58d9584f403bbbc"
integrity sha512-XkORZdS5kypzcBotAMPBoeckDs9aSZVkvrAlq5K3xP8IMAUek+x2O4NtwoSgkYkWWzVBu6DGdFZLR790QWGG+A==
"@styled-system/flexbox@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/flexbox/-/flexbox-5.1.2.tgz#077090f43f61c3852df63da24e4108087a8beecf"
integrity sha512-6hHV52+eUk654Y1J2v77B8iLeBNtc+SA3R4necsu2VVinSD7+XY5PCCEzBFaWs42dtOEDIa2lMrgL0YBC01mDQ==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/grid@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/grid/-/grid-5.1.2.tgz#7165049877732900b99cd00759679fbe45c6c573"
integrity sha512-K3YiV1KyHHzgdNuNlaw8oW2ktMuGga99o1e/NAfTEi5Zsa7JXxzwEnVSDSBdJC+z6R8WYTCYRQC6bkVFcvdTeg==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/layout@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/layout/-/layout-5.1.2.tgz#12d73e79887e10062f4dbbbc2067462eace42339"
integrity sha512-wUhkMBqSeacPFhoE9S6UF3fsMEKFv91gF4AdDWp0Aym1yeMPpqz9l9qS/6vjSsDPF7zOb5cOKC3tcKKOMuDCPw==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/position@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/position/-/position-5.1.2.tgz#56961266566836f57a24d8e8e33ce0c1adb59dd3"
integrity sha512-60IZfMXEOOZe3l1mCu6sj/2NAyUmES2kR9Kzp7s2D3P4qKsZWxD1Se1+wJvevb+1TP+ZMkGPEYYXRyU8M1aF5A==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/shadow@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/shadow/-/shadow-5.1.2.tgz#beddab28d7de03cd0177a87ac4ed3b3b6d9831fd"
integrity sha512-wqniqYb7XuZM7K7C0d1Euxc4eGtqEe/lvM0WjuAFsQVImiq6KGT7s7is+0bNI8O4Dwg27jyu4Lfqo/oIQXNzAg==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/space@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/space/-/space-5.1.2.tgz#38925d2fa29a41c0eb20e65b7c3efb6e8efce953"
integrity sha512-+zzYpR8uvfhcAbaPXhH8QgDAV//flxqxSjHiS9cDFQQUSznXMQmxJegbhcdEF7/eNnJgHeIXv1jmny78kipgBA==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/typography@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@styled-system/typography/-/typography-5.1.2.tgz#65fb791c67d50cd2900d234583eaacdca8c134f7"
integrity sha512-BxbVUnN8N7hJ4aaPOd7wEsudeT7CxarR+2hns8XCX1zp0DFfbWw4xYa/olA0oQaqx7F1hzDg+eRaGzAJbF+jOg==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/variant@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@styled-system/variant/-/variant-5.1.5.tgz#8446d8aad06af3a4c723d717841df2dbe4ddeafd"
integrity sha512-Yn8hXAFoWIro8+Q5J8YJd/mP85Teiut3fsGVR9CAxwgNfIAiqlYxsk5iHU7VHJks/0KjL4ATSjmbtCDC/4l1qw==
dependencies:
"@styled-system/core" "^5.1.2"
"@styled-system/css" "^5.1.5"
"@tootallnate/once@1": "@tootallnate/once@1":
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
...@@ -7121,6 +7211,11 @@ react-native-keyboard-aware-scroll-view@^0.9.5: ...@@ -7121,6 +7211,11 @@ react-native-keyboard-aware-scroll-view@^0.9.5:
prop-types "^15.6.2" prop-types "^15.6.2"
react-native-iphone-x-helper "^1.0.3" react-native-iphone-x-helper "^1.0.3"
react-native-multi-selectbox@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/react-native-multi-selectbox/-/react-native-multi-selectbox-1.5.0.tgz#a2bbb3ae9a76f10f6f0404ae9c9b0b573a051614"
integrity sha512-yRxV8PPD0TIRoXK4WduHcADzroB2UWGbJIlKEGkvz8sPPs80o8wdJDthuqbvO7U6rIP2ABb/TRaJAFAxFTi8jw==
react-native-safe-area-context@3.3.2: react-native-safe-area-context@3.3.2:
version "3.3.2" version "3.3.2"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz#9549a2ce580f2374edb05e49d661258d1b8bcaed" resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz#9549a2ce580f2374edb05e49d661258d1b8bcaed"
...@@ -7947,6 +8042,25 @@ strip-final-newline@^2.0.0: ...@@ -7947,6 +8042,25 @@ strip-final-newline@^2.0.0:
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
styled-system@^5.1.5:
version "5.1.5"
resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-5.1.5.tgz#e362d73e1dbb5641a2fd749a6eba1263dc85075e"
integrity sha512-7VoD0o2R3RKzOzPK0jYrVnS8iJdfkKsQJNiLRDjikOpQVqQHns/DXWaPZOH4tIKkhAT7I6wIsy9FWTWh2X3q+A==
dependencies:
"@styled-system/background" "^5.1.2"
"@styled-system/border" "^5.1.5"
"@styled-system/color" "^5.1.2"
"@styled-system/core" "^5.1.2"
"@styled-system/flexbox" "^5.1.2"
"@styled-system/grid" "^5.1.2"
"@styled-system/layout" "^5.1.2"
"@styled-system/position" "^5.1.2"
"@styled-system/shadow" "^5.1.2"
"@styled-system/space" "^5.1.2"
"@styled-system/typography" "^5.1.2"
"@styled-system/variant" "^5.1.5"
object-assign "^4.1.1"
sucrase@^3.20.0: sucrase@^3.20.0:
version "3.21.0" version "3.21.0"
resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.21.0.tgz#6a5affdbe716b22e4dc99c57d366ad0d216444b9" resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.21.0.tgz#6a5affdbe716b22e4dc99c57d366ad0d216444b9"
......
backend/backend/cms/models.py
View file @ a9219204
...@@ -22,7 +22,6 @@ class Conversation(models.Model): ...@@ -22,7 +22,6 @@ class Conversation(models.Model):
User, related_name='to_chat', on_delete=models.PROTECT) User, related_name='to_chat', on_delete=models.PROTECT)
timestamp = models.DateTimeField(auto_now=True) timestamp = models.DateTimeField(auto_now=True)
class Chat(models.Model): class Chat(models.Model):
id = models.AutoField(primary_key=True) id = models.AutoField(primary_key=True)
conversation = models.ForeignKey(Conversation, on_delete=models.PROTECT) conversation = models.ForeignKey(Conversation, on_delete=models.PROTECT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment