gsadmin/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-10-15 13:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts in drizzle migrations

Browse Source
This commit is contained in:
Yash Kumar
2026-09-08 17:06:17 +05:30
parent 6ed5746983 1e6ab0fab7
commit caca3c19ae
15 changed files with 9284 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dokploy/components/dashboard/application/domains/handle-domain.tsx
+12 -7
View File
@@ -156,7 +156,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
domainId,
},
{
enabled: !!domainId,
enabled: isOpen && !!domainId,
},
);
@@ -167,7 +167,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
applicationId: id,
},
{
enabled: !!id,
enabled: isOpen && !!id,
},
)
: api.compose.one.useQuery(
@@ -175,7 +175,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
composeId: id,
},
{
enabled: !!id,
enabled: isOpen && !!id,
},
);
@@ -187,9 +187,14 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
api.domain.generateDomain.useMutation();
const { data: canGenerateTraefikMeDomains } =
api.domain.canGenerateTraefikMeDomains.useQuery({
serverId: application?.serverId || "",
});
api.domain.canGenerateTraefikMeDomains.useQuery(
{
serverId: application?.serverId || "",
},
{
enabled: isOpen,
},
);
const {
data: services,
@@ -204,7 +209,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
{
retry: false,
refetchOnWindowFocus: false,
enabled: type === "compose" && !!id,
enabled: isOpen && type === "compose" && !!id,
},
);
apps/dokploy/components/dashboard/billing/trial-banner.tsx
+34
View File
@@ -0,0 +1,34 @@
import { Rocket } from "lucide-react";
import { useRouter } from "next/router";
import { Button } from "@/components/ui/button";
import { api } from "@/utils/api";
export const TrialBanner = () => {
const router = useRouter();
const { data: billingStatus } = api.stripe.getBillingStatus.useQuery();
if (!billingStatus?.isOnTrial) {
return null;
}
const daysRemaining = billingStatus.trialDaysRemaining ?? 0;
return (
<div className="sticky top-0 z-20 mx-4 mt-4 flex flex-wrap items-center justify-center gap-x-3 gap-y-2 rounded-lg border border-primary/20 bg-primary/10 px-4 py-2 text-sm">
<span className="flex items-center gap-2">
<Rocket className="h-4 w-4 text-primary shrink-0" />
{daysRemaining > 0
? `You have ${daysRemaining} day${daysRemaining === 1 ? "" : "s"} left in your free trial.`
: "Your free trial ends today."}
</span>
<Button
size="sm"
variant="default"
className="h-7"
onClick={() => router.push("/dashboard/settings/billing")}
>
Upgrade now
</Button>
</div>
);
};
apps/dokploy/components/dashboard/onboarding/steps/plan-step.tsx
+3 -3
View File
@@ -97,7 +97,7 @@ export const PlanStep = ({ onNext }: Props) => {
</p>
<ul className="flex flex-col gap-1.5 mt-4">
{[
"1 server included",
"Setup 1 server",
"Unlimited apps & databases",
"Community support",
].map((f) => (
@@ -140,7 +140,7 @@ export const PlanStep = ({ onNext }: Props) => {
</p>
<ul className="flex flex-col gap-1.5 mt-4">
{[
"1 server included",
"Setup 1 server",
"Unlimited apps & databases",
"2 environments",
"Community support",
@@ -183,7 +183,7 @@ export const PlanStep = ({ onNext }: Props) => {
</p>
<ul className="flex flex-col gap-1.5 mt-4">
{[
`${STARTUP_SERVERS_INCLUDED} servers included`,
`Setup up to ${STARTUP_SERVERS_INCLUDED} servers`,
"Unlimited users & environments",
"Basic RBAC + 2FA",
"Email & chat support",
apps/dokploy/components/dashboard/settings/billing/show-billing.tsx
+3 -3
View File
@@ -333,7 +333,7 @@ export const ShowBilling = () => {
</span>
<ul className="flex flex-col gap-1 mt-1">
{[
"1 server included",
"Setup 1 server",
"Unlimited apps & databases",
"Community support",
].map((feature) => (
@@ -917,7 +917,7 @@ export const ShowBilling = () => {
"Unlimited Deployments",
"Unlimited Databases",
"Unlimited Applications",
"1 Server Included",
"Setup 1 Server",
"1 Organization",
"1 User",
"2 Environments",
@@ -1049,7 +1049,7 @@ export const ShowBilling = () => {
All the features of Hobby, plus…
</li>
{[
"3 Servers Included",
"Setup up to 3 Servers",
"3 Organizations",
"Unlimited Users",
"Unlimited Environments",
apps/dokploy/components/layouts/side.tsx
+2
View File
@@ -101,6 +101,7 @@ import { authClient } from "@/lib/auth-client";
import { cn } from "@/lib/utils";
import type { AppRouter } from "@/server/api/root";
import { api } from "@/utils/api";
import { TrialBanner } from "../dashboard/billing/trial-banner";
import { AddOrganization } from "../dashboard/organization/handle-organization";
import { DialogAction } from "../shared/dialog-action";
import { Logo } from "../shared/logo";
@@ -1229,6 +1230,7 @@ export default function Page({ children }: Props) {
<SidebarRail />
</Sidebar>
<SidebarInset>
{isCloud === true && <TrialBanner />}
{!includesProjects && (
<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12">
<div className="flex items-center justify-between w-full px-4">
apps/dokploy/components/proprietary/sso/register-oidc-dialog.tsx
+7 -3
View File
@@ -83,6 +83,11 @@ const azureMapping: ClaimMapping = {
image: "",
};
// id: "sub",
// email: "preferred_username",
// emailVerified: "email_verified",
// name: "name",
const genericMapping: ClaimMapping = {
id: "sub",
email: "email",
@@ -228,10 +233,9 @@ export function RegisterOidcDialog({
mapping: {
id: oidc?.mapping?.id ?? baseMapping.id,
email: oidc?.mapping?.email ?? baseMapping.email,
emailVerified:
oidc?.mapping?.emailVerified ?? baseMapping.emailVerified,
emailVerified: oidc?.mapping?.emailVerified ?? "",
name: oidc?.mapping?.name ?? baseMapping.name,
image: oidc?.mapping?.image ?? baseMapping.image,
image: oidc?.mapping?.image ?? "",
},
});
}, [data, open, form]);
apps/dokploy/drizzle/0194_acoustic_prima.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE "sso_provider" ADD COLUMN "domain_verified" boolean DEFAULT true NOT NULL;
apps/dokploy/drizzle/0194_freezing_skin.sql → apps/dokploy/drizzle/0195_classy_whirlwind.sql
View File
apps/dokploy/drizzle/meta/0194_snapshot.json
+9 -2
View File
@@ -1,5 +1,5 @@
{
"id": "146ed901-5901-42e6-ae26-516d5909ddc6",
"id": "72de05be-6787-4fd9-8146-68e5902357a7",
"prevId": "68c11a1a-d7e0-475f-868f-f3a098d942a7",
"version": "7",
"dialect": "postgresql",
@@ -7983,6 +7983,13 @@
"primaryKey": false,
"notNull": true
},
"domain_verified": {
"name": "domain_verified",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
@@ -8803,7 +8810,7 @@
"type": "jsonb",
"primaryKey": false,
"notNull": false,
"default": "'{\"appName\":null,\"appDescription\":null,\"logoUrl\":null,\"faviconUrl\":null,\"customCss\":null,\"loginLogoUrl\":null,\"supportUrl\":null,\"docsUrl\":null,\"errorPageTitle\":null,\"errorPageDescription\":null,\"footerText\":null,\"ogImageUrl\":null}'::jsonb"
"default": "'{\"appName\":null,\"appDescription\":null,\"logoUrl\":null,\"faviconUrl\":null,\"customCss\":null,\"loginLogoUrl\":null,\"supportUrl\":null,\"docsUrl\":null,\"errorPageTitle\":null,\"errorPageDescription\":null,\"metaTitle\":null,\"footerText\":null}'::jsonb"
},
"remoteServersOnly": {
"name": "remoteServersOnly",
apps/dokploy/drizzle/meta/0195_snapshot.json
+9163
View File
File diff suppressed because it is too large Load Diff
apps/dokploy/drizzle/meta/_journal.json
+9 -2
View File
@@ -1363,8 +1363,15 @@
{
"idx": 194,
"version": "7",
"when": 1788849747825,
"tag": "0194_freezing_skin",
"when": 1788858506799,
"tag": "0194_acoustic_prima",
"breakpoints": true
},
{
"idx": 195,
"version": "7",
"when": 1788867370653,
"tag": "0195_classy_whirlwind",
"breakpoints": true
}
]
apps/dokploy/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "dokploy",
"version": "v0.30.5",
"version": "v0.30.6",
"private": true,
"license": "Apache-2.0",
"type": "module",