koodiklinikka/palkkakysely
1
0
Fork 0
mirror of https://github.com/koodiklinikka/palkkakysely.git synced 2026-01-26 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run prettier

Browse Source
This commit is contained in:
Aarni Koskela
2023-09-28 15:28:42 +03:00
parent 2049638e13
commit 767c9a8ed6
8 changed files with 115 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
.github/workflows/build.yml vendored
View File

@@ -2,51 +2,51 @@ name: Build
on: on:
push: push:
branches: [ master ] branches: [master]
pull_request: pull_request:
branches: [ master ] branches: [master]
#schedule: #schedule:
# Update automatically on weekdays during work hours # Update automatically on weekdays during work hours
#- cron: '0 10,13,16 * * 1-5' #- cron: '0 10,13,16 * * 1-5'
# ... and every night # ... and every night
#- cron: '0 0 * * *' #- cron: '0 0 * * *'
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python 3.11 - name: Set up Python 3.11
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: "3.11" python-version: "3.11"
cache: pip cache: pip
- name: Install dependencies - name: Install dependencies
run: python -m pip install -r requirements.txt run: python -m pip install -r requirements.txt
- name: Build - name: Build
run: make -j3 run: make -j3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: "20" node-version: "20"
cache: yarn cache: yarn
cache-dependency-path: analysaattori/yarn.lock cache-dependency-path: analysaattori/yarn.lock
- run: yarn - run: yarn
working-directory: analysaattori working-directory: analysaattori
- run: yarn build -- --base=/palkkakysely/analysaattori/ - run: yarn build -- --base=/palkkakysely/analysaattori/
working-directory: analysaattori working-directory: analysaattori
env: env:
GENERATE_SOURCEMAP: 'false' GENERATE_SOURCEMAP: "false"
- run: cp -a analysaattori/dist ./out/analysaattori - run: cp -a analysaattori/dist ./out/analysaattori
- run: ls -laR out - run: ls -laR out
- run: touch out/.nojekyll - run: touch out/.nojekyll
- name: Deploy - name: Deploy
uses: JamesIves/github-pages-deploy-action@v4 uses: JamesIves/github-pages-deploy-action@v4
with: with:
branch: gh-pages branch: gh-pages
folder: out folder: out
clean: false clean: false
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' }}
env: env:
GIT_AUTHOR_EMAIL: "koodiklinikka-robot@example.com" GIT_AUTHOR_EMAIL: "koodiklinikka-robot@example.com"
GIT_AUTHOR_NAME: "Koodiklinikka Robot" GIT_AUTHOR_NAME: "Koodiklinikka Robot"
GIT_COMMITTER_EMAIL: "koodiklinikka-robot@example.com" GIT_COMMITTER_EMAIL: "koodiklinikka-robot@example.com"
GIT_COMMITTER_NAME: "Koodiklinikka Robot" GIT_COMMITTER_NAME: "Koodiklinikka Robot"

4
.pre-commit-config.yaml
View File

@@ -12,3 +12,7 @@ repos:
rev: 23.9.1 rev: 23.9.1
hooks: hooks:
- id: black - id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
hooks:
- id: prettier

2
.prettierignore Normal file
View File

