ENV config

TnP-MACE · Apr 26, 2021 · 6ac8054 · 6ac8054
1 parent 7e44aa8
commit 6ac8054
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/components/Header/header.js b/components/Header/header.js
@@ -18,7 +18,7 @@ const Header = () => {
         if(localStorage.getItem('macebook-isauth')){
             localStorage.removeItem('macebook-isauth')
         }
-        const res = await fetch(`${process.env.API}/api/logout`, {
+        const res = await fetch(`${process.env.API}/logout`, {
             method: 'GET',
             credentials: 'include'
         })

diff --git a/next.config.js b/next.config.js
@@ -5,6 +5,6 @@ module.exports = {
         includePaths: [path.join(__dirname, 'styles')]
     },
     env: {
-        API: 'http://localhost:5001'
+        API: 'http://localhost:5001/api'
     }
 }
diff --git a/pages/feeds.js b/pages/feeds.js
@@ -14,7 +14,7 @@ const Feeds = ({feeds}) => {
 }
 
 Feeds.getInitialProps = async (ctx) => {
-    const res = await fetch(`${process.env.API}/api/feeds`, {
+    const res = await fetch(`${process.env.API}/feeds`, {
         method: 'GET',
         credentials: 'include',
         headers: ctx.req ? {cookie: ctx.req.headers.cookie} : undefined

diff --git a/pages/index.js b/pages/index.js
@@ -6,7 +6,7 @@ export default function Home() {
   return(
     <Layout>
       <SEO title="Macebook"/>
-      <div className={styles.heading}>MACE Alumini Portal</div>
+      <div className={styles.heading}>MACE Alumni Portal</div>
     </Layout>
   )
-}
+}
diff --git a/pages/login.js b/pages/login.js
@@ -10,25 +10,24 @@ const Login = () => {
     const handleClick = async (e) => {
         e.preventDefault()
         try {
-            const res = await fetch(`${process.env.API}/api/login`, {
+            const res = await fetch(`${process.env.API}/login`, {
                 method: 'POST',
                 headers: {'Content-Type': 'application/json'},
                 body: JSON.stringify({username, password}),
                 credentials: 'include'
             })
-            const user = await res.json()
-            if(res.status == 404){
-                return console.log("Invalid Username or Password")
+
+            if(res.status == 404 || res.status == 401){
+                return alert("Invalid Username or Password")
             }
+
             if(res.status == 200){
                 console.log("You're Logged In!")
                 localStorage.setItem('macebook-isauth', true)
-                // return router.push(`/user/${user.username}`)
                 return Router.replace('/feeds')
             }
-            console.log("Failed to login!")
         } catch (error) {
-            console.log("Failed to login!")
+            console.log("Server not responding!")
         }
     }
 

diff --git a/pages/messaging.js b/pages/messaging.js
@@ -14,7 +14,7 @@ const Messaging = ({messages}) => {
 }
 
 Messaging.getInitialProps = async (ctx) => {
-    const res = await fetch(`${process.env.API}/api/messages`, {
+    const res = await fetch(`${process.env.API}/messages`, {
         method: 'GET',
         credentials: 'include',
         headers: ctx.req ? {cookie: ctx.req.headers.cookie} : undefined

diff --git a/pages/notifications.js b/pages/notifications.js
@@ -14,7 +14,7 @@ const Notifications = ({notifications}) => {
 }
 
 Notifications.getInitialProps = async (ctx) => {
-    const res = await fetch(`${process.env.API}/api/notifications`, {
+    const res = await fetch(`${process.env.API}/notifications`, {
         method: 'GET',
         credentials: 'include',
         headers: ctx.req ? {cookie: ctx.req.headers.cookie} : undefined

diff --git a/pages/profile.js b/pages/profile.js
@@ -5,7 +5,7 @@ const Profile = () => {
 }
 
 Profile.getInitialProps = async (ctx) => {
-    const res = await fetch(`${process.env.API}/api/profile`, {
+    const res = await fetch(`${process.env.API}/profile`, {
         method: 'GET',
         credentials: 'include',
         headers: ctx.req ? {cookie: ctx.req.headers.cookie} : undefined

diff --git a/pages/user/[username].js b/pages/user/[username].js
@@ -23,7 +23,7 @@ const UserProfile = (props) => {
 export async function getServerSideProps(ctx){
     const cookie = ctx.req.headers.cookie
 
-    const res = await fetch(`${process.env.API}/api/users/${ctx.params.username}`, {
+    const res = await fetch(`${process.env.API}/users/${ctx.params.username}`, {
         headers: {
             cookie
         }