You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/07 03:41:41 UTC
[incubator-skywalking-ui] branch fix/license updated: Add license
header to mock
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
The following commit(s) were added to refs/heads/fix/license by this push:
new dd00c49 Add license header to mock
dd00c49 is described below
commit dd00c49adb0b2418110f131b7369db65ffe2b092
Author: hanahmily <ha...@gmail.com>
AuthorDate: Wed Mar 7 11:40:46 2018 +0800
Add license header to mock
---
mock/alarm.js | 18 ++++++++++++++++++
mock/application.js | 18 ++++++++++++++++++
mock/dashboard.js | 18 ++++++++++++++++++
mock/server.js | 18 ++++++++++++++++++
mock/service.js | 18 ++++++++++++++++++
mock/topology.js | 18 ++++++++++++++++++
mock/trace.js | 18 ++++++++++++++++++
src/assets/logo.svg | 43 -------------------------------------------
src/layouts/UserLayout.js | 10 +++++-----
9 files changed, 131 insertions(+), 48 deletions(-)
diff --git a/mock/alarm.js b/mock/alarm.js
index e72f9bc..150b7cb 100644
--- a/mock/alarm.js
+++ b/mock/alarm.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/application.js b/mock/application.js
index 7def66a..9f68b65 100644
--- a/mock/application.js
+++ b/mock/application.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/dashboard.js b/mock/dashboard.js
index fd5928c..400ec81 100644
--- a/mock/dashboard.js
+++ b/mock/dashboard.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/server.js b/mock/server.js
index 7a70310..55a859a 100644
--- a/mock/server.js
+++ b/mock/server.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/service.js b/mock/service.js
index 1d3ba58..1f1c42d 100644
--- a/mock/service.js
+++ b/mock/service.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/topology.js b/mock/topology.js
index 4394a4f..6a8f3b4 100644
--- a/mock/topology.js
+++ b/mock/topology.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/mock/trace.js b/mock/trace.js
index fa9145b..06f955c 100644
--- a/mock/trace.js
+++ b/mock/trace.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+
import mockjs from 'mockjs';
export default {
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
deleted file mode 100644
index e9f8c2a..0000000
--- a/src/assets/logo.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
- <title>Group 28 Copy 5</title>
- <desc>Created with Sketch.</desc>
- <defs>
- <linearGradient x1="62.1023273%" y1="0%" x2="108.19718%" y2="37.8635764%" id="linearGradient-1">
- <stop stop-color="#4285EB" offset="0%"></stop>
- <stop stop-color="#2EC7FF" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="69.644116%" y1="0%" x2="54.0428975%" y2="108.456714%" id="linearGradient-2">
- <stop stop-color="#29CDFF" offset="0%"></stop>
- <stop stop-color="#148EFF" offset="37.8600687%"></stop>
- <stop stop-color="#0A60FF" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="69.6908165%" y1="-12.9743587%" x2="16.7228981%" y2="117.391248%" id="linearGradient-3">
- <stop stop-color="#FA816E" offset="0%"></stop>
- <stop stop-color="#F74A5C" offset="41.472606%"></stop>
- <stop stop-color="#F51D2C" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="68.1279872%" y1="-35.6905737%" x2="30.4400914%" y2="114.942679%" id="linearGradient-4">
- <stop stop-color="#FA8E7D" offset="0%"></stop>
- <stop stop-color="#F74A5C" offset="51.2635191%"></stop>
- <stop stop-color="#F51D2C" offset="100%"></stop>
- </linearGradient>
- </defs>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="logo" transform="translate(-20.000000, -20.000000)">
- <g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)">
- <g id="Group-27-Copy-3">
- <g id="Group-25" fill-rule="nonzero">
- <g id="2">
- <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28 [...]
- <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28 [...]
- </g>
- <path d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.8 [...]
- </g>
- <ellipse id="Combined-Shape" fill="url(#linearGradient-4)" cx="100.519339" cy="100.436681" rx="23.6001926" ry="23.580786"></ellipse>
- </g>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js
index d6cffd2..7f898e4 100644
--- a/src/layouts/UserLayout.js
+++ b/src/layouts/UserLayout.js
@@ -22,7 +22,7 @@ import DocumentTitle from 'react-document-title';
import { Icon } from 'antd';
import GlobalFooter from '../components/GlobalFooter';
import styles from './UserLayout.less';
-import logo from '../assets/logo.svg';
+import logo from '../assets/sw-2.png';
import { getRoutes } from '../utils/utils';
const links = [{
@@ -31,11 +31,11 @@ const links = [{
href: '',
}, {
key: 'privacy',
- title: '隐私',
+ title: 'Privacy',
href: '',
}, {
key: 'terms',
- title: '条款',
+ title: 'Terms',
href: '',
}];
@@ -61,10 +61,10 @@ class UserLayout extends React.PureComponent {
<div className={styles.header}>
<Link to="/">
<img alt="logo" className={styles.logo} src={logo} />
- <span className={styles.title}>Ant Design</span>
+ <span className={styles.title}>Apache SkyWaling</span>
</Link>
</div>
- <div className={styles.desc}>Ant Design 是西湖区最具影响力的 Web 设计规范</div>
+ <div className={styles.desc}>Apache SkyWaling Opensource APM System</div>
</div>
<Switch>
{getRoutes(match.path, routerData).map(item =>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.