From 68455db860250e60d10f747bb9ea28a5c6268291 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Mon, 13 Jan 2025 22:01:20 +0000
Subject: [PATCH] fix: main lint errors (#18634)

* fix: error-page.tsx related lint errors

* fix: lint no continue-on-error

* Adding more lint fixes

* Bring back annotate code linting results

* Bring back linting continue-on-error

* Slimline lint
---
 .github/workflows/lint.yml                        | 15 ++-------------
 .../app/apps/installation/[[...step]]/page.tsx    |  1 -
 apps/web/app/apps/installed/[category]/page.tsx   |  2 +-
 apps/web/components/error/error-page.tsx          |  8 +++++---
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f867ed6110..c6455afbbc 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,16 +12,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
-      - name: Run Linting with Reports
-        run: yarn lint:report
-        continue-on-error: true
-
-      - name: Merge lint reports
-        run: jq -s '[.[]]|flatten' lint-results/*.json &> lint-results/eslint_report.json
-
-      - name: Upload ESLint report
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: lint-results
-          path: lint-results
+      - name: Run Lint
+        run: yarn lint
diff --git a/apps/web/app/apps/installation/[[...step]]/page.tsx b/apps/web/app/apps/installation/[[...step]]/page.tsx
index 6b536803b6..f111376820 100644
--- a/apps/web/app/apps/installation/[[...step]]/page.tsx
+++ b/apps/web/app/apps/installation/[[...step]]/page.tsx
@@ -22,4 +22,3 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
 const getData = withAppDirSsr<OnboardingPageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData, Page });
-
diff --git a/apps/web/app/apps/installed/[category]/page.tsx b/apps/web/app/apps/installed/[category]/page.tsx
index 9eb1a77c8d..c8f14c3f40 100644
--- a/apps/web/app/apps/installed/[category]/page.tsx
+++ b/apps/web/app/apps/installed/[category]/page.tsx
@@ -1,4 +1,4 @@
-import { PageProps } from "app/_types";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 import { redirect } from "next/navigation";
diff --git a/apps/web/components/error/error-page.tsx b/apps/web/components/error/error-page.tsx
index b70086ca85..891e4cb815 100644
--- a/apps/web/components/error/error-page.tsx
+++ b/apps/web/components/error/error-page.tsx
@@ -59,10 +59,12 @@ export const ErrorPage: React.FC<Props> = (props) => {
       <div className="bg-subtle flex h-screen">
         <div className="rtl: bg-default m-auto rounded-md p-10 text-right ltr:text-left">
           <h1 className="font-cal text-emphasis text-6xl">{statusCode}</h1>
-          <h2 className="text-emphasis mt-6 max-w-2xl text-2xl font-medium">It's not you, it's us.</h2>
+          <h2 className="text-emphasis mt-6 max-w-2xl text-2xl font-medium">
+            It&apos;s not you, it&apos;s us.
+          </h2>
           <p className="text-default mb-6 mt-4 max-w-2xl text-sm">
-            Something went wrong on our end. Get in touch with our support team, and we'll get it fixed right
-            away for you.
+            Something went wrong on our end. Get in touch with our support team, and we&apos;ll get it fixed
+            right away for you.
           </p>
 
           <div className="mb-8 flex flex-col">