From 68e1341f42d1a35340151f62b80ee7fa41ccd58a Mon Sep 17 00:00:00 2001 From: Rosyid Haryadi Date: Sat, 30 Sep 2023 23:07:54 +0700 Subject: styling --- package-lock.json | 26 ++++++++++++ package.json | 1 + src/App.jsx | 119 +++++++++++++++++++++++++++++++++++++----------------- src/Result.jsx | 2 +- 4 files changed, 109 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc66265..f745901 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@fontsource/roboto": "^5.0.8", + "@mui/icons-material": "^5.14.11", "@mui/material": "^5.14.11", "@mui/x-date-pickers": "^6.16.0", "dayjs": "^1.11.10", @@ -1115,6 +1116,31 @@ "url": "https://opencollective.com/mui" } }, + "node_modules/@mui/icons-material": { + "version": "5.14.11", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.11.tgz", + "integrity": "sha512-aHReLasBuS/+hhPzbZCgZ0eTcZ2QRnoC2WNK7XvdAf3l+LjC1flzjh6GWw1tZJ5NHnZ+bivdwtLFQ8XTR96JkA==", + "dependencies": { + "@babel/runtime": "^7.22.15" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui" + }, + "peerDependencies": { + "@mui/material": "^5.0.0", + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@mui/material": { "version": "5.14.11", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.11.tgz", diff --git a/package.json b/package.json index 46fd69a..a6425d8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@fontsource/roboto": "^5.0.8", + "@mui/icons-material": "^5.14.11", "@mui/material": "^5.14.11", "@mui/x-date-pickers": "^6.16.0", "dayjs": "^1.11.10", diff --git a/src/App.jsx b/src/App.jsx index 705587c..7fb1a6b 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,10 +1,12 @@ import {useEffect, useState} from "react"; import Entry from "./Entry.jsx"; -import {Button, Container, Typography} from "@mui/material"; +import {AppBar, Button, Container, Grid, Paper, Typography} from "@mui/material"; import dayjs from "dayjs"; import SalaryInput from "./SalaryInput.jsx"; import Result from "./Result.jsx"; +import RemoveCircleIcon from '@mui/icons-material/RemoveCircle'; +import AddCircleIcon from '@mui/icons-material/AddCircle'; function App() { @@ -55,46 +57,87 @@ function App() { }); } + // raimu kurang gawean return ( - - Overtime Calculator - 🤑🤑 Sudahkah anda lembur hari ini? - 🤑🤑 - + + + + + + + + + + +
    +
  • Disclaimer: keakuratan tidak terjamin
  • +
  • Sudah termasuk perhitungan lembur akhir pekan
  • +
  • Belum termasuk libur nasional (todo)
  • +
  • Belum termasuk versi 6 hari kerja (todo)
  • +
  • UI belum responsive (todo)
  • +
+
+ + Source + + + Rosyid + +
+
+
+
+ ) } diff --git a/src/Result.jsx b/src/Result.jsx index 5d885fe..fac2b18 100644 --- a/src/Result.jsx +++ b/src/Result.jsx @@ -12,7 +12,7 @@ function Result({listEntry, baseSalary}) { return ( - Total Overtime Pay: Rp {/*{listEntry.map((entry) => {*/} -- cgit v1.2.3-70-g09d2