Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update readme.md * Update readme.md (#1) * package-lock update * added mysql2 and sequelize package * added env variables example * imported env configuration * added sequelize config file * added migration files * added models file * added seeders file * added migrate.js to help with restarting database * renamed seeders for order fix * fix typo longtitude to longitude * fix table relation foreign key * updated seeders * updated models relationship * defaultValue for active set to true * updated package.json * setup for api base url and whitelisted domain * add tailwind setup * created User_tokens to handle forget password, verify email, and change email * fix relationship to hasMany * added fks constraints * Unified Account_verifications, Password_recoveries, and added action to choose token action * package-log update * added variables for nodemailer, added nodemailer * removed removeConstraint on unavailable tables * updated import after moving folder * added email template and nodemailer config * added HTTP method POST for user registration * added errors folder for error handling * fix action to verify_account * updated User_vouchers seeder, migration, and model" * updated Vouchers seeder, migration, and model, to use claim_limit instead of use_limit * fix directory for errors folder * added query function to award vouchers upon registration * Added checking on userDatabaseGeneration, to award users if they have referrer * email to include name * updated verificationEmail to follow company brand * log cleanup * added react-router-dom * updated package-lock" * added .jsx format for css config * renamed App.js to App.jsx following requirement * renamed index.js to index.jsx, added react-router-dom BrowserRouter * added RegisterMobile for RegisterPage * added MobileBackButton * added react-router-dom, material-icons * cleanup default App.jsx, setup index.css, added react-router-dom for index.jsx * added components for Register Page * updated package-lock * add get admins backend * Added white logo * added circular decoration * Added blank space component * BackButton to use chevron_left instead * Button to use text-white instead of green-100 * added InputHandler * RegisterPage for mobile component updated * added background-color to subtle gray * added zIndex to help layering * added background color white * create userManagementSettingPage * Merge branch 'OGWA-13' of https://github.com/purwadhikafullstack/JCWDOL0901 into OGWA-9 * update userManagementSettings page * add api get cities * added route for registration greeting * added several images to public * added onClickHandler for reusability * InputGroup to accept setInput function * Register Page to receive Component in div, for conditional rendering * Separated form for validation, RegisterInput to receive input state setter * added Greeting page * ErrorWarning component added for login / registration error * GreetingMessage for successfully registered user * conditional referrer id to prevent error * log cleanup * fix class to className * removed InputBoxIcon, fix class to className * conditional rendering for GreetingMobile * added color logo * added CompanyLogo reusable component * separated company logo from message * separated company logo from message * add city select menu on create branch admin form * updated email_check.png to be transparent * redirection to deliver email by navigate() * adjusted margin for layout * separated handlers for react component * fix responsive className * imported handler for RegisterFormWithValidator * add get province api * add province city api * added formik and yup * dynamic className for companyLogo * added Formik to validate input * implemented formik * formik configuration for registration added * add auto generate coordinate * renamed for clarity * add middleware isSuper * add bcrypt.js * added proper register illustration image * back button to accept className props * separated layout for desktop / mobile * phone field to be required * modularized registration form components * fix illustration for mobile view * add province select menu * used doublequote instead of single quote * Readjusted desktop layout * color theme match * adjusted rounded corner size * removed dark mode * fix * adjusted margin for layouting * added route for user verification * created SuccesBox for modularity * added route for user verification * added clickable optional props * added flow for user verification * added query for requirement, along with its error handling * added verify page for mobile and desktop * added niche icon * add formik * created modular AlertBox component * VerifiPage to not redirect on fail request * reduced redundancy * add alert after create branch admin * add desktop view * OGWA-13 As a non-registered user, I want to input my data, so that I can register as a user (#3) * package-log update * added variables for nodemailer, added nodemailer * removed removeConstraint on unavailable tables * updated import after moving folder * added email template and nodemailer config * added HTTP method POST for user registration * added errors folder for error handling * fix action to verify_account * updated User_vouchers seeder, migration, and model" * updated Vouchers seeder, migration, and model, to use claim_limit instead of use_limit * fix directory for errors folder * added query function to award vouchers upon registration * Added checking on userDatabaseGeneration, to award users if they have referrer * email to include name * updated verificationEmail to follow company brand * log cleanup * added react-router-dom * updated package-lock" * added .jsx format for css config * renamed App.js to App.jsx following requirement * renamed index.js to index.jsx, added react-router-dom BrowserRouter * added RegisterMobile for RegisterPage * added MobileBackButton * added react-router-dom, material-icons * cleanup default App.jsx, setup index.css, added react-router-dom for index.jsx * added components for Register Page * updated package-lock * Added white logo * added circular decoration * Added blank space component * BackButton to use chevron_left instead * Button to use text-white instead of green-100 * added InputHandler * RegisterPage for mobile component updated * added background-color to subtle gray * added zIndex to help layering * added background color white * added route for registration greeting * added several images to public * added onClickHandler for reusability * InputGroup to accept setInput function * Register Page to receive Component in div, for conditional rendering * Separated form for validation, RegisterInput to receive input state setter * added Greeting page * ErrorWarning component added for login / registration error * GreetingMessage for successfully registered user * conditional referrer id to prevent error * log cleanup * fix class to className * removed InputBoxIcon, fix class to className * conditional rendering for GreetingMobile * added color logo * added CompanyLogo reusable component * separated company logo from message * separated company logo from message * updated email_check.png to be transparent * redirection to deliver email by navigate() * adjusted margin for layout * separated handlers for react component * fix responsive className * imported handler for RegisterFormWithValidator * added formik and yup * dynamic className for companyLogo * added Formik to validate input * implemented formik * formik configuration for registration added * renamed for clarity * added proper register illustration image * back button to accept className props * separated layout for desktop / mobile * phone field to be required * modularized registration form components * fix illustration for mobile view * used doublequote instead of single quote * Readjusted desktop layout * color theme match * adjusted rounded corner size * removed dark mode * fix * adjusted margin for layouting * reduced redundancy * OGWA-14 As a user, I want to be able to verify my account (#4) * package-log update * added variables for nodemailer, added nodemailer * removed removeConstraint on unavailable tables * updated import after moving folder * added email template and nodemailer config * added HTTP method POST for user registration * added errors folder for error handling * fix action to verify_account * updated User_vouchers seeder, migration, and model" * updated Vouchers seeder, migration, and model, to use claim_limit instead of use_limit * fix directory for errors folder * added query function to award vouchers upon registration * Added checking on userDatabaseGeneration, to award users if they have referrer * email to include name * updated verificationEmail to follow company brand * log cleanup * added react-router-dom * updated package-lock" * added .jsx format for css config * renamed App.js to App.jsx following requirement * renamed index.js to index.jsx, added react-router-dom BrowserRouter * added RegisterMobile for RegisterPage * added MobileBackButton * added react-router-dom, material-icons * cleanup default App.jsx, setup index.css, added react-router-dom for index.jsx * added components for Register Page * updated package-lock * Added white logo * added circular decoration * Added blank space component * BackButton to use chevron_left instead * Button to use text-white instead of green-100 * added InputHandler * RegisterPage for mobile component updated * added background-color to subtle gray * added zIndex to help layering * added background color white * added route for registration greeting * added several images to public * added onClickHandler for reusability * InputGroup to accept setInput function * Register Page to receive Component in div, for conditional rendering * Separated form for validation, RegisterInput to receive input state setter * added Greeting page * ErrorWarning component added for login / registration error * GreetingMessage for successfully registered user * conditional referrer id to prevent error * log cleanup * fix class to className * removed InputBoxIcon, fix class to className * conditional rendering for GreetingMobile * added color logo * added CompanyLogo reusable component * separated company logo from message * separated company logo from message * updated email_check.png to be transparent * redirection to deliver email by navigate() * adjusted margin for layout * separated handlers for react component * fix responsive className * imported handler for RegisterFormWithValidator * added formik and yup * dynamic className for companyLogo * added Formik to validate input * implemented formik * formik configuration for registration added * renamed for clarity * added proper register illustration image * back button to accept className props * separated layout for desktop / mobile * phone field to be required * modularized registration form components * fix illustration for mobile view * used doublequote instead of single quote * Readjusted desktop layout * color theme match * adjusted rounded corner size * removed dark mode * fix * adjusted margin for layouting * added route for user verification * created SuccesBox for modularity * added route for user verification * added clickable optional props * added flow for user verification * added query for requirement, along with its error handling * added verify page for mobile and desktop * added niche icon * created modular AlertBox component * VerifiPage to not redirect on fail request * refactor opencage.js * OGWA 13 - minor fix (#6) * using built in formik.isSubmitting instead of isBusy * removed isBusy from handler * OGWA-10 As an admin, I can see dashboard page (#7) * add total gross income * add dashboard mobile view * add filter to transaction query * add branch filter * add moment * connect FE & BE chart * add dashboard card * reafactor dashboard api * update transactions seeder updated_at * fix bug query from & to * add product sold chart feature * connect alltime data with api * connect branch info with api * add desktop view * add sidebar * add side bar for mobile view * Ogwa 7 (#10) * start OGWA-7 * progress ogwa-7 * done working on OGWA-7, need review * emailer fix (#9) * Ogwa 13 (#8) * using built in formik.isSubmitting instead of isBusy * removed isBusy from handler * margin fix * OGWA-10 (#12) * using built in formik.isSubmitting instead of isBusy * basic asset improved * conditional formik * added components for mobile headers * add total gross income * added react-responsive-slider and splider * added static promotional banners * imported css for carousel * placeholders for mobile homepage * add dashboard mobile view * added promo banner * add filter to transaction query * add branch filter * landing page updated * add moment * removed border for top products * added mobile footer for landing page * connect FE & BE chart * add dashboard card * seeders updated * reafactor dashboard api * Added categories icons * mobile footer to include company headquarter address * update transactions seeder updated_at * added api to get Categories' ' * fix bug query from & to * updated seeders to match directory * CategoryCarousel to wait datas * add product sold chart feature * carousel done * refactor Splide * connect alltime data with api * added geolocation * implemented geolocation with promise * dynamic rendering for pending access, denied access * added back end api to get nearest branch * connect branch info with api * add desktop view * BranchMenu linked to back end * added @reduxjs/toolkit and react-redux * updated package-lock.json * add sidebar * fix key react requirement * fix class to className * refactor reducer * add side bar for mobile view * implemented global state for branch location to allow dynamic products fetching * fix resolve * update package.json and import name * fix layout * added conditional for address * fix bug at sidebar mobile * Change branch dynamic data ready * change dashboard color * fix setter * added backend API to get all branches * added dropdown handler * Change branch modal feature added * dynamic data ready for Products Recommendation * dynamic data ready2 * added back end api to get products recommendation * OGWA-Mobile done * .length removed * separated app and user * OGWA-2 done * minor fix for categories * set default redux app state to mobile * refactor and fix bug * refactor code * add switch view button and redux * fix bug sidebar --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> * Ogwa 2 (#11) * using built in formik.isSubmitting instead of isBusy * basic asset improved * conditional formik * added components for mobile headers * added react-responsive-slider and splider * added static promotional banners * imported css for carousel * placeholders for mobile homepage * added promo banner * landing page updated * removed border for top products * added mobile footer for landing page * seeders updated * Added categories icons * mobile footer to include company headquarter address * added api to get Categories' ' * updated seeders to match directory * CategoryCarousel to wait datas * carousel done * refactor Splide * added geolocation * implemented geolocation with promise * dynamic rendering for pending access, denied access * added back end api to get nearest branch * BranchMenu linked to back end * added @reduxjs/toolkit and react-redux * updated package-lock.json * fix key react requirement * fix class to className * refactor reducer * implemented global state for branch location to allow dynamic products fetching * fix resolve * update package.json and import name * fix layout * added conditional for address * Change branch dynamic data ready * fix setter * added backend API to get all branches * added dropdown handler * Change branch modal feature added * dynamic data ready for Products Recommendation * dynamic data ready2 * added back end api to get products recommendation * OGWA-Mobile done * .length removed * separated app and user * OGWA-2 done * minor fix for categories * set default redux app state to mobile * Update DashboardCharts.jsx * Ogwa 15 (#13) * create pages and components for User Login * done OGWA-15 - user login page * Ogwa 37 (#14) * using built in formik.isSubmitting instead of isBusy * basic asset improved * conditional formik * added components for mobile headers * added react-responsive-slider and splider * added static promotional banners * imported css for carousel * placeholders for mobile homepage * added promo banner * landing page updated * removed border for top products * added mobile footer for landing page * seeders updated * Added categories icons * mobile footer to include company headquarter address * added api to get Categories' ' * updated seeders to match directory * CategoryCarousel to wait datas * carousel done * refactor Splide * added geolocation * implemented geolocation with promise * dynamic rendering for pending access, denied access * added back end api to get nearest branch * BranchMenu linked to back end * added @reduxjs/toolkit and react-redux * updated package-lock.json * fix key react requirement * fix class to className * refactor reducer * implemented global state for branch location to allow dynamic products fetching * fix resolve * update package.json and import name * fix layout * added conditional for address * Change branch dynamic data ready * fix setter * added backend API to get all branches * added dropdown handler * Change branch modal feature added * dynamic data ready for Products Recommendation * dynamic data ready2 * added back end api to get products recommendation * OGWA-Mobile done * .length removed * separated app and user * OGWA-2 done * minor fix for categories * set default redux app state to mobile * update package.json * updated seeders * added api to get promotions type * added backend api to patch inventory promotions * added product images * update package-lock * Added backend api route to get promotions * added illustration for admin login * added front end route to manage promo * fix OGWA-7 * admin jsonwebtoken checker refactored * renamed bodySanitizer.js to sanitizer.js to handle all sanitation * opencage to input api key * added verifyJWToken function * added backend api to CRUD inventory_promotions * format issue * added Inventory_promotions query file * adjusted import name for sanitizer * cleared log file * fix carousel * dropdown text fix * package update * pagination to use sequelize * added pagination component * DropDown reusable component update * Added PageTitle reusable component * layout update * Added manage promotion page * Inventory_promotions to get only with expired_at greater than or equal now() * Mobile Version to manage inventory done * OGWA-37 Done * confirmation panel added * Ogwa 51 (#17) * OGWA-53 (#15) * fix middleware * fix dashboard page and sidebar * fix responsive create branch admin page * add logout functionality * Ogwa 52 (#16) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * HomeHeader padding adjusted * Ogwa 52 (#18) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * margin fix * Ogwa 54 (#19) * starting point of fix responsive design for OGWA-7 (admin login page) and OGWA-15 (user login page) * finish 1/2 fix responsive, 1 to go * deleting any console.log * finish fixing responsive on AdminLoginPage * finish fixing responsive OGWA-54 --------- Co-authored-by: farrez30 <59773413+farrez30@users.noreply.github.com> --------- Co-authored-by: Muhamad Danang Priambodo <68808411+mcdanang@users.noreply.github.com> Co-authored-by: farrez30 <59773413+farrez30@users.noreply.github.com> * Ogwa 29 (#20) * OGWA-53 (#15) * fix middleware * fix dashboard page and sidebar * fix responsive create branch admin page * add logout functionality * Ogwa 52 (#16) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * HomeHeader padding adjusted * Ogwa 52 (#18) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * margin fix * fix margin * visual improvement * start checkpoint * updated dropdown * update components * updated * fix table * updated table design * back end setup to filter and get Inventories and it's detail * added max height * table working as intended, and responsive * responsiveness improved * accidental fix * added temporary conditional pagination * ProductPromo refactor to follow ProductStock * fix route for login * front end formik validation for edit stock added * updated Stock_changes as sequelize requires primary key * added error handler for update service * Stock_changes model updated * added create method for Stock_changes, update method for Inventories * backend API to update stock added * EditModeButton type changed from submit to button, handler updated * Added formik configuration * promo service todo added * implemented formik for edit and create promo * moved EditMode and ViewMode to follow structure --------- Co-authored-by: Muhamad Danang Priambodo <68808411+mcdanang@users.noreply.github.com> * OGWA-24 As a branch admin, I want to create, update delete product category data (#21) * using built in formik.isSubmitting instead of isBusy * basic asset improved * conditional formik * added components for mobile headers * added react-responsive-slider and splider * added static promotional banners * imported css for carousel * placeholders for mobile homepage * added promo banner * landing page updated * removed border for top products * added mobile footer for landing page * seeders updated * Added categories icons * mobile footer to include company headquarter address * added api to get Categories' ' * updated seeders to match directory * CategoryCarousel to wait datas * carousel done * refactor Splide * added geolocation * implemented geolocation with promise * dynamic rendering for pending access, denied access * added back end api to get nearest branch * BranchMenu linked to back end * added @reduxjs/toolkit and react-redux * updated package-lock.json * fix key react requirement * fix class to className * refactor reducer * implemented global state for branch location to allow dynamic products fetching * fix resolve * update package.json and import name * fix layout * added conditional for address * Change branch dynamic data ready * fix setter * added backend API to get all branches * added dropdown handler * Change branch modal feature added * dynamic data ready for Products Recommendation * dynamic data ready2 * added back end api to get products recommendation * OGWA-Mobile done * .length removed * separated app and user * OGWA-2 done * minor fix for categories * set default redux app state to mobile * update package.json * updated seeders * added api to get promotions type * added backend api to patch inventory promotions * added product images * update package-lock * Added backend api route to get promotions * added illustration for admin login * added front end route to manage promo * fix OGWA-7 * admin jsonwebtoken checker refactored * renamed bodySanitizer.js to sanitizer.js to handle all sanitation * opencage to input api key * added verifyJWToken function * added backend api to CRUD inventory_promotions * format issue * added Inventory_promotions query file * adjusted import name for sanitizer * cleared log file * fix carousel * fix sidebar bug * dropdown text fix * add navigation to category page * add category form * add file uploads folder * connect fe & be create category * package update * pagination to use sequelize * added pagination component * DropDown reusable component update * Added PageTitle reusable component * layout update * Added manage promotion page * add file filter multer * add update category * add file size limit * Inventory_promotions to get only with expired_at greater than or equal now() * Mobile Version to manage inventory done * OGWA-37 Done * change folder name * fix bug middleware branchdata * fix middleware * fix dashboard page and sidebar * fix responsive create branch admin page * add logout functionality * OGWA-53 (#15) * fix middleware * fix dashboard page and sidebar * fix responsive create branch admin page * add logout functionality * fix category responsive page * Ogwa 52 (#16) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * HomeHeader padding adjusted * Ogwa 52 (#18) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * margin fix * fix margin * visual improvement * add category table * start checkpoint * updated dropdown * update components * updated * Update CategoryTable.jsx * get category data * add update category feature * add redux setSuper to admin login * add redux when logout to reset super admin * hide restricted button on sidebar * add delete warning modals * add delete category feature * add filter sort layout * add filter by name * add auth guard * add sort button * add sort category on backend --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * Ogwa 55 (#22) * fix new api issue * fix layout * fix done * layout consistency fix * OGWA-16 As a user, I want to be able to change my password (#24) * add change password page * finish change password frontend * add change password backend * add account/change-password route temporary to acount button * Ogwa 55 (#23) * fix new api issue * fix layout * fix done * layout consistency fix * code cleanup * added js-cookie * jsCookie added * implemented cookie * minor fix * Ogwa 55 (#25) * fix new api issue * fix layout * fix done * layout consistency fix * code cleanup * added js-cookie * jsCookie added * implemented cookie * minor fix * pagination default to 3 * consistent margin * readjusted create promo button position * z fix * added transition * added prettier config * Merge branch 'development' of https://github.com/purwadhikafullstack/JCWDOL0901 into development * Ogwa 26 (#27) * Creating early folder's structure and related files for UserAccountSetting page * Creating UserAccountSettingHandler.js under /Components/UserAccountSetting/handlers/ * Creating formikUserAccountSettingConfiguration.js (not finish) under /Components/UserAccountSetting/Config/ and UserAccountSettingForm.jsx (not finish) * OGWA-53 (#15) * fix middleware * fix dashboard page and sidebar * fix responsive create branch admin page * add logout functionality * Ogwa 52 (#16) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * HomeHeader padding adjusted * Ogwa 52 (#18) * clean logs * responsive fix for register and greeting page * unified GreetingPage * fix registration verification rote * fix responsive for VerifyPage * fix BackButton * removed uneeded files * HomePage to be responsive * manage promotion fix * removed border and background white * fix back button * fix createPromotion responsive * margin fix * Ogwa 54 (#19) * starting point of fix responsive design for OGWA-7 (admin login page) and OGWA-15 (user login page) * finish 1/2 fix responsive, 1 to go * deleting any console.log * finish fixing responsive on AdminLoginPage * finish fixing responsive OGWA-54 --------- Co-authored-by: farrez30 <59773413+farrez30@users.noreply.github.com> * working on User Account Setting Page * working on front end Account Setting Page * finished Account Setting Page client, working on server * finished create server for Profile Update in User Account Setting (Patch) * Finish fixing server for get Profile data in UserAccountSettingPage * Finish fixing server for Update Profile data in UserAccountSettingPage * Finish refactoring UserAccountSetting page --------- Co-authored-by: Muhamad Danang Priambodo <68808411+mcdanang@users.noreply.github.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> * OGWA-19 As a user, I want to see a product list page (#30) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * Ogwa 12 (#33) * Ogwa 45 (#31) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * merge conflict done * added back end api to get cart and default address * updateed seeders * checkout page using static data * added back end api to get user addresses * redux configuration for checkout added * added data for addresses * fix radio logic * improved click area * fully using redux * checkout to fully utilize global state * improved switch address ui * improved uis * layout improved * added redux persist * updated seeders and addd backend api to get user vouchers * implemented redux persist * Select Vouchers added * voucher seeders updated * redux fix, order ready * added remove voucher button * separated initialValues * updated table to follow spec requirement * OGWA-45 ready, waiting for OGWA-44 * fix variable * cleanup * added reset value on unmount * redux reset on back button * create transaction done * Ogwa 44 (#32) * added rajaOngkir setup * renamed rajaOngkir to rajaOngkirService.js * rajaOngkirService ready * added backend api to get delivery cost * added body sanitizer * updated bodyHelper.js * updated redux for need * added select logistic menu * updated vouchers seeder * added more vouchers * fix redux logic * fix another redux logic * updated payload for order creation * deleted cart after order, user_voucher isUsed to true after order, logistic logged on order * finalized OGWA-44 * OGWA-12 improved for empty cart * Refactor for redux * redux fix * willUnmount removed * refactor * disable change on empty cart * fix conflict * fix conflict 2 * reduced stock on order * added style on radio * Ogwa 28 (#34) * fixing server upload avatar * creating frontend for userAvatarUpload page * fixing front end for upload avatar * fixing backend multer for upload avatar * fixing backend multer for upload avatar part 2 (succesfully get and update avatar but model/database profiles didn't updated * finish OGWA-28 * finish fixing layout for profile update, avatar update, user login and admin login page * OGWA-30 As a user, I want to add, update or delete my address (#35) * add Op import * add get address & get default address * add create address * add update & delete address * fix category bug * create account menu * add address list * create new address form * delete consolelog error * create FE edit address * fix coordinate bug when update address * finish manage address * add address info on landing page * fix overall bug * Ogwa 31 (#37) * updated seeders * OGWA 33 (#36) * updated tailwind config, manage order table prototyped * checkpoint * by date range added * dynamic data ready * fix react state * seeders updated * added Proofs table * Proofs models defined * added proofs dummy image * added backend api to get branch transactions * added more seeders * added save-file * Front end for manage order done * Transactions data added * seeders fix * minor filter bug fix * changing filterBy and sortBy doesn't reset page * Ogwa 46 (#38) * Ogwa 45 (#31) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * merge conflict done * added back end api to get cart and default address * updateed seeders * checkout page using static data * added back end api to get user addresses * redux configuration for checkout added * added data for addresses * fix radio logic * improved click area * fully using redux * checkout to fully utilize global state * improved switch address ui * improved uis * layout improved * added redux persist * updated seeders and addd backend api to get user vouchers * implemented redux persist * Select Vouchers added * voucher seeders updated * redux fix, order ready * added remove voucher button * separated initialValues * updated table to follow spec requirement * OGWA-45 ready, waiting for OGWA-44 * fix variable * cleanup * added reset value on unmount * redux reset on back button * create transaction done * Ogwa 44 (#32) * added rajaOngkir setup * renamed rajaOngkir to rajaOngkirService.js * rajaOngkirService ready * added backend api to get delivery cost * added body sanitizer * updated bodyHelper.js * updated redux for need * added select logistic menu * updated vouchers seeder * added more vouchers * fix redux logic * fix another redux logic * updated payload for order creation * deleted cart after order, user_voucher isUsed to true after order, logistic logged on order * finalized OGWA-44 * OGWA-12 improved for empty cart * Refactor for redux * redux fix * willUnmount removed * refactor * disable change on empty cart * fix conflict * fix conflict 2 * reduced stock on order * added style on radio * conflict fix * checkpoint * added backend api to get user transaction, post proof * upload proof page front end added * added back end api to handle payment proof upload * code cleanup and front end page to upload payment proof done * OGWA - 19 Fix Minor Bug (#39) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * OGWA-27 As a branch admin, I want to see all product list (#41) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation * fix bug pagination * add FE & BE * add create product page & update product page * add filter by name * finish add sort and filter * Update SearchFilter.jsx --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * OGWA-18 As a user, I want to be able to reset my password (#42) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation * fix bug pagination * add FE & BE * add create product page & update product page * add filter by name * finish add sort and filter * Update SearchFilter.jsx * add reset password illustration * add forgot password * add resetpassword route * update email template * add reset password api * fix height component * update data padding on table --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * OGWA-36 As a branch admin, I want to send user orders (#43) * create api for send, cancel, confirm payment, and reject payment * add frontend send button * add sweetalert * OGWA-38 As a branch admin, I want to cancel user orders (#44) * create api for send, cancel, confirm payment, and reject payment * add frontend send button * add sweetalert * add cancel, confirm, and reject button * Ogwa 40 (#48) (#53) * layout minor fix * ascending and descending updated to A to Z, Z to A, and so on * layout updated * updated PageTitle * fix default value to * minor tweak for DropDown.jsx * navigationConfig updated, PageTitle to accept className instead of color * Ogwa 46 (#38) * Ogwa 45 (#31) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * merge conflict done * added back end api to get cart and default address * updateed seeders * checkout page using static data * added back end api to get user addresses * redux configuration for checkout added * added data for addresses * fix radio logic * improved click area * fully using redux * checkout to fully utilize global state * improved switch address ui * improved uis * layout improved * added redux persist * updated seeders and addd backend api to get user vouchers * implemented redux persist * Select Vouchers added * voucher seeders updated * redux fix, order ready * added remove voucher button * separated initialValues * updated table to follow spec requirement * OGWA-45 ready, waiting for OGWA-44 * fix variable * cleanup * added reset value on unmount * redux reset on back button * create transaction done * Ogwa 44 (#32) * added rajaOngkir setup * renamed rajaOngkir to rajaOngkirService.js * rajaOngkirService ready * added backend api to get delivery cost * added body sanitizer * updated bodyHelper.js * updated redux for need * added select logistic menu * updated vouchers seeder * added more vouchers * fix redux logic * fix another redux logic * updated payload for order creation * deleted cart after order, user_voucher isUsed to true after order, logistic logged on order * finalized OGWA-44 * OGWA-12 improved for empty cart * Refactor for redux * redux fix * willUnmount removed * refactor * disable change on empty cart * fix conflict * fix conflict 2 * reduced stock on order * added style on radio * conflict fix * checkpoint * added backend api to get user transaction, post proof * upload proof page front end added * added back end api to handle payment proof upload * code cleanup and front end page to upload payment proof done * added back end api to get stock_changes, relation fixed * front end OGWA-40 completed * OGWA - 19 Fix Minor Bug (#39) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation --------- * OGWA-27 As a branch admin, I want to see all product list (#41) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation * fix bug pagination * add FE & BE * add create product page & update product page * add filter by name * finish add sort and filter * Update SearchFilter.jsx --------- * OGWA-18 As a user, I want to be able to reset my password (#42) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation * fix bug pagination * add FE & BE * add create product page & update product page * add filter by name * finish add sort and filter * Update SearchFilter.jsx * add reset password illustration * add forgot password * add resetpassword route * update email template * add reset password api * fix height component * update data padding on table --------- * bug fix for date filter --------- Co-authored-by: Muhamad Danang Priambodo <68808411+mcdanang@users.noreply.github.com> * OGWA 12 Merge for OGWA 46 Epic (#52) * Ogwa 45 (#31) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * merge conflict done * added back end api to get cart and default address * updateed seeders * checkout page using static data * added back end api to get user addresses * redux configuration for checkout added * added data for addresses * fix radio logic * improved click area * fully using redux * checkout to fully utilize global state * improved switch address ui * improved uis * layout improved * added redux persist * updated seeders and addd backend api to get user vouchers * implemented redux persist * Select Vouchers added * voucher seeders updated * redux fix, order ready * added remove voucher button * separated initialValues * updated table to follow spec requirement * OGWA-45 ready, waiting for OGWA-44 * fix variable * cleanup * added reset value on unmount * redux reset on back button * create transaction done * Ogwa 44 (#32) * added rajaOngkir setup * renamed rajaOngkir to rajaOngkirService.js * rajaOngkirService ready * added backend api to get delivery cost * added body sanitizer * updated bodyHelper.js * updated redux for need * added select logistic menu * updated vouchers seeder * added more vouchers * fix redux logic * fix another redux logic * updated payload for order creation * deleted cart after order, user_voucher isUsed to true after order, logistic logged on order * finalized OGWA-44 * OGWA-12 improved for empty cart * Refactor for redux * redux fix * willUnmount removed * refactor * disable change on empty cart * fix conflict * fix conflict 2 * reduced stock on order * added style on radio * conflict fix * Ogwa 46 (#40) * checkpoint * added backend api to get user transaction, post proof * upload proof page front end added * Ogwa 31 (#37) * updated seeders * OGWA 33 (#36) * updated tailwind config, manage order table prototyped * checkpoint * by date range added * dynamic data ready * fix react state * seeders updated * added Proofs table * Proofs models defined * added proofs dummy image * added backend api to get branch transactions * added more seeders * added save-file * Front end for manage order done * Transactions data added * seeders fix * minor filter bug fix * changing filterBy and sortBy doesn't reset page * added back end api to handle payment proof upload * code cleanup and front end page to upload payment proof done * Ogwa 46 (#49) * checkpoint * added backend api to get user transaction, post proof * upload proof page front end added * Ogwa 31 (#37) * updated seeders * OGWA 33 (#36) * updated tailwind config, manage order table prototyped * checkpoint * by date range added * dynamic data ready * fix react state * seeders updated * added Proofs table * Proofs models defined * added proofs dummy image * added backend api to get branch transactions * added more seeders * added save-file * Front end for manage order done * Transactions data added * seeders fix * minor filter bug fix * changing filterBy and sortBy doesn't reset page * added back end api to handle payment proof upload * code cleanup and front end page to upload payment proof done * Ogwa 46 (#38) * Ogwa 45 (#31) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * merge conflict done * added back end api to get cart and default address * updateed seeders * checkout page using static data * added back end api to get user addresses * redux configuration for checkout added * added data for addresses * fix radio logic * improved click area * fully using redux * checkout to fully utilize global state * improved switch address ui * improved uis * layout improved * added redux persist * updated seeders and addd backend api to get user vouchers * implemented redux persist * Select Vouchers added * voucher seeders updated * redux fix, order ready * added remove voucher button * separated initialValues * updated table to follow spec requirement * OGWA-45 ready, waiting for OGWA-44 * fix variable * cleanup * added reset value on unmount * redux reset on back button * create transaction done * Ogwa 44 (#32) * added rajaOngkir setup * renamed rajaOngkir to rajaOngkirService.js * rajaOngkirService ready * added backend api to get delivery cost * added body sanitizer * updated bodyHelper.js * updated redux for need * added select logistic menu * updated vouchers seeder * added more vouchers * fix redux logic * fix another redux logic * updated payload for order creation * deleted cart after order, user_voucher isUsed to true after order, logistic logged on order * finalized OGWA-44 * OGWA-12 improved for empty cart * Refactor for redux * redux fix * willUnmount removed * refactor * disable change on empty cart * fix conflict * fix conflict 2 * reduced stock on order * added style on radio * conflict fix * checkpoint * added backend api to get user transaction, post proof * upload proof page front end added * added back end api to handle payment proof upload * code cleanup and front end page to upload payment proof done * OGWA - 19 Fix Minor Bug (#39) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for related product and recommendation --------- Co-authored-by: Gameciel <christofer.calvin.pranata@gmail.com> Co-authored-by: Gameciel <113884895+Gameciel@users.noreply.github.com> * transparent products added * added loading effect on busy * removed back button on verification page * OGWA-27 As a branch admin, I want to see all product list (#41) * backend api set * add getproducts controller * fix api get product reccomendation * add promotion name on api get products * create product page layout * update search bar layout * edit category and product recommendation space * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Ogwa 20 (#26) * backend api set * added column for Product query * Added custom css to zoom on hover * responsive product detail done * added disabled condition for add to cart * added conditional expired_at * product detail page can now show promotion * OGWA-20 done * Added scheduler to delete expired inventory promotion every 00:00 * updated relation for inventories and inventory_promotions * updated change according to models * Update SliderSlides.jsx * fix related product api bug * add cards * add focus on category slide * add sort order frontend * add card * add sort modal * add alt on image * Update package-lock.json * fix bug pagination * fix bug sort order * fix bug setpage error on homepage * fix bug address select * fix bug select city * add city & province * clean console.log * fix conflict * refactor useeffect didmount * use product card for rela…
- Loading branch information
5 people
committed
Jul 11, 2023
1 parent
a280d30
commit a8e5d35
