Merge branch 'main' into DEAR-98-happiness-data

.dockerignore

@@ -0,0 +1,9 @@
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+README.md
+.next
+!.next/static
+!.next/standalone
+.git

.env.sample

@@ -0,0 +1,24 @@
+# Auth.js
+AUTH_SECRET=
+AUTH_TRUST_HOST=
+
+# Github Provider
+AUTH_GITHUB_ID=
+AUTH_GITHUB_SECRET=
+
+# Google Provider
+AUTH_GOOGLE_ID=
+AUTH_GOOGLE_SECRET=
+
+# yappi DB
+DATABASE_HOST=
+DATABASE_PORT=
+DATABASE_NAME=
+DATABASE_USER=
+DATABASE_PASSWORD=n
+
+# JWT 
+JWT_SECRET=
+
+# API
+API_BASE_URL=

.github/workflows/ci-cd.yml

@@ -63,7 +63,10 @@ jobs:
         run: |
           REPO_NAME=ghcr.io/${{ github.repository_owner }}/dear-dev-frontend
           LOWER_REPO_NAME=$(echo $REPO_NAME | tr '[A-Z]' '[a-z]')
-          docker build --build-arg SECRET_KEY_NEXT_AUTH=${{ secrets.SECRET_KEY_NEXT_AUTH }} -t $LOWER_REPO_NAME:latest .
+          docker build \
+          --build-arg SECRET_KEY_NEXT_AUTH=${{ secrets.SECRET_KEY_NEXT_AUTH }} \
+          --build-arg NEXT_PUBLIC_API_URL=http://yappi.ch \
+          -t $LOWER_REPO_NAME:latest .
           docker push $LOWER_REPO_NAME:latest
 
   deploy:
@@ -91,10 +94,10 @@ jobs:
           ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} <<'EOF'
           echo '${{ secrets.SSH_ITALIAN_PASSWORD }}' | sudo -S su - ${{ secrets.SSH_ITALIAN_USER }} -c '
           cd ~/yappi &&
-          docker-compose stop frontend nginx &&
-          docker-compose rm frontend nginx &&
+          docker-compose stop frontend &&
+          docker-compose rm frontend &&
           docker pull ghcr.io/24fsiit16/dear-dev-frontend:latest
-          docker-compose up -d frontend nginx '
+          docker-compose up -d frontend'
           EOF
 
       - name: cleanup

.gitignore

@@ -27,6 +27,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env*.production
 
 # vercel
 .vercel

Dockerfile

@@ -7,8 +7,8 @@ WORKDIR /app
 # Copy the package.json and package-lock.json file
 COPY package*.json ./
 
+# Accept build arguments
 ARG NEXT_PUBLIC_API_URL
-
 ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
 
 # Install the dependencies

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  yappi-app:
+    container_name: yappi_frontend
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - '3000:3000'
+    env_file:
+      - .env.production
+    networks:
+      - yappi_network
+
+networks:
+  yappi_network:
+    external: true

lib/api/apiClient.ts

@@ -1,4 +1,4 @@
-export const API_BASE_URL = 'http://localhost:8080';
+export const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL;
 
 const setHeaders = (token: string) => ({
   Authorization: `Bearer ${token}`,

next.config.mjs

@@ -1,4 +1,11 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+  images: {
+    domains: ['media.giphy.com'],
+  },
+  env: {
+    NEXT_PUBLIC_API_KEY: process.env.NEXT_PUBLIC_API_KEY,
+  },
+};
 
 export default nextConfig;

providers/AuthProvider.tsx

@@ -14,6 +14,8 @@ interface ExtendedSession extends Session {
   error?: string | null;
 }
 
+const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL;
+
 const AuthContext = React.createContext<ExtendedSession | null>(null);
 
 interface AuthProviderProps {
@@ -31,7 +33,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
   const sessionData = session as ExtendedSession;
 
   const fetchUser = async (id: string, bearerToken: string) => {
-    const response = await fetch(`http://localhost:8080/v1/user/${id}`, {
+    const response = await fetch(`${API_BASE_URL}/v1/user/${id}`, {
       headers: {
         Authorization: `Bearer ${bearerToken}`,
       },