update static resources

spencerattick · Apr 10, 2024 · 8e04d13 · 8e04d13
1 parent b887558
commit 8e04d13
Show file tree

Hide file tree

Showing 19 changed files with 1,429 additions and 920 deletions.
diff --git a/.env b/.env
@@ -1 +1,5 @@
-VITE_SERVER_URL=http://localhost:3000
+STRAVA_EXPIRATION_TIME=1683606397
+STRAVA_CACHED_REFRESH_TOKEN=25bd1cf38e37ee07e53d446f10ef812daee4d9bc
+STRAVA_CACHED_TOKEN=25b0ab3f4831c7fba452bfa39910b730db955be7
+STRAVA_CLIENT_ID=105494
+STRAVA_CLIENT_SECRET=aeca4b4832d195c467d23e1c465781eed04be76b
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
-.DS_Store
+.DS_Store
+.env
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/src/test.js"
+        }
+    ]
+}
diff --git a/assets/staticGoodreadsFeed.json b/assets/staticGoodreadsFeed.json
diff --git a/assets/staticMediumFeed.json b/assets/staticMediumFeed.json
diff --git a/dist/assets/index-049fdd1d.js b/dist/assets/index-049fdd1d.js
diff --git a/dist/assets/index-5d1ad553.js b/dist/assets/index-5d1ad553.js
diff --git a/dist/index.html b/dist/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Spencer's Portfolio</title>
-    <script type="module" crossorigin src="/assets/index-049fdd1d.js"></script>
+    <script type="module" crossorigin src="/assets/index-5d1ad553.js"></script>
     <link rel="stylesheet" href="/assets/index-3e40f224.css">
   </head>
   <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@types/node": "^18.13.0",
     "@vitejs/plugin-react": "^3.1.0",
+    "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/server/server.js b/server/server.js
@@ -2,8 +2,9 @@ const express = require('express');
 const app = express();
 const { parse } = require('rss-to-json');
 const path = require('path');
