chenshuai2144 5 лет назад
Родитель
Сommit
8065f52038
11 измененных файлов с 5 добавлено и 89 удалено
  1. 0 6
      README.fr-FR.md
  2. 0 6
      README.ja-JP.md
  3. 0 6
      README.md
  4. 1 7
      README.pt-BR.md
  5. 0 6
      README.ru-RU.md
  6. 0 6
      README.tr-TR.md
  7. 0 6
      README.zh-CN.md
  8. 1 1
      config/config.ts
  9. 1 1
      docker/nginx.conf
  10. 0 16
      netlify.toml
  11. 2 28
      src/layouts/BasicLayout.tsx

+ 0 - 6
README.fr-FR.md

@@ -119,9 +119,3 @@ Toute forme de contribution est la bienvenue, voici quelques exemples de façons
 - Utiliser Ant Design Pro dans votre travail quotidien.
 - Soumettre des [issues](http://github.com/ant-design/ant-design-pro/issues) pour reporter les bugs ou poser des questions.
 - Proposer des [pull requests](http://github.com/ant-design/ant-design-pro/pulls) pour améliorer notre code.
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

+ 0 - 6
README.ja-JP.md

@@ -121,9 +121,3 @@ Gitpod(GitHub 用の無料オンライン開発環境)でプロジェクト
 - 更新すること。 改善を、[pull requests](http://github.com/ant-design/ant-design-pro/pulls) で送ってください。
 
 [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro?type=dev)
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

+ 0 - 6
README.md

@@ -121,9 +121,3 @@ Any type of contribution is welcome, here are some examples of how you may contr
 - Use Ant Design Pro in your daily work.
 - Submit [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions.
 - Propose [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code.
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

Разница между файлами не показана из-за своего большого размера
+ 1 - 7
README.pt-BR.md


+ 0 - 6
README.ru-RU.md

@@ -107,9 +107,3 @@ $ npm start         # visit http://localhost:8000
 - Использовать Ant Design Pro в ежедневной работе.
 - Создавать [задачи](http://github.com/ant-design/ant-design-pro/issues) заводить баги или отвечать на вопросы.
 - Делать [pull-реквесты](http://github.com/ant-design/ant-design-pro/pulls) для совершенствования нашего кода.
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

+ 0 - 6
README.tr-TR.md

@@ -121,9 +121,3 @@ Her türlü desteğinize açığız, bu projeye nasıl katkıda bulunabileceğin
 - Günlük işinizde Ant Design Pro kullanın.
 - Hataları bildirmek veya soru sormak için [issues](http://github.com/ant-design/ant-design-pro/issues) gönderin.
 - Kodumuzu geliştirmek için [pull requests](http://github.com/ant-design/ant-design-pro/pulls) gönderin.
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

+ 0 - 6
README.zh-CN.md

@@ -109,9 +109,3 @@ $ npm start         # visit http://localhost:8000
 - 在你的公司或个人项目中使用 Ant Design Pro。
 - 通过 [Issue](http://github.com/ant-design/ant-design-pro/issues) 报告 bug 或进行咨询。
 - 提交 [Pull Request](http://github.com/ant-design/ant-design-pro/pulls) 改进 Pro 的代码。
-
-<div align="center">
-   <a href="https://www.netlify.com">
-    <img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"/>
-  </a>
-</div>

+ 1 - 1
config/config.ts

@@ -46,7 +46,7 @@ const plugins: IPlugin[] = [
       // dll features https://webpack.js.org/plugins/dll-plugin/
       // dll: {
       //   include: ['dva', 'dva/router', 'dva/saga', 'dva/fetch'],
-      //   exclude: ['@babel/runtime', 'netlify-lambda'],
+      //   exclude: ['@babel/runtime'],
       // },
     },
   ],

+ 1 - 1
docker/nginx.conf

@@ -14,7 +14,7 @@ server {
         try_files $uri $uri/ /index.html;
     }
     location /api {
-        proxy_pass https://ant-design-pro.netlify.com;
+        proxy_pass https://proapi.azurewebsites.net;
         proxy_set_header   X-Forwarded-Proto $scheme;
         proxy_set_header   X-Real-IP         $remote_addr;
     }

+ 0 - 16
netlify.toml

@@ -1,16 +0,0 @@
-[build]
-  functions = "./functions"
-
-[[redirects]]
-  from = "/api/*"
-  to = "/.netlify/functions/api/:splat"
-  status = 200
-  force = true
-  [redirects.headers]
-    X-From = "Netlify"
-    X-Api-Key = "some-api-key-string"
-    
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

+ 2 - 28
src/layouts/BasicLayout.tsx

@@ -19,7 +19,7 @@ import { Result, Button } from 'antd';
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import { ConnectState } from '@/models/connect';
-import { isAntDesignPro, getAuthorityFromRouter } from '@/utils/utils';
+import { getAuthorityFromRouter } from '@/utils/utils';
 import logo from '../assets/logo.svg';
 
 const noMatch = (
@@ -85,32 +85,6 @@ const defaultFooterDom = (
   />
 );
 
-const footerRender: BasicLayoutProps['footerRender'] = () => {
-  if (!isAntDesignPro()) {
-    return defaultFooterDom;
-  }
-
-  return (
-    <>
-      {defaultFooterDom}
-      <div
-        style={{
-          padding: '0px 24px 24px',
-          textAlign: 'center',
-        }}
-      >
-        <a href="https://www.netlify.com" target="_blank" rel="noopener noreferrer">
-          <img
-            src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
-            width="82px"
-            alt="netlify logo"
-          />
-        </a>
-      </div>
-    </>
-  );
-};
-
 const BasicLayout: React.FC<BasicLayoutProps> = props => {
   const {
     dispatch,
@@ -180,7 +154,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
           <span>{route.breadcrumbName}</span>
         );
       }}
-      footerRender={footerRender}
+      footerRender={() => defaultFooterDom}
       menuDataRender={menuDataRender}
       rightContentRender={() => <RightContent />}
       {...props}