diff --git a/LICENSE.MD b/LICENSE.MD index 9c53a3bc0..9031c94b9 100644 --- a/LICENSE.MD +++ b/LICENSE.MD @@ -1,5 +1,7 @@ # License +## Core License (Apache License 2.0) + Copyright 2024 Mauricio Siu. Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,11 +15,12 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -## Appendix +## Additional Terms for Specific Features -In the event of a conflict, the provisions in this appendix shall take precedence over those in the Apache License. +The following additional terms apply to the multi-node support and Docker Compose file support features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License: -- **Modification Distribution:** Any modifications to the software must be distributed freely. -- **Future Paid Features:** Any future paid features of Dokploy cannot be sold or offered as a service by any party other than the copyright holder without prior written consent. +- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support and Docker Compose file support, will always be free to use in the self-hosted version. +- **Restriction on Resale**: The multi-node support and Docker Compose file support features cannot be sold or offered as a service by any party other than the copyright holder without prior written consent. +- **Modification Distribution**: Any modifications to the multi-node support and Docker Compose file support features must be distributed freely and cannot be sold or offered as a service. For further inquiries or permissions, please contact us directly. diff --git a/README-de.md b/README-de.md index 29f3482c4..2d6734062 100644 --- a/README-de.md +++ b/README-de.md @@ -41,6 +41,8 @@ Getestete Systems: - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## πŸ“„ Dokumentation diff --git a/README-ru.md b/README-ru.md index ac4ff6647..5f07d38d5 100644 --- a/README-ru.md +++ b/README-ru.md @@ -42,6 +42,8 @@ curl -sSL https://dokploy.com/install.sh | sh - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## πŸ“„ ДокумСнтация -Для ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎΠΉ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ посСтитС docs.dokploy.com/docs. \ No newline at end of file +Для ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎΠΉ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ посСтитС [docs.dokploy.com/docs](https://docs.dokploy.com). diff --git a/README-zh.md b/README-zh.md index 010ca799c..1832800c0 100644 --- a/README-zh.md +++ b/README-zh.md @@ -45,6 +45,8 @@ curl -sSL https://dokploy.com/install.sh | sh - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## πŸ“„ ζ–‡ζ‘£ diff --git a/README.md b/README.md index ff142f1e7..28c11f9ab 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ Tested Systems: - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## πŸ“„ Documentation diff --git a/components/dashboard/projects/show.tsx b/components/dashboard/projects/show.tsx index 4604f20b4..4aa721268 100644 --- a/components/dashboard/projects/show.tsx +++ b/components/dashboard/projects/show.tsx @@ -89,9 +89,9 @@ export const ShowProjects = () => {
- + {project.name} - +
diff --git a/components/dashboard/settings/appearance-form.tsx b/components/dashboard/settings/appearance-form.tsx index 6623e5a2f..75b5d0d99 100644 --- a/components/dashboard/settings/appearance-form.tsx +++ b/components/dashboard/settings/appearance-form.tsx @@ -25,7 +25,7 @@ import { } from "@/components/ui/card"; const appearanceFormSchema = z.object({ - theme: z.enum(["light", "dark"], { + theme: z.enum(["light", "dark", "system"], { required_error: "Please select a theme.", }), }); @@ -34,7 +34,7 @@ type AppearanceFormValues = z.infer; // This can come from your database or API. const defaultValues: Partial = { - theme: "light", + theme: "system", }; export function AppearanceForm() { @@ -46,7 +46,7 @@ export function AppearanceForm() { useEffect(() => { form.reset({ - theme: theme === "light" ? "light" : "dark", + theme: (theme ?? "system") as AppearanceFormValues["theme"], }); }, [form, theme]); function onSubmit(data: AppearanceFormValues) { @@ -81,28 +81,15 @@ export function AppearanceForm() { onValueChange={field.onChange} defaultValue={field.value} value={field.value} - className="grid max-w-md grid-cols-1 sm:grid-cols-2 gap-8 pt-2" + className="grid max-w-md md:max-w-lg grid-cols-1 sm:grid-cols-3 gap-8 pt-2" > -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ light
Light @@ -114,27 +101,30 @@ export function AppearanceForm() { -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ dark
Dark + + + + + +
+ system +
+ + System + + + ); diff --git a/components/dashboard/settings/profile/profile-form.tsx b/components/dashboard/settings/profile/profile-form.tsx index d79861174..ea227382c 100644 --- a/components/dashboard/settings/profile/profile-form.tsx +++ b/components/dashboard/settings/profile/profile-form.tsx @@ -147,11 +147,11 @@ export const ProfileForm = () => { }} defaultValue={field.value} value={field.value} - className="flex flex-row flex-wrap gap-2 max-xl:justify-cente" + className="flex flex-row flex-wrap gap-2 max-xl:justify-center" > {randomImages.map((image) => ( - + { key={image} src={image} alt="avatar" - className="h-12 w-12 rounded-full border transition-transform" + className="h-12 w-12 rounded-full border hover:p-px hover:border-primary transition-transform" /> diff --git a/components/layouts/settings-layout.tsx b/components/layouts/settings-layout.tsx index 8371814e3..b3bf93417 100644 --- a/components/layouts/settings-layout.tsx +++ b/components/layouts/settings-layout.tsx @@ -109,7 +109,6 @@ export const Nav = ({ links }: NavProps) => {