From f19b09c5fd26f917cf169d4dc041f62f3df1fe2a Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Mon, 19 Feb 2024 08:17:17 +0000 Subject: [PATCH] Update Import Paths --- frontend-next/src/{lib => app/api}/firebase-admin.js | 2 +- frontend-next/src/{lib => app/api}/firebase-config.js | 2 +- frontend-next/src/app/api/login/route.js | 4 ++-- frontend-next/src/app/api/register/route.js | 2 +- frontend-next/src/app/login/page.js | 3 --- 5 files changed, 5 insertions(+), 8 deletions(-) rename frontend-next/src/{lib => app/api}/firebase-admin.js (79%) rename frontend-next/src/{lib => app/api}/firebase-config.js (81%) diff --git a/frontend-next/src/lib/firebase-admin.js b/frontend-next/src/app/api/firebase-admin.js similarity index 79% rename from frontend-next/src/lib/firebase-admin.js rename to frontend-next/src/app/api/firebase-admin.js index 781c331..93591f4 100644 --- a/frontend-next/src/lib/firebase-admin.js +++ b/frontend-next/src/app/api/firebase-admin.js @@ -1,6 +1,6 @@ // lib/firebase-admin-config.js import { initializeApp, getApps, cert } from "firebase-admin/app"; -import serviceAccount from "../../../firebase-admin-key" +import serviceAccount from "../../../../firebase-admin-key" export function customInitApp() { if (getApps().length <= 0) { diff --git a/frontend-next/src/lib/firebase-config.js b/frontend-next/src/app/api/firebase-config.js similarity index 81% rename from frontend-next/src/lib/firebase-config.js rename to frontend-next/src/app/api/firebase-config.js index 4a5abcf..e1da74b 100644 --- a/frontend-next/src/lib/firebase-config.js +++ b/frontend-next/src/app/api/firebase-config.js @@ -1,6 +1,6 @@ import { initializeApp, getApps, getApp } from "firebase/app"; import { getAuth } from "firebase/auth"; -import firebaseConfigFile from "../../../firebase-config" +import firebaseConfigFile from "../../../../firebase-config" var firebaseConfig = firebaseConfigFile; diff --git a/frontend-next/src/app/api/login/route.js b/frontend-next/src/app/api/login/route.js index 55d9967..2ce8f5a 100644 --- a/frontend-next/src/app/api/login/route.js +++ b/frontend-next/src/app/api/login/route.js @@ -4,8 +4,8 @@ import { NextResponse } from "next/server"; import { auth } from "firebase-admin"; import { signInWithEmailAndPassword } from "firebase/auth"; // Lib Imports -import { auth as authConfig } from "../../../lib/firebase-config"; -import { customInitApp } from "../../../lib/firebase-admin"; +import { auth as authConfig } from "../firebase-config"; +import { customInitApp } from "../firebase-admin"; // Needs to "init" on each call to the API customInitApp(); diff --git a/frontend-next/src/app/api/register/route.js b/frontend-next/src/app/api/register/route.js index 0dba943..9bc7268 100644 --- a/frontend-next/src/app/api/register/route.js +++ b/frontend-next/src/app/api/register/route.js @@ -1,6 +1,6 @@ // Import necessary functions import { createUserWithEmailAndPassword } from "firebase/auth"; -import { auth } from "../../../lib/firebase-config"; +import { auth } from "../firebase-config"; import { NextResponse } from "next/server"; // Function to register a new user using Firebase Authentication diff --git a/frontend-next/src/app/login/page.js b/frontend-next/src/app/login/page.js index 5844183..dad45da 100644 --- a/frontend-next/src/app/login/page.js +++ b/frontend-next/src/app/login/page.js @@ -1,7 +1,4 @@ "use client"; -import {createUserWithEmailAndPassword, getRedirectResult,signInWithRedirect,} from "firebase/auth"; -import { useEffect, useState } from "react"; -import { auth, provider } from "../../lib/firebase-config"; import { useForm } from "react-hook-form"; import { useRouter } from "next/navigation"; import "../globals.css"