-
-// [] see about not allowing * CORS requests
+const dotenv = require('dotenv');
+require('dotenv').config();
+const fs = require('fs');
 
 // Allow cross-origin requests from Vite
 app.use(function(req, res, next) {
@@ -35,6 +36,125 @@ app.get('/api/feed', async (req, res) => {
   }
 });
 
+//STRAVA ROUTE START
+const isStravaTokenExpired = (currentExpirationTime) => {
+  console.log('IS STRAVA TOKEN EXPIRED')
+  const currentEpochTime = Date.now();
+  if (currentExpirationTime === 'undefined') {
+      return `There is an error with the currentEpirationTime, it's value is: ${currentExpirationTime}.`
+  }
+  return currentEpochTime > currentExpirationTime;
+}
+
+const generateNewToken = async () => {
+  console.log('Generating new token...');
+  const requestOptions = {
+      method: 'POST',
+      redirect: 'follow'
+    };
+  const requestURL = `https://www.strava.com/oauth/token?client_id=${process.env.STRAVA_CLIENT_ID}&client_secret=${process.env.STRAVA_CLIENT_SECRET}&grant_type=refresh_token&refresh_token=ReplaceWithRefreshToken&refresh_token=${process.env.STRAVA_CACHED_REFRESH_TOKEN}`;
+
+  try {
+      let response = await fetch(requestURL, requestOptions);
+      response = await response.json(); 
+      if (response.message === 'Bad Request') {
+        console.log(response);
+          return;
+      }
+      console.log('NO PROBLEM GETTING NEW TOKEN')
+      return {
+          refreshToken: await response.refresh_token, 
+          expirationTime: await response.expires_at,
+          accessToken: await response.access_token
+      }
+  } catch (error) {
+      console.log(error);
+  }
+
+}
+
+
+
+const persistNewTokenData = async (newTokenData) => {
+  console.log('PERSIST NEW TOKEN DATA')
+  // Read the .env file
+  const envBuffer = fs.readFileSync('.env');
+  const envConfig = dotenv.parse(envBuffer);
+
+  // // // Update the relevant key with the new value
+  if (newTokenData.expirationTime) {
+    envConfig['STRAVA_EXPIRATION_TIME'] = newTokenData.expirationTime;
+  }
+  if (newTokenData.refreshToken) {
+    envConfig['STRAVA_CACHED_REFRESH_TOKEN'] = newTokenData.refreshToken;
+  }
+  if (newTokenData.accessToken) {
+    envConfig['STRAVA_CACHED_TOKEN'] = newTokenData.accessToken;
+  }
+
+  // const envText = Object.keys(envConfig).map(key => `${key}=${envConfig[key]}`).join('\n');
+  // try {
+  //   await fs.promises.writeFile('.env', envText);
+  //   console.log('File successfully written');
+  // } catch (error) {
+  //   console.error('Error writing file:', error);
+  // }
+
+};
+
+const getStravaActivityData = async () => {
+  console.log('GET STRAVA ACTIVITY DATA')
+  console.log('Requesting activity data from Strava...');
+  let myHeaders = new Headers();
+  myHeaders.append("Authorization", `Bearer ${process.env.STRAVA_CACHED_TOKEN}`);
+
+  const requestOptions = {
+    method: 'GET',
+    headers: myHeaders,
+    redirect: 'follow'
+  };
+
+  try {
+      const response = await fetch("https://www.strava.com/api/v3/athlete/activities", requestOptions);
+      return response.json();
+
+  } catch (error) {
+      console.log('error', error);
+      return;
+  }   
+}
+
+//check to see if the expiration time has passed
+const executeStravaLogic = async () => {
+  console.log('EXECUTE STRAVA LOGIC')
+  const isTokenExpired = isStravaTokenExpired(process.env.STRAVA_EXPIRATION_TIME);
+  console.log('TOKEN EXPIRED? ', isTokenExpired)
+
+  if (typeof isTokenExpired === 'string') {
+      console.log('Please resolve the error with the current expiration time stored in the .env file.');
+      return;
+  } else if (isTokenExpired) {
+      console.log('The expiration time has passed. Generating a new token...');
+      //if yes - generate a new token
+      const newTokenData = await generateNewToken();
+      if (!newTokenData.expirationTime) {
+          console.log('There was an error getting refresh token data.')
+          return;
+      } 
+     //save the new token info to .env
+      persistNewTokenData(newTokenData);
+
+  } 
+  // //make request to Strava activities endpoint
+  const stravaActivityData = await getStravaActivityData();
+  console.log(stravaActivityData[0].name);
+};
+
+app.get('/api/strava', executeStravaLogic);
+
+
+//STRAVA ROUTE END
+
 // Start the server
 app.listen(3000, () => {
   console.log('Server started on http://localhost:3000');

diff --git a/src/App.jsx b/src/App.jsx
@@ -6,6 +6,7 @@ import Blog from './Blog';
 import Contact from './Contact';
 import Projects from './Projects';
 import GoodReads from './GoodReads';
+import Strava from './Strava';
 
 // add movement that draws attention to important pieces of the site as you scroll
 
@@ -18,6 +19,7 @@ export default function App() {
             <TechStack />
             <Blog />
             <GoodReads />
+            <Strava />
             <Contact />
         </div>
     )

diff --git a/src/Blog.jsx b/src/Blog.jsx
@@ -57,7 +57,7 @@ const getSixPostsOrMax = data => {
   useEffect(() => {
     async function fetchBlogPosts() {
       try {
-        const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/posts`);
+        const response = await fetch(`http://localhost:3000/api/posts`);
         const data = await response.json();
         setBlogPosts(getSixPostsOrMax(data));
       } catch (error) {

diff --git a/src/GoodReads.jsx b/src/GoodReads.jsx
@@ -22,7 +22,7 @@ export default function GoodReads() {
 
   const fetchGoodReadsFeed = async () => {
     try {
-      const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/feed`);
+      const response = await fetch(`http://localhost:3000/api/feed`);
       const data = await response.json();
       setGoodReadsFeed(data);
     } catch (error) {

diff --git a/src/Projects.jsx b/src/Projects.jsx
@@ -25,7 +25,7 @@ export default function Projects() {
   useEffect(() => {
     async function fetchBlogPosts() {
       try {
-        const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/posts`);
+        const response = await fetch(`http://localhost:3000/api/posts`);
         const data = await response.json();
         setProjectPosts(getProjectPosts(data));
       } catch (error) {

diff --git a/src/Strava.jsx b/src/Strava.jsx
@@ -1,47 +1,32 @@
-// https://developers.strava.com/docs/getting-started/#account
-
-// get an API key
-
-
-
-
-// FOLLOWING STEPS HERE: https://developers.strava.com/docs/getting-started/#oauth (this vid is pretty good: https://www.youtube.com/watch?v=sgscChKfGyg)
-
-
-// 1. http://localhost/exchange_token?state=&code=62b8194da84fd2f4455851e52b26f49a1ca9991e&scope=read,read_all
-
-// 2. curl --location --request POST 'https://www.strava.com/oauth/token?client_id=105494&client_secret=aeca4b4832d195c467d23e1c465781eed04be76b&code=62b8194da84fd2f4455851e52b26f49a1ca9991e&grant_type=authorization_code' \
-// --header 'Authorization: Basic SXI5RjJySjRYWUhNRTNuYjJvSDhPYU5zaklNVlFmdzY6' \
-// --data ''
-
-// {
-//     "token_type": "Bearer",
-//     "expires_at": 1681258716,
-//     "expires_in": 21600,
-//     "refresh_token": "cc5a66ffbe22e42dac7aa175097485bffa03b123",
-//     "access_token": "b6ddf246cde306a6520efaf8c8686ce0d95cdfab",
-//     "athlete": {
-//         "id": 8470431,
-//         "username": "sattick",
-//         "resource_state": 2,
-//         "firstname": "Spencer",
-//         "lastname": "Attick",
-//         "bio": null,
-//         "city": "Oakland",
-//         "state": "California",
-//         "country": "United States",
-//         "sex": "M",
-//         "premium": false,
-//         "summit": false,
-//         "created_at": "2015-04-01T00:46:54Z",
-//         "updated_at": "2023-03-23T00:01:05Z",
-//         "badge_type_id": 0,
-//         "weight": 0.0,
-//         "profile_medium": "https://graph.facebook.com/1226490129/picture?height=256&width=256",
-//         "profile": "https://graph.facebook.com/1226490129/picture?height=256&width=256",
-//         "friend": null,
-//         "follower": null
-//     }
-// }
-
-3. 
+import React, { useEffect, useState } from 'react';
+// import staticFeed from '../assets/staticGoodreadsFeed.json';
+
+export default function Strava() {
+
+  const [stravaData, setStravaData] = useState([]);
+  const [error, setError] = useState(null);
+
+  useEffect(() => {
+    async function fetchStravaData() {
+      try {
+        const response = await fetch(`http://localhost:3000/api/strava`);
+        const data = await response.json();
+        setStravaData(data);
+      } catch (error) {
+        console.log(error);
+        setError(error);
+      }
+    }
+    fetchStravaData();
+  }, []);
+
+
+    return (
+        <div id="strava">
+            <h2>Strava</h2>
+            <div>
+                {JSON.stringify(stravaData[0])}
+            </div>
+        </div>
+    )
+}