Skip to content

Commit 728ee7d

Browse files
hunterraffetyhunterraffety
committed
updates to styling
2 parents 347fab9 + 17e990c commit 728ee7d

File tree

11 files changed

+647
-380
lines changed

11 files changed

+647
-380
lines changed

‎src/actions/index.js‎

Lines changed: 76 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
1-
import axios from 'axios';
2-
import { toast } from 'react-toastify';
3-
import { axiosWithAuth } from '../util/axiosWithAuth';
1+
import axios from "axios";
2+
import { toast } from "react-toastify";
3+
import { axiosWithAuth } from "../util/axiosWithAuth";
44

55
// export actions
6-
export const FETCHING_ITEMS_START = 'FETCHING_ITEMS_START';
7-
export const FETCHING_ITEMS_SUCCESS = 'FETCHING_ITEMS_SUCCESS';
8-
export const FETCHING_ITEMS_FAILURE = 'FETCHING_ITEMS_FAILURE';
6+
export const FETCHING_ITEMS_START = "FETCHING_ITEMS_START";
7+
export const FETCHING_ITEMS_SUCCESS = "FETCHING_ITEMS_SUCCESS";
8+
export const FETCHING_ITEMS_FAILURE = "FETCHING_ITEMS_FAILURE";
99

10-
export const REGISTERING_USER_START = 'REGISTERING_USER_START';
11-
export const REGISTERING_USER_SUCCESS = 'REGISTERING_USER_SUCCESS';
12-
export const REGISTERING_USER_FAILURE = 'REGISTERING_USER_FAILURE';
10+
export const REGISTERING_USER_START = "REGISTERING_USER_START";
11+
export const REGISTERING_USER_SUCCESS = "REGISTERING_USER_SUCCESS";
12+
export const REGISTERING_USER_FAILURE = "REGISTERING_USER_FAILURE";
1313

14-
export const USER_LOGIN_START = 'USER_LOGIN_START';
15-
export const USER_LOGIN_SUCCESS = 'USER_LOGIN_SUCCESS';
16-
export const USER_LOGIN_FAILURE = 'USER_LOGIN_FAILURE';
14+
export const USER_LOGIN_START = "USER_LOGIN_START";
15+
export const USER_LOGIN_SUCCESS = "USER_LOGIN_SUCCESS";
16+
export const USER_LOGIN_FAILURE = "USER_LOGIN_FAILURE";
1717

18-
export const FETCHING_USERS_START = 'FETCHING_USERS_START';
19-
export const FETCHING_USERS_SUCCESS = 'FETCHING_USERS_SUCCESS';
20-
export const FETCHING_USERS_FAILURE = 'FETCHING_USERS_FAILURE';
18+
export const FETCHING_USERS_START = "FETCHING_USERS_START";
19+
export const FETCHING_USERS_SUCCESS = "FETCHING_USERS_SUCCESS";
20+
export const FETCHING_USERS_FAILURE = "FETCHING_USERS_FAILURE";
2121

22-
export const FETCHING_CATEGORY_START = 'FETCHING_CATEGORY_START';
23-
export const FETCHING_CATEGORY_SUCCESS = 'FETCHING_CATEGORY_SUCCESS';
24-
export const FETCHING_CATEGORY_FAILURE = 'FETCHING_CATEGORY_FAILURE';
22+
export const FETCHING_CATEGORY_START = "FETCHING_CATEGORY_START";
23+
export const FETCHING_CATEGORY_SUCCESS = "FETCHING_CATEGORY_SUCCESS";
24+
export const FETCHING_CATEGORY_FAILURE = "FETCHING_CATEGORY_FAILURE";
2525

26-
export const ADD_ITEM_START = 'ADD_ITEMS_START';
27-
export const ADD_ITEM_SUCCESS = 'ADD_ITEMS_SUCCESS';
28-
export const ADD_ITEM_FAILURE = 'ADD_ITEMS_FAILURE';
26+
export const ADD_ITEM_START = "ADD_ITEMS_START";
27+
export const ADD_ITEM_SUCCESS = "ADD_ITEMS_SUCCESS";
28+
export const ADD_ITEM_FAILURE = "ADD_ITEMS_FAILURE";
2929

