From b0c4527a72a3d2a61c75e3bc64a276be9bc0a452 Mon Sep 17 00:00:00 2001 From: henrydays Date: Fri, 8 Mar 2019 18:24:01 +0000 Subject: [PATCH] calendar --- App/app/Router.js | 9 +- App/app/screens/Calendar.js | 15 +- App/app/screens/Eventos.js | 8 +- App/app/screens/Home.js | 5 +- App/app/screens/choosePath.js | 217 ++++++++++-------- App/app/screens/compras.js | 102 ++++++++ App/app/screens/febrada.js | 92 ++++++++ App/app/store/actions/actionTypes.js | 3 +- App/app/store/actions/api.js | 215 +++++++++++++++-- App/app/store/actions/index.js | 3 + App/app/store/reducers/api.js | 21 +- App/ios/app.xcodeproj/project.pbxproj | 55 ++++- App/package.json | 1 + api/Data/EventLocsVisitedRepository.cs | 10 +- api/app.js | 7 + api/obj/Debug/netcoreapp2.1/api.assets.cache | Bin 133820 -> 133027 bytes .../Debug/netcoreapp2.1/project.razor.json | 2 +- 17 files changed, 623 insertions(+), 142 deletions(-) create mode 100644 App/app/screens/compras.js create mode 100644 App/app/screens/febrada.js create mode 100644 api/app.js diff --git a/App/app/Router.js b/App/app/Router.js index 74783cfe..7e32d92d 100755 --- a/App/app/Router.js +++ b/App/app/Router.js @@ -23,7 +23,8 @@ import Scan from './screens/Scan' import Calendar from './screens/Calendar' import Home from './screens/Home' - +import febrada from './screens/febrada' +import compras from './screens/compras' /*Icons*/ @@ -183,6 +184,12 @@ const Stack = createStackNavigator({ }, calendarDetail:{ screen:calendarDetail + }, + febrada:{ + screen:febrada + }, + compras:{ + screen: compras } diff --git a/App/app/screens/Calendar.js b/App/app/screens/Calendar.js index bb216504..01a1e59e 100644 --- a/App/app/screens/Calendar.js +++ b/App/app/screens/Calendar.js @@ -49,13 +49,16 @@ class Calendar extends React.Component { {key: 'fourth', weekDay: 'seg', day:15}, ], + CP:'SEM' }; componentDidMount() { this.props.getEvents(this.props.user); - console.log('didMount'); - console.log(this.props.events); + + this.props.getSessions(this.props.userDetails.token) + + } _openDetails=()=>{ @@ -135,6 +138,7 @@ class Calendar extends React.Component { }; + constructor() { super() @@ -272,7 +276,7 @@ class Calendar extends React.Component { textAlign:'center', }}> - WEB DEVELOPMENT + {this.props.careerPath} - asd +