Merge branch 'dev'

neopromic · Sep 30, 2023 · ce074b4 · ce074b4
2 parents 5349f54 + 84ba13a
commit ce074b4
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 55 deletions.
diff --git a/firebase.ts b/firebase.ts
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ForDevs</title>
-    <link rel="shortcut icon" href="/assets/logo.png" type="image/png">
+    <link rel="shortcut icon" href="/assets/favicon.ico">
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -22,7 +22,8 @@
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.15.0",
     "tailwind-merge": "^1.14.0",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "vite-plugin-env-compatible": "^1.1.1"
   },
   "devDependencies": {
     "@klarr-agency/circum-icons-react": "^2.0.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/api/user/authContextApi/index.ts b/public/api/user/authContextApi/index.ts
diff --git a/src/pages/SignIn/index.tsx b/src/pages/SignIn/index.tsx
@@ -3,7 +3,7 @@ import Header from "../../components/ui/Header";
 import "./SignIn.css";
 import { useState } from "react";
 import { signInWithEmailAndPassword } from "firebase/auth"
-import { auth } from "../../../firebase"
+import { auth } from "@/utils/api/auth/config/index"
 import { Button } from "@/components/ui/button";
 
 export default function SignIn() {

diff --git a/src/pages/SignUp/index.tsx b/src/pages/SignUp/index.tsx
@@ -2,29 +2,30 @@ import { Link } from "react-router-dom";
 import Header from "../../components/ui/Header";
 import "./SignUp.css";
 import { useState } from "react";
-import {auth} from "../../../firebase";
+import { auth } from "@/utils/api/auth/config"
 import { createUserWithEmailAndPassword } from "firebase/auth";
 
 export default function SignUp() {
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
-  const [username, setUsername] = useState(""); 
+  const [username, setUsername] = useState("");
   const signUp = (e) => {
-    e.preventDefault()
+    e.preventDefault();
 
     createUserWithEmailAndPassword(auth, email, password)
-    .then((userCredential) => {
-      console.log(userCredential)
-    }).catch((error) => console.error(error))
-  }
+      .then((userCredential) => {
+        console.log(userCredential);
+      })
+      .catch((error) => console.error(error));
+  };
   return (
     <>
       <Header />
       <div className="h-screen flex items-center justify-center p-4 overflow-hidden">
         <form className="max-w-xl" onSubmit={signUp}>
           <div className="form-header">
             <img
-              src="/assets/logo.png"
+              src="/assets/favicon.ico"
               className="w-8 h-8 object-cover rounded-full"
             />
             <h1>Começando no Fordevs</h1>
@@ -63,7 +64,10 @@ export default function SignUp() {
             Iniciar jornada!
           </button>
           <span className="text-sm">
-            Já possui conta? <Link to="/login" className="text-violet-500 font-bold">Entrar agora!</Link>
+            Já possui conta?{" "}
+            <Link to="/login" className="text-violet-500 font-bold">
+              Entrar agora!
+            </Link>
           </span>
         </form>
       </div>

diff --git a/src/utils/api/auth/authContextApi/index.ts b/src/utils/api/auth/authContextApi/index.ts
@@ -0,0 +1,8 @@
+import { createContext } from "react";
+
+createContext(authContext)
+
+
+export function authContext() {
+  return;
+}
diff --git a/src/utils/api/auth/config/index.ts b/src/utils/api/auth/config/index.ts
@@ -0,0 +1,22 @@
+import { initializeApp } from "firebase/app";
+import { getFirestore } from "firebase/firestore"
+import { Auth, getAuth } from "firebase/auth"
+
+
+const firebaseConfig = {
+  apiKey: import.meta.env.REACT_APP_FIREBASE_KEY,
+  authDomain: import.meta.env.REACT_APP_FIREBASE_DOMAIN,
+  databaseURL: import.meta.env.REACT_APP_FIREBASE_DATABASE_URL,
+  projectId: import.meta.env.REACT_APP_FIREBASE_PROJECT_ID,
+  storageBucket: import.meta.env.REACT_APP_FIREBASE_BUCKET,
+  messagingSenderId: import.meta.env.REACT_APP_FIREBASE_SENDER_ID,
+  appId: import.meta.env.REACT_APP_FIREBASE_APP_ID,
+  measurementId: import.meta.env.REACT_APP_FIREBASE_MEANSUREMENT_ID
+};
+
+// Initialize Firebase
+const app = initializeApp(firebaseConfig);
+const auth: Auth = getAuth(app);
+const db = getFirestore(app);
+
+export { db, app, auth }
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,7 +6,7 @@
         "./src/*",
       ],
       "@api/*": [
-        "./public/api/*",
+        "src/utils/api/*",
       ]
     },
     "target": "ES2020",

diff --git a/vite.config.ts b/vite.config.ts
@@ -1,9 +1,11 @@
 import path from "path"
 import react from "@vitejs/plugin-react"
+// import envCompatible from 'vite-plugin-env-compatible'
 import { defineConfig } from "vite"
 
 export default defineConfig({
-  plugins: [react()],
+  envPrefix: "REACT_APP_",
+  plugins: [react(),],
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src"),