Skip to content

Commit

Permalink
Merge pull request #47 from ReAGEnT-WiSe2021-22/party-reputation/ft/r…
Browse files Browse the repository at this point in the history
…efining

Party reputation/ft/refining
  • Loading branch information
LouisAndrew authored Feb 2, 2022
2 parents 3f23ada + 3d08db4 commit a016969
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 5 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/container/public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions packages/container/public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added packages/container/public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/container/public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/container/public/favicon.ico
Binary file not shown.
12 changes: 9 additions & 3 deletions packages/container/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->

<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
<link rel="manifest" href="%PUBLIC_URL%/site.webmanifest">
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
Expand Down Expand Up @@ -40,4 +46,4 @@
-->
</body>

</html>
</html>
Binary file added packages/container/public/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions packages/container/public/safari-pinned-tab.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: 19 additions & 0 deletions packages/container/public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-384x384.png",
"sizes": "384x384",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
2 changes: 1 addition & 1 deletion packages/party-reputation/src/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const PARTY_RAW_DATA_COLORS: Record<string, string> = {
[Party.CDU]: '#888',
[Party.SPD]: '#faa',
[Party.gruene]: '#7f7',
[Party.FDP]: '#ff5',
[Party.FDP]: '#ed6',
[Party.linke]: '#faf',
[Party.CSU]: '#aaf',
[Party.AFD]: '#ccf',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import App from './App';
export default () => {
const isInProduction = process.env.REACT_APP_ENVIRONMENT === 'production';
if (!isInProduction) {
console.log('Initiating Party-Reputation mock server');
initMockServer();
} else {
console.log('Skipping');
}

return DireflowComponent.create({
Expand Down
1 change: 0 additions & 1 deletion packages/party-reputation/src/utils/mock-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { createServer } from 'miragejs';
import { createMockDatas } from './fixture';

export const initMockServer = () => {
console.log('Initiating mock server');
(window as any).server = createServer({
routes() {
this.get('/api/party-reputation', () => {
Expand Down

0 comments on commit a016969

Please sign in to comment.