cupcakearmy
/
rauchmelder
mirror of https://github.com/cupcakearmy/rauchmelder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rework & new build system

This commit is contained in:
cupcakearmy 2019-11-08 22:36:04 +01:00
parent 5eee5c75a7
commit 652aa06ebf
15 changed files with 181 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.drone.yml
View File

@ -3,20 +3,17 @@ name: default
steps:
- name: build
image: node:11-alpine
image: node:12-alpine
pull: always
commands:
- node -v
- npm -v
- npm i
- npm run build:prod
- yarn
- yarn run build
- name: deploy
image: cupcakearmy/drone-deploy
pull: always
# environment:
# PLUGIN_KEY:
# from_secret: ssh_key
settings:
host: nicco.io
user: root
@ -25,12 +22,11 @@ steps:
port: 1312
target: /srv/web/rauchmelder
sources:
- ./public
- ./docker-compose.yml
- ./dist
- ./docker-compose.prod.yml
commands:
- docker-compose -f docker-compose.yml -f docker-compose.prod.yml down
- docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
- docker-compose -f docker-compose.prod.yml down
- docker-compose -f docker-compose.prod.yml up -d
when:
event: push
branch: master

5
.gitignore vendored
View File

@ -1,6 +1,9 @@
node_modules
package-lock.json
public
pnpm-lock.yaml
.cache
dist
.idea
.vscode

8
docker-compose.prod.yml
View File

@ -1,7 +1,13 @@
version: '3'
version: '3.6'
services:
home:
image: nginx:alpine
restart: always
ports:
- 80
volumes:
- ./public:/usr/share/nginx/html:ro
networks:
- traefik
labels:

36
package.json
View File

@ -1,30 +1,24 @@
{
"private": true,
"browserslist": [
"last 2 Chrome versions",
"last 2 Safari versions",
"last 2 Firefox versions"
],
"scripts": {
"build:dev": "webpack -d",
"build:prod": "webpack -p",
"dev": "webpack-dev-server -d"
"dev": "parcel ./src/index.html",
"build": "parcel build ./src/index.html"
},
"dependencies": {
"moment": "^2.24.0",
"react": "^16.8",
"react-dom": "^16.8",
"react-fittext": "^1.0.0"
"react": "16.9",
"react-dom": "16.9"
},
"devDependencies": {
"@types/react": "^16.8",
"@types/react-dom": "^16.8",
"awesome-typescript-loader": "^5",
"css-loader": "^2",
"file-loader": "^3",
"html-webpack-plugin": "^3",
"mini-css-extract-plugin": "^0.5.0",
"style-loader": "^0",
"stylus": "^0",
"stylus-loader": "^3",
"typescript": "^3.3.3",
"webpack": "^4",
"webpack-cli": "^3",
"webpack-dev-server": "^3.1.14"
"@types/react": "16.9",
"@types/react-dom": "16.9",
"stylus": "^0.54.7",
"parcel-bundler": "^1.12.4",
"typescript": "^3.7"
}
}
}

42
src/App.styl
View File

