Code

Developement of Sprint 12#152

Code

Merged

Waldleufer merged 145 commits intomainamosproj/amos2021ss08-carbon-footprint:mainfrom dev-simaProDataamosproj/amos2021ss08-carbon-footprint:dev-simaProDataCopy head branch name to clipboardJul 7, 2021

+1,725-1,062

Commits

Commits on Jun 13, 2021

• Added DocumentController

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  a5faae3

Commits on Jun 15, 2021

• sending post request to server with axios

  gandompm

  committed
  53b7b4e

Commits on Jun 16, 2021

• Merge pull request #121 from amosproj/dev

  Show description for 2f7b691
  gandompm

  authored
  2f7b691

Commits on Jun 19, 2021

• Replacing images in docx and return docx via request response

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  d2646a6

• Receiving image data from the frontend

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  21eb0f4

Commits on Jun 20, 2021

• sending multiple images with axios

  gandompm

  committed
  aaeac34

Commits on Jun 21, 2021

• changed exportPDF url to CreateReport

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  1d3b13c

• Added Report request response including Report

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  e2472c3

Commits on Jun 22, 2021

• recieving the docx file from server

  gandompm

  committed
  ff61dd8

• renamed res response

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  06827a5

• Resolved the CORS Error, recieving the calculation data from backend

  

  SaiVarunVaranasi

  authored and

  Martin Dürsch

  committed
  8e72cd5

• Resolved the CORS Error, recieving the calculation data from backend

  

  SaiVarunVaranasi

  authored and

  Martin Dürsch

  committed
  983602c

• WIP

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  d9c403e

• WIP

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  b3de555

• Added response file download

  Show description for a3b8425
  

  2 peopleauthored and

  Martin Dürsch

  committed
  a3b8425

Commits on Jun 23, 2021

• Trying to find the right headers for data transfer

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  cab6306

• Merge Dev-#39 Frontend Backend

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  a8a9c75

Commits on Jun 24, 2021

• gitignore

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  5d9f10b

Commits on Jun 27, 2021

• exporting in frontend side

  Show description for fd583a7
  gandompm

  committed
  fd583a7

• Merge branch 'dev-#39' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#39

  gandompm

  committed
  2032409

• move export Pdf function to a separate module

  gandompm

  committed
  3ac13c4

• defining the backend request to a separate module

  Show description for b28d301
  gandompm

  committed
  b28d301

• documenting and refactoring ui

  gandompm

  committed
  afcc25c

Commits on Jun 29, 2021

• Merge pull request #138 from amosproj/dev-#82

  Show description for 72ffeff
  SaiVarunVaranasi

  authored
  72ffeff

• Implemented category seperation

  Show description for 0b1beb2
  SaiVarunVaranasi

  committed
  0b1beb2

• fixing shape of diagrams in pdf in compare page

  gandompm

  committed
  7fd1199

Commits on Jun 30, 2021

• Merge branch 'dev' into dev-#39

  Show description for d7a274f
  

  Waldleufer

  and

  ScoutAtlas

  committed
  d7a274f

• Merge Preparation

  Show description for f9bc697
  

  Waldleufer

  and

  ScoutAtlas

  committed
  f9bc697

• Frontend Pipeline fixed.

  Waldleufer

  committed
  3c7e00a

• mydashboard page reconfigured

  Show description for d3017b5
  IremToroslu

  committed
  d3017b5

• Merge branch 'dev-#125' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#125

  IremToroslu

  committed
  c7edd83

• Backend pipeline fix

  Show description for 9367d50
  SaiVarunVaranasi

  authored
  9367d50

• Card components restructured and resized

  Show description for 8aacffb
  IremToroslu

  committed
  8aacffb

• mydasboard page card resized and reconfigured

  Show description for 4e23312
  IremToroslu

  committed
  4e23312

• Fix the backend build errors

  SaiVarunVaranasi

  committed
  b87eaaf

• Merge branch 'dev-#39' of

  Show description for cfa8b84
  SaiVarunVaranasi

  committed
  cfa8b84

• Merge pull request #143 from amosproj/dev-#125

  Show description for f98829c
  Waldleufer

  authored
  f98829c

• Merge pull request #144 from amosproj/dev

  Show description for 271f2e9
  Waldleufer

  authored
  271f2e9

• Configured the slideshow of the dashboard

  Show description for 01da797
  manifau

  committed
  01da797

• Changed the naming convention for slideshow component

  Show description for ff41ce3
  manifau

  committed
  ff41ce3

• Sort data recieved from API category/Secnario

  Show description for 808e2b9
  

  SaiVarunVaranasi

  and

  manifau

  committed
  808e2b9

Commits on Jul 1, 2021

• Added getDummyProducts function

  Show description for 2a18194
  

  ScoutAtlas

  and

  Waldleufer

  committed
  2a18194

• Reworked getSimaProducts

  Show description for 6266048
  

  ScoutAtlas

  and

  Waldleufer

  committed
  6266048

• Included custom image to getSimaProducts()

  Show description for 2a33e57
  

  ScoutAtlas

  and

  Waldleufer

  committed
  2a33e57

