diff --git a/Dockerfile.devdoc b/Dockerfile.devdoc index 602f2172e..86778a847 100644 --- a/Dockerfile.devdoc +++ b/Dockerfile.devdoc @@ -25,6 +25,7 @@ RUN pnpm build FROM node:20.8.1-alpine WORKDIR /app COPY --from=base /app/src/apps/devdoc/.next ./.next +COPY --from=base /app/src/apps/devdoc/public ./public COPY --from=base /app/src/apps/devdoc/package.json ./package.json COPY --from=base /app/src/apps/devdoc/node_modules ./node_modules diff --git a/src/apps/devdoc/app/layout/theme.tsx b/src/apps/devdoc/app/layout/theme.tsx index 3bf4eeb7e..ba8f7ca3f 100644 --- a/src/apps/devdoc/app/layout/theme.tsx +++ b/src/apps/devdoc/app/layout/theme.tsx @@ -76,6 +76,20 @@ const Main = ({ children, pageOpts }: NextraThemeLayoutProps) => { {title} + + {activeThemeContext.layout !== 'raw' ? ( diff --git a/src/apps/devdoc/fonts/Familjen-Grotesk.css b/src/apps/devdoc/fonts/Familjen-Grotesk.css new file mode 100644 index 000000000..961b52c25 --- /dev/null +++ b/src/apps/devdoc/fonts/Familjen-Grotesk.css @@ -0,0 +1,33 @@ + + /* latin */ + @font-face { + font-family: 'Familjen Grotesk'; + font-style: normal; + font-weight: 400; + src: url("/fonts/familjen.woff2") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* latin */ + @font-face { + font-family: 'Familjen Grotesk'; + font-style: normal; + font-weight: 500; + src: url("/fonts/familjen.woff2") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* latin */ + @font-face { + font-family: 'Familjen Grotesk'; + font-style: normal; + font-weight: 600; + src: url("/fonts/familjen.woff2") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* latin */ + @font-face { + font-family: 'Familjen Grotesk'; + font-style: normal; + font-weight: 700; + src: url("/fonts/familjen.woff2") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } \ No newline at end of file diff --git a/src/apps/devdoc/fonts/Inter.css b/src/apps/devdoc/fonts/Inter.css new file mode 100644 index 000000000..4a36f9fa4 --- /dev/null +++ b/src/apps/devdoc/fonts/Inter.css @@ -0,0 +1,87 @@ +/* cyrillic-ext */ +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 200; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + + /* cyrillic-ext */ + @font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url(/fonts/inter-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } \ No newline at end of file diff --git a/src/apps/devdoc/public/cost-illustration.svg b/src/apps/devdoc/images/cost-illustration.svg similarity index 100% rename from src/apps/devdoc/public/cost-illustration.svg rename to src/apps/devdoc/images/cost-illustration.svg diff --git a/src/apps/devdoc/public/create-cluster.svg b/src/apps/devdoc/images/create-cluster.svg similarity index 100% rename from src/apps/devdoc/public/create-cluster.svg rename to src/apps/devdoc/images/create-cluster.svg diff --git a/src/apps/devdoc/public/devops/config-devops.svg b/src/apps/devdoc/images/devops/config-devops.svg similarity index 100% rename from src/apps/devdoc/public/devops/config-devops.svg rename to src/apps/devdoc/images/devops/config-devops.svg diff --git a/src/apps/devdoc/public/devops/cover-devops.svg b/src/apps/devdoc/images/devops/cover-devops.svg similarity index 100% rename from src/apps/devdoc/public/devops/cover-devops.svg rename to src/apps/devdoc/images/devops/cover-devops.svg diff --git a/src/apps/devdoc/public/devops/create-project-devops.svg b/src/apps/devdoc/images/devops/create-project-devops.svg similarity index 100% rename from src/apps/devdoc/public/devops/create-project-devops.svg rename to src/apps/devdoc/images/devops/create-project-devops.svg diff --git a/src/apps/devdoc/public/devops/deploy-devops.svg b/src/apps/devdoc/images/devops/deploy-devops.svg similarity index 100% rename from src/apps/devdoc/public/devops/deploy-devops.svg rename to src/apps/devdoc/images/devops/deploy-devops.svg diff --git a/src/apps/devdoc/public/devops/setup-devops.svg b/src/apps/devdoc/images/devops/setup-devops.svg similarity index 100% rename from src/apps/devdoc/public/devops/setup-devops.svg rename to src/apps/devdoc/images/devops/setup-devops.svg diff --git a/src/apps/devdoc/public/distribution/build-distribution.svg b/src/apps/devdoc/images/distribution/build-distribution.svg similarity index 100% rename from src/apps/devdoc/public/distribution/build-distribution.svg rename to src/apps/devdoc/images/distribution/build-distribution.svg diff --git a/src/apps/devdoc/public/distribution/create-distribution.svg b/src/apps/devdoc/images/distribution/create-distribution.svg similarity index 100% rename from src/apps/devdoc/public/distribution/create-distribution.svg rename to src/apps/devdoc/images/distribution/create-distribution.svg diff --git a/src/apps/devdoc/public/distribution/distribute-distribution.svg b/src/apps/devdoc/images/distribution/distribute-distribution.svg similarity index 100% rename from src/apps/devdoc/public/distribution/distribute-distribution.svg rename to src/apps/devdoc/images/distribution/distribute-distribution.svg diff --git a/src/apps/devdoc/public/distribution/distribution-cover.svg b/src/apps/devdoc/images/distribution/distribution-cover.svg similarity index 100% rename from src/apps/devdoc/public/distribution/distribution-cover.svg rename to src/apps/devdoc/images/distribution/distribution-cover.svg diff --git a/src/apps/devdoc/public/embedded-data.svg b/src/apps/devdoc/images/embedded-data.svg similarity index 100% rename from src/apps/devdoc/public/embedded-data.svg rename to src/apps/devdoc/images/embedded-data.svg diff --git a/src/apps/devdoc/public/faster-dev.svg b/src/apps/devdoc/images/faster-dev.svg similarity index 100% rename from src/apps/devdoc/public/faster-dev.svg rename to src/apps/devdoc/images/faster-dev.svg diff --git a/src/apps/devdoc/public/flexible-illustration.svg b/src/apps/devdoc/images/flexible-illustration.svg similarity index 100% rename from src/apps/devdoc/public/flexible-illustration.svg rename to src/apps/devdoc/images/flexible-illustration.svg diff --git a/src/apps/devdoc/public/illustraion.png b/src/apps/devdoc/images/illustraion.png similarity index 100% rename from src/apps/devdoc/public/illustraion.png rename to src/apps/devdoc/images/illustraion.png diff --git a/src/apps/devdoc/public/illustraion.svg b/src/apps/devdoc/images/illustraion.svg similarity index 100% rename from src/apps/devdoc/public/illustraion.svg rename to src/apps/devdoc/images/illustraion.svg diff --git a/src/apps/devdoc/public/illustraion1.svg b/src/apps/devdoc/images/illustraion1.svg similarity index 100% rename from src/apps/devdoc/public/illustraion1.svg rename to src/apps/devdoc/images/illustraion1.svg diff --git a/src/apps/devdoc/public/nodepool-simple-to-use.svg b/src/apps/devdoc/images/nodepool-simple-to-use.svg similarity index 100% rename from src/apps/devdoc/public/nodepool-simple-to-use.svg rename to src/apps/devdoc/images/nodepool-simple-to-use.svg diff --git a/src/apps/devdoc/public/seamless-dev.svg b/src/apps/devdoc/images/seamless-dev.svg similarity index 100% rename from src/apps/devdoc/public/seamless-dev.svg rename to src/apps/devdoc/images/seamless-dev.svg diff --git a/src/apps/devdoc/public/trouble-free.svg b/src/apps/devdoc/images/trouble-free.svg similarity index 100% rename from src/apps/devdoc/public/trouble-free.svg rename to src/apps/devdoc/images/trouble-free.svg diff --git a/src/apps/devdoc/pages/_app.tsx b/src/apps/devdoc/pages/_app.tsx index 29ad97a17..bb4e45476 100644 --- a/src/apps/devdoc/pages/_app.tsx +++ b/src/apps/devdoc/pages/_app.tsx @@ -8,6 +8,10 @@ import { SearchProvider } from '~/app/utils/use-search'; export default function MyApp({ Component, pageProps }: AppProps) { return ( +
diff --git a/src/apps/devdoc/pages/devops-design.mdx b/src/apps/devdoc/pages/devops-design.mdx index bf9332754..f4b8b6eec 100644 --- a/src/apps/devdoc/pages/devops-design.mdx +++ b/src/apps/devdoc/pages/devops-design.mdx @@ -3,17 +3,17 @@ import Container from '~/app/components/container'; import HorizontalTopTabDevops from '~/app/components/website/horizontal-top-tab-devops'; import Discover from '~/app/components/website/discover-component'; import ReadyToOps from '~/app/components/website/ready-to-ops'; -import EmbeddedData from '../public/embedded-data.svg'; -import TroubleFree from '../public/trouble-free.svg'; -import SeamlessDev from '../public/seamless-dev.svg'; -import FasterDev from '../public/faster-dev.svg'; -import ConfigDevops from '../public/devops/config-devops.svg'; -import CreateDevops from '../public/devops/create-project-devops.svg'; -import DeployDevops from '../public/devops/deploy-devops.svg'; -import SetupDevops from '../public/devops/setup-devops.svg'; +import EmbeddedData from '../images/embedded-data.svg'; +import TroubleFree from '../images/trouble-free.svg'; +import SeamlessDev from '../images/seamless-dev.svg'; +import FasterDev from '../images/faster-dev.svg'; +import ConfigDevops from '../images/devops/config-devops.svg'; +import CreateDevops from '../images/devops/create-project-devops.svg'; +import DeployDevops from '../images/devops/deploy-devops.svg'; +import SetupDevops from '../images/devops/setup-devops.svg'; import GetStarted from '~/app/components/website/get-started'; import SuccessStories from '~/app/components/website/success-stories'; -import Cover from '../public/devops/cover-devops.svg'; +import Cover from '../images/devops/cover-devops.svg'; import { successStories, } from '~/app/utils/dummy-data'; diff --git a/src/apps/devdoc/pages/distribution-design.mdx b/src/apps/devdoc/pages/distribution-design.mdx index aee640e66..a4dee50ad 100644 --- a/src/apps/devdoc/pages/distribution-design.mdx +++ b/src/apps/devdoc/pages/distribution-design.mdx @@ -2,10 +2,10 @@ import { useState } from 'react'; import Container from '~/app/components/container'; import Discover from '~/app/components/website/discover-component'; import ReadyToOps from '~/app/components/website/ready-to-ops'; -import DistributeDis from '../public/distribution/distribute-distribution.svg'; -import CreateDis from '../public/distribution/create-distribution.svg'; -import BuildDis from '../public/distribution/build-distribution.svg'; -import Cover from '../public/distribution/distribution-cover.svg'; +import DistributeDis from '../images/distribution/distribute-distribution.svg'; +import CreateDis from '../images/distribution/create-distribution.svg'; +import BuildDis from '../images/distribution/build-distribution.svg'; +import Cover from '../images/distribution/distribution-cover.svg'; import GetStarted from '~/app/components/website/get-started'; import SuccessStories from '~/app/components/website/success-stories'; import { Button } from 'kl-design-system/atoms/button'; diff --git a/src/apps/devdoc/pages/index.mdx b/src/apps/devdoc/pages/index.mdx index 8e3371940..c1dd8d519 100644 --- a/src/apps/devdoc/pages/index.mdx +++ b/src/apps/devdoc/pages/index.mdx @@ -10,7 +10,7 @@ import ProgressTracker from "~/app/components/progress-tracker" import {Graph, GraphItem} from "~/app/components/graph" import ReadyTo from "~/app/components/website/ready-to" -import Illustration from "../public/illustraion1.svg" +import Illustration from "../images/illustraion1.svg" import { cn } from '~/app/utils/commons'; @@ -20,19 +20,22 @@ export const suites = [ title: "DevOps", desc: "Self-Serve environments crafted for development, staging and production workloads", img: , - imgPad: "px-[74px] py-[22px] md:px-[10px] xl:px-[74px] xl:py-[22px]" + imgPad: "px-[74px] py-[22px] md:px-[10px] xl:px-[74px] xl:py-[22px]", + to:"devops-design" }, { title: "InfraOps", desc: "Flexible & Cost Effective Kubernetes Cluster Management at your fingertips", imgPad: "px-[45px] py-[42px]", - img: + img: , + to:"infraops-design" }, { title: "Distribution", desc: "Cloud accelerated build system and container registry to build and ship containers anywhere", imgPad: "px-[76px] py-[22px]", - img: + img: , + to:"distribution-design" }, ] @@ -207,8 +210,8 @@ export const ChangeLogCard = () => { } -export const SuiteCard = ({ title, img, imgPad, desc }) => { - return
+export const SuiteCard = ({ title, img, imgPad, desc, to }) => { + return {img} @@ -216,7 +219,7 @@ export const SuiteCard = ({ title, img, imgPad, desc }) => { {title} {desc}
-
+ } export const Main = () => { diff --git a/src/apps/devdoc/pages/infraops-design.mdx b/src/apps/devdoc/pages/infraops-design.mdx index 0bdd8f873..94598beae 100644 --- a/src/apps/devdoc/pages/infraops-design.mdx +++ b/src/apps/devdoc/pages/infraops-design.mdx @@ -11,9 +11,9 @@ import Discover from '~/app/components/website/discover-component'; import GetStarted from '~/app/components/website/get-started'; import ReadyToOps from '~/app/components/website/ready-to-ops'; import SuccessStories from '~/app/components/website/success-stories'; -import NodePoolImg from '../public/nodepool-simple-to-use.svg'; -import FlexibleImage from '../public/flexible-illustration.svg'; -import CostIllustration from '../public/cost-illustration.svg'; +import NodePoolImg from '../images/nodepool-simple-to-use.svg'; +import FlexibleImage from '../images/flexible-illustration.svg'; +import CostIllustration from '../images/cost-illustration.svg'; import { successStories, } from '~/app/utils/dummy-data'; diff --git a/src/apps/devdoc/public/fonts/familjen.woff2 b/src/apps/devdoc/public/fonts/familjen.woff2 new file mode 100644 index 000000000..01623feb0 Binary files /dev/null and b/src/apps/devdoc/public/fonts/familjen.woff2 differ diff --git a/src/apps/devdoc/public/fonts/inter-cyrillic-ext.woff2 b/src/apps/devdoc/public/fonts/inter-cyrillic-ext.woff2 new file mode 100644 index 000000000..3c039fcc6 Binary files /dev/null and b/src/apps/devdoc/public/fonts/inter-cyrillic-ext.woff2 differ diff --git a/src/apps/devdoc/style.css b/src/apps/devdoc/style.css index 2ae6314a9..97d8ed5bf 100644 --- a/src/apps/devdoc/style.css +++ b/src/apps/devdoc/style.css @@ -1,5 +1,5 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Familjen+Grotesk:ital,wght@0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap'); +@import url('./fonts/Familjen-Grotesk.css'); +@import url('./fonts/Inter.css'); @tailwind base; @tailwind components; @@ -204,7 +204,7 @@ code{ content: ''; position: absolute; top: 50%; - background-image: url("strike.svg"); + background-image: url("/strike.svg"); height: 100%; background-repeat: no-repeat; width: 110%; @@ -237,21 +237,26 @@ code{ } .infraops-cover-graph{ - background-image: url("infraops/graph.svg"); + background-image: url("/infraops/graph.svg"); background-position: center; } .distribution-cover-graph{ - background-image: url("distribution/distribution-graph.svg"); + background-image: url("/distribution/distribution-graph.svg"); background-position: center; } .help-card-graph{ - background-image: url("help-and-support/card-graph.svg"); + background-image: url("/help-and-support/card-graph.svg"); background-position: right top; background-repeat: no-repeat; } .shadow-filter{ filter: drop-shadow(0px 2px 16px rgba(33, 43, 54, 0.08)) drop-shadow(0px 0px 0px rgba(6, 44, 82, 0.10)); + } + + + .loading-overlay{ + display: none !important; } \ No newline at end of file diff --git a/src/apps/devdoc/tsconfig.json b/src/apps/devdoc/tsconfig.json index 247c981ea..378a77c5f 100644 --- a/src/apps/devdoc/tsconfig.json +++ b/src/apps/devdoc/tsconfig.json @@ -45,6 +45,5 @@ }, "exclude": [ "node_modules/**/*", - "public" ] }