Merge branch 'main' of gitlab.33.cn:Website/web_2022

.env.development

+NODE_ENV=dev
+VITE_FETCH_URL = http://localhost:3000
\ No newline at end of file

env.production

+NODE_ENV=prod
+VITE_FETCH_URL = http://localhost:3000
\ No newline at end of file

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --mode development",
     "build": "tsc && vite build",
     "preview": "vite preview"
   },
@@ -23,7 +23,8 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-helmet": "^6.1.0",
-    "react-router-dom": "6"
+    "react-router-dom": "6",
+    "rxjs": "^7.5.5"
   },
   "devDependencies": {
     "@tailwindcss/line-clamp": "^0.4.0",

src/components/DetailsExceTable.tsx

@@ -16,7 +16,7 @@ const data = [
     service:'联盟链管理',
     function:'支持在用户自卑主机上（至少4台主机）部署联盟链，支持联盟链删除',
     dev:true,
-    test:true,
+    test:false,
   },
   {
     module:'BAAS平台-前台功能',
@@ -72,7 +72,7 @@ const data = [
     service:'平行链管理',
     function:'支持在用户自备主机上（至少1台主机）部署平行链，支持平行链删除',
     dev:true,
-    test:true,
+    test:true
   },
 ];
 export const DetailsExceTable = () => {
@@ -108,22 +108,6 @@ export const DetailsExceTable = () => {
           })
         }
     </tr>
