Merge pull request #211 from steedos/master

网站修改同步到beta

.gitignore

@@ -36,5 +36,3 @@ yarn-error.log*
 .serverless
 
 public/sitemap-0.xml
-# Sentry
-.sentryclirc

Dockerfile

@@ -23,9 +23,6 @@ COPY ./next-sitemap.js /app
 COPY ./package.json /app
 COPY ./postcss.config.js /app
 COPY ./prettier.config.js /app
-COPY ./sentry.client.config.js /app
-COPY ./sentry.properties /app
-COPY ./sentry.server.config.js /app
 COPY ./redirects.json /app
 COPY ./tailwind.config.js /app
 COPY ./tsconfig.json /app

deployment-k8s.yaml

@@ -26,7 +26,7 @@ spec:
       # imagePullSecrets:
       #   - name: steedos-account
       containers:
-        - image: ecr.aws.steedos.cn/ivscode/steedos/steedos.com:latest
+        - image: steedos/steedos.com:latest
           imagePullPolicy: Always
           name: steedos-com
           command: ["/bin/sh", "-c", " echo $(date +%T) && yarn start"]

next.config.js

@@ -5,7 +5,6 @@ const withSmartQuotes = require('@silvenon/remark-smartypants')
 const { withTableOfContents } = require('./remark/withTableOfContents')
 const { withSyntaxHighlighting } = require('./remark/withSyntaxHighlighting')
 const { withLinkRoles } = require('./rehype/withLinkRoles')
-// const { withSentryConfig } = require('@sentry/nextjs');
 const minimatch = require('minimatch')
 
 
@@ -290,21 +289,4 @@ const moduleExports =
   },
 });
 
-
-
-// const sentryWebpackPluginOptions = {
-//   // Additional config options for the Sentry Webpack plugin. Keep in mind that
-//   // the following options are set automatically, and overriding them is not
-//   // recommended:
-//   //   release, url, org, project, authToken, configFile, stripPrefix,
-//   //   urlPrefix, include, ignore
-
-//   silent: true, // Suppresses all logs
-//   // For all available options, see:
-//   // https://github.com/getsentry/sentry-webpack-plugin#options.
-// };
-
-// // Make sure adding Sentry options is the last code to run before exporting, to
-// // ensure that your source maps include changes from all other Webpack plugins
-// module.exports = withSentryConfig(moduleExports, sentryWebpackPluginOptions);
 module.exports = moduleExports

package.json

@@ -28,7 +28,6 @@
     "@next/mdx": "^10.0.1",
     "@pondorasti/remark-img-links": "^1.0.8",
     "@reach/rect": "^0.10.5",
-    "@sentry/nextjs": "^7.10.0",
     "@silvenon/remark-smartypants": "^1.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "@sls-next/cdk-construct": "3.7.0",
@@ -83,7 +82,6 @@
     "next-seo": "^4.26.0",
     "next-sitemap": "^2.5.20",
     "next-transpile-modules": "^8.0.0",
-    "next-use-posthog": "^1.16.0",
     "node-loader": "^2.0.0",
     "photoswipe": "^4.1.3",
     "pnpapi": "^0.0.0",

redirects.json

