Skip to content

Commit

Permalink
Merge pull request #66 from falsepopsky/dev
Browse files Browse the repository at this point in the history
fix: styles
  • Loading branch information
falsepopsky authored Aug 27, 2023
2 parents 10b1cf3 + 8b7273b commit 7c6c96a
Show file tree
Hide file tree
Showing 9 changed files with 176 additions and 131 deletions.
22 changes: 15 additions & 7 deletions sun/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@
"globals": {
"React": "readonly"
},
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"rules": {
"no-undef": "off"
"rules": {
"@typescript-eslint/consistent-type-exports": [
"error",
{
"fixMixedExportsWithInlineTypeSpecifier": true
}
}
],
],
"@typescript-eslint/consistent-type-imports": [
"error",
{
"prefer": "type-imports",
"disallowTypeAnnotations": true,
"fixStyle": "inline-type-imports"
}
]
},
"ignorePatterns": ["/*", "!app"]
}
4 changes: 2 additions & 2 deletions sun/app/components/ApexChart.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import ApexCharts, { ApexOptions } from 'apexcharts';
import ApexCharts, { type ApexOptions } from 'apexcharts';
import { useEffect, useRef } from 'react';

interface PropsApex {
Expand All @@ -27,7 +27,7 @@ const ApexChart = (props: PropsApex) => {
}
}, [config]);

return <div className='bg-neutral-900/60 dark:bg-neutral-950' ref={chartRef} />;
return <div ref={chartRef} />;
};

export default ApexChart;
3 changes: 3 additions & 0 deletions sun/app/components/Chapterpa.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const TreemapDB: ApexOptions = {
itemMargin: {
vertical: 20,
},
labels: {
colors: 'inherit',
},
},
series: [
{
Expand Down
17 changes: 17 additions & 0 deletions sun/app/components/Chapterpy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,23 @@ const AreaDB: ApexOptions = {
tooltip: {
enabled: false,
},
labels: {
style: {
colors: 'currentcolor',
},
},
},
yaxis: {
labels: {
style: {
colors: 'currentcolor',
},
},
},
legend: {
labels: {
colors: 'inherit',
},
},
colors: ['#1ee979', '#e91e63'],
theme: {
Expand Down
16 changes: 14 additions & 2 deletions sun/app/components/ThemeToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,22 @@ export function ToggleTheme() {
title='Toggle light & dark color scheme'
aria-label='Toggle light & dark theme'
aria-live='polite'>
<svg className='hidden h-4 w-4 dark:block' viewBox='0 0 32 32' fill='currentColor' aria-hidden='true'>
<svg
className='hidden h-4 w-4 dark:block'
viewBox='0 0 32 32'
fill='currentColor'
aria-hidden='true'
width={16}
height={16}>
<path d='M13.5025,5.4136A15.0755,15.0755,0,0,0,25.096,23.6082a11.1134,11.1134,0,0,1-7.9749,3.3893c-.1385,0-.2782.0051-.4178,0A11.0944,11.0944,0,0,1,13.5025,5.4136M14.98,3a1.0024,1.0024,0,0,0-.1746.0156A13.0959,13.0959,0,0,0,16.63,28.9973c.1641.006.3282,0,.4909,0a13.0724,13.0724,0,0,0,10.702-5.5556,1.0094,1.0094,0,0,0-.7833-1.5644A13.08,13.08,0,0,1,15.8892,4.38,1.0149,1.0149,0,0,0,14.98,3Z' />
</svg>
<svg className='h-4 w-4 dark:hidden' viewBox='0 0 32 32' fill='currentColor' aria-hidden='true'>
<svg
className='h-4 w-4 dark:hidden'
viewBox='0 0 32 32'
fill='currentColor'
aria-hidden='true'
width={16}
height={16}>
<rect x='15' y='2' width='2' height='5' />
<rect x='21.6675' y='6.8536' width='4.958' height='1.9998' transform='translate(1.5191 19.3744) rotate(-45)' />
<rect x='25' y='15' width='5' height='2' />
Expand Down
10 changes: 0 additions & 10 deletions sun/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,3 @@
html {
scrollbar-width: thin;
}

::-webkit-scrollbar {
width: 4px;
height: 4px;
}

::-webkit-scrollbar-thumb {
border-radius: 0;
border: 3px solid white;
}
11 changes: 6 additions & 5 deletions sun/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@
"format": "prettier --cache -w ."
},
"dependencies": {
"apexcharts": "^3.41.1",
"apexcharts": "^3.42.0",
"next": "^13.4.19",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@nivo/core": "^0.83.0",
"@nivo/heatmap": "^0.83.0",
"@types/node": "^20.5.3",
"@types/node": "^20.5.6",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"autoprefixer": "^10.4.15",
"eslint": "^8.47.0",
"eslint": "^8.48.0",
"eslint-config-next": "^13.4.19",
"eslint-config-prettier": "^9.0.0",
"next-themes": "^0.2.1",
"postcss": "^8.4.28",
"prettier": "^3.0.2",
"prettier-plugin-tailwindcss": "^0.5.3",
"tailwindcss": "^3.3.3",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"engines": {
"node": ">=18",
"pnpm": ">=8"
}
},
"packageManager": "[email protected]"
}
Loading

1 comment on commit 7c6c96a

@vercel
Copy link

@vercel vercel bot commented on 7c6c96a Aug 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.