removed files, and logs

Author: Jandrew2055

backend/auth.js

@@ -11,7 +11,7 @@ const client = jwksClient({
   jwksUri: `${COGNITO_ISSUER}/.well-known/jwks.json`,
 });
 
-//function to get signing key 
+//function to get signing key
 const getKey = async (header) => {
   try {
     const key = await client.getSigningKey(header.kid);
@@ -23,10 +23,10 @@ const getKey = async (header) => {
 
 const authenticateToken = async (req, res, next) => {
   try {
-    //grabs the first token (access token) sent in the header otherwise just returns null or undefined 
+    //grabs the first token (access token) sent in the header otherwise just returns null or undefined
     const token = req.headers.authorization?.split(' ')[1];
 
-    //if token is nonexisten, return error 
+    //if token is nonexisten, return error
     if (!token) {
       return res
         .status(401)

backend/controllers/authMiddleware.js

@@ -157,13 +157,11 @@ export const awsData = async () => {
     // Sends the request and waits for the response
     response = await client.send(command);
 
-    // console.log('response results', response.MetricDataResults);
-
     return response; // logs the metric data and entire response if successful
   } catch (caught) {
     if (caught instanceof CloudWatchServiceException) {
       // if theres a CloudWatch error, it logs the error name and message
-      // console.error(`Error from CloudWatch. ${caught.name}: ${caught.message}`);
+      console.error(`Error from CloudWatch. ${caught.name}: ${caught.message}`);
     } else {
       throw caught; // if its a different error, it throws it so it can be handled elsewhere
     }
@@ -172,7 +170,7 @@ export const awsData = async () => {
   console.log('Inserting metrics into database...');
   for (const metric of response.MetricDataResults) {
     for (let i = 0; i < metric.Timestamps.length; i++) {
-      console.log('Metric:', metric.Id, 'Value:', metric.Values[i]); // Debugging output
+      // console.log('Metric:', metric.Id, 'Value:', metric.Values[i]); // Debugging output
 
       const query = `
           INSERT INTO aws_metrics 
@@ -191,7 +189,7 @@ export const awsData = async () => {
       await Pool.query(query, values);
     }
   }
-  console.log('Metrics inserted successfully!');
+  // console.log('Metrics inserted successfully!');
 };
 
 // ✅ Correctly formatted IIFE to execute `awsData()`

backend/controllers/loginController.js

@@ -1,13 +1,10 @@
 const externalIdGenerator = () => {
   const letters = '1234567890qwertyuiopasdfghjklzxcvbnm';
   let result = '';
-
-  for (let i = 0; i < 10; i++){
+  for (let i = 0; i < 10; i++) {
     result += letters[Math.floor(Math.random() * 35)];
   }
-
-  return result
+  return result;
 };
 
 export default externalIdGenerator;
-// uuid npm 

backend/controllers/signupController.js

@@ -88,6 +88,7 @@ const Workflow = async () => {
     if (!awsAccountId) {
       throw new Error("No AWS account found for the provided email.");
     }
+    //testing Account ID
     console.log("AWS Account ID:", awsAccountId);
 
     // Fetch the data from AWS CloudWatch

backend/data.js

@@ -13,7 +13,7 @@ const client = new pg.Client({
 client
   .connect()
   .then(() => console.log('Connected to PostgreSQL!'))
-  .catch((err) => console.log('uncomment below in modal'));
+  .catch((err) => console.log('uncomment below in modal:', err));
 //console.error("Error connecting to PostgreSQL:", err)
 
 export default client; // Export the client instance for use in other modules

backend/externalIDGenerator.js

@@ -2,9 +2,6 @@ import express from 'express';
 import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import { awsData, awsHourData } from './data.js';
-import router from './auth.js';
-import loginRouter from './routes/loginRouter.js';
-import signupRouter from './routes/signupRouter.js';
 import authenticateToken from './controllers/authMiddleware.js';
 import Awsrouter from './routes/ApiRoutes.js';
 import externalIdGenerator from './externalIDGenerator.js';
@@ -20,19 +17,13 @@ app.use(express.urlencoded({ extended: true }));
 app.use(express.static(path.join(__dirname, 'dist')));
 
 //CAN BE DELETED, WAS ONCE A TEST ROUTER
-app.use('/auth', router);
 app.use('/aws_services', Awsrouter);
 
 //TEST ROUTE, can be deleted
 app.get('/protected', authenticateToken, (req, res) => {
   res.json({ message: 'You have accessed a protected route!', user: req.user });
 });
 
-//CAN BE DELETED
-// ROUTES ORIGINALLY SET UP TO SEND USER TO login or signup page
-// app.use('/signup', signupRouter);
-// app.use('/login', loginRouter);
-
 //VITE CONFIG file allows for this to be just /data instead of /Home/data
 app.get('/data', async (req, res) => {
   let data = await awsHourData();
@@ -64,10 +55,6 @@ app.use((err, req, res, next) => {
   return res.status(errorObj.status).json(errorObj.message);
 });
 
-
-// app.use(express.static(path.resolve(__dirname, '../src')));
-
-
 app.listen(port, () => {
   console.log(`Server started at http://localhost:${port}`);
 });

backend/metrics.js

@@ -1,12 +1,9 @@
 function Error() {
-  
+  return (
+    <>
+      <h1>This is not the page you are looking for, sorry about that.</h1>
+    </>
+  );
+}
 
-    return (
-      <>
-        <h1>This is the Error page</h1>
-      </>
-    )
-  }
-  
-  export default Error
-  
+export default Error;

backend/modal.js

@@ -1,9 +1,8 @@
-import './Home.css';
 import { useNavigate } from 'react-router';
 import BarChart from './components/Barchart.jsx';
 import LineChart from './components/Linechart.jsx';
 import { useSelector } from 'react-redux';
-import DropDownMenu from './menu.jsx';
+import DropDownMenu from './components/menu.jsx';
 import { useAuth } from './context/AuthContext.jsx';
 import { useEffect } from 'react';
 
@@ -19,24 +18,24 @@ const Home = () => {
     signOut();
   };
 
+  //ASK JASON ABOUT THIS
   //SIMPLY TESTING MIDDLEWARE, To be implemented properly needs an api call to fetch current user's access token
   //then use that token and send it as part of the header with each request
-  const testingMiddleware = () => {
-    fetch('/protected', {
-      method: 'GET',
-      headers: {
-        Authorization:
-          'Bearer eyJraWQiOiI0Ym9xcFBHU2ZPVTFvS0RWRVlPS2RFYzBPcFhYXC82eEVnN0MxR0tLZitqcz0iLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJhNDc4YTQ2OC00MGMxLTcwNDAtZGZjOS01MTVkMzNiZWM5YTUiLCJpc3MiOiJodHRwczpcL1wvY29nbml0by1pZHAudXMtZWFzdC0xLmFtYXpvbmF3cy5jb21cL3VzLWVhc3QtMV9wOUVIWHhPOTQiLCJjbGllbnRfaWQiOiIxYjUxNTV2MXQxNzZrM2FmY2o2bXM5NjRsOCIsIm9yaWdpbl9qdGkiOiJkNGI2YjJmMS0yNjlhLTQ4YjctODAwZC1hNTUyOTEyZDZkNzYiLCJldmVudF9pZCI6IjkwYmRiNjU1LTNhOWYtNGU1ZS05YWNmLWY2MzA1YjAyMGM1YiIsInRva2VuX3VzZSI6ImFjY2VzcyIsInNjb3BlIjoiYXdzLmNvZ25pdG8uc2lnbmluLnVzZXIuYWRtaW4iLCJhdXRoX3RpbWUiOjE3Mzg3OTI2OTMsImV4cCI6MTczODg3NDgwOCwiaWF0IjoxNzM4ODcxMjA4LCJqdGkiOiI5OGZkZGE2Zi0zYWMxLTQwZmItYmE2Yi1iYTg0MWQxZjIxZDUiLCJ1c2VybmFtZSI6ImE0NzhhNDY4LTQwYzEtNzA0MC1kZmM5LTUxNWQzM2JlYzlhNSJ9.VN4dRDdhh_ISefP734u4yBV5TknNb48_deExZ9HXHBwQS3lZ1J0xvsn8T2CD13Xn1H3PHoSQEIaqAP2lwyfzRfYFFOJGd5bScOWQd2Hk043MWfMGt1K3mzMTmGqz6FXHnHw9QG-jjE3jPGTn6BUvQ49u0gPB_57PrZ6fWOFAiwPlUAvC5MLLzFun6FbguwetdGfEySFuM5mRGoHPGJsDs4aKrj9GCzO5fnUket23fTzwwB4djkCsqGL6v2Vcbw-bI-9YOlYV-TOHM-fLnJ2VyYJfHBokX3BI0MIP8vzt1op8CDFzYMIrvnrs_yqVH2tOZKW-nqQSBtYIWV2CsPyd0g',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then((response) => response.json())
-      .then((data) => console.log('Response:', data))
-      .catch((error) => console.error('Error:', error));
-  };
+  // const testingMiddleware = () => {
+  //   fetch('/protected', {
+  //     method: 'GET',
+  //     headers: {
+  //       Authorization:
+  //         'Bearer ',
+  //       'Content-Type': 'application/json',
+  //     },
+  //   })
+  //     .then((response) => response.json())
+  //     .then((data) => console.log('Response:', data))
+  //     .catch((error) => console.error('Error:', error));
+  // };
 
   const graphs = useSelector((state) => state.graphs);
-  console.log(graphs);
   const newgraph = [];
 
   for (let i = 0; i < graphs.graph.length; i++) {
@@ -81,12 +80,7 @@ const Home = () => {
           >
             Account
           </button>
-          <a href='#' className='hover:underline'>
-            Settings
-          </a>
-          <a href='#' className='hover:underline'>
-            Recommended
-          </a>
+
           <button onClick={logOut} className='hover:underline'>
             Logout
           </button>

backend/routes/loginRouter.js

@@ -1,11 +1,10 @@
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react';
 import { useDispatch } from 'react-redux';
-import { addGraph } from '../state/graph-reducer.js';
+import { addGraph } from '../../state/graph-reducer.js';
 
 export default function DropDownMenu() {
   const dispatch = useDispatch();
 
-
   return (
     <Menu as='div' className='relative inline-block text-left'>
       <div>
@@ -19,11 +18,18 @@ export default function DropDownMenu() {
         className=' absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-white ring-1 shadow-lg ring-black/5 transition focus:outline-hidden data-closed:scale-95 data-closed:transform data-closed:opacity-0 data-enter:duration-100 data-enter:ease-out data-leave:duration-75 data-leave:ease-in'
       >
         <div className='py-1 bg-purple-600'>
-        <input id='metricBar' className='text-blue-600'></input>
+          <input id='metricBar' className='text-blue-600'></input>
           <MenuItem>
             <button
               className=' text-pink-50 block px-4 py-2 text-sm text-gray-700 data-focus:bg-gray-100 data-focus:text-gray-900 data-focus:outline-hidden'
-              onClick={() => dispatch(addGraph({ type: 'bar', metric: document.getElementById('metricBar').value }))}
+              onClick={() =>
+                dispatch(
+                  addGraph({
+                    type: 'bar',
+                    metric: document.getElementById('metricBar').value,
+                  })
+                )
+              }
             >
               Bar Graph
             </button>
@@ -32,7 +38,14 @@ export default function DropDownMenu() {
           <MenuItem>
             <button
               className='text-pink-50 block px-4 py-2 text-sm text-gray-700 data-focus:bg-gray-100 data-focus:text-gray-900 data-focus:outline-hidden'
-              onClick={() => dispatch(addGraph({ type: 'areaLine', metric: document.getElementById('metricLine').value }))}
+              onClick={() =>
+                dispatch(
+                  addGraph({
+                    type: 'areaLine',
+                    metric: document.getElementById('metricLine').value,
+                  })
+                )
+              }
             >
               Line Graph
             </button>

backend/routes/signupRouter.js

@@ -26,7 +26,6 @@ export const AuthProvider = ({ children }) => {
       //grab userSession info
       currentUser.getSession((err, session) => {
         if (err || !session.isValid()) {
-          console.log('not logged in testing');
           //if user session is not valid, set session to null
           setUserSession(null);
         } else {