From 2dc1821012f0a03a03444854c95b989295fdc887 Mon Sep 17 00:00:00 2001
From: sirAvent <chiu7a@gmail.com>
Date: Mon, 30 Oct 2023 14:48:13 -0700
Subject: [PATCH] Conflicting Public and Page files

---
 {src/assets/data => assets}/clubs.json  | 0
 {src/assets/data => assets}/events.json | 0
 src/components/events/events.js         | 2 +-
 src/components/footer.js                | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {src/assets/data => assets}/clubs.json (100%)
 rename {src/assets/data => assets}/events.json (100%)

diff --git a/src/assets/data/clubs.json b/assets/clubs.json
similarity index 100%
rename from src/assets/data/clubs.json
rename to assets/clubs.json
diff --git a/src/assets/data/events.json b/assets/events.json
similarity index 100%
rename from src/assets/data/events.json
rename to assets/events.json
diff --git a/src/components/events/events.js b/src/components/events/events.js
index 7977df3..683af61 100644
--- a/src/components/events/events.js
+++ b/src/components/events/events.js
@@ -1,5 +1,5 @@
 import { FaExternalLinkAlt } from "react-icons/fa";
-import EventsData from "../../assets/data/events.json";
+import EventsData from "../../../assets/events.json";
 
 function getFormattedDate(date) {
   const dateObject = new Date(date + "T00:00:00").toLocaleDateString("en-US", {
diff --git a/src/components/footer.js b/src/components/footer.js
index 4ae44e9..be58896 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -6,7 +6,7 @@ import {
   FaEnvelope,
 } from "react-icons/fa";
 import Link from "next/link";
-import Clubs from "../assets/data/clubs.json";
+import Clubs from "../../assets/clubs.json";
 
 const MEDIA_LINKS = [
   {