zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a

This commit is contained in:
henrydays 2019-03-18 19:15:00 +00:00
parent 3b95a78f2e
commit fbce4c801f
5 changed files with 113 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App/app/screens/Eventos.js
View File

@ -30,6 +30,7 @@ class Eventos extends React.Component {
_update=()=> {
this.props.getAllEvents(this.props.internalToken);
this.props.getEventLocsVisited(this.props.team.id,this.props.internalToken);
}
state = {
index: 0,
@ -43,6 +44,7 @@ _update=()=> {
componentDidMount(){
this.props.getAllEvents(this.props.internalToken);
this.props.getEventLocsVisited(this.props.team.id,this.props.internalToken);
}

2
App/app/store/actions/actionTypes.js
View File

@ -5,7 +5,7 @@ export const GET_INTERNAL_EVENTS ='GET_INTERNAL_EVENTS'
export const CREATE_TEAM='CREATE_TEAM'
export const DELETE_TEAM='DELETE_TEAM'
export const GET_CROMOS='GET_CROMOS'
export const GET_LOCS_VISITED= 'GET_LOCS_VISITED'

198
App/app/store/actions/api.js
View File

@ -28,7 +28,8 @@ import {
GET_INTERNAL_EVENTS,
CREATE_TEAM,
DELETE_TEAM,
GET_CROMOS
GET_CROMOS,
GET_LOCS_VISITED
} from "./actionTypes"; //Import the actions types constant we defined in our actions
import moment from "moment";
@ -45,9 +46,33 @@ axios.defaults.baseURL = "https://api.enei.pt/internal/api";
const map = require("lodash/fp/map").convert({ cap: false });
export function getEventLocsVisited(teamId, tokenInternal ) {
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
axios.defaults.baseURL = "https://api.enei.pt/api";
return dispatch => {
axios
.get(`/EventLocsVisited/t/${teamId}`)
.then(a => {
console.log("sucesso!");
console.log(a);
dispatch({
type: GET_LOCS_VISITED,
locais: a.data
});
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!", "erro a obter os locais visitados");
});
export function getCromos(user,tokenInternal){
};
}
export function getCromos(user, tokenInternal) {
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
@ -60,13 +85,12 @@ export function getCromos(user,tokenInternal){
console.log(a);
dispatch({
type: GET_CROMOS,
cromos: a.data
cromos: a.data
});
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!", "erro a obter os eventos")
Alert.alert("ERRO!", "erro a obter os eventos");
});
dispatch({
@ -75,86 +99,71 @@ export function getCromos(user,tokenInternal){
};
}
export function deleteTeam(data,tokenInternal){
axios.defaults.baseURL = "https://api.enei.pt";
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
console.log(data)
return dispatch=>{
axios
.post("/api/Teams/delete",data)
.then(a => {
console.log(a.data)
Alert.alert("SUCESSO!", "A equipa foi removida com sucesso")
dispatch({
type: DELETE_TEAM,
});
}).catch(err=>{
console.log(err)
Alert.alert("ERRO!", "Existiu um erro na remoção da equipa")
})
}
}
export function createTeam(team, tokenInternal){
export function deleteTeam(data, tokenInternal) {
axios.defaults.baseURL = "https://api.enei.pt";
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
return dispatch=>{
console.log(data);
return dispatch => {
axios
.post("/api/Teams/add",team)
.then(a => {
console.log(a.data)
Alert.alert("SUCESSO!", "A equipa foi criada com sucesso")
dispatch({
type: CREATE_TEAM,
.post("/api/Teams/delete", data)
.then(a => {
console.log(a.data);
Alert.alert("SUCESSO!", "A equipa foi removida com sucesso");
dispatch({
type: DELETE_TEAM
});
})
.catch(err => {
console.log(err);
Alert.alert("ERRO!", "Existiu um erro na remoção da equipa");
});
}).catch(err=>{
console.log(err)
Alert.alert("ERRO!", "Existiu um erro na criação da equipa")
})
}
};
}
export function createTeam(team, tokenInternal) {
axios.defaults.baseURL = "https://api.enei.pt";
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
return dispatch => {
axios
.post("/api/Teams/add", team)
.then(a => {
console.log(a.data);
Alert.alert("SUCESSO!", "A equipa foi criada com sucesso");
dispatch({
type: CREATE_TEAM
});
})
.catch(err => {
console.log(err);
Alert.alert("ERRO!", "Existiu um erro na criação da equipa");
});
};
}
export function getAllEvents(tokenInternal){
export function getAllEvents(tokenInternal) {
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
axios.defaults.baseURL = "https://api.enei.pt/api";
return dispatch => {
axios
.get('/Events')
.get("/Events")
.then(a => {
console.log("sucesso!");
console.log(a);
dispatch({
type: GET_INTERNAL_EVENTS,
eventsInternal:a.data
eventsInternal: a.data
});
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!", "erro a obter os eventos")
Alert.alert("ERRO!", "erro a obter os eventos");
});
dispatch({
@ -163,68 +172,59 @@ export function getAllEvents(tokenInternal){
};
}
export function removeUserTeam(data, tokenInternal){
export function removeUserTeam(data, tokenInternal) {
//remove/member
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
axios.defaults.baseURL = "https://api.enei.pt";
return dispatch => {
axios
.post("/api/Teams/remove/member",data)
.then(a => {
axios.defaults.baseURL = "https://api.enei.pt";
return dispatch => {
axios
.post("/api/Teams/remove/member", data)
.then(a => {
if (a.status == 201) {
console.log("sucesso!");
console.log(a.data);
Alert.alert("Sucesso!", "Elemento removido com sucesso!!");
}
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!!", "Erro a remover!");
});
if(a.status==201){
console.log("sucesso!");
console.log(a.data);
Alert.alert("Sucesso!","Elemento removido com sucesso!!")
}
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!!", "Erro a remover!")
dispatch({
type: OPEN_MODAL
});
dispatch({
type: OPEN_MODAL
});
};
};
}
export function addUserTeam(data, tokenInternal){
export function addUserTeam(data, tokenInternal) {
axios.defaults.headers.common = {
Authorization: `bearer ${tokenInternal}`
};
axios.defaults.baseURL = "https://api.enei.pt";
return dispatch => {
axios
.post("/api/Teams/add/member",data)
.post("/api/Teams/add/member", data)
.then(a => {
if(a.status==201){
if (a.status == 201) {
console.log("sucesso!");
console.log(a.data);
Alert.alert("Sucesso!","Elemento adicionado com sucesso!!")
Alert.alert("Sucesso!", "Elemento adicionado com sucesso!!");
}
})
.catch(p => {
console.log(p);
Alert.alert("ERRO!!", "Esse utlizador já se encontra numa equipa!!")
Alert.alert("ERRO!!", "Esse utlizador já se encontra numa equipa!!");
});
dispatch({
type: OPEN_MODAL
});
};
add/member
add / member;
}
export function getUserTeam(user, tokenInternal) {
@ -240,14 +240,14 @@ export function getUserTeam(user, tokenInternal) {
console.log(a);
dispatch({
type: GET_TEAM,
team:a.data
team: a.data
});
})
.catch(p => {
console.log(p);
dispatch({
type: GET_TEAM,
team:'none'
team: "none"
});
});
@ -1122,9 +1122,9 @@ function getE(user, careerPath) {
export function getEvents(user, careerPath) {
var result = getE(user, careerPath);
console.log("putaaaaaaa")
console.log(result)
console.log("putaaaaaaa")
console.log("putaaaaaaa");
console.log(result);
console.log("putaaaaaaa");
return dispatch => {
dispatch({
type: GET_EVENTS,

3
App/app/store/actions/index.js
View File

@ -27,7 +27,8 @@ export {checkUser,
getAllEvents,
createTeam,
deleteTeam,
getCromos
getCromos,
getEventLocsVisited
} from "./api"

12
App/app/store/reducers/api.js
View File

@ -22,7 +22,8 @@ import {
GET_TEAM,
GET_INTERNAL_EVENTS,
CREATE_TEAM,
GET_CROMOS
GET_CROMOS,
GET_LOCS_VISITED
} from "../actions/actionTypes"; //Import the actions types constant we defined in our actions
import { REHYDRATE } from "redux-persist";
@ -63,7 +64,8 @@ let apiState = {
team:undefined,
internalToken:"eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiIxIiwidW5pcXVlX25hbWUiOiJjZW5hIiwicm9sZSI6IkFkbWluIiwibmJmIjoxNTUyOTI4NTgyLCJleHAiOjE1NTMwMTQ5ODIsImlhdCI6MTU1MjkyODU4Mn0.Kwc-vu9lTGFDTKOAt7LKvBb0pnEnF6v30kF-4RjjU8swAwTJLF_oymF-MKOYtpY0a9IRaBK9yrED5b5Wkc2aoQ",
eventsInternal:[],
cromos:[]
cromos:[],
locais:[],
};
const apiReducer = (state = apiState, action) => {
@ -122,7 +124,11 @@ const apiReducer = (state = apiState, action) => {
cromos: action.cromos
});
case GET_LOCS_VISITED:
return Object.assign({}, state, {
locais: action.locais
});
case "CHANGE_CONNECTION_STATUS":
return Object.assign({}, state, {
isConnected: action.isConnected