Merge pull request #142 from amosproj/main

Sprint 11: Merging main branch into release branch.
amosproj · Jun 30, 2021 · 5157017 · 5157017
2 parents 9eee6df + 1fba93c
commit 5157017
Show file tree

Hide file tree

Showing 46 changed files with 1,127 additions and 273 deletions.
diff --git a/.github/workflows/Reactjs.yml b/.github/workflows/Reactjs.yml
@@ -11,8 +11,11 @@ on:
 
 jobs:
   buildAndTest:
-    name: Build and Test Frontend
-    runs-on: ubuntu-latest
+    name: Build and Test Frontend on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     defaults:
       run:
         working-directory: ./frontend

diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,10 @@ node_modules
 .idea
 /.vs/slnx.sqlite-journal
 .vs/slnx.sqlite
+obj/Debug/netcoreapp5.0/amos-ss2021-carbon-footprint.csproj.AssemblyReference.cache
 
 frontend/yarn.lock
+.vs/slnx.sqlite
+.vs/amos-ss2021-carbon-footprint/v16/.suo
+.vs/slnx.sqlite
+.vs/slnx.sqlite
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/backend/Backend/Backend.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/backend/Backend/Backend.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/backend/Backend/Backend.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/backend/Backend/Backend.csproj b/backend/Backend/Backend.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.Proxy" Version="4.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/backend/Backend/Startup.cs b/backend/Backend/Startup.cs
@@ -29,10 +29,19 @@ public Startup(IConfiguration configuration)
 
         public IConfiguration Configuration { get; }
 
+        readonly string MyAllowSpecificOrigins = "_myAllowSpecificOrigins";
+
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddCors(options =>
+            {
+                options.AddPolicy(name: MyAllowSpecificOrigins,
+                                  builder => {
+                                      builder.WithOrigins("http://localhost:3000").AllowAnyHeader();
 
+                                  });
+            });
             services.AddControllers();
             services.AddSwaggerGen(c =>
             {
@@ -76,11 +85,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseRouting();
 
+            app.UseCors();
+
             app.UseAuthorization();
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapControllers();
+                endpoints.MapControllers()
+                            .RequireCors(MyAllowSpecificOrigins);
             });
         }
 

diff --git a/deliverables/2021-06-30 - AMOS SS2021 - Team 8 - Planning Document.pdf b/deliverables/2021-06-30 - AMOS SS2021 - Team 8 - Planning Document.pdf
diff --git a/deliverables/2021-06-30 Kanban Board.png b/deliverables/2021-06-30 Kanban Board.png
diff --git a/docs/drawing.svg b/docs/drawing.svg
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
@@ -187,3 +187,9 @@ module.exports = {
     // Whether to use watchman for file crawling
     // watchman: true,
 };
+module.exports = {
+    moduleNameMapper: {
+        '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|css|png|less|scss)$':
+            'identity-obj-proxy'
+    }
+};
diff --git a/frontend/package.json b/frontend/package.json
@@ -6,21 +6,25 @@
     "dependencies": {
         "@material-ui/core": "^4.11.4",
         "@react-pdf/renderer": "^2.0.12",
-        "apexcharts": "^3.26.1",
+        "@reduxjs/toolkit": "^1.6.0",
+        "apexcharts": "^3.27.1",
         "axios": "^0.21.1",
         "cors": "^2.8.5",
         "html2canvas": "^1.0.0-rc.7",
         "jspdf": "^2.3.1",
         "jspdf-autotable": "^3.5.14",
         "prop-types": "^15.7.2",
         "react": "^16.13.1",
+        "react-alice-carousel": "^2.5.1",
         "react-apexcharts": "^1.3.9",
         "react-burger-menu": "^2.6.13",
+        "react-collapsible": "^2.8.3",
         "react-collapsible-content": "^1.0.0",
         "react-dom": "^16.8.6",
         "react-grid-system": "^7.1.2",
         "react-hook-form": "^7.4.2",
         "react-jss": "^10.6.0",
+        "react-redux": "^7.2.4",
         "react-router-dom": "^5.2.0",
         "react-scripts": "^4.0.3",
         "react-select": "^4.3.0",
@@ -54,8 +58,12 @@
     "devDependencies": {
         "@testing-library/jest-dom": "^5.12.0",
         "@testing-library/react": "^11.2.7",
-        "gh-pages": "^2.2.0",
+        "enzyme": "^3.11.0",
+        "enzyme-adapter-react-16": "^1.15.6",
+        "gh-pages": "^3.2.3",
+        "identity-obj-proxy": "^3.0.0",
         "jest": "26.6.0",
+        "jest-transform-stub": "^2.0.0",
         "prettier": "2.3.0"
     }
 }
