Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
JensRavens committed Sep 30, 2024
1 parent fad5396 commit 7c132a9
Show file tree
Hide file tree
Showing 11 changed files with 1,707 additions and 825 deletions.
32 changes: 0 additions & 32 deletions .eslintrc.js

This file was deleted.

4 changes: 3 additions & 1 deletion app/assets/stylesheets/application/components/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
position: relative;
background-color: white;
border-radius: 5px 5px 0 0;
transition: opacity 0.5s, transform 0.5s;
transition:
opacity 0.5s,
transform 0.5s;
opacity: 0;
transform: translate(0, 80px);
padding: 1rem 1rem 0;
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/application/components/popover.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.popover {
position: relative;
background-color: var(--color-background);
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3),
box-shadow:
0px 1px 2px rgba(0, 0, 0, 0.3),
0px 2px 6px 2px rgba(0, 0, 0, 0.15);
display: block;
border-radius: 12px;
Expand Down
5 changes: 4 additions & 1 deletion app/assets/stylesheets/application/util/reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ body {
-webkit-font-smoothing: antialiased;
font-size: var(--size-text);
line-height: 1.5;
font-feature-settings: 'kern' 1, 'onum' 0, 'liga' 1;
font-feature-settings:
'kern' 1,
'onum' 0,
'liga' 1;
background-color: var(--color-background);
caret-color: var(--color-tint);
}
Expand Down
3 changes: 1 addition & 2 deletions app/javascript/controllers/hydrate_controller.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ export default class extends Controller {
}
const implementation = imports['../../views/' + this.componentName];
if (!implementation) return;
const App = (await implementation()).default;
const App = ((await implementation()) as any).default;
this.root.render(<App {...this.props} />);
console.info('Hydrated', this.componentName);
}

disconnect(): void {
Expand Down
14 changes: 7 additions & 7 deletions app/views/pages/home.schema.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export interface Props {
currentUser: {
id: string;
firstName: string;
};
sprint: {
id: string;
title: string;
} | null;
id: string;
firstName: string;
};
sprint: {
id: string;
title: string;
} | null;
}
23 changes: 23 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import globals from 'globals';
import { fixupConfigRules } from '@eslint/compat';
import pluginJs from '@eslint/js';
import tseslint from 'typescript-eslint';
import react from 'eslint-plugin-react';

export default [
{ languageOptions: { globals: globals.browser } },
pluginJs.configs.recommended,
...tseslint.configs.recommended,
{
plugins: react,
},
{
rules: {
'no-console': 2,
eqeqeq: 2,
},
},
{
ignores: ['generated/*'],
},
];
41 changes: 22 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"scripts": {
"format": "prettier --write \"src/**/*.{tsx,ts,scss,json}\"",
"format": "prettier --write \"app/**/*.{tsx,ts,scss,json}\"",
"lint": "yarn lint:types && yarn lint:style && yarn lint:format",
"lint:types": "tsc --noEmit",
"lint:style": "eslint app/javascript/**/*.ts --max-warnings 0",
Expand All @@ -13,30 +13,33 @@
"license": "MIT",
"dependencies": {
"@hotwired/stimulus": "^3.2.2",
"@hotwired/turbo-rails": "^8.0.5",
"@nerdgeschoss/shimmer": "^0.0.10",
"@types/bun": "^1.1.8",
"@types/react": "^18.3.5",
"@hotwired/turbo-rails": "^8.0.10",
"@nerdgeschoss/shimmer": "^0.0.38",
"@types/bun": "^1.1.10",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"bun": "^1.1.26",
"chart.js": "^3.7.0",
"chartkick": "^4.1.1",
"esbuild": "^0.23.1",
"flatpickr": "^4.6.9",
"bun": "^1.1.29",
"chart.js": "^4.4.4",
"chartkick": "^5.0.1",
"esbuild": "^0.24.0",
"flatpickr": "^4.6.13",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.6",
"typescript": "^4.5.4",
"vite": "^5.3.1",
"sass": "^1.79.4",
"typescript": "^5.6.2",
"vite": "^5.4.8",
"vite-plugin-rails": "^0.5.0",
"vite-plugin-sass-glob-import": "^3.0.2"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.8.1",
"@typescript-eslint/parser": "^5.8.1",
"eslint": "^8.5.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.5.1"
"@eslint/compat": "^1.1.1",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.0",
"prettier": "^3.3.3",
"typescript-eslint": "^8.7.0"
}
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"skipLibCheck": true,
"lib": [
"es2020",
"dom"
Expand Down
4 changes: 4 additions & 0 deletions typings.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
/// <reference types="vite/client" />
declare module '@hotwired/stimulus' {
export const Controller: any;
export const Application: any;
}
Loading

0 comments on commit 7c132a9

Please sign in to comment.