Explorar el Código

Fixed bug 1574

bugfix/1574
jovan.cirkovic hace 3 años
padre
commit
f163de2eb3

+ 1
- 0
src/components/Buttons/PrimaryButton/PrimaryButton.styled.js Ver fichero

&:disabled { &:disabled {
background-color: ${selectedTheme.colors.primaryPurpleDisabled}; background-color: ${selectedTheme.colors.primaryPurpleDisabled};
color: ${(props) => props.textcolor}; color: ${(props) => props.textcolor};
border: 1px solid ${selectedTheme.colors.primaryBorderDisabled};
} }
`; `;

+ 1
- 1
src/components/Scroller/VerticalScroller.styled.js Ver fichero

flex-wrap: nowrap; flex-wrap: nowrap;
overflow: hidden; overflow: hidden;
padding-right: 5px; padding-right: 5px;
height: 100%;
/* height: 100%; */


/* @media screen and (max-width: 1200px) { /* @media screen and (max-width: 1200px) {
height: 465px; height: 465px;

+ 2
- 2
src/store/saga/chatSaga.js Ver fichero

queryString: queryString, queryString: queryString,
}); });
yield call(console.dir, data); yield call(console.dir, data);
yield put(setChats([...data.data]));
yield put(setChats([...data.data.chatsWithData]));
yield put(fetchChatsSuccess()); yield put(fetchChatsSuccess());
} catch (e) { } catch (e) {
yield put(fetchChatsError()); yield put(fetchChatsError());
try { try {
const userId = yield select(selectUserId); const userId = yield select(selectUserId);
const data = yield call(attemptFetchHeaderChats, userId); const data = yield call(attemptFetchHeaderChats, userId);
yield put(setChats([...data.data]));
yield put(setChats([...data.data.chatsWithData]));
yield put(fetchHeaderChatsSuccess()); yield put(fetchHeaderChatsSuccess());
} catch (e) { } catch (e) {
yield put(fetchHeaderChatsError()); yield put(fetchHeaderChatsError());

+ 2
- 2
src/store/saga/offersSaga.js Ver fichero

try { try {
const userId = yield select(selectUserId); const userId = yield select(selectUserId);
const data = yield call(attemptFetchProfileOffers, userId); const data = yield call(attemptFetchProfileOffers, userId);
yield put(setMineOffers(data.data));
yield put(setMineOffers(data.data.offers));
yield put(fetchMineOffersSuccess()); yield put(fetchMineOffersSuccess());
} catch (e) { } catch (e) {
yield put(fetchMineOffersError()); yield put(fetchMineOffersError());
try { try {
const userId = yield select(selectUserId); const userId = yield select(selectUserId);
const data = yield call(attemptFetchProfileOffers, userId); const data = yield call(attemptFetchProfileOffers, userId);
yield put(setMineHeaderOffers(data.data.slice(0, 2)));
yield put(setMineHeaderOffers(data.data.offers.slice(0, 2)));
yield put(fetchMineHeaderOffersSuccess()); yield put(fetchMineHeaderOffersSuccess());
} catch (e) { } catch (e) {
yield put(fetchMineHeaderOffersError()); yield put(fetchMineHeaderOffersError());

+ 10
- 4
src/store/saga/registerSaga.js Ver fichero

try { try {
const requestBody = new FormData(); const requestBody = new FormData();
requestBody.append("email", payload.values.mail); requestBody.append("email", payload.values.mail);
requestBody.append("password", payload.values.password);
requestBody.append("password", payload.values.registerPassword);
requestBody.append("file", payload.values.image); requestBody.append("file", payload.values.image);
requestBody.append("company[name]", payload.values.nameOfFirm); requestBody.append("company[name]", payload.values.nameOfFirm);
requestBody.append("company[PIB]", payload.values.PIB); requestBody.append("company[PIB]", payload.values.PIB);
if (payload.values.phoneNumber.toString().length !== 0) if (payload.values.phoneNumber.toString().length !== 0)
requestBody.append("company[contacts][telephone]", payload.values.phoneNumber);
requestBody.append(
"company[contacts][telephone]",
payload.values.phoneNumber
);
if (payload.values.location.toString().length !== 0) if (payload.values.location.toString().length !== 0)
requestBody.append("company[contacts][location]", payload.values.location);
requestBody.append(
"company[contacts][location]",
payload.values.location
);
if (payload.values.website.toString().length !== 0) if (payload.values.website.toString().length !== 0)
requestBody.append("company[contacts][web]", payload.values.website); requestBody.append("company[contacts][web]", payload.values.website);
yield call(attemptRegister, requestBody); yield call(attemptRegister, requestBody);


const { data } = yield call(attemptLogin, { const { data } = yield call(attemptLogin, {
email: payload.values.mail, email: payload.values.mail,
password: payload.values.password,
password: payload.values.registerPassword,
}); });
if (data.token) { if (data.token) {
const token = data.token; const token = data.token;

+ 3
- 2
src/themes/primaryTheme/primaryThemeColors.js Ver fichero

primaryPurple: "#5A3984", primaryPurple: "#5A3984",
primaryPurpleAnimation: "#4B2C73", primaryPurpleAnimation: "#4B2C73",
primaryYellow: "#f7b126", primaryYellow: "#f7b126",
primaryPurpleDisabled: "#4D4D4D",
primaryPurpleDisabled: "#E4E4E4",
primaryBorderDisabled: "#D4D4D4",
primaryBackgroundColor: "#F1F1F1", primaryBackgroundColor: "#F1F1F1",
primaryTextDisabled: "#F1F1F1",
primaryTextDisabled: "#B4B4B4",
primaryText: "#4D4D4D", primaryText: "#4D4D4D",
primaryGrayText: "#818181", primaryGrayText: "#818181",
primaryDarkGrayText: "#DCDCDC", primaryDarkGrayText: "#DCDCDC",

Cargando…
Cancelar
Guardar