Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of #107 #135

Merged
merged 36 commits into from
Jul 5, 2021
Merged

Implementation of #107 #135

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
72ffeff
Merge pull request #138 from amosproj/dev-#82
SaiVarunVaranasi Jun 29, 2021
0b1beb2
Implemented category seperation
SaiVarunVaranasi Jun 29, 2021
271f2e9
Merge pull request #144 from amosproj/dev
Waldleufer Jun 30, 2021
808e2b9
Sort data recieved from API category/Secnario
SaiVarunVaranasi Jun 30, 2021
2a18194
Added getDummyProducts function
ScoutAtlas Jul 1, 2021
6266048
Reworked getSimaProducts
ScoutAtlas Jul 1, 2021
2a33e57
Included custom image to getSimaProducts()
ScoutAtlas Jul 1, 2021
cfaa65b
Updated Dummy Data
Waldleufer Jul 1, 2021
b0bf9c1
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
Waldleufer Jul 1, 2021
83c9e25
Adapting Dummy Data
Waldleufer Jul 1, 2021
914bea1
Cleanup
Waldleufer Jul 1, 2021
da018f5
Creating three Slices for the Categories
Waldleufer Jul 1, 2021
80239c7
added services,solution and scenarios to dummy data
SaiVarunVaranasi Jul 1, 2021
95866ee
Added selectedType as parameter to functions
ScoutAtlas Jul 1, 2021
a34a6d2
Adding PropType to ProductSolutionsServices Component
Waldleufer Jul 1, 2021
2510c24
moved dummy data to another file
SaiVarunVaranasi Jul 1, 2021
5438ee0
Resolved Eslint Error
Waldleufer Jul 1, 2021
af99bd6
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
Waldleufer Jul 1, 2021
1f6e71b
Fixes
Jul 1, 2021
6e422cf
changed slices
Jul 1, 2021
dd5f78b
fill data via type and category
Jul 1, 2021
b9f259c
Put data in corresponding slices
Waldleufer Jul 1, 2021
162157c
Only get projects once (after login)
Waldleufer Jul 1, 2021
f7a2294
Displaying only the Products of the corresponding Category
Waldleufer Jul 1, 2021
f899d53
Added optional chaining in switch case
Jul 1, 2021
9e3ca04
Adding some more demo data
Waldleufer Jul 2, 2021
5fc85e8
Uniforming names of categories and types
Waldleufer Jul 2, 2021
6c36eca
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
Waldleufer Jul 2, 2021
0b93a0c
Added more dummy data
Waldleufer Jul 2, 2021
2230274
Added a missing break;
Waldleufer Jul 2, 2021
99853e7
Added a function that handles scenarios in the (sorted) ProjectList
Waldleufer Jul 2, 2021
11ab92d
sorted the Projects alphabetically
Waldleufer Jul 2, 2021
3b24898
Renaming and Documentation
Waldleufer Jul 2, 2021
7650c31
Added a class for productObject
Waldleufer Jul 2, 2021
3d586af
Adding more dummy scenarios
Waldleufer Jul 2, 2021
a97bfe5
Updating Documentation
Waldleufer Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions frontend/src/components/productGrid/ProductGridComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ function ProductGridComponent({ selectedCategory, selectedType }) {
case 'generation':
switch (selectedType) {
case 'products':
products = preProducts.generation.products;
products = preProducts?.generation?.products;
Waldleufer marked this conversation as resolved.
Show resolved Hide resolved
break;
case 'solutions':
products = preProducts.generation.solutions;
products = preProducts?.generation?.solutions;
break;
case 'services':
products = preProducts.generation.services;
products = preProducts?.generation?.services;
break;
default:
break;
Expand All @@ -45,13 +45,13 @@ function ProductGridComponent({ selectedCategory, selectedType }) {
case 'transmission':
switch (selectedType) {
case 'products':
products = preProducts.transmission.products;
products = preProducts?.transmission?.products;
break;
case 'solutions':
products = preProducts.transmission.solutions;
products = preProducts?.transmission?.solutions;
break;
case 'services':
products = preProducts.transmission.services;
products = preProducts?.transmission?.services;
break;
default:
break;
Expand All @@ -60,13 +60,13 @@ function ProductGridComponent({ selectedCategory, selectedType }) {
case 'industrialApplications':
switch (selectedType) {
case 'products':
products = preProducts.industrialApplication.products;
products = preProducts?.industrialApplication?.products;
break;
case 'solutions':
products = preProducts.industrialApplication.solutions;
products = preProducts?.industrialApplication?.solutions;
break;
case 'services':
products = preProducts.industrialApplication.services;
products = preProducts?.industrialApplication?.services;
break;
default:
break;
Expand Down