emh/blazerapp
1
0
Fork 0
mirror of https://github.com/Blair-SGA-Dev-Team/blazerapp.git synced 2026-07-16 06:50:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

push something

Browse Source
This commit is contained in:
Michael Ilie
2020-12-21 22:34:09 -05:00
parent 7e1e841f41
commit 6b6eea4c22
10 changed files with 739 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Calendar.js
+1 -1
View File
@@ -113,7 +113,7 @@ class Calendar extends React.Component {
render() {
return (
<View>
<View style = {{height: 90, display: 'flex'}}>
<View style = {{height: 56, display: 'flex'}}>
<LinearGradient
colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
app/Home.js
+45 -4
View File
@@ -19,7 +19,8 @@ import {
ReloadInstructions,
} from 'react-native/Libraries/NewAppScreen';
import styles from './styles/morestyles'
import { url } from './resources/fetchInfo.json'
import LinearGradient from 'react-native-linear-gradient';
function Home1() {
const [modalVisible, setModalVisible] = useState(true);
@@ -35,7 +36,7 @@ const [modalVisible, setModalVisible] = useState(true);
</View>
<View>
<Image source = {require('./assets/blair_logo.png')} style = {{alignSelf: 'center', marginTop: '5%', height: 325, width: 325}}/>
<Text style={styles.modalText}>hgjriwogjewope</Text>
<Text style={styles.modalText}>{url}</Text>
</View>
</View>
</Modal>
@@ -51,7 +52,7 @@ class Home extends React.Component {
super(props)
this.state = {
data: [],
isLoading:true
isLoading:true
}
}
@@ -61,7 +62,7 @@ class Home extends React.Component {
'Cache-Control': 'no-cache'
}}
).then((response) => {
return response.text();
return response.text();list
}).then((json) => {
this.setState({data: JSON.parse(json),isLoading:false});
}).catch((error) => console.error(error))
@@ -70,7 +71,47 @@ class Home extends React.Component {
render() {
return (
<View>
<View style = {{height: 56, display: 'flex'}}>
<LinearGradient
colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
>
<Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
</LinearGradient>
</View>
<Home1></Home1>
<ScrollView>
<View style = {{height: 210, display: 'flex'}}>
<LinearGradient
colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
>
<Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
</LinearGradient>
</View>
<View style = {{height: 210, display: 'flex'}}>
<LinearGradient
colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
>
<Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
</LinearGradient>
</View>
<View style = {{height: 210, display: 'flex'}}>
<LinearGradient
colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
>
<Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
</LinearGradient>
</View>
</ScrollView>
</View>
)
}
app/resources/fetchInfo.json
+1 -1
View File
@@ -1 +1 @@
{"url":"http://10.0.2.2:5000"}
{"url":"https://6227632bc899.ngrok.io"}