@@ -1,6 +1,6 @@
 [
-  { "source": "/docs", "destination": "https://docs.steedos.cn/zh-CN/", "permanent": true },
-  { "source": "/docs/:slug*", "destination": "https://docs.steedos.cn/zh-CN/", "permanent": true },
+  { "source": "/docs", "destination": "https://docs.steedos.com/zh-CN/getting-started/", "permanent": true },
+  { "source": "/docs/:slug*", "destination": "https://docs.steedos.com/zh-CN/getting-started/", "permanent": true },
   { "source": "/cn", "destination": "https://www.steedos.cn/", "permanent": true },
   { "source": "/cn/", "destination": "https://www.steedos.cn/", "permanent": true },
   { "source": "/platform", "destination": "/", "permanent": true },

src/components/FloatingMenu.js

@@ -4,34 +4,50 @@ import React from 'react';
 export const FloatingMenu = function () {
   return (
     <div class="hidden md:flex md:fixed md:top-1/2 md:right-4 md:transform md:-translate-y-1/2 bg-white p-4 rounded-full shadow-lg z-10 flex-col items-center space-y-2">
-      <a href="https://sp0dtpsxxk.jiandaoyun.com/f/660a2de0b0a76aafa09bde68" target='_blank' class="flex flex-col items-center px-4 py-2 text-gray-800 text-sm hover:bg-blue-100 w-full rounded-lg">
+      {/* <a href="https://sp0dtpsxxk.jiandaoyun.com/f/660a2de0b0a76aafa09bde68" target='_blank' class="flex flex-col items-center px-4 py-2 text-gray-800 text-sm hover:bg-blue-100 w-full rounded-lg">
         <img src="/img/demo.png" alt="预约演示" class="mb-2 h-6 w-6"/>
         预约演示
-      </a>
-      <a href="https://sp0dtpsxxk.jiandaoyun.com/f/660a2de0b0a76aafa09bde68" target='_blank' class="flex flex-col items-center px-4 py-2 text-gray-800 text-sm hover:bg-blue-100 w-full rounded-lg">
-        <img src="/img/online_consultation.png" alt="在线咨询" class="mb-2 h-6 w-6"/>
-        在线咨询
-      </a>
+      </a> */}
+      <div class="relative group px-4 py-2 text-gray-800 text-sm w-full rounded-lg hover:bg-blue-100">
+          <div class="cursor-pointer flex flex-col items-center w-full">
+              <img src="/img/demo.png" alt="微信咨询" class="mb-2 h-6 w-6"/>
+              预约演示
+          </div>
+          <div class="absolute right-28 top-[0.5rem] -translate-y-1/2 w-40 bg-white opacity-0 group-hover:opacity-100 flex flex-col items-center py-1 px-0.5 shadow-xl rounded-lg transition-all duration-300 ease-in-out pointer-events-none group-hover:pointer-events-auto">
+              <div class="text-gray-700 text-sm mt-3 mb-2 px-0.5">扫码预约产品演示</div>
+              <img src="https://console.steedos.cn/api/files/files/66bc4f0bbb7702003d2d7511" alt="商务咨询 QR Code" class="h-32 w-32 m-0.5" />
+          </div>
+      </div>
+      <div class="relative group px-4 py-2 text-gray-800 text-sm w-full rounded-lg hover:bg-blue-100">
+          <div class="cursor-pointer flex flex-col items-center w-full">
+              <img src="/img/online_consultation.png" alt="微信咨询" class="mb-2 h-6 w-6"/>
+              商务咨询
+          </div>
+          <div class="absolute right-28 top-[0.5rem] -translate-y-1/2 w-40 bg-white opacity-0 group-hover:opacity-100 flex flex-col items-center py-1 px-0.5 shadow-xl rounded-lg transition-all duration-300 ease-in-out pointer-events-none group-hover:pointer-events-auto">
+              <div class="text-gray-700 text-sm mt-3 mb-2 px-0.5">扫码添加商务微信</div>
+              <img src="https://console.steedos.cn/api/files/files/66bc4f0bbb7702003d2d7511" alt="商务咨询 QR Code" class="h-32 w-32 m-0.5" />
+          </div>
+      </div>
+      <div class="relative group px-4 py-2 text-gray-800 text-sm w-full rounded-lg hover:bg-blue-100">
+          <div class="cursor-pointer flex flex-col items-center w-full">
+              <img src="/img/qywx.svg" alt="微信咨询" class="mb-2 h-6 w-6"/>
+              技术咨询
+          </div>
+          <div class="absolute right-28 top-[0.5rem] -translate-y-1/2 w-40 bg-white opacity-0 group-hover:opacity-100 flex flex-col items-center py-1 px-0.5 shadow-xl rounded-lg transition-all duration-300 ease-in-out pointer-events-none group-hover:pointer-events-auto">
+              <div class="text-gray-700 text-sm mt-3 mb-2 px-0.5">扫码添加技术服务群</div>
+              <img src="https://console.steedos.cn/api/files/files/66bc4f0fbb7702003d2d7513" alt="技术服务 QR Code" class="h-32 w-32 m-0.5" />
+          </div>
+      </div>
       <div class="group relative px-4 py-2 text-gray-800 text-sm hover:bg-blue-100 w-full rounded-lg">
         <div class="cursor-pointer flex flex-col items-center w-full">
             <img src="/img/mobile_consultation.png" alt="电话咨询" class="mb-2 h-6 w-6"/>
             电话咨询
         </div>
         <div class="w-40 bg-white absolute right-28 top-[1rem] -translate-y-1/2 opacity-0 group-hover:opacity-100 flex flex-col items-center py-3 px-4 shadow-lg rounded-md transition-opacity duration-300 ease-in-out pointer-events-none group-hover:pointer-events-auto">
-            <span class="text-gray-700 text-sm">官网免费咨询热线</span>
+            <span class="text-gray-700 text-sm">官方免费咨询热线</span>
             <span class="text-blue-700 text-lg font-semibold">400-820-1612</span>
         </div>
       </div>
-      <div class="relative group px-4 py-2 text-gray-800 text-sm w-full rounded-lg hover:bg-blue-100">
-          <div class="cursor-pointer flex flex-col items-center w-full">
-              <img src="/img/qywx.svg" alt="微信咨询" class="mb-2 h-6 w-6"/>
-              微信咨询
-          </div>
-          <div class="absolute right-28 top-[0.5rem] -translate-y-1/2 w-40 bg-white opacity-0 group-hover:opacity-100 flex flex-col items-center py-1 px-0.5 shadow-xl rounded-lg transition-all duration-300 ease-in-out pointer-events-none group-hover:pointer-events-auto">
-              <div class="text-gray-700 text-sm mt-3 mb-2 px-0.5">扫码获取产品介绍资料</div>
-              <img src="https://console.steedos.cn/api/files/images/64631db2c106fe003e69cbac" alt="商务咨询 QR Code" class="h-32 w-32 m-0.5" />
-          </div>
-      </div>
     </div>
   );
-}
+}