@ -1,42 +0,0 @@
@import url('https://fonts.googleapis.com/css?family=PT+Sans')
*
box-sizing border-box
html
body
#root
margin 0
padding 0
width 100vw
height 100vh
overflow hidden
font-family 'PT Sans', sans-serif
font-weight bold
#app
height: 100%
width: 100%
//background-color #eeffee
background linear-gradient(45deg, #111, #222)
color #fff
display flex
justify-content center
align-items center
text-align center
@media (min-width: 0px)
#text
font-size 3em
#title
font-size 2em
@media (min-width: 900px)
#text
font-size 4em
#title
font-size 3em
@media (min-width: 1200px)
#text
font-size 5em
#title
font-size 4em

31
src/App.tsx
View File

@ -1,31 +0,0 @@
import moment from 'moment'
import React, { useEffect, useState } from 'react'
// @ts-ignore
const App: React.FC = () => {
const [refresh, setRefresh] = useState<number>(0)
const gloryTime = moment('2019-02-12').unix()
const now = Date.now() / 1000 | 0
const delta = moment.duration(now - gloryTime, 'seconds')
useEffect(()=> {
setTimeout(()=> setRefresh(refresh + 1), 1000)
}, [refresh])
return <div id="app">
<div>
<div id={'title'}>Rauchmelder 💨</div>
<br/>
<div id={'text'}>
{delta.humanize()}
<br/>
{delta.asSeconds()}
</div>
</div>
</div>
}
export default App

35
src/Components/App.tsx Normal file
View File

@ -0,0 +1,35 @@
import React, { useState, useCallback } from 'react'
import moment from 'moment'
import ShowTime from './ShowTime'
import Switcher from './Switcher'
export const Glories = {
Cosi: moment('2019-02-12').unix(),
Georg: moment('2019-11-08').unix()
}
export type Person = keyof typeof Glories
const init: Person = window.localStorage.getItem('selected') as Person || 'Cosi'
const App: React.FC = () => {
const [person, setPerson] = useState(init)
const _set = useCallback((p: Person) => {
window.localStorage.setItem('selected', p)
setPerson(p)
}, [])
return <div id="app">
<Switcher onChange={_set} />
<div>
<div id={'title'}>💨 Rauchmelder 💨</div>
<br />
<ShowTime glory={Glories[person]} />
</div>
</div>
}
export default App

26
src/Components/ShowTime.tsx Normal file
View File

@ -0,0 +1,26 @@
import React, { useEffect, useState } from 'react'
import moment from 'moment'
type Props = {
glory: number
}
const ShowTime: React.FC<Props> = ({ glory }) => {
const [refresh, setRefresh] = useState(0)
const now = Date.now() / 1000 | 0
const delta = moment.duration(now - glory, 'seconds')
useEffect(() => {
setTimeout(() => setRefresh(refresh + 1), 1000)
}, [refresh])
return <div id={'text'}>
{delta.humanize()}
<br />
{delta.asSeconds()}
</div>
}
export default ShowTime

20
src/Components/Switcher.tsx Normal file
View File

@ -0,0 +1,20 @@
import React, { useMemo } from 'react'
import { Glories, Person } from './App'
type Props = {
onChange: (p: Person) => void,
}
const Switcher: React.FC<Props> = ({ onChange }) => {
return <div id={'switcher'}>
{Object.keys(Glories).map((glory, i) => <span
key={i}
onClick={() => onChange(glory as Person)}
>
{glory}
</span>
)}
</div>
}
export default Switcher

2
src/index.html
View File

@ -5,10 +5,12 @@
<title>💨</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=PT+Sans:400,700&display=swap" rel="stylesheet">
</head>
<body>
<main id="root"></main>
<script src="./main.tsx"></script>
</body>
</html>

7
src/index.tsx
View File

@ -1,7 +0,0 @@
import React from 'react'
import ReactDOM from 'react-dom'
import './App.styl'
import App from './App'
ReactDOM.render(<App />, document.getElementById('root'))

38
src/main.styl Normal file
View File

@ -0,0 +1,38 @@
*
box-sizing border-box
html, body, #root
margin 0
padding 0
width 100%
height 100%
overflow hidden
font-family 'PT Sans', sans-serif
font-weight bold
#app
height: 100%
width: 100%
background linear-gradient(45deg, #111, #222)
color #fff
display flex
justify-content center
align-items center
text-align center
#text
font-size 17vmin
#title
font-weight: normal
font-size 12vmin
#switcher
position: fixed
top: 0
padding: 1rem
font-size: 2em
&>span
margin: 1rem
text-decoration: underline
cursor pointer

8
src/main.tsx Executable file
View File

@ -0,0 +1,8 @@
import * as React from 'react'
import * as ReactDOM from 'react-dom'
import './main.styl'
import App from './Components/App'
ReactDOM.render(<App />, document.getElementById('root'))

40
tsconfig.json
View File

@ -1,60 +1,60 @@
{
"compilerOptions": {
/* Basic Options */
"target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
"module": "esnext", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
// "incremental": true, /* Enable incremental compilation */
"target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
"jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
"rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
"removeComments": true, /* Do not emit comments to output. */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
"strictNullChecks": true, /* Enable strict null checks. */
"strictFunctionTypes": true, /* Enable strict checking of function types. */
"strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
"strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
"noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
"alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
/* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
/* Advanced Options */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
}
}

65
webpack.config.js
View File

@ -1,65 +0,0 @@
const path = require('path')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
module.exports = {
entry: [
'./index.tsx'
],
output: {
filename: 'bundle.js',
path: path.resolve(__dirname, 'public')
},
resolve: {
extensions: ['.js', '.jsx', '.ts', '.tsx']
},
context: path.resolve(__dirname, 'src'),
devServer: {
contentBase: path.resolve(__dirname, 'public/assets'),
open: true,
},
plugins: [
new HtmlWebpackPlugin({
template: 'index.html'
}),
new MiniCssExtractPlugin({
filename: 'bundle.css'
})
],
stats: {
assets: true,
assetsSort: 'size',
all: false,
errors: true,
colors: true,
performance: true,
timings: true,
},
module: {
rules: [{
test: /\.tsx?$/,
loader: 'awesome-typescript-loader',
},
// {
// test: /\.html$/,
// use: ['html-loader']
// },
{
test: /\.css$/,
use: [MiniCssExtractPlugin.loader, 'css-loader']
}, {
test: /\.styl$/,
use: [MiniCssExtractPlugin.loader, 'css-loader', 'stylus-loader'],
}, {
test: /\.(jpg|png|gif|svg|woff2?|ttf|eot|svg|otf)$/,
use: [{
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: './assets/',
},
}],
}]
}
}