From 1ad1964a06d038d62b6ba694cb1fbd1bcbafaf15 Mon Sep 17 00:00:00 2001 From: Alex Vanderbist Date: Tue, 19 Sep 2023 16:57:16 +0200 Subject: [PATCH] Squashed commit of the following: commit 41c51304195ba6a9af46659899024eb6eae9987e Author: Alex Vanderbist Date: Tue Sep 19 16:55:16 2023 +0200 Tweak stacktrace background gradient commit 0be058c410d1b30bae467c83538d1c467865a531 Author: Alex Vanderbist Date: Mon Sep 18 17:51:15 2023 +0200 Update shared errors docs link commit 32aace41de7accb1bf60f9b58b3302ae0a6f8d53 Author: Alex Vanderbist Date: Mon Sep 18 14:54:15 2023 +0200 Add footer commit 066e9a220b3fd65f6692081837baab7b576b520f Author: Alex Vanderbist Date: Fri Sep 15 20:30:18 2023 +0200 Open docs and links in new tabs commit 3669b45ba945a2c21dfacfa470ef98f57fb954c0 Author: Alex Vanderbist Date: Fri Sep 15 19:19:24 2023 +0200 Use container queries commit e761db2c02b49de67cc1df22c1bea4e68215ba11 Author: Alex Vanderbist Date: Fri Sep 15 19:12:18 2023 +0200 Update icon commit 315a160104632264ef6147510b4fade04cb0e271 Author: Alex Vanderbist Date: Fri Sep 15 15:04:38 2023 +0200 Fix type error when missing editor options commit b8d35babdbda57f8a645e10cb3f3e31ee7ba4e42 Author: Alex Vanderbist Date: Fri Sep 15 15:04:27 2023 +0200 Remove obsolete TailwindCSS plugins commit 8604821f86d364f75074979f6373af1bc5880128 Author: Alex Vanderbist Date: Fri Sep 15 15:04:12 2023 +0200 Fix spacing on important navbar items commit 50c100245c5a1c8cd4d800f712703b9a467cf927 Author: Alex Vanderbist Date: Fri Sep 15 15:03:51 2023 +0200 Move share icon right commit 042293257d8829bd986dad7a7007f2d052a47eb1 Author: Alex Vanderbist Date: Thu Aug 10 16:08:53 2023 +0200 Test navbar links commit fad23db7907a7d22af4f7a51e8b66617fed5c238 Author: Alex Vanderbist Date: Thu Aug 10 16:07:45 2023 +0200 Add footer --- package.json | 2 +- resources/css/utilities/theme.css | 7 ++ resources/js/Ignition.tsx | 15 ++++- resources/js/components/AppDebugWarning.tsx | 1 - resources/js/components/FlareFooter.tsx | 69 ++++++++++++++++++++ resources/js/components/NavBar.tsx | 16 ++++- resources/js/components/NavBarItem.tsx | 1 + resources/js/components/SettingsDropdown.tsx | 3 +- resources/js/components/ShareDropdown.tsx | 6 +- tailwind.config.js | 5 ++ 10 files changed, 113 insertions(+), 12 deletions(-) create mode 100644 resources/js/components/FlareFooter.tsx diff --git a/package.json b/package.json index 201ff1e8..73bc5a97 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "typecheck": "tsc -w --preserveWatchOutput" }, "dependencies": { - "@flareapp/ignition-ui": "^4.9.1", + "@flareapp/ignition-ui": "^4.9.4", "@fortawesome/fontawesome-common-types": "^6.1.1", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-brands-svg-icons": "^6.1.1", diff --git a/resources/css/utilities/theme.css b/resources/css/utilities/theme.css index 5333309a..3f7c212f 100644 --- a/resources/css/utilities/theme.css +++ b/resources/css/utilities/theme.css @@ -162,6 +162,13 @@ @apply dark:border-gray-500/20; } +@layer utilities { + .\~border-violet-500 { + @apply border-violet-500; + @apply dark:border-violet-400/70; + } +} + .\~border-b-dropdown { @apply border-b-white !important; @apply dark:border-b-gray-700 !important; diff --git a/resources/js/Ignition.tsx b/resources/js/Ignition.tsx index ef09be2f..d8094d68 100644 --- a/resources/js/Ignition.tsx +++ b/resources/js/Ignition.tsx @@ -17,14 +17,21 @@ import { import {IgniteData} from './types'; import {useInView} from 'react-intersection-observer'; import AppDebugWarning from 'components/AppDebugWarning'; +import FlareFooter from "components/FlareFooter"; type Props = { errorOccurrence: ErrorOccurrence; igniteData: IgniteData; }; -export default function Ignition({errorOccurrence, igniteData}: Props) { - const {ref: intersectionRef, inView: errorCardInView} = useInView({ +export default function Ignition({ + errorOccurrence, + igniteData +}: Props) { + const { + ref: intersectionRef, + inView: errorCardInView + } = useInView({ rootMargin: '-40px 0px 0px 0px', threshold: 0.3, initialInView: true, @@ -38,7 +45,7 @@ export default function Ignition({errorOccurrence, igniteData}: Props) {
@@ -51,6 +58,8 @@ export default function Ignition({errorOccurrence, igniteData}: Props) {
}/> {hasDebugInfo(errorOccurrence) &&
}/>} + +
}/>
diff --git a/resources/js/components/AppDebugWarning.tsx b/resources/js/components/AppDebugWarning.tsx index be70faf4..84ff6e85 100644 --- a/resources/js/components/AppDebugWarning.tsx +++ b/resources/js/components/AppDebugWarning.tsx @@ -30,7 +30,6 @@ export default function AppDebugWarning() { diff --git a/resources/js/components/FlareFooter.tsx b/resources/js/components/FlareFooter.tsx new file mode 100644 index 00000000..df4aa593 --- /dev/null +++ b/resources/js/components/FlareFooter.tsx @@ -0,0 +1,69 @@ +import { FlareIcon } from '@flareapp/ignition-ui'; +import React from 'react'; + +export default function FlareFooter() { + return ( + + ) +} diff --git a/resources/js/components/NavBar.tsx b/resources/js/components/NavBar.tsx index 484d6131..a28f8bc4 100644 --- a/resources/js/components/NavBar.tsx +++ b/resources/js/components/NavBar.tsx @@ -104,6 +104,18 @@ export default function NavBar({ showException }: Props) { /> )} + + + + + + } + /> + +
    {ignitionConfig.enableShareButton && ( )} -
-