Update

flowinquiry · Dec 27, 2024 · afc7b71 · afc7b71
1 parent b52049c
commit afc7b71
Show file tree

Hide file tree

Showing 16 changed files with 184 additions and 143 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -48,6 +48,5 @@ jobs:
       - run: pnpm install
       - name: Build the application
         env:
-          NEXT_PUBLIC_API_URL: "http://localhost:8080"
           BACK_END_URL: "http://localhost:8080"
         run: pnpm build
diff --git a/README.md b/README.md
@@ -110,10 +110,10 @@ Set up the application environment variables by running the following script:
 scripts/init_environments.sh
 ```
 
-This script generates environment variables, including NEXT_PUBLIC_API_URL, to establish the communication between the client and server. Example
+This script generates environment variables, including BACK_END_URL, to establish the communication between the client and server. Example
 
 ```
-NEXT_PUBLIC_API_URL=http://localhost:8080
+BACK_END_URL=http://localhost:8080
 ```
 
 We recommend running the `scripts/all.sh` script, as it streamlines the process by checking your environment settings and performing all necessary configurations, removing the need to execute multiple scripts manually.

diff --git a/next.config.mjs b/next.config.mjs
@@ -6,7 +6,7 @@ const nextConfig = {
       fallback: [
         {
           source: "/api/:path*",
-          destination: `${process.env.NEXT_PUBLIC_API_URL}/api/:path*`,
+          destination: `${process.env.BACK_END_URL}/api/:path*`,
         },
       ],
     };

diff --git a/scripts/docker_deployment.sh b/scripts/docker_deployment.sh
@@ -24,14 +24,14 @@ docker tag ${IMAGE_NAME} ${REMOTE_REPO}:${TAG}
 docker tag ${IMAGE_NAME} ${REMOTE_REPO}:latest
 
 # Step 3: Log in to the Docker repository (Docker Hub by default)
-#echo "Logging into Docker repository..."
-#docker login || { echo "Login failed"; exit 1; }
-#
-## Step 4: Push both tags to the remote repository
-#echo "Pushing Docker image to remote repository with tag '${TAG}'..."
-#docker push ${REMOTE_REPO}:${TAG}
-#
-#echo "Pushing Docker image to remote repository with tag 'latest'..."
-#docker push ${REMOTE_REPO}:latest
-#
-#echo "Docker image has been pushed successfully with tags '${TAG}' and 'latest'."
+echo "Logging into Docker repository..."
+docker login || { echo "Login failed"; exit 1; }
+
+# Step 4: Push both tags to the remote repository
+echo "Pushing Docker image to remote repository with tag '${TAG}'..."
+docker push ${REMOTE_REPO}:${TAG}
+
+echo "Pushing Docker image to remote repository with tag 'latest'..."
+docker push ${REMOTE_REPO}:latest
+
+echo "Docker image has been pushed successfully with tags '${TAG}' and 'latest'."
diff --git a/scripts/init_environments.sh b/scripts/init_environments.sh
@@ -33,8 +33,7 @@ while true; do
 done
 
 # Append to the .env.local file
-echo "NEXT_PUBLIC_API_URL=\"$backend_server\"" >> "$output_file"
-echo "BACK_END_URL=\"$backend_server\"" >> "$output_file"
+echo "NEXT_PUBLIC_BACK_END_URL=\"$backend_server\"" >> "$output_file"
 
 
 # Run npx auth and append its output to .env

diff --git a/src/auth.ts b/src/auth.ts
@@ -3,6 +3,7 @@ import NextAuth, { User } from "next-auth";
 import CredentialsProvider from "next-auth/providers/credentials";
 
 import apiAuthSignIn from "@/lib/auth";
+import { BASE_URL } from "@/lib/constants";
 
 export const { handlers, auth } = NextAuth({
   providers: [
@@ -23,6 +24,19 @@ export const { handlers, auth } = NextAuth({
     }),
   ],
   callbacks: {
+    async redirect({ url, baseUrl }) {
+      // Allows relative callback URLs
+      if (url.startsWith("/")) return `${baseUrl}${url}`;
+      // Works for the deployment model while API_URL is the front url of the reverse proxy
+      else if (
+        process.env.NODE_ENV === "production" &&
+        new URL(url).origin === BASE_URL
+      )
+        return url;
+      // Allows callback URLs on the same origin
+      else if (new URL(url).origin === baseUrl) return url;
+      return baseUrl;
+    },
     jwt({ token, account, user }) {
       if (user) {
         token.accessToken = user?.accessToken;

diff --git a/src/components/admin-panel/user-nav.tsx b/src/components/admin-panel/user-nav.tsx
@@ -30,7 +30,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { API_URL } from "@/lib/constants";
+import { BASE_URL } from "@/lib/constants";
 
 export function UserNav() {
   const { data: session } = useSession();
@@ -50,7 +50,7 @@ export function UserNav() {
                     <AvatarImage
                       src={
                         session?.user?.imageUrl
-                          ? `${API_URL}/api/files/${session?.user?.imageUrl}`
+                          ? `${BASE_URL}/api/files/${session?.user?.imageUrl}`
                           : undefined
                       }
                       alt="Avatar"
@@ -102,7 +102,7 @@ export function UserNav() {
           <DropdownMenuSeparator />
           <DropdownMenuItem
             className="hover:cursor-pointer"
-            onClick={() => signOut()}
+            onClick={() => signOut({ redirectTo: BASE_URL, redirect: true })}
           >
             <LogOut className="w-4 h-4 mr-3 text-muted-foreground" />
             Sign out
@@ -112,7 +112,7 @@ export function UserNav() {
       <DialogContent>
         <DialogHeader className="flex items-center space-x-4">
           <div>
-            <AppLogo />
+            <AppLogo size={100} />
           </div>
 
           <div>
@@ -127,6 +127,24 @@ export function UserNav() {
             </DialogDescription>
           </div>
         </DialogHeader>
+
+        {/* Footer */}
+        <div className="mt-2 flex justify-between items-center border-t pt-2">
+          {/* Copyright and Year */}
+          <div className="text-sm text-gray-500 dark:text-gray-400">
+            © {new Date().getFullYear()} FlowInquiry. All rights reserved.
+          </div>
+
+          {/* Website Link */}
+          <a
+            href="https://www.flowinquiry.io"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-sm font-medium text-blue-600 hover:underline dark:text-blue-400"
+          >
+            flowinquiry.io
+          </a>
+        </div>
       </DialogContent>
     </Dialog>
   );

diff --git a/src/components/app-logo.tsx b/src/components/app-logo.tsx
@@ -1,37 +1,38 @@
 import React from "react";
 
-type IconProps = React.HTMLAttributes<SVGElement>;
+type IconProps = React.HTMLAttributes<SVGElement> & {
+  size?: number;
+};
 
-const AppLogo = (props: IconProps) => {
+const AppLogo = ({ size = 40, ...props }: IconProps) => {
   return (
-    <>
-      <svg
-        width="40"
-        height="40"
-        viewBox="0 0 100 100"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          transform="scale(1.00287,1.00287)"
-          d="M30 100c-16.569 0-30-13.431-30-30v-40c0-16.569 13.431-30 30-30h40c16.569 0 30 13.431 30 30v40c0 16.569-13.431 30-30 30z"
-          fill="#000000"
-          stroke="none"
-          strokeWidth="1"
-        />
-        <path
-          d="M49.942 52.994L90.595 51.529C88.068 47.352 87.436 43.698 82.606 43.068 75.377 42.128 68.148 41.185 60.918 40.242L18.843 34.762C20.101 36.792 39.724 53.361 49.942 52.994"
-          fill="#ffffff"
-        />
-        <path
-          d="M0 9.786C4.391 17.043 26.615 32.858 32.953 33.672 50.283 35.903 67.61 38.132 84.939 40.36 81.546 34.753 80.759 31.01 74.627 29.401L47.91 22.378C31.94 18.182 15.97 13.984 0 9.786"
-          fill="#ffffff"
-        />
-        <path
-          d="M63.108 66.207L94.349 59.547C92.321 56.201 92.315 54.188 88.522 54.358 82.364 54.631 76.208 54.907 70.051 55.18 58.708 55.686 47.365 56.194 36.023 56.698 37.298 58.064 54.94 67.947 63.108 66.207"
-          fill="#ffffff"
-        />
-      </svg>
-    </>
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 100 100"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        transform="scale(1.00287,1.00287)"
+        d="M30 100c-16.569 0-30-13.431-30-30v-40c0-16.569 13.431-30 30-30h40c16.569 0 30 13.431 30 30v40c0 16.569-13.431 30-30-30z"
+        fill="#000000"
+        stroke="none"
+        strokeWidth="1"
+      />
+      <path
+        d="M49.942 52.994L90.595 51.529C88.068 47.352 87.436 43.698 82.606 43.068 75.377 42.128 68.148 41.185 60.918 40.242L18.843 34.762C20.101 36.792 39.724 53.361 49.942 52.994"
+        fill="#ffffff"
+      />
+      <path
+        d="M0 9.786C4.391 17.043 26.615 32.858 32.953 33.672 50.283 35.903 67.61 38.132 84.939 40.36 81.546 34.753 80.759 31.01 74.627 29.401L47.91 22.378C31.94 18.182 15.97 13.984 0 9.786"
+        fill="#ffffff"
+      />
+      <path
+        d="M63.108 66.207L94.349 59.547C92.321 56.201 92.315 54.188 88.522 54.358 82.364 54.631 76.208 54.907 70.051 55.18 58.708 55.686 47.365 56.194 36.023 56.698 37.298 58.064 54.94 67.947 63.108 66.207"
+        fill="#ffffff"
+      />
+    </svg>
   );
 };