diff --git a/frontend/src/components/dashboard/UnresolvedTicketsComponent.js b/frontend/src/components/dashboard/UnresolvedTicketsComponent.js
@@ -32,8 +32,13 @@ function UnresolvedTicketsComponent({ containerStyles }) {
             title='Unresolved tickets'
             link='View details'
             subtitle='Group:'
+
             subtitleTwo='Support'
             items={[
+                renderStat('Waiting on Feature Request', 4238),
+                renderStat('Awaiting Customer Response', 1005),
+                renderStat('Awaiting Developer Fix', 914),
+                renderStat('Pending', 281),
                 renderStat('Waiting on Feature Request', 4238),
                 renderStat('Awaiting Customer Response', 1005),
                 renderStat('Awaiting Developer Fix', 914),

diff --git a/frontend/src/components/details/ColumnChartComponent.jsx b/frontend/src/components/details/ColumnChartComponent.jsx
@@ -1,18 +1,18 @@
-import React from 'react';
+import { React } from 'react';
 import ReactApexChart from 'react-apexcharts';
-import { getImpactAssessmentData, getLifeCycleStages } from 'interface/projectInterface';
+import { getColumnChartData, getLifeCycleStages } from 'interface/projectInterface';
 
 /**
  * Column Chart
- *
- * @author Julian Oelhaf
+ * Recieves the data from projectInterface.js using "getColumnChartData()"
+ * populates the data ito the column chart in Details Page.
  */
 const ColumnChartComponent = () => {
+    const values = getColumnChartData();
     const series = [
         {
             name: 'Global warming in kg CO2 equivalents',
-            // TODO: this data needs to be recieved from backend
-            data: getImpactAssessmentData()
+            data: values
         }
     ];
 
@@ -68,7 +68,7 @@ const ColumnChartComponent = () => {
             },
             responsive: [
                 {
-                    breakpoint: 300,
+                    breakpoint: 6400,
                     options: {
                         chart: {
                             width: 500

diff --git a/frontend/src/components/details/DetailsComponent.js b/frontend/src/components/details/DetailsComponent.js
@@ -5,14 +5,15 @@ import { jsPDF } from 'jspdf';
 import html2canvas from 'html2canvas';
 import { Col, Container, Row } from 'react-grid-system';
 import './navbar.css';
-// import { postCalculationRequest } from 'interface/BackendConnect';
-
+import { postCalculationRequest } from 'interface/BackendConnect';
+import LoadingComponent from 'components/loading';
 /**
  * the main component for detail page which includes
  * canvas page and variable drop down list
  *
  * @param props the recently selected model of a product.
  */
+
 class DetailsComponent extends Component {
     /* State consists of three variable one for each of the possible state
      * baselineScenario: only display the baseline scenario
@@ -22,7 +23,8 @@ class DetailsComponent extends Component {
     state = {
         baselineScenario: true,
         modifiedScenario: false,
-        loadComparePage: false
+        loadComparePage: false,
+        stillLoading: true
     };
 
     render() {
@@ -82,17 +84,29 @@ class DetailsComponent extends Component {
                 pdf.save('invoice.pdf');
             });
         };
-
+        /*
+         * Important function that is given as the callback parameter to the postCalculationRequest in order to be called
+         * when the data processing is finished. Then the state stillLoading will be set to false.
+         * This change of state trigger the DetailsComponent to rerender and now display the charts and tables
+         * instead of the LoadingComponent.
+         */
+        let handleFinishedDataRequest = () => {
+            this.setState({ stillLoading: false });
+        };
         const scenarioNames = {
             baseline: 'Baseline Scenario',
             modified: 'Modified Scenario'
         };
         const { selectedProduct } = this.props;
 
-        // postCalculationRequest(selectedProduct.productID);
+        if (this.state.stillLoading) {
+            postCalculationRequest(selectedProduct.productID, handleFinishedDataRequest);
+            return <LoadingComponent loading />;
+        }
 
         if (this.state.baselineScenario) {
             // if state equals baseline scenario only
+            console.log(selectedProduct);
             return (
                 <Container className='ScenarioContainer' id='capture' fluid>
                     <Row>