30-
export const DELETE_ITEM_START = 'DELETE_ITEM_START';
31-
export const DELETE_ITEM_SUCCESS = 'DELETE_ITEM_SUCCESS';
32-
export const DELETE_ITEM_FAILURE = 'DELETE_ITEM_FAILURE';
30+
export const DELETE_ITEM_START = "DELETE_ITEM_START";
31+
export const DELETE_ITEM_SUCCESS = "DELETE_ITEM_SUCCESS";
32+
export const DELETE_ITEM_FAILURE = "DELETE_ITEM_FAILURE";
3333

34-
export const UPDATE_ITEM_START = 'UPDATE_ITEM_START';
35-
export const UPDATE_ITEM_SUCCESS = 'UPDATE_ITEM_SUCCESS';
36-
export const UPDATE_ITEM_FAILURE = 'UPDATE_ITEM_FAILURE';
34+
export const UPDATE_ITEM_START = "UPDATE_ITEM_START";
35+
export const UPDATE_ITEM_SUCCESS = "UPDATE_ITEM_SUCCESS";
36+
export const UPDATE_ITEM_FAILURE = "UPDATE_ITEM_FAILURE";
3737

38-
export const UPDATE_USER_START = 'UPDATE_USER_START';
39-
export const UPDATE_USER_SUCCESS = 'UPDATE_USER_SUCCESS';
40-
export const UPDATE_USER_FAILURE = 'UPDATE_USER_FAILURE';
38+
export const UPDATE_USER_START = "UPDATE_USER_START";
39+
export const UPDATE_USER_SUCCESS = "UPDATE_USER_SUCCESS";
40+
export const UPDATE_USER_FAILURE = "UPDATE_USER_FAILURE";
4141

42-
export const FETCHING_ITEM_BY_ID_START = 'FETCHING_ITEM_BY_ID_START';
43-
export const FETCHING_ITEM_BY_ID_SUCCESS = 'FETCHING_ITEM_BY_ID_SUCCESS';
44-
export const FETCHING_ITEM_BY_ID_FAILURE = 'FETCHING_ITEM_BY_ID_FAILURE';
42+
export const FETCHING_ITEM_BY_ID_START = "FETCHING_ITEM_BY_ID_START";
43+
export const FETCHING_ITEM_BY_ID_SUCCESS = "FETCHING_ITEM_BY_ID_SUCCESS";
44+
export const FETCHING_ITEM_BY_ID_FAILURE = "FETCHING_ITEM_BY_ID_FAILURE";
4545

46-
export const SIGN_OUT_USER = 'SIGN_OUT_USER';
46+
export const SIGN_OUT_USER = "SIGN_OUT_USER";
47+
export const RESET_ADD_ITEM_SUCCESS = "RESET_ADD_ITEM_SUCCESS";
4748