@@ -0,0 +1,2 @@
# prettier doesn't understand jinja, the poor thing
template/*.html

12
analysaattori/index.html
View File

@@ -1,11 +1,17 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="./favicon.ico" /> <link rel="icon" href="./favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="Web site created using create-react-app" /> <meta
<script src="https://cdn.plot.ly/plotly-latest.min.js" charset="utf-8"></script> name="description"
content="Web site created using create-react-app"
/>
<script
src="https://cdn.plot.ly/plotly-latest.min.js"
charset="utf-8"
></script>
<title>Palkka-analysaattori</title> <title>Palkka-analysaattori</title>
</head> </head>
<body> <body>

13
analysaattori/src/App.tsx
View File

@@ -1,16 +1,15 @@
import React from 'react'; import React from "react";
import PivotTableUI from 'react-pivottable/PivotTableUI'; import PivotTableUI from "react-pivottable/PivotTableUI";
import 'react-pivottable/pivottable.css'; import "react-pivottable/pivottable.css";
import TableRenderers from 'react-pivottable/TableRenderers'; import TableRenderers from "react-pivottable/TableRenderers";
import createPlotlyComponent from 'react-plotly.js/factory'; import createPlotlyComponent from "react-plotly.js/factory";
import createPlotlyRenderers from 'react-pivottable/PlotlyRenderers'; import createPlotlyRenderers from "react-pivottable/PlotlyRenderers";
import useSWR from "swr/esm"; import useSWR from "swr/esm";
const Plot = createPlotlyComponent(window.Plotly); const Plot = createPlotlyComponent(window.Plotly);
const PlotlyRenderers = createPlotlyRenderers(Plot); const PlotlyRenderers = createPlotlyRenderers(Plot);
const renderers = Object.assign({}, TableRenderers, PlotlyRenderers); const renderers = Object.assign({}, TableRenderers, PlotlyRenderers);
function App() { function App() {
const qs = new URLSearchParams(window.location.search); const qs = new URLSearchParams(window.location.search);
const [pivotState, setPivotState] = React.useState({}); const [pivotState, setPivotState] = React.useState({});

8
analysaattori/src/index.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react'; import React from "react";
import ReactDOM from 'react-dom'; import ReactDOM from "react-dom";
import App from './App'; import App from "./App";
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
<App /> <App />
</React.StrictMode>, </React.StrictMode>,
document.getElementById('root') document.getElementById("root"),
); );

10
analysaattori/tsconfig.json
View File

@@ -1,11 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "es5", "target": "es5",
"lib": [ "lib": ["dom", "dom.iterable", "esnext"],
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
"esModuleInterop": true, "esModuleInterop": true,
@@ -20,7 +16,5 @@
"noEmit": true, "noEmit": true,
"jsx": "react-jsx" "jsx": "react-jsx"
}, },
"include": [ "include": ["src"]
"src"
]
} }

77
template/style.css
View File

@@ -1,63 +1,78 @@
body { body {
padding: 1em; padding: 1em;
font: 18px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font:
18px/1.5 -apple-system,
BlinkMacSystemFont,
"Segoe UI",
Roboto,
"Helvetica Neue",
Arial,
"Noto Sans",
sans-serif,
"Apple Color Emoji",
"Segoe UI Emoji",
"Segoe UI Symbol",
"Noto Color Emoji";
} }
body.static-body { body.static-body {
max-width: 650px; max-width: 650px;
margin: auto; margin: auto;
} }
body.table-body { body.table-body {
font-size: 14px; font-size: 14px;
line-height: 1.3; line-height: 1.3;
} }
body.table-body table { body.table-body table {
border-collapse: collapse; border-collapse: collapse;
} }
body.table-body td, body.table-body th { body.table-body td,
padding: 0.3em; body.table-body th {
border: 1px solid #999; padding: 0.3em;
border: 1px solid #999;
} }
h1, h2, h3 { h1,
line-height: 1.2; h2,
h3 {
line-height: 1.2;
} }
a:link { a:link {
color: #2181b7; color: #2181b7;
} }
a:visited { a:visited {
color: #4e1ecb; color: #4e1ecb;
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
body { body {
color: white; color: white;
background: #444 background: #444;
} }
a:link { a:link {
color: #5bf color: #5bf;
} }
a:visited { a:visited {
color: #ccf color: #ccf;
} }
} }
header { header {
border-bottom: 2px solid #2a6180; border-bottom: 2px solid #2a6180;
padding-bottom: 1em; padding-bottom: 1em;
line-height: 1; line-height: 1;
} }
footer { footer {
border-top: 2px solid #2a6180; border-top: 2px solid #2a6180;
padding: 1em; padding: 1em;
margin-top: 1em; margin-top: 1em;
text-align: center; text-align: center;
} }