Skip to content

Commit

Permalink
Update button styling and typescript configs
Browse files Browse the repository at this point in the history
  • Loading branch information
lucemans committed Aug 27, 2024
1 parent 3851b6d commit 31a3228
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 131 deletions.
1 change: 1 addition & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@eslint/js": "^9.8.0",
"@radix-ui/react-slot": "^1.1.0",
"@tanstack/react-router": "^1.49.2",
"@types/web": "^0.0.157",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19",
"class-variance-authority": "^0.7.0",
Expand Down
8 changes: 8 additions & 0 deletions web/pnpm-lock.yaml

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

28 changes: 9 additions & 19 deletions web/src/components/ui/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/* eslint-disable no-undef */
/* eslint-disable sonarjs/no-duplicate-string */
import { Slot } from '@radix-ui/react-slot';
import { cva, VariantProps } from 'class-variance-authority';
import { ButtonHTMLAttributes, forwardRef } from 'react';

import { cn } from '../../utils/cva';

const gradientBg = 'bg-[linear-gradient(to_right,var(--bg-from),var(--bg-to))]'; // Gradient background

export const buttonVariants = cva(
[
'unstyled inline-flex items-center justify-center', // Layout
Expand All @@ -24,38 +23,29 @@ export const buttonVariants = cva(
},
variant: {
default: [
gradientBg,
'text-[#FFF3E8] [--bg-from:#e95666] [--bg-to:#e95666]', // Default
'text-text-inverse bg-primary', // Default
'not-disabled:hover:[--bg-from:#f43355] not-disabled:hover:[--bg-to:#ff6d0a]', // Hover
'focus-visible:border-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[#FFF3E8]', // Focus
],
secondary: [
gradientBg,
'text-[#E95666] [--bg-from:#ffdbca] [--bg-to:#ffdbca]', // Default
'text-text bg-secondary', // Default
'not-disabled:hover:text-[#ED3D50] not-disabled:hover:[--bg-from:#ffd067] not-disabled:hover:[--bg-to:#ff9b7c]', // Hover
'focus-visible:border-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[#E95666]', // Focus
],
outline: [
gradientBg,
'text-[#E95666] [--bg-from:#ffdbca] [--bg-to:#ffdbca]', // Default
'not-disabled:hover:text-[#ED3D50] not-disabled:hover:[--bg-from:#ffd067] not-disabled:hover:[--bg-to:#ff9b7c]', // Hover
'border-2 border-[#E95666]', // Border
'focus-visible:border-dashed focus-visible:outline-none', // Focus
],
link: [
'bg-none text-[#833216] underline', // Default
'bg-none text-text underline', // Default
'hover:text-[#E95666]', // Hover
'focus-visible:text-[#E95666] focus-visible:outline-none', // Focus
],
ghost: [
'text-[#833216]', // Default
'text-text', // Default
'not-disabled:hover:bg-[#FFDBCA]/80', // Hover
'disabled:text-[#833216]/80', // Disabled
'disabled:text-text/80', // Disabled
'focus-visible:border-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[#E95666]', // Focus
],
ghostOutline: [
'bg-[#FFDBCA]/80 text-[#833216]', // Default
'border-2 border-[#833216]', // Hover
'bg-[#FFDBCA]/80 text-text', // Default
'border-2 border-text', // Hover
'focus-visible:border-dashed focus-visible:outline-none', // Focus
],
},
Expand All @@ -69,7 +59,7 @@ export const buttonVariants = cva(

export interface ButtonProperties
extends ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
VariantProps<typeof buttonVariants> {
asChild?: boolean;
}

Expand Down
1 change: 0 additions & 1 deletion web/src/routes/debug.lazy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const component = () => {
<div className="flex gap-2">
<Button>Default</Button>
<Button variant="secondary">Secondary</Button>
<Button variant="outline">Outline</Button>
<Button variant="link">Link</Button>
<Button variant="ghost">Ghost</Button>
<Button variant="ghostOutline">Ghost Outline</Button>
Expand Down
10 changes: 10 additions & 0 deletions web/src/routes/index.lazy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ const component = () => {
/>
<Button>Subscribe</Button>
</div>
<div>
Being developed by{' '}
<a
href="https://v3x.company"
className="link"
target="_blank"
>
V3X Labs
</a>
</div>
</div>
</div>
);
Expand Down
17 changes: 15 additions & 2 deletions web/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],
theme: {
extend: {},
extend: {
colors: {
primary: {
DEFAULT: '#2d3436',
},
secondary: {
DEFAULT: '#fd79a8',
},
text: {
DEFAULT: '#2d3436',
inverse: 'white',
},
},
},
},
plugins: [],
};
136 changes: 27 additions & 109 deletions web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,112 +1,30 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
"lib": [
"ES2020",
"DOM",
"DOM.Iterable"
] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
"jsx": "react-jsx" /* Specify what JSX code is generated. */,
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
"useDefineForClassFields": true /* Emit ECMAScript-standard-compliant class fields. */,
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "ESNext" /* Specify what module code is generated. */,
// "rootDir": "./", /* Specify the root folder within your source files. */
"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
"resolveJsonModule": true /* Enable importing .json files. */,
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
// "outDir": "./", /* Specify an output folder for all emitted files. */
// "removeComments": true, /* Disable emitting comments. */
"noEmit": true /* Disable emitting files from a compilation. */,
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */

/* Interop Constraints */
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
// "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
}
"module": "ESNext",
"moduleResolution": "Bundler",
"esModuleInterop": true,
"skipLibCheck": true,
"target": "es2022",
"allowJs": true,
"resolveJsonModule": true,
"moduleDetection": "force",
"isolatedModules": true,
"verbatimModuleSyntax": false,
"strict": true,
"noUncheckedIndexedAccess": true,
"noImplicitOverride": true,
"noEmit": true,
"baseUrl": ".",
"plugins": [
{
"name": "next"
}
],
"lib": ["es2022", "dom", "dom.iterable"],
"incremental": true,
"jsx": "preserve",
"strictNullChecks": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules", "./functions"]
}

0 comments on commit 31a3228

Please sign in to comment.