4849
// export const FILTER_ITEMS_START = 'FILTER_ITEMS_START';
4950
// export const FILTER_ITEMS_SUCCESS = 'FILTER_ITEMS_SUCCESS';
@@ -54,7 +55,7 @@ export const getItems = () => dispatch => {
5455
dispatch({ type: FETCHING_ITEMS_START });
5556
return axios
5657
.get(
57-
'https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/items'
58+
"https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/items"
5859
)
5960
.then(res => {
6061
dispatch({ type: FETCHING_ITEMS_SUCCESS, payload: res.data });
@@ -71,16 +72,24 @@ export const registerUser = user => dispatch => {
7172
dispatch({ type: REGISTERING_USER_START });
7273
return axios
7374
.post(
74-
'https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/auth/register',
75+
"https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/auth/register",
7576
user
7677
)
7778
.then(res => {
79+
dispatch({
80+
type: REGISTERING_USER_FAILURE,
81+
payload: ""
82+
});
7883
dispatch({ type: REGISTERING_USER_SUCCESS, payload: res.data });
7984
})
8085
.catch(err => {
8186
dispatch({
8287
type: REGISTERING_USER_FAILURE,
83-
payload: ''
88+
payload: err
89+
});
90+
dispatch({
91+
type: REGISTERING_USER_FAILURE,
92+
payload: ""
8493
});
8594
});
8695
};
@@ -89,17 +98,25 @@ export const userLogin = creds => dispatch => {
8998
dispatch({ type: USER_LOGIN_START });
9099
return axiosWithAuth()
91100
.post(
92-
'https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/auth/login',
101+
"https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/auth/login",
93102
creds
94103
)
95104
.then(res => {
96-
localStorage.setItem('token', res.data.token);
105+
localStorage.setItem("token", res.data.token);
106+
dispatch({
107+
type: USER_LOGIN_FAILURE,
108+
payload: ""
109+
});
97110
dispatch({ type: USER_LOGIN_SUCCESS, payload: res.data });
98111
})
99112
.catch(err => {
100113
dispatch({
101114
type: USER_LOGIN_FAILURE,
102-
payload: ''
115+
payload: err
116+
});
117+
dispatch({
118+
type: USER_LOGIN_FAILURE,
119+
payload: ""
103120
});
104121
});
105122
};
@@ -108,7 +125,7 @@ export const getUsers = () => dispatch => {
108125
dispatch({ type: FETCHING_USERS_START });
109126
return axiosWithAuth()
110127
.get(
111-
'https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/users'
128+
"https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/users"
112129
)
113130
.then(res => {
114131
dispatch({ type: FETCHING_USERS_SUCCESS, payload: res.data });
@@ -130,35 +147,43 @@ export const getItemsByCategories = categoryName => dispatch => {
130147
.then(res => {
131148
dispatch({
132149
type: FETCHING_CATEGORY_FAILURE,
133-
payload: ''
150+
payload: ""
134151
});
135152
dispatch({ type: FETCHING_CATEGORY_SUCCESS, payload: res.data });
136153
})
137154
.catch(() =>
138155
dispatch({
139156
type: FETCHING_CATEGORY_FAILURE,
140-
payload: 'Unable to get category items'
157+
payload: "Unable to get category items"
141158
})
142159
)
143160
.finally(() => dispatch({ type: FETCHING_CATEGORY_START }));
144161
};
145162

146163
export const addItem = item => dispatch => {
147164
dispatch({ type: ADD_ITEM_START });
148-
console.log(`what is my item`, item);
149165
return axiosWithAuth()
150166
.post(
151-
'https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/items',
167+
"https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/items",
152168
item
153169
)
154170
.then(res => {
171+
dispatch({
172+
type: ADD_ITEM_FAILURE,
173+
payload: ""
174+
});
155175
dispatch({ type: ADD_ITEM_SUCCESS, payload: res.data });
176+
dispatch({ type: RESET_ADD_ITEM_SUCCESS });
156177
})
157178
.catch(err => {
158179
dispatch({
159180
type: ADD_ITEM_FAILURE,
160181
payload: err
161182
});
183+
dispatch({
184+
type: ADD_ITEM_FAILURE,
185+
payload: ""
186+
});
162187
});
163188
};
164189

@@ -180,6 +205,7 @@ export const deleteItem = item => dispatch => {
180205
export const updateItem = item => dispatch => {
181206
console.log(item);
182207
dispatch({ type: UPDATE_ITEM_START });
208+
console.log(item, "aaaaa");
183209
return axiosWithAuth()
184210
.put(
185211
`https://cors-anywhere.herokuapp.com/https://usemytechstuffbe.herokuapp.com/api/items/${
@@ -188,6 +214,7 @@ export const updateItem = item => dispatch => {
188214
item
189215
)
190216
.then(res => {
217+
console.log(res);
191218
dispatch({ type: UPDATE_ITEM_SUCCESS, payload: res.data });
192219
})
193220
.catch(err => {
@@ -228,22 +255,22 @@ export const getItemById = id => dispatch => {
228255
.then(res => {
229256
dispatch({
230257
type: FETCHING_ITEM_BY_ID_FAILURE,
231-
payload: ''
258+
payload: ""
232259
});
233260
dispatch({ type: FETCHING_ITEM_BY_ID_SUCCESS, payload: res.data });
234261
})
235262
.catch(() =>
236263
dispatch({
237264
type: FETCHING_ITEM_BY_ID_FAILURE,
238-
payload: 'Unable to get category items'
265+
payload: "Unable to get category items"
239266
})
240267
)
241268
.finally(() => dispatch({ type: FETCHING_ITEM_BY_ID_START }));
242269
};
243270

244271
export const signOut = () => {
245-
localStorage.removeItem('token');
246-
toast.success('Signed Out Successfully');
272+
localStorage.removeItem("token");
273+
toast.success("Signed Out Successfully");
247274

248275
return {
249276
type: SIGN_OUT_USER

0 commit comments

Comments
 (0)