src/components/Footer.js

@@ -32,7 +32,7 @@ export const Footer = (props) => {
       <div className="border-t border-gray-200 dark:border-gray-700 py-10 text-center">
         <p className="text-sm text-gray-500">&copy; 2022 华炎软件, 保留所有权利</p>
         <a className="text-xs text-gray-400 mt-2" href="https://beian.miit.gov.cn">(沪ICP备09089283号)</a>
-        <img className="max-h-60 mx-auto pt-6" src="/img/QR_contact.png"/>
+        <img className="max-h-60 mx-auto pt-6" src="/img/QR_contact1.png"/>
       </div>
     </div>
   </footer>

src/components/Header.js

@@ -225,23 +225,8 @@ export function Header({ hasNav = false, navIsOpen, onNavToggle, title, section
     console.log(userInfo);
   }, [authenticated, userInfo]);
 
-  // const { data: session } = useSession()
-
-
-  // useEffect(() => {
-  //   if (session) {
-  //     const userId = session.user.email;
-  //     const people = {
-  //       id: userId,
-  //       name: 'steedos.com/' + session.user.name,
-  //       spaceId: 'steedos.com',
-  //       spaceName: 'steedos.com',
-  //     }
-  //     window.posthog.identify(userId);
-  //     window.posthog.people.set(people);
-  //   }
-  // }, [session]);
-
+
+
 
   useEffect(() => {
     let offset = 50

src/components/salient/CallToAction.jsx

@@ -26,7 +26,7 @@ export function CallToAction() {
           <p className="mt-4 text-lg tracking-tight text-white">
           与其他低代码或无代码平台不同，Steedos DX优先考虑版本控制和持续集成/持续部署（CI/CD），使得开发人员能够在一个更加结构化和版本化的环境中协作。通过利用源码作为真理的单一来源，它确保了更高的代码质量、更好的团队协作和更快的发布周期。
           </p>
-          <Button href="https://docs.steedos.cn/zh-CN/developer" color="white" className="mt-10">
+          <Button href="https://docs.steedos.com/zh-CN/developer" color="white" className="mt-10">
             了解更多
           </Button>
         </div>

src/components/salient/Hero.jsx

@@ -54,7 +54,7 @@ export function Hero() {
         <a target="_blank" href="/videos/" className="group inline-flex items-center justify-center rounded-full py-2 px-4 text-sm font-semibold focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 bg-slate-900 text-white hover:bg-slate-700 hover:text-slate-100 active:bg-slate-800 active:text-slate-300 focus-visible:outline-slate-900">
           视频演示
         </a>
-        <a target="_blank" href="https://docs.steedos.cn/zh-CN/getting-started" className="group inline-flex ring-1 items-center justify-center rounded-full py-2 px-4 text-sm focus:outline-none ring-slate-200 text-slate-700 hover:text-slate-900 hover:ring-slate-300 active:bg-slate-100 active:text-slate-600 focus-visible:outline-blue-600 focus-visible:ring-slate-300">
+        <a target="_blank" href="https://docs.steedos.com/zh-CN/getting-started" className="group inline-flex ring-1 items-center justify-center rounded-full py-2 px-4 text-sm focus:outline-none ring-slate-200 text-slate-700 hover:text-slate-900 hover:ring-slate-300 active:bg-slate-100 active:text-slate-600 focus-visible:outline-blue-600 focus-visible:ring-slate-300">
           文档
         </a>
       </div>
@@ -63,7 +63,7 @@ export function Hero() {
           <Player
             // ref={playerRef}
             className=" rounded-lg"
-            hls_url='https://vod.steedos.cn/video/175146ea-1772962056e-0000-0000-009-c59e0.mp4'
+            hls_url='https://outin-ea8a479c6eca11e8a49300163e1a3b4a.oss-cn-shanghai.aliyuncs.com/video/3d5e3f1d-1921d525125-0000-0000-009-c59e0.mov'
             light={`${process.env.NEXT_PUBLIC_STEEDOS_ROOT_URL}/api/files/images/uYfiSbnj7Ms7djamt`}
             width="100%"
             height="100%"

src/navs/header.js

@@ -29,7 +29,7 @@ export const headerNav = {
             { name: '技术架构', href: '/platform/architecture' },
             { name: '十大引擎', href: '/platform/features' },
             { name: '报价', href: '/pricing/platform' },
-            { name: '文档', href: '/docs' },
+            { name: '文档', href: 'https://docs.steedos.com/zh-CN/getting-started/', target: "_blank"},
             { name: '视频', href: '/videos' },
           ],
         },
@@ -122,7 +122,7 @@ export const headerNav = {
 
   ],
   pages: [
-    { name: '文档', href: 'https://docs.steedos.cn/', target: "steedos-docs" },
+    { name: '文档', href: 'https://docs.steedos.com/zh-CN/getting-started/', target: "steedos-docs" },
     { name: '视频', href: '/videos/' },
     { name: '联系我们', href: '/company/contact-us' },
   ],

src/pages/_app.js

@@ -14,7 +14,6 @@ import 'intersection-observer'
 import {has, isArray} from 'lodash';
 import { SearchProvider } from '@/components/Search'
 // import { SessionProvider } from "next-auth/react"
-import { usePostHog } from 'next-use-posthog'
 // import { getSite } from '@/lib/site';
 
 if (typeof window !== 'undefined' && !('ResizeObserver' in window)) {
@@ -48,19 +47,6 @@ export default function App({
   router 
 }) {
 
-  usePostHog('phc_Hs5rJpeE5JK3GdR3NWOf75TvjEcnYShmBxNU2Y942HB', {
-    api_host: 'https://posthog.steedos.cn',
-    loaded: (posthog) => {
-      window.posthog = posthog;
-      window.posthog.group('space', 'steedos.com');
-      window.posthog.people.set({
-        spaceId: 'steedos.com',
-        spaceName: 'steedos.com',
-      });
-      posthog.opt_in_capturing()
-    },
-  })  
-
   let [navIsOpen, setNavIsOpen] = useState(false)
 
   useEffect(() => {

src/pages/_document.js

@@ -29,14 +29,14 @@ export default class MyDocument extends Document {
             src="/js/keycloak.js"
             defer
           ></script>
-          <script type="text/javascript" id="zsiqchat" src="/js/salesiq.js"></script>
+          {/* <script type="text/javascript" id="zsiqchat" src="/js/salesiq.js"></script> */}
           <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
           <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
           <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
           <link rel="manifest" href="/manifest.json" />
           <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00b4b6" />
           <meta name="application-name" content="华炎魔方" />
-  
+
           <meta name="theme-color" content="#ffffff" />
         </Head>
         <body