Commits · 89b7e0edd17c761fc44dd8c4eb2392a88aca27d7 · Ascend / inventory-promotion-react

10 May, 2021 8 commits
- [AFP-12] Fix merge conflict · 89b7e0ed
  Khai Yuan Liew authored May 10, 2021
  
  89b7e0ed
- [AFP-12] Work on Search Component · aedec205
  Khai Yuan Liew authored May 10, 2021
  
  aedec205
- Fixed routing and data fetching · af70a1fa
  Ben Anderson authored May 10, 2021
  
  af70a1fa
- Merge branch 'AFP-11' into dev · a6fee5bc
  Ben Anderson authored May 10, 2021
  
  a6fee5bc
- Removed duplocate close button · 59209607
  Ben Anderson authored May 10, 2021
  
  59209607
- Resolved merge conflixt AFP-8 · 2971e4f7
  Ben Anderson authored May 10, 2021
  
  2971e4f7
- Resolved merge conflixt AFP-8 · 5122da5b
  Ben Anderson authored May 10, 2021
  
  5122da5b
- Fixes button spacing · 07064059
  Sumaiyya Burney authored May 10, 2021
  
  07064059
09 May, 2021 1 commit
- Adds product pop up · ccf9925a
  Sumaiyya Burney authored May 10, 2021
  
  ccf9925a
07 May, 2021 13 commits
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into AFP-12 · 33c9bdb2
  Khai Yuan Liew authored May 07, 2021
```
Merged with dev
```
  33c9bdb2
- [AFP-12] Start Search Functionality · 103c947b
  Khai Yuan Liew authored May 07, 2021
  
  103c947b
- Merge branch 'AFP-7' into 'dev' · cb411b58
  John Lam authored May 07, 2021
```
Afp 7

See merge request !1
```
  cb411b58
- Added Docker and nginx config · 3c7004ab
  Ben Anderson authored May 07, 2021
  
  3c7004ab
- spacing · b6968929
  John Lam authored May 07, 2021
  
  b6968929
- add css, error validation to promotion form · e9dc5693
  John Lam authored May 07, 2021
  
  e9dc5693
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into dev · 89f107b4
  Khai Yuan Liew authored May 07, 2021
```
Need to merge
```
  89f107b4
- Merge branch 'AFP-10' into dev · 6c54474a
  Ben Anderson authored May 07, 2021
  
  6c54474a
- Added Heading to products page · b125e520
  Ben Anderson authored May 07, 2021
  
  b125e520
- Fixes dependencies · e269419a
  Sumaiyya Burney authored May 07, 2021
  
  e269419a
- Moves CSS into appropriate folder · 14c80682
  Sumaiyya Burney authored May 07, 2021
  
  14c80682
- Adds imgUrl upload+changes field names to match DB · d3245d94
  Sumaiyya Burney authored May 07, 2021
  
  d3245d94
- Aligns products to a responsive grid · e60ba407
  Sumaiyya Burney authored May 07, 2021
  
  e60ba407
06 May, 2021 7 commits
- add new promo form working · 7b599b8c
  John Lam authored May 07, 2021
  
  7b599b8c
- Fetches products from DB and outputs as table · c184820a
  Sumaiyya Burney authored May 07, 2021
  
  c184820a
- Fixed issue in field name · 3a3923b2
  Ben Anderson authored May 06, 2021
  
  3a3923b2
- add promotion form component · 5207d84d
  John Lam authored May 06, 2021
  
  5207d84d
- Added redirect after form submission, connected it to local API · 9d1adcd6
  Ben Anderson authored May 06, 2021
  
  9d1adcd6
- Added form validations for product creation · 17319145
  Ben Anderson authored May 06, 2021
  
  17319145
- Created product creation form · 95104079
  Ben Anderson authored May 06, 2021
  
  95104079
05 May, 2021 4 commits
- Fixed merge conflict · 831bd6aa
  Khai Yuan Liew authored May 05, 2021
  
  831bd6aa
- Modified gitignore · fc5c32df
  Khai Yuan Liew authored May 05, 2021
  
  fc5c32df
- Fleshed out routing more, added routes to products and promos pages and their forms · 290c7a9b
  Ben Anderson authored May 05, 2021
  
  290c7a9b
- Added authenticated routing and Created navbar · 7dc0e2f1
  Ben Anderson authored May 05, 2021
  
  7dc0e2f1
04 May, 2021 1 commit
- Initialize project using Create React App · f58a2572
  Khai Yuan Liew authored May 04, 2021
  
  f58a2572