Merge pull request #93 from mokletdev/staging

fix: Logo & email
mokletdev · May 21, 2024 · f0b802d · f0b802d
2 parents 4c9dfa0 + e8dac4f
commit f0b802d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -5,39 +5,39 @@ name: deploy
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
 
 jobs:
   build:
-
     runs-on: self-hosted
 
     strategy:
       matrix:
         node-version: [20.13.1]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: create env
-      run: |
-        touch /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'DATABASE_URL=${{secrets.DATABASE_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'CLOUDINARY_URL=${{secrets.CLOUDINARY_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'NEXTAUTH_URL=${{secrets.NEXTAUTH_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'GOOGLE_CLIENT_ID=${{secrets.GOOGLE_CLIENT_ID}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'GOOGLE_CLIENT_SECRET=${{secrets.GOOGLE_CLIENT_SECRET}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-        echo 'GOOGLE_REFRESH_TOKEN=${{secrets.GOOGLE_REFRESH_TOKEN}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
-    - name: Install Modules
-      run: npm ci
-    - name: Generate prisma
-      run: npm run prisma:generate
-    - name: Build site
-      run: npm run build --if-present
-    - name: change dir
-      run: cd /home/mokletdev/actions-runner/_work/antareja/antareja
-    - run: pm2 restart 0
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: create env
+        run: |
+          touch /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'DATABASE_URL=${{secrets.DATABASE_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'CLOUDINARY_URL=${{secrets.CLOUDINARY_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'NEXTAUTH_URL=${{secrets.NEXTAUTH_URL}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'GOOGLE_CLIENT_ID=${{secrets.GOOGLE_CLIENT_ID}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'GOOGLE_CLIENT_SECRET=${{secrets.GOOGLE_CLIENT_SECRET}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'GOOGLE_REFRESH_TOKEN=${{secrets.GOOGLE_REFRESH_TOKEN}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+          echo 'GOOGLE_REDIRECT_URI=${{secrets.GOOGLE_REDIRECT_URI}}' >> /home/mokletdev/actions-runner/_work/antareja/antareja/.env.local
+      - name: Install Modules
+        run: npm ci
+      - name: Generate prisma
+        run: npm run prisma:generate
+      - name: Build site
+        run: npm run build --if-present
+      - name: change dir
+        run: cd /home/mokletdev/actions-runner/_work/antareja/antareja
+      - run: pm2 restart 0
diff --git a/src/app/(admin)/admin/layout.tsx b/src/app/(admin)/admin/layout.tsx
@@ -33,7 +33,7 @@ export default function AdminLayout({
         <div className="bg-white w-full h-[55px] justify-between items-center flex relative px-5 z-[999]">
           <Link href={"/admin"}>
             <Image
-              src={"/logo.png"}
+              src={"/logo.svg"}
               alt="logo"
               width={64}
               height={64}

diff --git a/src/app/(main)/auth/login/page.tsx b/src/app/(main)/auth/login/page.tsx
@@ -61,11 +61,11 @@ export default function Login() {
         />
         <div className="bg-primary-500 w-[48px] h-[45px] lg:w-[76.15px] lg:h-[71.31px] flex flex-col justify-center items-center rounded-xl drop-shadow-glow">
           <Image
-            src={"/logomin.svg"}
+            src={"/icon.svg"}
             width={55}
             height={57}
             alt="logo"
-            className="lg:w-[55px] lg:h-[57px] h-[26px] w-[25px]"
+            className="lg:w-[55px] lg:h-[57px] h-[26px] w-[25px] invert"
           />
         </div>
         <H1>

diff --git a/src/app/(main)/auth/register/page.tsx b/src/app/(main)/auth/register/page.tsx
@@ -46,11 +46,11 @@ export default function Register() {
         />
         <div className="bg-primary-500 w-[48px] h-[45px] lg:w-[76.15px] lg:h-[71.31px] flex flex-col justify-center items-center rounded-xl drop-shadow-glow">
           <Image
-            src={"/logomin.svg"}
+            src={"/icon.svg"}
             width={55}
             height={57}
             alt="logo"
-            className="lg:w-[55px] lg:h-[57px] h-[26px] w-[25px]"
+            className="lg:w-[55px] lg:h-[57px] h-[26px] w-[25px] invert"
           />
         </div>
         <H1>

diff --git a/src/app/(main)/auth/verify/page.tsx b/src/app/(main)/auth/verify/page.tsx
@@ -28,7 +28,7 @@ export default async function Verification({
   return (
     <div className="flex justify-center items-center text-center flex-col h-screen gap-5">
       <H1>Berhasil memverifikasi akun {session.user?.email}!</H1>
-      <SecondaryLinkButton href="/auth/login">Login</SecondaryLinkButton>
+      <SecondaryLinkButton href="/">Kembali</SecondaryLinkButton>
     </div>
   );
 }