Commit Graph

  • 1e620a5805 Merge branch 'development' into HIMA-38 Lorenz Hilpert 2019-02-04 13:58:15 +01:00
  • 01612d1e9c - Added InfoDTO - Added FeedDTO.emphasize property - Updated Mock Data Lorenz Hilpert 2019-02-04 13:57:32 +01:00
  • 55f9be7092 [HIMA-26] Added FeedMockService to app.module Eraldo Hasanaj 2019-02-04 13:38:32 +01:00
  • b708934b3b [HIMA-39] - Added FeedMockService Lorenz Hilpert 2019-02-04 13:08:54 +01:00
  • c6ab91f74d Merge branch 'development' into HIMA-38 Lorenz Hilpert 2019-02-04 12:49:44 +01:00
  • 4858b39304 Merge conflicts at feed.effects Eraldo Hasanaj 2019-02-04 12:39:31 +01:00
  • 89ddaf56dc [HIMA-13] Added mapper function for product type icons Eraldo Hasanaj 2019-02-04 12:36:32 +01:00
  • ae57e7b604 - FeedServiceModule.forRoot added enpoint string - Import Fix in feed.effect and feed.action Lorenz Hilpert 2019-02-04 12:36:20 +01:00
  • dff615ff17 organise imports Eraldo Hasanaj 2019-02-04 11:25:08 +01:00
  • 84d233b914 Added action and reducer for feed Eraldo Hasanaj 2019-02-03 20:50:16 +01:00
  • c8bc014fc4 Changed search service to call the actual backend Eraldo Hasanaj 2019-02-01 17:40:24 +01:00
  • 2cbc8adb94 [HIMA-10] Updated the design parameters acording to the QA comments Eraldo Hasanaj 2019-02-01 16:20:27 +01:00
  • 5a8771bb83 fixed content body height Eraldo Hasanaj 2019-02-01 15:18:24 +01:00
  • 64cc098788 Merged in HIMA-38 (pull request #9) Lorenz Hilpert 2019-02-01 13:25:22 +00:00
  • d333a71bad Merge remote-tracking branch 'origin/development' into HIMA-38 Lorenz Hilpert 2019-02-01 14:11:38 +01:00
  • ffefa34a52 [HIMA-10] Created functionality when there is any active process and the user starts searching products, an active process will be created automatically Eraldo Hasanaj 2019-02-01 14:03:52 +01:00
  • 610ca63aca - Added feed-service build to bitbucket-pipelines.yml Lorenz Hilpert 2019-02-01 12:45:37 +01:00
  • 371021ab29 - Added Barrel Files - Updated publich_api.ts Lorenz Hilpert 2019-02-01 12:44:44 +01:00
  • d66c951547 [HIMA-39] - Added new library feed-service - initial FeedService - DTOs - Models Lorenz Hilpert 2019-02-01 12:43:07 +01:00
  • c7870c9446 - Updated UnitTest for CatSearchService - Changed ApiResponse and PagedApiResponse from class to interface Lorenz Hilpert 2019-02-01 12:41:16 +01:00
  • fbf2a97f05 Merge branch 'development' of https://bitbucket.org/umwerk/instore-ma-app into development Eraldo Hasanaj 2019-02-01 12:08:35 +01:00
  • 66dc4705ae [HIMA-23] Changed the resolution on the logo, changed the height of the header component, fixed the distances of the header elements & changed add-process icon with sympli resource Eraldo Hasanaj 2019-02-01 12:02:44 +01:00
  • 4358c2db55 ProductCardComponent display product image Lorenz Hilpert 2019-02-01 10:41:10 +01:00
  • 96a006c619 Fix Import Issues in FilterService and ProductService Lorenz Hilpert 2019-01-31 17:48:41 +01:00
  • 5f71f2772a Merged in HIMA-38 (pull request #8) Lorenz Hilpert 2019-01-31 16:39:54 +00:00
  • 79f06808ad Merge branch 'development' into HIMA-38 Lorenz Hilpert 2019-01-31 17:19:59 +01:00
  • 75b96287a4 - Import Fix - ProductService.searchItems => throw error when response.error is true - Added ean to Product Model Lorenz Hilpert 2019-01-31 17:16:04 +01:00
  • 91d024bc5b added build cat-service module to pipeline for master branch Eraldo Hasanaj 2019-01-31 16:37:37 +01:00
  • 5242179254 added build cat-service module to pipeline Eraldo Hasanaj 2019-01-31 16:03:52 +01:00
  • 14f98bcc95 fixed router to public at menu.component Eraldo Hasanaj 2019-01-31 15:55:57 +01:00
  • 446b815301 Merged HIMA-38 to development Eraldo Hasanaj 2019-01-31 15:35:45 +01:00
  • 9d41f75e76 update itemFormatMap Lorenz Hilpert 2019-01-31 15:28:13 +01:00
  • 8ae445316b Created ProductMapping Service and Moved the mapping function to ProductMapping.fromitemDto() Lorenz Hilpert 2019-01-31 15:21:50 +01:00
  • 9924207c21 [HIMA-10] Changed general font for application to Open Sans & added lower navigation Eraldo Hasanaj 2019-01-31 15:11:25 +01:00
  • 5a851bb816 Update Mapping for ItemDTO to Product Lorenz Hilpert 2019-01-31 15:10:31 +01:00
  • 579d038b91 fixed import of car-service on filter service & product service Eraldo Hasanaj 2019-01-31 14:47:27 +01:00
  • e06a4658a6 Merged in HIMA-38 (pull request #6) Lorenz Hilpert 2019-01-31 13:38:53 +00:00
  • 1f2faef28a Uncomment CatSearchMockService Lorenz Hilpert 2019-01-31 13:41:29 +01:00
  • bcc8e8e603 Fix Import issues Lorenz Hilpert 2019-01-31 13:40:20 +01:00
  • 12255964f1 Merge branch 'development' into HIMA-38 Lorenz Hilpert 2019-01-31 13:33:56 +01:00
  • 28c0c1cfd3 Added Config Service to Main Updated BasicAuthorizationInterceptor Added config.json to assets Lorenz Hilpert 2019-01-31 13:31:45 +01:00
  • f8bdb44740 Merge branch 'testing' Eraldo Hasanaj 2019-01-30 20:12:40 +01:00
  • 8e393a00c0 fixed error when there were no recent article searches Eraldo Hasanaj 2019-01-30 20:11:31 +01:00
  • ba8c7d974f added loger on filter service Eraldo Hasanaj 2019-01-30 19:32:36 +01:00
  • b539f8b679 organise imports Eraldo Hasanaj 2019-01-30 18:42:45 +01:00
  • 136bc4c670 Merged HIMA-38 to development Eraldo Hasanaj 2019-01-30 18:20:45 +01:00
  • 543c120501 Added missing exports to index.ts files Lorenz Hilpert 2019-01-30 16:39:23 +01:00
  • 999400bc75 CatSearchService.settings cache settings and add options parameter Lorenz Hilpert 2019-01-30 16:30:26 +01:00
  • 7e181f6ac0 [HIMA-40][HIMA-41][HIMA-42] -Added TranslationDTO - Added property UiSettingsDTO.translations: TranslationDTO[] - Added property ItemDTO.recommendation?: boolean - Added property ProductDTO.locale Lorenz Hilpert 2019-01-30 16:18:12 +01:00
  • 9988a7aa3e Added CatImageService to get the image url Lorenz Hilpert 2019-01-30 16:03:33 +01:00
  • 69a28e091d [HIMA-12] Created component for product detail page & [HIMA-29] Implemeted api calls to get filters Eraldo Hasanaj 2019-01-30 15:59:41 +01:00
  • 8a85b87e58 ItemDTO to Product mapping Lorenz Hilpert 2019-01-30 15:34:38 +01:00
  • 6bfbd64309 [HIMA-11 Created service method searchItems wchich implements call to CatSearchService.search()] Eraldo Hasanaj 2019-01-30 13:31:19 +01:00
  • bdf8c57f40 Merged in HIMA-38 (pull request #4) Lorenz Hilpert 2019-01-30 12:05:25 +00:00
  • 5c6a5fc7e8 [HIMA-11] Added ItemDTO to be persisted in the ngrx/store Eraldo Hasanaj 2019-01-30 13:04:07 +01:00
  • a40a6e6018 initial version of the ItemDTO to Product mapper Lorenz Hilpert 2019-01-30 12:57:09 +01:00
  • 1eb24bf449 Merged in HIMA-38 (pull request #3) Lorenz Hilpert 2019-01-30 10:55:08 +00:00
  • 68a606a631 [HIMA-13] Added filter compoenent to search result component Eraldo Hasanaj 2019-01-30 11:54:16 +01:00
  • 89b317ac4b [HIMA-41] - Changed ResponseType of CatSearchService.complete to PagedApiResponse<string> - Updated mock data Lorenz Hilpert 2019-01-30 11:46:49 +01:00
  • b5a38072bd [HIMA-13] Finished product card component which represent a product in the search result component Eraldo Hasanaj 2019-01-30 11:29:36 +01:00
  • 767d909ebf Updated Readme.md Lorenz Hilpert 2019-01-30 10:57:41 +01:00
  • e669b1681b Merge branch 'feature(CatService)' into HIMA-38 Lorenz Hilpert 2019-01-30 10:53:21 +01:00
  • 5ef2af5d3c Merge branch 'development' into HIMA-38 Lorenz Hilpert 2019-01-30 10:44:55 +01:00
  • 302baa3412 [HIMA-40] - Added Api Call for Autocomplete Lorenz Hilpert 2019-01-30 10:43:28 +01:00
  • ebcc72b810 Added Readme Lorenz Hilpert 2019-01-29 18:11:52 +01:00
  • e2cc975c67 Implemented model for search-result compoent & added search-result component & product-card compoenent also added navigation when click loop on recent searches Eraldo Hasanaj 2019-01-29 17:02:27 +01:00
  • ae6ecfce33 Fix CatService DTO barrel Lorenz Hilpert 2019-01-29 16:49:31 +01:00
  • fe89da3ce3 Merget feature(CatService) to development Eraldo Hasanaj 2019-01-29 13:50:23 +01:00
  • c3b45fb227 Added @ngrx/ruter-state which will be used for state management of url navigation Eraldo Hasanaj 2019-01-29 13:43:32 +01:00
  • 951e690b84 Removed test service call from AppModule Lorenz Hilpert 2019-01-29 13:08:38 +01:00
  • 47959bbf23 Removed second parameter from CatServiceModule.forRoot call Lorenz Hilpert 2019-01-29 13:04:40 +01:00
  • 0e153a522f CatSerarchService Mock - Added settings call Lorenz Hilpert 2019-01-29 11:02:04 +01:00
  • 4d62fc77ad added more filters functinoality Eraldo Hasanaj 2019-01-28 20:24:42 +01:00
  • 2c44639050 Merged feature(CatService) into Development Eraldo Hasanaj 2019-01-28 19:27:30 +01:00
  • 3ddc723b59 Merge branch 'development' into testing Eraldo Hasanaj 2019-01-28 18:42:52 +01:00
  • 62e56999a6 working on filter logic Eraldo Hasanaj 2019-01-28 18:39:44 +01:00
  • ef69d4133c working with search filters Eraldo Hasanaj 2019-01-28 15:17:40 +01:00
  • 8072b942ab Added BasicAuthorizationInterceptor, Added forRoot to CatServiceModule, Removed defaultHeader from CatSearchService Lorenz Hilpert 2019-01-28 13:46:22 +01:00
  • fbc68c4463 Merge branch 'master' into testing Eraldo Hasanaj 2019-01-28 11:08:39 +01:00
  • 7adbe20ba4 Added filter & filter-item components Eraldo Hasanaj 2019-01-28 11:07:09 +01:00
  • a49558ae57 Merge branch 'development' into feature(CatService) Lorenz Hilpert 2019-01-28 09:47:27 +01:00
  • 571fadf410 Merge branch 'development' into testing Eraldo Hasanaj 2019-01-28 09:34:16 +01:00
  • a10e487113 search box icon positioning fixed for lower widths Eraldo Hasanaj 2019-01-28 09:32:19 +01:00
  • aea2461eeb Added DTOS, Enums, Models and basic CatService implementation Lorenz Hilpert 2019-01-28 09:32:18 +01:00
  • e0773faea5 Added cat-service Project - generated via 'ng g library cat-service' Lorenz Hilpert 2019-01-28 09:28:14 +01:00
  • a92600644b Merge branch 'master' into testing Eraldo Hasanaj 2019-01-28 09:07:46 +01:00
  • 586a2bec8e Implemented functionality for saving & loading recent searches from local storage Eraldo Hasanaj 2019-01-25 23:13:45 +01:00
  • 419056d449 Merge branch 'master' into testing Eraldo Hasanaj 2019-01-25 16:54:28 +01:00
  • ba41d4713e Added services for persisting last product search to localstorage, also added service to read recent prodcut searches from local storage Eraldo Hasanaj 2019-01-25 16:49:02 +01:00
  • ff72e551bd Merge branch 'development' into testing Eraldo Hasanaj 2019-01-25 14:15:34 +01:00
  • 7e7ac30267 Added comment to searchProduct service method Eraldo Hasanaj 2019-01-25 14:13:09 +01:00
  • 05936e7871 Created reducers, actions, effect and service for Product search.. backend API call for product search is to be implemented at method searchProduct of ProductService Eraldo Hasanaj 2019-01-25 14:12:36 +01:00
  • 091249c74c Merge branch 'master' into testing Eraldo Hasanaj 2019-01-24 18:25:38 +01:00
  • a6f6d2999c Working on product search Eraldo Hasanaj 2019-01-24 18:19:52 +01:00
  • 9bd7e2a31b Merge branch 'master' into testing Eraldo Hasanaj 2019-01-24 12:16:44 +01:00
  • 190900c18f Fixed build error becouse router was declared private Eraldo Hasanaj 2019-01-24 12:15:19 +01:00
  • 358d5ca4d0 Merge branch 'master' into testing Eraldo Hasanaj 2019-01-24 12:09:17 +01:00
  • 3e1da2f8e7 Finished dashboard feed design & added control so that menu is shown anly when there is an active process Eraldo Hasanaj 2019-01-24 12:05:02 +01:00
  • 179820de63 Finished design for event card in dashboard feed Eraldo Hasanaj 2019-01-24 10:58:22 +01:00
  • f8fe4aa79f Merge branch 'master' into development Eraldo Hasanaj 2019-01-24 10:07:23 +01:00