-    // Object.entries(d).forEach((v,i,a)=>{
-    //    if(!parent){
-    //      console.log('这');
-         
-    //     return <tr key={index + Math.random()}>
-    //       {
-    //         new Array(a.length).map(td=>{
-    //           return <td key={index +  Math.random()}>{v[1]}</td>
-    //         })
-    //       }
-    //     </tr>
-    //    }else{
-    //     return <td key={index + Math.random()}>1</td>
-    //    }
-      
-    // })
       return res
   },[])  
   return (

src/fetch/axios.ts

+
+import axios,{ AxiosRequestConfig,AxiosInstance,AxiosPromise } from 'axios';
+
+
+export const baseURL = import.meta.env.VITE_FETCH_URL
+export const axiosRequestConfiguration: AxiosRequestConfig = {
+    baseURL,
+    responseType: 'json',
+    headers: {
+        'Content-Type': 'application/json',
+    },
+};
+
+const initialization = (config: AxiosRequestConfig): AxiosInstance => {
+    const axiosInstance = axios.create(config);
+
+    /*
+        Add default headers, interceptors etc..
+    */
+
+    return axiosInstance;
+};
+
+export default initialization;
\ No newline at end of file

src/fetch/index.ts

+import {of} from 'rxjs'
+import {ajax} from "rxjs/ajax"
+import { map , catchError } from 'rxjs/operators'
+
+import axios,{ AxiosRequestConfig,AxiosInstance,AxiosPromise } from 'axios';
+
+
+export const baseURL = import.meta.env.VITE_FETCH_URL
+export const axiosRequestConfiguration: AxiosRequestConfig = {
+    baseURL,
+    responseType: 'json',
+    headers: {
+        'Content-Type': 'application/json',
+    },
+};
+
+// const observable$ = ajax.getJSON(url)
+// .pipe(
+//   map(response => response),
+//   catchError(error => of(error))
+// ) 
\ No newline at end of file

src/layouts/PageLayout.tsx

@@ -14,7 +14,7 @@ export const PageLayout=(props:PageLayoutType)=>{
         <GradientLay config={gradientConfig}>
             <div className={`h-screen w-screen relative ${className}`}>
                 <BallAnime config={ballConfig}>
-                <div className='h-[100vh] w-full pt-[70px]  flex-col items-center'>
+                <div className='h-full w-full pt-[70px]  flex-col items-center'>
                     {children}    
                 </div>
                 </BallAnime>

fzmweb.style.js → src/rxjs.ts

-export default{
+
+export const playGround = {
 
 }
\ No newline at end of file

src/style.css

@@ -8,16 +8,16 @@
 
 @layer components{
     .hero-title{
-        @apply text-[90px] tracking-wider font-bold font-galano leading-[90px]
+        @apply  text-[78px] labtop:text-[68px]  sreen:text-[90px] tracking-wider font-bold font-galano leading-[90px]
     }
     .sub-title-cn{
-        @apply  text-[30px] tracking-wide font-mono font-bold py-3
+        @apply  text-[16px] labtop:text-[26px] sreen:text-[30px] tracking-wide font-mono font-bold sreen:py-3 py-1
     }
     .content-title-cn{
-        @apply  text-[24px] tracking-wide font-mono font-bold py-3
+        @apply  text-[22px] labtop:text-[22px] sreen:text-[24px] tracking-wide font-mono font-bold py-3
     }
     .normal-text{
-        @apply text-[14px] tracking-wide font-mono font-normal py-3
+        @apply text-[12px] labtop:text-[14px] sreen:text-[14px] tracking-wide font-mono font-normal py-3
     }
     .des-cn{
         @apply font-mono font-light
@@ -25,6 +25,10 @@
     .table-header{
         @apply text-white bg-black py-3 px-2
     }
+
+    .featuresGrid{
+        @apply grid grid-cols-2 w-10/12 gap-y-[1rem]  gap-x-[1rem] sreen:gap-y-[5rem] sreen:gap-x-[10rem]
+    }
 }
 
 .hero-baas{

src/views/Baas33/Dtails.tsx

 import { IProps } from "@/common/Iprops.interface"
 import { DetailsExceTable } from "@/components/DetailsExceTable"
 import { DetailScrollView } from "@/components/DtailScrollView"
+
 import { AppContianer } from "@/layouts/AppContianer"
 import { PageLayout } from "@/layouts/PageLayout"
+import { playGround } from "@/rxjs"
+import { useEffect } from "react"
 import { useParams } from 'react-router-dom'
 interface DetailsType extends IProps{
    
@@ -10,7 +13,7 @@ interface DetailsType extends IProps{
 
 export const Details = (props:DetailsType)=>{
     const {id} = useParams()
-
+    playGround
     return(
 
             <PageLayout ballConfig={[]}>

src/views/Baas33/Features/index.tsx

@@ -24,11 +24,11 @@ const FeaturesGrid = ()=>{
         }
     ]
     return(
-        <div className="grid grid-cols-2 w-10/12 gap-y-[5rem] gap-x-[10rem]">
+        <div className="featuresGrid">
             {
                 data.map((i,index)=>(
                     <div key={index} className='max-w-[320px] min-w-[280px]'>
-                        <div className='content-title-cn py-5'>{i.title}</div>
+                        <div className='content-title-cn '>{i.title}</div>
                         <div className='des-cn'>{i.text}</div>
                     </div>
                 ))

src/vite-env.d.ts

 /// <reference types="vite/client" />
+interface ImportMetaEnv {
+    readonly VITE_FETCH_URL: string
+    // more env variables...
+  }
+  
+  interface ImportMeta {
+    readonly env: ImportMetaEnv
+  }
\ No newline at end of file

tailwind.config.js

@@ -14,7 +14,7 @@ module.exports = withAnimations({
       screens:{
         'moblie':"640px",
         'table':"961px",
-        "labtop":"1921px",
+        "labtop":"1520px",
         "sreen":"2881px",
       }
     },

yarn.lock

@@ -840,7 +840,11 @@ arg@^5.0.1:
 
 asynckit@^0.4.0:
   version "0.4.0"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+=======
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 autoprefixer@^10.4.7:
@@ -857,7 +861,11 @@ autoprefixer@^10.4.7:
 
 axios@^0.27.2:
   version "0.27.2"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+=======
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
     follow-redirects "^1.14.9"
@@ -939,7 +947,11 @@ color-name@^1.1.4:
 
 combined-stream@^1.0.8:
   version "1.0.8"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+=======
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
@@ -985,7 +997,11 @@ defined@^1.0.0:
 
 delayed-stream@~1.0.0:
   version "1.0.0"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+=======
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 detective@^5.2.0:
@@ -1190,12 +1206,20 @@ fill-range@^7.0.1:
 
 follow-redirects@^1.14.9:
   version "1.15.1"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+=======
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
 form-data@^4.0.0:
   version "4.0.0"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+=======
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
@@ -1365,12 +1389,20 @@ micromatch@^4.0.4:
 
 mime-db@1.52.0:
   version "1.52.0"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+=======
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12:
   version "2.1.35"
+<<<<<<< HEAD
   resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+=======
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+>>>>>>> caf60b8a0235283f9c77d25e1cf48aa52731c7d2
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
@@ -1692,6 +1724,13 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+rxjs@^7.5.5:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -1770,6 +1809,11 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+tslib@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 typescript@^4.6.3:
   version "4.6.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"