Merge branch 'main' into develop

This commit is contained in:
Arthur Belleville 2025-07-13 23:14:29 +02:00
commit d2a5e4f5e5
No known key found for this signature in database
2 changed files with 4 additions and 7 deletions

View file

@ -1,6 +1,5 @@
import { twMerge } from "tailwind-merge";
import {
HelpCircleIcon,
SendIcon,
ChevronRightIcon,
ConstructionIcon,
@ -332,7 +331,7 @@ export function MainNavigation({ isCollapsed }: { isCollapsed: boolean }) {
isCollapsed ? "pl-2.5 pr-3" : ""
)}
>
<li>
{/* <li>
<NavLink isActive={location.pathname === "/support"}>
<RouterLink
to="/support"
@ -354,7 +353,7 @@ export function MainNavigation({ isCollapsed }: { isCollapsed: boolean }) {
</div>
</RouterLink>
</NavLink>
</li>
</li> */}
<li>
<NavLink isActive={location.pathname === "/feedback"}>
<RouterLink

View file

@ -12,10 +12,8 @@ enabled = true
[vars]
PYTHON_VERSION = "3.11.5"
[env.production.vars]
PYTHON_VERSION = "3.11.5"
[env.production]
route = { pattern = "app.xtablo.com", custom_domain = true }
[env.staging]
[env.staging]
route = { pattern = "app-staging.xtablo.com", custom_domain = true }