diff --git a/frontend/src/components/layout/RightColumn/RightColumn.scss b/frontend/src/components/layout/RightColumn/RightColumn.scss deleted file mode 100644 index bd5bdaf..0000000 --- a/frontend/src/components/layout/RightColumn/RightColumn.scss +++ /dev/null @@ -1,11 +0,0 @@ -@use '../../../tailwind-values.scss' as tailwind; - -.right-column-wrapper { - height: calc(100vh - 20px); -} - -@media (max-width: tailwind.$xl-breakpoint) { - .right-column-wrapper { - height: calc(100vh - 3.9rem); - } -} diff --git a/frontend/src/components/layout/RightColumn/RightColumn.tsx b/frontend/src/components/layout/RightColumn/RightColumn.tsx index 23b8b1a..9acbe9a 100644 --- a/frontend/src/components/layout/RightColumn/RightColumn.tsx +++ b/frontend/src/components/layout/RightColumn/RightColumn.tsx @@ -1,7 +1,6 @@ -import { component$, useStylesScoped$ } from '@builder.io/qwik' +import { component$ } from '@builder.io/qwik' import { Link, useLocation } from '@builder.io/qwik-city' import { WildebeestLogo } from '~/components/MastodonLogo' -import styles from './RightColumn.scss?inline' type LinkConfig = { iconName: string @@ -11,7 +10,6 @@ type LinkConfig = { } export default component$(() => { - useStylesScoped$(styles) const location = useLocation() const renderNavLink = ({ iconName, linkText, linkTarget, linkActiveRegex }: LinkConfig) => { @@ -40,8 +38,8 @@ export default component$(() => { const aboutLink = { iconName: 'fa-ellipsis', linkText: 'About', linkTarget: '/about', linkActiveRegex: /^\/about/ } return ( -
-
+
+
)} -
+
{showHeaderAndColumns && ( {showHeaderAndColumns && ( -
-
+
+
)}
+ ) }) diff --git a/frontend/src/utils/getCommitHash.ts b/frontend/src/utils/getCommitHash.ts new file mode 100644 index 0000000..8e35c3e --- /dev/null +++ b/frontend/src/utils/getCommitHash.ts @@ -0,0 +1,7 @@ +declare const COMMIT_INFO: { + hash: string +} + +export function getCommitHash(): string { + return COMMIT_INFO.hash +} diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 3bee198..3676a99 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -2,9 +2,15 @@ import { defineConfig } from 'vite' import { qwikVite } from '@builder.io/qwik/optimizer' import { qwikCity } from '@builder.io/qwik-city/vite' import tsconfigPaths from 'vite-tsconfig-paths' +import { execSync } from 'child_process' + +const commitHash = execSync('git rev-parse --short HEAD').toString().replace(/\n/g, '') export default defineConfig(() => { return { + define: { + COMMIT_INFO: JSON.stringify({ hash: commitHash }), + }, plugins: [ qwikCity({ trailingSlash: false,