• Updated Dummy Data

  Show description for cfaa65b
  

  Waldleufer

  and

  ScoutAtlas

  committed
  cfaa65b

• Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#107

  Waldleufer

  committed
  b0bf9c1

• Adapting Dummy Data

  Show description for 83c9e25
  

  Waldleufer

  and

  ScoutAtlas

  committed
  83c9e25

• Cleanup

  Show description for 914bea1
  

  Waldleufer

  and

  ScoutAtlas

  committed
  914bea1

• Added footer for the dashboard

  Show description for c3ac305
  manifau

  committed
  c3ac305

• Creating three Slices for the Categories

  Show description for da018f5
  

  4 peoplecommitted
  da018f5

• added services,solution and scenarios to dummy data

  Show description for 80239c7
  

  4 peoplecommitted
  80239c7

• Added selectedType as parameter to functions

  Show description for 95866ee
  

  4 peoplecommitted
  95866ee

• Adding PropType to ProductSolutionsServices Component

  Waldleufer

  committed
  a34a6d2

• moved dummy data to another file

  Show description for 2510c24
  

  4 peoplecommitted
  2510c24

• Resolved Eslint Error

  Waldleufer

  committed
  5438ee0

• Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#107

  Waldleufer

  committed
  af99bd6

• Fixes

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  1f6e71b

• changed slices

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  6e422cf

• fill data via type and category

  Show description for dd5f78b
  

  3 peopleauthored and

  Martin Dürsch

  committed
  dd5f78b

• Put data in corresponding slices

  Show description for b9f259c
  

  Waldleufer

  and

  MartinDuersch

  committed
  b9f259c

• Only get projects once (after login)

  Show description for 162157c
  

  Waldleufer

  and

  MartinDuersch

  committed
  162157c

• Displaying only the Products of the corresponding Category

  Show description for f7a2294
  

  Waldleufer

  and

  MartinDuersch

  committed
  f7a2294

• Added optional chaining in switch case

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  f899d53

• Footer reconfigured

  Show description for 736f65a
  

  manifau

  and

  IremToroslu

  committed
  736f65a

• Changed docx template handling

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  e5aa6b4

• Fixed download of file from backend

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  59d3d03

• manual DetailsComponent Merge from Main

  Show description for 094dc7e
  

  2 peopleauthored and

  Martin Dürsch

  committed
  094dc7e

• my dashboard page restructured

  Show description for 1d77dc1
  

  IremToroslu

  and

  manifau

  committed
  1d77dc1

• Subscribe section reconfigured.

  Show description for cdb4e79
  

  IremToroslu

  and

  manifau

  committed
  cdb4e79

• my dashboard page reconfigured

  Show description for e85f382
  

  IremToroslu

  and

  manifau

  committed
  e85f382

Commits on Jul 2, 2021

• Adding some more demo data

  Waldleufer

  committed
  9e3ca04

• Uniforming names of categories and types

  Show description for 5fc85e8
  Waldleufer

  committed
  5fc85e8

• Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#107

  Waldleufer

  committed
  6c36eca

• Added more dummy data

  Show description for 0b93a0c
  Waldleufer

  committed
  0b93a0c

• Added a missing break;

  Waldleufer

  committed
  2230274

• Added a function that handles scenarios in the (sorted) ProjectList

  Waldleufer

  committed
  99853e7

• sorted the Projects alphabetically

  Show description for 11ab92d
  Waldleufer

  committed
  11ab92d

• Renaming and Documentation

  Waldleufer

  committed
  3b24898

• Added a class for productObject

  Show description for 7650c31
  Waldleufer

  committed
  7650c31

• Adding more dummy scenarios

  Waldleufer

  committed
  3d586af

• adding loading bar for exporting pdf

  gandompm

  committed
  dbbac37

• product grid clickable card hover color changed.

  Show description for a600c4a
  IremToroslu

  committed
  a600c4a

• resoliving CI Pipe line errors

  gandompm

  committed
  5f780c8

• deleting frontend pdf generater function

  gandompm

  committed
  946bcc2

• Updating Documentation

  Show description for a97bfe5
  Waldleufer

  committed
  a97bfe5

• Merge pull request #146 from amosproj/dev-#107

  Show description for ba80274
  Waldleufer

  authored
  ba80274

Commits on Jul 3, 2021

• Removed unused Component

  Waldleufer

  committed
  9f13fc1

• Introducing dummy Methods for Details Page

  Show description for f4b838d
  

  Waldleufer

  and

  gandompm

  committed
  f4b838d

• Implemented DummyData Switch

  Show description for 93d69cf
  

  Waldleufer

  and

  gandompm

  committed
  93d69cf

• storing all infromation of selected product

  Show description for a0eba26
  

  gandompm

  and

  Waldleufer

  committed
  a0eba26

• refactoring scenarioComponent

  Show description for cdbde7a
  

  gandompm

  and

  Waldleufer

  committed
  cdbde7a

• Populating the SelectScenarioComponent

  Show description for af1771c
  

  Waldleufer

  and

  gandompm

  committed
  af1771c

• Renaming and BugFixing

  Show description for 272e83f
  

  Waldleufer

  and

  gandompm

  committed
  272e83f

