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.

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 #37 #43

Merged
merged 39 commits into from
May 17, 2021
Merged

Implementation of #37 #43

merged 39 commits into from
May 17, 2021

Conversation

Waldleufer
Copy link
Collaborator

#37

IremToroslu and others added 3 commits May 13, 2021 17:12
Navigation bar fontsize and icon size changed and new icons added
Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😃 Suggesting some small changes, looking good!

frontend/src/components/productGrid/DropdownButton.js Outdated Show resolved Hide resolved
frontend/src/resources/theme.js Outdated Show resolved Hide resolved
Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good! 😃

@Waldleufer
Copy link
Collaborator Author

-> @olyaee Reference for the future: The actual Images we want to use need to be of the same proportions (or they need to be prepared)

Image size  attached to the related Card/grid components reconfigured
@Waldleufer
Copy link
Collaborator Author

Maybe useful for the Header

Maybe useful for the sidebar:

@Waldleufer
Copy link
Collaborator Author

@IremToroslu
Copy link
Collaborator

@Waldleufer thanks for the info you have provided! Let's try these out and see how it looks.

IremToroslu and others added 10 commits May 15, 2021 18:30
General font size and font colors created for sidebar, header and text
content. Worked on the page configuration as well.
detail page and graphs reconfigured
Details and catagories sections UI styles reconfigured such as fontsizes,fontcolors
etc.
Table and chart look and feel changed as well as dropdown's look and
feel
#36 (comment)
Reformatted the index.html file.
Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added some suggestions @IremToroslu you can directly commit them from the github, if you agree on the little tweaks I made here on the fly. Just make sure to git pull on your computer afterwards.

Comment on lines +35 to +47
colors: [theme.color.TransformerOil, theme.color.Steel, theme.color.Pressboard, theme.color.StainlessSteel, theme.color.Alminium, theme.color.SiliconSteel, theme.color.Copper],
fill: {
type: 'gradient'
type: 'gradient',
gradient: {
shade: 'dark',
type: "horizontal",
shadeIntensity: 0.5,
gradientToColors: undefined, // optional, if not defined - uses the shades of same color in series
inverseColors: true,
opacityFrom: 1,
opacityTo: 1,
stops: [0, 50, 100],
colorStops: []}
Copy link
Collaborator Author

@Waldleufer Waldleufer May 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure whether this does what it should. Also is there maybe a way to tell the chart what it should display in the tooltips (when hovering with the mouse over the graph)? @IremToroslu @gandompm

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Waldleufer we do have "shadow effect" on the fonts and charts when using the cursor on them and now we do not have them there , I added this code to remove the shadowing.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

And what about the Tooltips? do you or maybe @gandompm have an Idea about that? Because the numbers don't match 100% and the % is missing in the tooltips

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Waldleufer
I do not see any problem with that. if you sum up all the percentages that are shown on each part, it would be 100%.
also, the number on tooltips doesn't have a percentage notation because it is rounded down to an integer value.

frontend/src/components/details/TableComponent.jsx Outdated Show resolved Hide resolved
frontend/src/components/header/HeaderComponent.js Outdated Show resolved Hide resolved
frontend/src/components/header/HeaderComponent.js Outdated Show resolved Hide resolved
frontend/src/components/sidebar/SidebarComponent.js Outdated Show resolved Hide resolved
frontend/src/resources/theme.js Outdated Show resolved Hide resolved
frontend/src/routes/PrivateRoutes.js Outdated Show resolved Hide resolved
frontend/src/routes/PrivateSection.js Outdated Show resolved Hide resolved
Waldleufer and others added 8 commits May 17, 2021 11:28
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@IremToroslu
Copy link
Collaborator

I like the button colors as well ☺️ thanks for the review and suggested changes! @Waldleufer

Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

IremToroslu and others added 4 commits May 17, 2021 20:27
buttons and page size reconfigured
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Mani Anand <mani.anand@fau.de>
Card and button component allignment

Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Mani Anand <mani.anand@fau.de>
Header allignment

Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Mani Anand <mani.anand@fau.de>
Uniform button color set on the product grid

Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Mani Anand <mani.anand@fau.de>
@Waldleufer Waldleufer marked this pull request as ready for review May 17, 2021 19:49
@Waldleufer Waldleufer merged commit 19da4fe into frontend-dev May 17, 2021
@Waldleufer Waldleufer deleted the frontend-dev-#37 branch May 18, 2021 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants