Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dreampipcom/oneiros
Browse files Browse the repository at this point in the history
  • Loading branch information
angeloreale committed May 11, 2024
2 parents 3511267 + dd1addd commit 48a3721
Show file tree
Hide file tree
Showing 5 changed files with 277 additions and 6 deletions.
53 changes: 53 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"env": {
"jest": true,
"browser": true
},
"root": true,
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "react"],
"settings": {
"react": {
"version": "detect"
},
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"],
"moduleDirectory": ["node_modules", "src/"]
}
},
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
}
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"prettier",
"plugin:prettier/recommended",
"plugin:react-hooks/recommended",
"plugin:storybook/recommended",
"airbnb"
],
"rules": {
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",
"react/require-default-props": "off",
"react/react-in-jsx-scope": "off",
"import/no-extraneous-dependencies": "off",
"import/no-unresolved": "off",
"import/extensions": "off",
"react/jsx-filename-extension": [1,
{
"extensions": [
".tsx"
]
}
],
"react/function-component-definition": [2, { "namedComponents": "function-expression" }]
},
}
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 80,
"tabWidth": 2,
"singleQuote": true
}
210 changes: 210 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,8 @@
"react-dom": "^18.2.0",
"tailwind": "^4.0.0"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "4.9.5"
},
"snyk": true
}
12 changes: 6 additions & 6 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ export default {
theme: {
colors: {
primary: {
light: '#123456',
dark: '#654321',
light: '#2962FF',
dark: '#82B1FF',
},
secondary: {
light: '#567890',
dark: '#098765',
light: '#558B2F',
dark: '#AED581',
},
outro: {
light: '#345678',
dark: '#876543',
light: '#FF7043',
dark: '#FFAB91',
},
body: {
light: '#2A2A2A',
Expand Down

0 comments on commit 48a3721

Please sign in to comment.