Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
IremToroslu committed May 15, 2021
1 parent d2784a2 commit d265882
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 36 deletions.
Binary file removed frontend/public/LogoCarbonteam.png
Binary file not shown.
38 changes: 9 additions & 29 deletions frontend/src/components/productGrid/ProductGridComponent.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
/**
* The Componenet creates new cards for the product items using the minicard components form 'components/cards/MiniCardComponent'
* it displays all the related products images attached to each card in a certain category.
* Also stores the product and model properties and pass this values to the detail page once clicking on the image
* /**
*
* @returns the product and model properties
* @author Irem Toroslu, Martin Wagner, Mani Anand
*/

import React, {useContext} from 'react';
import {Column, Row} from 'simple-flexbox';
import {createUseStyles} from 'react-jss';
Expand All @@ -20,25 +10,15 @@ import {PrivateSectionContext} from 'hooks/PrivateSectionContext';
import { Component } from 'react';
import LabelComponent from './LabelComponent'

const myStyles = createUseStyles((theme) => ({

title: {
...theme.typography.cardTitle,
color: theme.color.grayishBlue2,
marginBottom: 12,
minWidth: 205,
textAlign: 'center'
},
value: {
color: theme.color.veryDarkGrayishBlue,
fontWeight: 'bold',
fontSize: 20,
letterSpacing: '1px',
lineHeight: '50px',
textAlign: 'center'
}
}));

/**
* The Componenet creates new cards for the product items using the minicard components form 'components/cards/MiniCardComponent'
* it displays all the related products images attached to each card in a certain category.
* Also stores the product and model properties and pass this values to the detail page once clicking on the image
* /**
*
* @returns the product and model properties
* @author Irem Toroslu, Martin Wagner, Mani Anand
*/

function ProductGridComponent() {
const [selectedProducts, setSelectedProducts] = useContext(PrivateSectionContext);
Expand Down
13 changes: 6 additions & 7 deletions frontend/src/components/sidebar/SidebarComponent.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
/**
* The SidebarComponent consists out of the functionality and the Look and Feel of the Left-Side-Navigationbar
*
* @author Irem Toroslu
* @author Martin Wagner
*/

import React from 'react';
import { createUseStyles, useTheme } from 'react-jss';
import { useHistory } from 'react-router-dom';
Expand All @@ -26,6 +19,12 @@ import Menu from './MenuComponent';
import MenuItem from './MenuItemComponent';
import logo from 'assets/logo/LogoCarbonteam.png';

/**
* The SidebarComponent consists out of the functionality and the Look and Feel of the Left-Side-Navigationbar
*
* @author Irem Toroslu
* @author Martin Wagner
*/

const useStyles = createUseStyles({
separator: {
Expand Down

0 comments on commit d265882

Please sign in to comment.