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

Browse Source
This commit is contained in:
emilyliublair
2021-09-08 23:50:20 -04:00
parent 583b572b09
commit 613429707b
13 changed files with 214 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Announcements.js
+2 -1
View File
@@ -163,7 +163,7 @@ class Announcements extends React.Component {
}
getData() {
fetch(`${url}/api/en/announcements`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/announcements`,{
headers: {
'Cache-Control': 'no-cache'
}
@@ -174,6 +174,7 @@ class Announcements extends React.Component {
})
.then((txt) => {
const data = JSON.parse(txt).data;
console.log(data)
const teacherNames = [...new Set(data.filter(x=>x.teacher!=null&&x.teacher.trim()!=='').map(x=>x.teacher))];
teacherNames.sort()
this.setState({data: data, teacherNames: teacherNames.map(x=>({name:x})),isLoading:false});
app/Calendar.js
+35 -21
View File
@@ -28,19 +28,21 @@ const Stack = createStackNavigator();
const getCurrentDate=()=>{
var date = new Date().getDate();
var month = new Date().getMonth() + 1;
var month = new Date().getMonth();
var year = new Date().getFullYear();
return new Date(year, month, date);
}
export const EventInfo = ({route}) => {
const item = route.params;
const itemDate = new Date(item.date)
const itemDate = new Date(item.event_date)
const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
const months = ['January','February','March','April','May','June','July','August','September','October','November','December',]
const dayOfWeek = days[itemDate.getDay()]
const month = months[itemDate.getMonth()]
const date = itemDate.getDate()
console.log(itemDate.getDate())
return (
<ScrollView style = {{backgroundColor: 'white', flex:1, padding: '5%', paddingRight: '10%'}}>
@@ -77,11 +79,11 @@ export const EventInfo = ({route}) => {
}
const Event = (props) => {
const item = props.item
const date = item.item.date.split('-')
const date = item.item.event_date.split('-')
return (
<View>
<TouchableOpacity style={[styles.listItem, {padding: '2%'}]} onPress={()=>props.navigation.navigate('EventInfo', {data:props.data, title: item.item.title,text:item.item.text,location:item.item.location,date:item.item.date, name:item.item.name, emails: item.item.emails})} activeOpacity={0.8}>
<TouchableOpacity style={[styles.listItem, {padding: '2%'}]} onPress={()=>props.navigation.navigate('EventInfo', {data:props.data, title: item.item.title,text:item.item.text,location:item.item.location,date:item.item.event_date, name:item.item.name, emails: item.item.emails})} activeOpacity={0.8}>
<View style = {[styles.container2, {justifyContent: 'space-between'}]}>
<View style={{display: 'flex', flexDirection: 'row'}}>
<Ionicons name='calendar' size={32} color={'#323232'} style={{marginRight: 15}}/>
@@ -172,17 +174,18 @@ class Calendar extends React.Component {
}
getData() {
fetch(`${url}/api/en/events`,{
fetch(`http://127.0.0.1:8080/api/en/events`,{
headers: {
'Cache-Control': 'no-cache'
} })
.then((response) => {
return response.text();
})
.then((json) => {
const data = JSON.parse(json).data
data.sort((a,b)=>new Date(b.date).getTime()-new Date(a.date).getTime())
console.log(data);
const data = JSON.parse(json)
data.sort((a,b)=>a.id-b.id)
data.sort((a,b)=>new Date(b.event_date).getTime()-new Date(a.event_date).getTime())
this.setState({data: data});
})
.catch((error) => console.error(error))
@@ -202,20 +205,31 @@ class Calendar extends React.Component {
var todayBoolean = true
var pastBoolean = true
var futureBoolean = true
for (var i =0; i < this.state.data.length; i++) {
const itemDate = new Date(this.state.data[i].date)
if (itemDate == todayDate) {
today.push(this.state.data[i])
}
else if (itemDate > todayDate && itemDate <= weekFutureDate) {
future.push(this.state.data[i])
}
//else if (itemDate >= weekPastDate && itemDate < todayDate) {
else if (itemDate < todayDate) {
past.push(this.state.data[i])
if (this.state.data.length >0) {
try {
for (var i =0; i < this.state.data.length; i++) {
console.log(String(this.state.data[i].event_date))
const itemDate = new Date(parseInt(String(this.state.data[i].event_date).split('-')[0]), parseInt(String(this.state.data[i].event_date).split('-')[1])-1, parseInt(String(this.state.data[i].event_date).split('-')[2]))
console.log(itemDate)
console.log('he')
if (itemDate.getTime() == todayDate.getTime()) {
today.push(this.state.data[i])
}
else if (itemDate > todayDate && itemDate <= weekFutureDate) {
future.push(this.state.data[i])
}
//else if (itemDate >= weekPastDate && itemDate < todayDate) {
else if (itemDate < todayDate) {
past.push(this.state.data[i])
}
}
}
catch {null}
}
if (today.length === 0) todayBoolean = false
if (past.length === 0) pastBoolean = false
if (future.length === 0) futureBoolean = false
@@ -223,8 +237,8 @@ class Calendar extends React.Component {
return (
<ScrollView style={{flex:1, backgroundColor: 'white'}}>
{todayBoolean?<NewCalendarCategory name = 'today' list = {today} navigation={this.props.navigation} />: <></>}
{pastBoolean?<NewCalendarCategory name = 'past' list = {past} navigation={this.props.navigation} />: <></>}
{futureBoolean?<NewCalendarCategory name = 'future' list = {future} navigation={this.props.navigation} />: <></>}
{pastBoolean?<NewCalendarCategory name = 'past' list = {past} navigation={this.props.navigation} />: <></>}
{!noAnn?<Text style={{textAlign: 'center', fontSize: 20, paddingTop: '2%'}}>{I18n.t('calendar.noEvents')}</Text>:<></>}
</ScrollView>
)
app/ChallengeWeek.js
+1 -1
View File
@@ -33,7 +33,7 @@ class ChallengeWeek extends React.Component {
}
componentDidMount() {
fetch(`${url}/api/en/challenge`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/challenge`,{
headers: {
'Cache-Control': 'no-cache'
}}
app/Clubs.js
+1 -1
View File
@@ -140,7 +140,7 @@ class Clubs extends React.Component {
}
getData() {
fetch(`${url}/api/en/clubs`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/clubs`,{
headers: {
'Cache-Control': 'no-cache'
} })
app/Home.js
+6 -5
View File
@@ -41,6 +41,8 @@ const Stack = createStackNavigator()
const windowWidth = Dimensions.get('window').width;
const windowHeight = Dimensions.get('window').height;
console.log(String(I18n.locale).split('-')[0])
const getCurrentDate=()=>{
var date = new Date().getDate();
var month = new Date().getMonth();
@@ -196,7 +198,6 @@ export const NewItem = ({route}) => {
<View style={{backgroundColor: 'white', marginTop: '-5%', padding: '5%', borderTopLeftRadius: 20, borderTopRightRadius: 20}}>
<Text style={{fontSize: 14, fontWeight: '200', textAlign: 'center'}}>{item.date}</Text>
<Text style={{fontSize: 20, textAlign: 'center', paddingBottom: '2%', fontWeight: 'bold'}}>{item.name}</Text>
<Text style={{}}></Text>
</View>
</ScrollView>
)
@@ -489,7 +490,7 @@ class Home extends React.Component {
AsyncStorage.setItem(STORAGE_KEY,JSON.stringify(favoriteNames)).catch(console.log).done()
}
componentDidMount() {
fetch(`${url}/api/en/student`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/student`,{
headers: {
'Cache-Control': 'no-cache'
}}
@@ -499,7 +500,7 @@ class Home extends React.Component {
this.setState({studentData: JSON.parse(json),isLoading:false});
}).catch((error) => console.error(error))
fetch(`${url}/api/en/lunchEvents`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/lunchEvents`,{
headers: {
'Cache-Control': 'no-cache'
}}
@@ -526,7 +527,7 @@ class Home extends React.Component {
}
getData() {
fetch(`${url}/api/en/new`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/new`,{
headers: {
'Cache-Control': 'no-cache'
} })
@@ -543,7 +544,7 @@ class Home extends React.Component {
}
getData1() {
fetch(`${url}/api/en/announcements`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/announcements`,{
headers: {
'Cache-Control': 'no-cache'
}})
app/LunchEvents.js
+1 -1
View File
@@ -81,7 +81,7 @@ class LunchEvents extends React.Component {
}
componentDidMount() {
fetch(`${url}/api/en/lunchEvents`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/lunchEvents`,{
headers: {
'Cache-Control': 'no-cache'
}
app/SSLOps.js
+3 -2
View File
@@ -91,7 +91,8 @@ class SSLOps extends React.Component {
}
componentDidMount() {
fetch(`${url}/api/en/sslOps`,{
fetch(`http://localhost:8000/data/en/sslOps.json`,{
//fetch(`${url}/api/en/sslOps`,{
headers: {
'Cache-Control': 'no-cache'
}
@@ -101,7 +102,7 @@ class SSLOps extends React.Component {
return response.text();
})
.then((json) => {
this.setState({data: JSON.parse(json).ops});
this.setState({data: JSON.parse(json)});
})
.catch((error) => console.error(error))
}
app/Staff.js
+1 -1
View File
@@ -171,7 +171,7 @@ class Staffs extends React.Component {
}
getData() {
fetch(`${url}/api/en/teachers`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/teachers`,{
headers: {
'Cache-Control': 'no-cache'
} })
app/StudentWeek.js
+3 -1
View File
@@ -50,14 +50,16 @@ class StudentWeek extends React.Component {
componentDidMount() {
fetch(`${url}/api/en/student`,{
fetch(`${url}/api/`+String(I18n.locale).split('-')[0]+`/student`,{
headers: {
'Cache-Control': 'no-cache'
}}
).then((response) => {
return response.text();
}).then((json) => {
this.setState({data: JSON.parse(json),isLoading:false});
console.log(this.state.data)
}).catch((error) => console.error(error))
}