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 #106 - Siemens Energy Color Scheme #115

Merged
merged 76 commits into from
Jun 15, 2021
Merged

Implementation of #106 - Siemens Energy Color Scheme #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
3ee89b6
reconfiguration of the index.css
IremToroslu Jun 10, 2021
115565d
Merge pull request #113 from amosproj/dev-#78
Waldleufer Jun 10, 2021
204c868
header and side bar color changed
IremToroslu Jun 10, 2021
60544ad
Splitting the index.css file
Waldleufer Jun 10, 2021
3f6c892
Cleanup of css and unused Code
Waldleufer Jun 10, 2021
694a269
Fixing Pipeline
Waldleufer Jun 10, 2021
b713c83
Strange loginstyle.css issue in pipeline
Waldleufer Jun 10, 2021
7629bea
Merge pull request #114 from amosproj/dev-#78
Waldleufer Jun 10, 2021
213fea2
Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…
IremToroslu Jun 10, 2021
e7dcd97
Strangelogin.css resolved
IremToroslu Jun 10, 2021
6c852bf
Merge pull request #116 from amosproj/dev-#78
Waldleufer Jun 10, 2021
e4d07ee
css files created for each components
IremToroslu Jun 10, 2021
5e025d4
Merge branch 'dev-#78' into dev-#106
Waldleufer Jun 10, 2021
dd2fa6e
Header, sidebar and panel componant reconfigured
IremToroslu Jun 10, 2021
ebd103b
Radial graident applied on Sidebar and header bar
IremToroslu Jun 10, 2021
85567d4
header reconfigured
IremToroslu Jun 10, 2021
bddda71
reconfiguration of navbar
IremToroslu Jun 11, 2021
b3a4557
details page panel bar and dasboard colors changed
IremToroslu Jun 11, 2021
177b222
reconfiguration of the header, sideand panel bar
IremToroslu Jun 11, 2021
3cb6726
Removing unused import
Waldleufer Jun 11, 2021
ae50b4c
Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…
Waldleufer Jun 11, 2021
1072fde
details page charts color changed
IremToroslu Jun 11, 2021
8fa0fe4
Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…
IremToroslu Jun 11, 2021
0568032
Installing Material-UI
Waldleufer Jun 11, 2021
69e5790
Remove and ignore yarn.lock
Waldleufer Jun 11, 2021
b8b46f2
Dynamic assignment of TableName
Waldleufer Jun 11, 2021
c8abfc3
details dashboards color changed
IremToroslu Jun 11, 2021
48b710c
Styling the login page with Siemens Energy Color
manifau Jun 11, 2021
16cb0f4
Drop down button- coloring scheme changed
manifau Jun 11, 2021
e2ce710
Cleaning CI pipeline error
manifau Jun 11, 2021
27714d5
Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…
IremToroslu Jun 11, 2021
f967fa8
Adding a Mobile version of the TableComponent
Waldleufer Jun 11, 2021
c7d3b88
Category index page modification
manifau Jun 11, 2021
bba51e1
Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…
manifau Jun 11, 2021
5b4e90b
Resolved identical key error
Waldleufer Jun 11, 2021
9129e5a
styling of the Table component
Waldleufer Jun 11, 2021
edd33e2
Fixing visual bugs
Waldleufer Jun 11, 2021
06b25d6
details page reconfigured
IremToroslu Jun 11, 2021
9011292
navbar color changed
IremToroslu Jun 11, 2021
c9d9dec
reconfiguration of details page
IremToroslu Jun 12, 2021
2485248
sidebar , navbar, table and piechart color change
IremToroslu Jun 12, 2021
f4f3ee6
navbar color changed
IremToroslu Jun 13, 2021
c7af7a5
login page color changed
IremToroslu Jun 13, 2021
2cd2083
Adding a margin to the contentBlock
Waldleufer Jun 14, 2021
c4f5d89
Added global highlighting color variable
Waldleufer Jun 14, 2021
70ff3ac
Swapped out simple flexbox with react grid system
Waldleufer Jun 14, 2021
7f62658
Revamped MiniCardComponent
Waldleufer Jun 14, 2021
b94c78c
Cleaned up a lot of unneccesary and unused Code
Waldleufer Jun 14, 2021
0c80bec
Added the new Stylefiles to index.css
Waldleufer Jun 14, 2021
78dd3a5
Cleanup of unused Code
Waldleufer Jun 14, 2021
64614ea
Cut label names that are too long
Waldleufer Jun 14, 2021
d0a39cc
Showing vertical overflow (Model Dropdown)
Waldleufer Jun 14, 2021
ed275c1
Moved Alignment of ModelDropdown to css
Waldleufer Jun 14, 2021
2318b1f
Make y overflow visible to show Dropdown content properly
Waldleufer Jun 14, 2021
1ac61da
Cleanup
Waldleufer Jun 14, 2021
7b3c177
Removal of nonrequired imports
Waldleufer Jun 14, 2021
72004c5
Removing non required padding
Waldleufer Jun 14, 2021
87fadfc
Merge branch 'dev-#84' into dev-#78
Waldleufer Jun 14, 2021
e11dee3
Uniforming styling that can not be moved to css
Waldleufer Jun 14, 2021
f06f7d1
Removed unused file
Waldleufer Jun 14, 2021
27d1396
Removing unused Styling
Waldleufer Jun 14, 2021
5592aa3
bar and dashboard colors changed
IremToroslu Jun 14, 2021
11c4732
bar color chnaged
IremToroslu Jun 14, 2021
c4e138e
login page background color changed
IremToroslu Jun 14, 2021
27902e3
login page background changed
IremToroslu Jun 14, 2021
36ede67
image label color changed
IremToroslu Jun 14, 2021
d5e454e
Javascript styling marked
IremToroslu Jun 15, 2021
5edaaf9
Piechart style moved to .css
IremToroslu Jun 15, 2021
c0ab7f0
working on table header color
IremToroslu Jun 15, 2021
e21ee8e
TableComponent styling -> .css
Waldleufer Jun 15, 2021
42939a9
Documented MenuItem Styling
Waldleufer Jun 15, 2021
42de032
Defusing Lasers to make the App more safe to use.
Waldleufer Jun 15, 2021
21f374e
fixing navbarcomponent style
gandompm Jun 15, 2021
c34333a
Merge branch 'dev-#78' into dev-#106
Waldleufer Jun 15, 2021
6d667c1
Merging Pdf-Button and Header changes
Waldleufer Jun 15, 2021
7544a8e
mobile view table header bar color changed
IremToroslu Jun 15, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ node_modules
.idea
/.vs/slnx.sqlite-journal
.vs/slnx.sqlite

frontend/yarn.lock
1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.4",
"@react-pdf/renderer": "^2.0.12",
"apexcharts": "^3.26.1",
"axios": "^0.21.1",
Expand Down
8 changes: 0 additions & 8 deletions frontend/src/assets/icons/checkbox-off.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/assets/icons/checkbox-on.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/assets/icons/icon-agents.js
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions frontend/src/assets/icons/icon-arrow-down.js
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions frontend/src/assets/icons/icon-arrow-up.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/assets/icons/icon-arrow.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/assets/icons/icon-articles.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/assets/icons/icon-bell-new.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions frontend/src/assets/icons/icon-browse.js
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/src/assets/icons/icon-building.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/assets/icons/icon-burger.js
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/src/assets/icons/icon-circle.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/assets/icons/icon-contacts.js
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/src/assets/icons/icon-heart.js
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/src/assets/icons/icon-home.js
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions frontend/src/assets/icons/icon-ideas.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/assets/icons/icon-inbox.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/assets/icons/icon-login.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions frontend/src/assets/icons/icon-logo.js
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions frontend/src/assets/icons/icon-logout.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions frontend/src/assets/icons/icon-overview.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/assets/icons/icon-plus.js
View file
Open in desktop

This file was deleted.

Loading