diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c17db54..d4aa996 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,11 +16,21 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v2 with: +<<<<<<< HEAD node-version: "16" # Make sure this matches your local environment +======= + node-version: "18" # Make sure this matches your local environment +>>>>>>> 9d112aefea993563d76cd2762919f5e2a18321d1 - name: Clear npm cache run: npm cache clean --force +<<<<<<< HEAD +======= + - name: Clean and install dependencies + run: rm -rf node_modules package-lock.json + +>>>>>>> 9d112aefea993563d76cd2762919f5e2a18321d1 - name: Install dependencies run: npm install @@ -32,4 +42,8 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} +<<<<<<< HEAD publish_dir: ./dist # Use ./build for Create React App, ./dist for Vite +======= + publish_dir: ./dist +>>>>>>> 9d112aefea993563d76cd2762919f5e2a18321d1 diff --git a/package-lock.json b/package-lock.json index a582ae8..18bb992 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "eslint-plugin-react": "^7.35.0", "eslint-plugin-react-hooks": "^5.1.0-rc.0", "eslint-plugin-react-refresh": "^0.4.9", + "gh-pages": "^6.2.0", "globals": "^15.9.0", "postcss": "^8.4.47", "tailwindcss": "^3.4.13", diff --git a/package.json b/package.json index 36b1baf..81c57a8 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "eslint-plugin-react": "^7.35.0", "eslint-plugin-react-hooks": "^5.1.0-rc.0", "eslint-plugin-react-refresh": "^0.4.9", + "gh-pages": "^6.2.0", "globals": "^15.9.0", "postcss": "^8.4.47", "tailwindcss": "^3.4.13", diff --git a/src/context/HomeNewsContext.jsx b/src/context/HomeNewsContext.jsx index 57861bc..c05275c 100644 --- a/src/context/HomeNewsContext.jsx +++ b/src/context/HomeNewsContext.jsx @@ -9,7 +9,7 @@ export const HomeNewsCardContext = ({ children }) => { const [cards, setCards] = useState([]); useEffect(() => { - Papa.parse(`${baseURL}/assets/news.csv`, { + Papa.parse(`${baseURL}assets/news.csv`, { download: true, header: true, skipEmptyLines: true, diff --git a/src/context/TeamContext.jsx b/src/context/TeamContext.jsx index a1dde39..3695cc9 100644 --- a/src/context/TeamContext.jsx +++ b/src/context/TeamContext.jsx @@ -23,7 +23,7 @@ export const CardProvider = ({ children }) => { useEffect(() => { const fetchData = async () => { try { - const data = await fetchYAML(`${baseURL}/assets/members-1.yml`); + const data = await fetchYAML(`${baseURL}assets/members-1.yml`); const categorizedData = { lead: data.filter((card) => card.Degree === "Director"), diff --git a/src/pages/home/team/HomeTeam.jsx b/src/pages/home/team/HomeTeam.jsx index d375302..1ec96c9 100644 --- a/src/pages/home/team/HomeTeam.jsx +++ b/src/pages/home/team/HomeTeam.jsx @@ -8,12 +8,12 @@ const teamMembers = [ name: "Dr Jacob Luber", role: "Director, HDSL", - imgSrc: baseURL + "/assets/images/jacob.jpg", + imgSrc: baseURL + "assets/images/jacob.jpg", }, { name: "Helen Shang", role: "Visiting Assistant Professor", - imgSrc: baseURL + "/assets/images/shang.jpeg", + imgSrc: baseURL + "assets/images/shang.jpeg", }, ];