Skip to content

Commit

Permalink
fix dash and rebrand (#72)
Browse files Browse the repository at this point in the history
* fix dash and rebrand

* Update package.json

* add favicon
  • Loading branch information
gdams authored Sep 27, 2021
1 parent b9996b8 commit 6b36143
Show file tree
Hide file tree
Showing 14 changed files with 1,412 additions and 2,014 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist
.cache
.project
.DS_Store
.parcel-cache
3,325 changes: 1,370 additions & 1,955 deletions package-lock.json

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"name": "react-starter",
"version": "1.0.0",
"main": "index.js",
"license": "Apache License Version 2.0",
"scripts": {
"start": "node server.js",
"build": "parcel build index.html"
},
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"parcel-bundler": "^1.12.4"
},
"dependencies": {
"antd": "^3.26.18",
"express": "^4.17.1",
"highcharts": "^9.0.0",
"highcharts-react-official": "^2.2.2",
"http-proxy-middleware": "^0.19.2",
"lodash": "^4.17.21",
"moment": "^2.26.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"static-server": "^2.2.1"
}
"name": "react-starter",
"version": "1.0.0",
"main": "index.js",
"license": "Apache License Version 2.0",
"scripts": {
"start": "node server.js",
"build": "parcel build index.html"
},
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"parcel-bundler": "^1.12.4"
},
"dependencies": {
"antd": "^3.26.18",
"express": "^4.17.1",
"highcharts": "^9.0.0",
"highcharts-react-official": "^2.2.2",
"http-proxy-middleware": "^0.19.2",
"lodash": "^4.17.21",
"moment": "^2.26.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"static-server": "^2.2.1"
}
}
1 change: 1 addition & 0 deletions src/Adoptiumlogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions src/Adoptlogo.svg

This file was deleted.

8 changes: 4 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ErrorBoundary from './ErrorBoundary';
import { Download, Trends } from './Graph/';

import 'antd/dist/antd.css';
import AdoptLogo from './Adoptlogo.svg';
import AdoptiumLogo from './Adoptiumlogo.svg';

const { SubMenu } = Menu;
const { Header, Content, Sider } = Layout;
Expand All @@ -26,15 +26,15 @@ export default class extends Component {
render() {
return <ConfigProvider locale={enUS}>
<Layout>
<Header className="header" style={{ background: '#152935' }}>
<Header className="header" style={{ background: '#14003c' }}>
<div className="logo" />
<Menu
theme="dark"
mode="horizontal"
defaultSelectedKeys={['2']}
style={{ lineHeight: '64px', background: '#152935' }}
style={{ lineHeight: '64px', background: '#14003c' }}
>
<Menu.Item key="1"><a href="https://adoptopenjdk.net/" style={{ height: '100%', display: 'flex' }}><img src={AdoptLogo} /></a></Menu.Item>
<Menu.Item key="1"><a href="https://adoptium.net/" style={{ height: '100%', display: 'flex' }}><img src={AdoptiumLogo} style={{height: '3.5em', paddingTop: '1em'}} /></a></Menu.Item>
<Menu.Item key="2"><Link to="/download">Download Stats</Link></Menu.Item>
</Menu>

Expand Down
2 changes: 1 addition & 1 deletion src/Graph/BarChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default class BarChart extends Component {
text: name
},
subtitle: {
text: 'Data is from: <a href="https://api.adoptopenjdk.net/v3/stats/downloads/total" target="_blank" rel="noopener noreferrer">api.adoptopenjdk.net/v3/stats/downloads/total</a>',
text: 'Data is from: <a href="https://api.adoptium.net/v3/stats/downloads/total" target="_blank" rel="noopener noreferrer">api.adoptium.net/v3/stats/downloads/total</a>',
useHTML: true,
},
xAxis: {
Expand Down
2 changes: 1 addition & 1 deletion src/Graph/ColumnDrilldown.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default class ColumnDrilldown extends Component {
text: name
},
subtitle: {
text: 'Click the columns to view the version specific data. Data is from: <a href="https://api.adoptopenjdk.net/" target="_blank" rel="noopener noreferrer">api.adoptopenjdk.net</a>',
text: 'Click the columns to view the version specific data. Data is from: <a href="https://api.adoptium.net/" target="_blank" rel="noopener noreferrer">api.adoptium.net</a>',
useHTML: true,
},
xAxis: {
Expand Down
2 changes: 1 addition & 1 deletion src/Graph/Download.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default class DownloadTotal extends Component {

return <>
<div style={{ textAlign: "center" }}>
<div ><p style={{ fontSize: 20, color: "rgb(107,164,231)" }}>AdoptOpenJDK Download Stats</p></div>
<div ><p style={{ fontSize: 20, color: "rgb(107,164,231)" }}>Adoptium Download Stats</p></div>
<div ><Icon type="cloud-download" style={{ fontSize: 20, color: "rgb(48,135,255)" }} /><h2 >{total}</h2><p >Total Downloads/Docker pulls Ever</p></div>
</div>
<Divider />
Expand Down
Loading

0 comments on commit 6b36143

Please sign in to comment.