Moved file structure and completed myContentWidget script

index.js

@@ -3,11 +3,11 @@ import express from 'express';
 import exactLandingPage from './tests/LandingPage/exactLandingPage.js';
 //import ExACT_login from './tests/ExACT_login.js';
 
-//DASHBOARDS
+//DASHBOARD
 import correlationDashboard from './tests/CorrelationDashboard/correlationDashboard.js';
-  import dashboardMyStandards from './tests/CorrelationDashboard/MyStandardsWidget/dashboardMyStandards.js';
+  import myStandardsWidget from './tests/CorrelationDashboard/Widgets/myStandardsWidget.js';
+  import myContentWidget from './tests/CorrelationDashboard/Widgets/myContentWidget.js';
   
-import ExACT_dashboardMyContent from './tests/ExACT_dashboardMyContent.js';
 import ExACT_dashboardSemanticStandardsComparison from './tests/ExACT_dashboardSemanticStandardsComparison.js';
 
   import myStandardsSearchAlignedContent from './tests/myStandardsSearchAlignedContent.js';
@@ -32,7 +32,7 @@ import uploadBatchUploadPage from './tests/Upload/uploadBatchUpload.js';
 import uploadImportAlignmentsPage from './tests/Upload/uploadImportAlignmentsPage.js';
 
 //ACTIVITY REPORT
-import activityReportPage from './tests/ActivityReport/ActivityReportPage.js';
+import activityReportPage from './tests/Activity Report/ActivityReportPage.js';
 
 //REPORT
 import reportBuildYourReportPage from './tests/Report/reportBuildYourReportPage.js';
@@ -67,12 +67,12 @@ app.get('/', (req, res) => {
 
     <h1 style="text-align:center; color:#055a8c; font-size:20px; ">DASHBOARD</h1>
     <div style="padding:3px;"><strong><a href='/correlationDashboard' target='_blank'>Correlation Dashboard</a></strong></div>
-      <div style="padding:3px;"><strong>- <a href='/dashboardMyStandards' target='_blank'>My Standards Widget</a></strong></div>
+      <div style="padding:3px;"><strong>- <a href='/myStandardsWidget' target='_blank'>My Standards Widget</a></strong></div>
+      <div style="padding:3px;"><strong>- <a href='/myContentWidget' target='_blank'>My Content Widget</a></strong></div>
+      
+    
    
       
-    <!-- NEEDS UPDATE
-    <div style="padding:3px;"><strong><a href='/ExACT_dashboardMyContent' target='_blank'>My Content Widget</a></strong></div>
-    -->
     <h1 style="text-align:center; color:#055a8c; font-size:20px; ">FRAMEWORKS</h1>
     <div style="padding:3px;"><strong><a href='/frameworkManagementPage' target='_blank'>Framework Management Page</a></strong></div>
     
@@ -135,7 +135,8 @@ app.get('/exactLandingPage', exactLandingPage);
 
 //DASHBOARDS
 app.get('/correlationDashboard', correlationDashboard);
-  app.get('/dashboardMyStandards', dashboardMyStandards);
+  app.get('/myStandardsWidget', myStandardsWidget);
+  app.get('/myContentWidget', myContentWidget);
 
 //FRAMEWORKS
 app.get('/frameworkManagementPage', frameworkManagementPage);
@@ -170,7 +171,6 @@ app.get('/approveApprovalHistoryPage', approveApprovalHistoryPage);
 app.get('/approveRejectionHistoryPage', approveRejectionHistoryPage);
 
 //My Content
-app.get('/ExACT_dashboardMyContent', ExACT_dashboardMyContent);
 app.get('/ExACT_dashboardSemanticStandardsComparison', ExACT_dashboardSemanticStandardsComparison);
 
   app.get('/myStandardsSearchAlignedContent', myStandardsSearchAlignedContent);

tests/myStandardsSearchAlignedContent.js

@@ -8306,7 +8306,7 @@ const myStandardsSearch = (req, res) => {
 const takeScreenshot = async (driver, stepIndex, stepDescription) => {
   const screenshot = await driver.takeScreenshot();
 
-  const dir = path.join('screenshots', 'myStandardsSearchAlignedContentResults');
+  const dir = path.join('screenshots', 'myStandardsSearchAlignedContent');
 
   const screenshotFileName = `step_${stepIndex}_${stepDescription.replace(/\s+/g, '_')}.png`;
   const screenshotPath = path.join(dir, screenshotFileName);