Skip to content

Commit

Permalink
fix: main lint errors (calcom#18634)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
emrysal authored Jan 13, 2025
1 parent 96ff88d commit 68455db
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 18 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion apps/web/app/apps/installation/[[...step]]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
const getData = withAppDirSsr<OnboardingPageProps>(getServerSideProps);

export default WithLayout({ getLayout: null, getData, Page });

2 changes: 1 addition & 1 deletion apps/web/app/apps/installed/[category]/page.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
8 changes: 5 additions & 3 deletions apps/web/components/error/error-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 68455db

Please sign in to comment.