Commit Graph

120 Commits

Author SHA1 Message Date
Llewellyn Dsouza
2ad24e6bba Fix: Height of noncollapsable item in sidenav 2022-02-26 23:40:00 +05:30
Llewellyn Dsouza
1596dc1a39 Update: Sidebar standalone item 2022-02-26 23:28:19 +05:30
Llewellyn Dsouza
28ecd84bb8 Added: FSR logo 2022-02-26 22:47:32 +05:30
Llewellyn Dsouza
134f416beb Update: disabled menu items 2022-02-26 22:45:59 +05:30
bhavana-jain
8084b4005b Feature/logout (#63)
* Added Logout option on navbar
* fixed multipe menu click issue on navbar
* Update: Linted

Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-26 08:08:46 +05:30
Llewellyn Dsouza
c9817273a5 Removed: Footer 2022-02-26 08:04:18 +05:30
bluestreamlds
2ce13ba312 Feature/wms 39 nestedtable (#62)
* Updated: routes
* Rewritten nested table logic
* Updated: page with sample data and removed unnecessary components
* Removed: footer
* Fix: initial selected null handler
* Added: styling
* Updated: Table/button styling
* Added: API responses
* Fix: dispatch parameters
* Update: disable dropdown when no children
* Update: better receiving of data
* Update: better click handling, row distribution
* Update: yay the add form works finally
* Added: navigation
* Fixed: add zone button
* Added some colours
* Added: positions for sublevel
* Fixed: null check
* Added: initial sublevel values
* Update: fixed add sublevel
* Removed: location edit in sublevel
* Fixed: sublevel locations
* Added: edit apis handler
* Added: dispatch
* Fix: handle type seperately
* Added: edit warehouse redux
* Removed: loggers
* Update: edit form payload method
* Fix: multiple requests

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-25 11:08:55 +05:30
Hiren Padsala
b606cecb24 complete design of create users (#61)
* complete design of create users
* Removed: package-lock.json
* Linted

Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-25 10:17:24 +05:30
Dikshajain39511
302057a0a7 Feature/wms 56 (#59)
* create warehouse
* edit warehouse changes
* Update: linted and formatted
* add warehouse button
* user access changes
* basic table component changes
* Updated: eslint errors
* basic table component changes
* update: linted
* add New Product form api integrate
* add Inventory changes
* policies change
* add validation for widget
* Fixed: Image upload component
* Updated: Custom styling inputs

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-22 13:48:26 +05:30
bhavana-jain
68dca0dc34 Feature/wms 42 (#60)
* Added: transfer list component
* Updated: package.json
* Linted
* Udpated: removed width constrain
* create user role UI changes

Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-21 12:33:46 +05:30
Llewellyn D'souza
e6186d7835 Removed: Footer and search bar 2022-02-16 13:13:31 +05:30
Dikshajain39511
243f4c5fa1 Feature/wms 50 (#57)
* create warehouse
* edit warehouse changes
* Update: linted and formatted
* add warehouse button
* user access changes
* basic table component changes
* Updated: eslint errors
* basic table component changes
* update: linted
* add New Product form api integrate
* add new product changes
* textarea changes
* Linted code
* Fix: image preview placeholder

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-16 11:54:27 +05:30
Hiren Padsala
fc5128aec1 feature/wms-36 complete design of widget label screen (#58)
* feature/wms-36 complete design of widget label screen
* Linted

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-16 10:43:23 +05:30
bhavana-jain
66443f85a1 Added transfer list component (fixed commit) (#56)
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-11 23:07:18 +05:30
Sathishkumar Krishnan
4c2df3fd2c Feat: List roles page (WMS-40) (#55)
* feat: list roles page with api integration
* Update: added dispatch on first load
2022-02-11 22:55:54 +05:30
bluestreamlds
ff9ea9c71c Feature/wms 63 - Image upload component (#54)
* Updated: Image component functionality
* Updated: Added accept type support
* Updated: Restrict based on multiple key

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-11 16:26:32 +05:30
Llewellyn D'souza
aa3e712ebe Udpate: Added createdAt, updatedAt rows 2022-02-11 15:43:18 +05:30
Llewellyn D'souza
a42fa2f1af Added: token expiry verification 2022-02-11 15:17:06 +05:30
Dikshajain39511
a4198afc1d Feature/wms 53 (#53)
* create warehouse
* edit warehouse changes
* Update: linted and formatted
* add warehouse button
* user access changes
* basic table component changes
* Updated: eslint errors
* basic table component changes
* update: linted

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-11 14:53:22 +05:30
Dikshajain39511
97b7d5a85e Merge pull request #52 from kfnawaz/feature/WMS-63
Fixed: Multiple select form component
2022-02-10 12:37:46 +05:30
Hiren Padsala
3d50583791 Feature/wms-39 Component design completed and Name is ChooseAvatar (#51)
* Feature/wms-39 Component design completed and  Name is ChooseAvatar
* Fixed: MUI import
* Removed: Unnecessary layout in component
* Linted and formatted

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-10 12:06:12 +05:30
Hiren Padsala
e79ae36f4f Fixed issue of code (#50)
* Fixed issue of code
* Fixed wms-34 comment as per jira ticket
* Updated: Linted and fixed import
* Renamed: File Component
* Added: route

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-10 11:54:16 +05:30
Llewellyn D'souza
c106412691 Fixed: Multiple select form component 2022-02-08 18:10:03 +05:30
Llewellyn Dsouza
e2d720c044 Updated: all page routes 2022-02-07 23:02:26 +05:30
bluestreamlds
27ff4e17db Feature/wms 62 (#47)
* create warehouse
* edit warehouse changes
* Update: linted and formatted
* add warehouse button
* Update: linted
* Added: icons
* Update: Hidden pre decoration
* Updated: breadcrumbs logic

Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-07 22:53:05 +05:30
Dikshajain39511
d32a8892e3 Feature/wms 48 (#46)
* create warehouse
* edit warehouse changes
* Update: linted and formatted
* add warehouse button
* Update: linted

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-02-07 16:57:53 +05:30
bluestreamlds
1cc9a95e9f Feat/wms 49 (#45)
* Added: inventory home route
* Deleted: extra file
* Updated: linted
* Fixed: Tilegrid for tile component
* Integrated: tile component
* Fixed: routes
* Updated: Setup page order
* Added: redirect to inventory
* Fixed: add new inventory redirect
* Udpate: restructured code

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-04 15:36:54 +05:30
Llewellyn D'souza
6561755cb3 Linted: .eslintrc file 2022-02-04 15:06:09 +05:30
Talha Abbas
0fc8e2924f Feature/wms 33 (#31)
* Start the home page
* Created Setup Inventory Page
* delete useless files
* fixed a bug
* Add links for the sub actions
* fix naming
* Fix the tiles
* fix the path bug

Co-authored-by: bluestreamlds <85561356+bluestreamlds@users.noreply.github.com>
2022-02-04 13:55:25 +05:30
Llewellyn D'souza
be26d80906 Fixed: warehouse null check 2022-02-04 13:25:41 +05:30
bluestreamlds
5857706e89 Feat/wms 51 (#44)
* Added: icons
* Updated: routes
* Updated: Tilebasic component
* Updated: homepage component and styling
* Updated: Setup page styles and component
* Updated: Labelling home styles and components
* Fixed: missing footer
* Updated: reorder routes
* Fixed: tiles width for many items
* Fixed: warehouse missing path
* Fixed: setup screen icon sizes

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-04 13:19:03 +05:30
Hiren Padsala
b867a25974 fixed/wms-13 - Component update with code (#43)
* fixed/wms-13 - Component update with code
* Update: Linted with comment
2022-02-03 12:58:42 +05:30
bluestreamlds
48b3a25dd3 Merge pull request #41 from kfnawaz/feature/WMS_47
* warehouse api integration
* Updated: tile basic and icon

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
2022-02-02 15:17:19 +05:30
Llewellyn D'souza
3017ce1bae Updated: tile basic and icon 2022-02-02 15:12:52 +05:30
Dikshajain39511
9efde3d75f Merge branch 'develop' into feature/WMS_47 2022-02-02 14:52:34 +05:30
[Diksha]
6f99ba5541 warehouse api integration 2022-02-02 14:45:41 +05:30
bluestreamlds
5089501d40 Merge pull request #40 from kfnawaz/feature/WMS-57
* Added: 'hide' unnecessary navbar items
* Updated: homepage

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-02 13:55:43 +05:30
Llewellyn D'souza
599ff88a96 Updated: homepage 2022-02-02 12:55:03 +05:30
Llewellyn D'souza
5e52c90299 Added: 'hide' unnecessary navbar items 2022-02-02 12:45:35 +05:30
Talha Abbas
d2c2472e29 Feature/wms 5 (#32)
* Start the home page

* Fix the Tile and Tile Grid Component and also created the homePage

* Recreated the tile component with TileBasic

* fix the tile component

* Fixed: tile length sizing

* Rename page export

* Added: page to routes

* Renamed: sidenav title

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-01 15:02:48 +05:30
Hiren Padsala
384805865e Feature/wms-32 WareHouse details in table page completed (#39)
* Feature/wms-32 WareHouse details in table page completed

* Resolved: Box import

* Updated: .gitignore file

* Update: route component name

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-01 13:40:12 +05:30
Dikshajain39511
03a9dd5370 Feature/wms 44 (#37)
* add new/update inventory

* prop validation in imageupload component

* Linted

* add table to inventory page

* Renamed: ImageUpload - Index to index

* Resolved: route merge conflict

* Resolved: ImageUpload conflicts w/ warehouse page

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-01 13:26:22 +05:30
Dikshajain39511
ab4aa065fd Feature/wms 41 (#38)
* tileGrid page

* Updated: Tile component props

* TileBasic Component Changes

* Basic Tile Changes

* bug fix

* location form changes

* props pass to dropdown

* list users page

* user access changes

* user and access

* tabs changes

* Removed: Duplicate import

* Removed: extra tile component

* Resolved: Linter errors

* Undo: BasicTable conflict

* Resolved: PropTypes error

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-02-01 13:07:31 +05:30
Hiren Padsala
a99feeea7e feature/wms-30 completed design with single component (#36)
* feature/wms-30 completed design with single component
* Renamed, linted, fixed broken import

Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-01-31 15:44:59 +05:30
Hiren Padsala
4666a1e3b9 feature/wms-28 Warehouse Setup Page Design completed (#35)
* feature/wms-28 Warehouse Setup Page Design completed
* Renamed, linted
2022-01-31 15:32:33 +05:30
Hiren Padsala
0e7952f83d Feature/Wms-14 Nested Table component design completed (#30)
* Feature/Wms-14 Nested Table component design completed
2022-01-31 15:25:12 +05:30
Llewellyn D'souza
0774fa19de Fix: merge error 2022-01-31 11:42:09 +05:30
Dikshajain39511
ab1d396287 Feature/wms 35 (#34)
Added: Location label form

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
Co-authored-by: bluestreamlds <85561356+bluestreamlds@users.noreply.github.com>
2022-01-31 11:31:25 +05:30
Dikshajain39511
a3732def15 Feature/wms 29 (#29)
* tileGrid page
* fixed: overlap issue

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
2022-01-28 18:04:59 +05:30
Talha Abbas
129f1f1738 Feature/wms 15 (#21)
* completed the toggle component
* Delete: breadcrumbs changes
* Updated: file location and naming
* Fix naming and props errors

Co-authored-by: TalhaAbbas55 <talhaabbas556989@.com>
Co-authored-by: bluestreamlds <85561356+bluestreamlds@users.noreply.github.com>
Co-authored-by: Llewellyn Dsouza <lledsouza2209@gmail.com>
2022-01-26 14:25:03 +05:30