• handling new scenario selection

  gandompm

  committed
  fab6c54

• passing the selected scenario type

  gandompm

  committed
  6040845

• card components reconfigured.

  Show description for cb1edf1
  IremToroslu

  committed
  cb1edf1

• adding documentation

  gandompm

  committed
  90724d5

• mydashboard.css file reconfigured

  Show description for 26886f1
  IremToroslu

  committed
  26886f1

Commits on Jul 4, 2021

• Merge pull request #148 from amosproj/dev-#17

  Show description for 6ef3eec
  Waldleufer

  authored
  6ef3eec

• reconfiguration of mydashboardpage and detailspage

  Show description for 71581d1
  IremToroslu

  committed
  71581d1

• export button removed when it comes to compare page

  Show description for eb7c741
  IremToroslu

  committed
  eb7c741

Commits on Jul 5, 2021

• card titles resized and card borders removed

  Show description for 8e0f6a4
  IremToroslu

  committed
  8e0f6a4

• borders added back

  Show description for 76a1374
  IremToroslu

  committed
  76a1374

• Turning Columns into Cols

  Show description for c8c98e8
  Waldleufer

  committed
  c8c98e8

• removing unneeded fixed height

  Waldleufer

  committed
  895df20

• Using react-grid-system

  Waldleufer

  committed
  550df57

• Swaping out simple-flexbox with react-grid-system

  Waldleufer

  committed
  81663af

• Resized card components

  Show description for 80bec9b
  IremToroslu

  committed
  80bec9b

• Fixing MiniCard Styling

  Waldleufer

  committed
  0143aff

• Improved Favourites Content

  Waldleufer

  committed
  ec0e9fd

• Merge branch 'dev-#137' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#137

  Waldleufer

  committed
  beb08f7

• Cleaning up unused files

  Waldleufer

  committed
  460ebec

• Fitting the Header to Screen-width

  Waldleufer

  committed
  a018620

• Cleaning up unused Code

  Waldleufer

  committed
  25e5582

• Slideshow Container Alignment Improved

  Waldleufer

  committed
  184c1d0

• fixing console errors

  Waldleufer

  committed
  c592ce7

• Mooving Footer One level Up

  Waldleufer

  committed
  cc419ed

• Removing non effective attributes

  Waldleufer

  committed
  86f74af

• Renaming Recent Projects

  Waldleufer

  committed
  aa63646

• Changing out Simple-Flexbox with react-grid-system

  Waldleufer

  committed
  bcecc95

• Changed the naming convention of favorite card

  Show description for 2b00f26
  manifau

  committed
  2b00f26

• Modifying answer section of FAQ

  Show description for 4f56fe2
  manifau

  committed
  4f56fe2

• height of the latest update section resized

  Show description for 5fdd199
  IremToroslu

  committed
  5fdd199

• Merge branch 'dev-#137' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#137

  IremToroslu

  committed
  d1a7230

• Changed arrow

  manifau

  committed
  b2f04c9

• text changed.

  Show description for 50f87f3
  IremToroslu

  committed
  50f87f3

• Updating Documentation

  Waldleufer

  committed
  4100608

• Merge pull request #135 from amosproj/dev-#107

  Show description for ec244b0
  Waldleufer

  authored
  ec244b0

• Merge pull request #147 from amosproj/dev-#17

  Show description for baba5b0
  Waldleufer

  authored
  baba5b0

• Merge pull request #145 from amosproj/dev-#137

  Show description for 0d99040
  Waldleufer

  authored
  0d99040

• fixing the exception

  gandompm

  committed
  025bd16

• fixing ui

  gandompm

  committed
  7b186d7

• Merge branch 'dev' into dev-#39 - Merge Preparation

  Show description for 26cbe50
  

  3 peoplecommitted
  26cbe50

• Merge branch 'dev-#39' of https://github.com/amosproj/amos-ss2021-carbon-footprint into dev-#39

  Show description for 81f0227
  

  3 peoplecommitted
  81f0227

• Merge pull request #128 from amosproj/dev-#39

  Show description for 2c19e74
  Waldleufer

  authored
  2c19e74

Commits on Jul 6, 2021

• Use simaPro Data

  Waldleufer

  committed
  d658491

• Gave LoadingComponent a makeover

  Waldleufer

  committed
  89ab960

• Fixed Industrial Application Typo

  Waldleufer

  committed
  2fd87fc

• Removed Console.log

  Waldleufer

  committed
  346d413

• Fixing odd indentations in Category texts

  Waldleufer

  committed
  aceadda

• Fixed some Mobile Screen Edge Cases

  Waldleufer

  committed
  f300511

• return postCalculation response in case of failure

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  54c779f

Commits on Jul 7, 2021

• template layouting

  

  Martin Dürsch

  authored and

  Martin Dürsch

  committed
  315ac3d

• Merge pull request #151 from amosproj/dev-#107

  Show description for ffa3d08
  Waldleufer

  authored
  ffa3d08

• Merge pull request #150 from amosproj/dev-#39

  Show description for 4820c78
  Waldleufer

  authored
  4820c78