Skip to content

Commit

Permalink
Merge branch 'master' into feat/root-endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
NaucMeIT authored Dec 10, 2024
2 parents 4707568 + 86ed2d8 commit 904cbd4
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 42 deletions.
3 changes: 2 additions & 1 deletion libs/ui/design-system/src/actions-wrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client'

import { Button, Tooltip } from '@nmit-coursition/ui/design-system'
import { cn } from '@nmit-coursition/ui/utils'
import { type FileFormat, useContentCopy, useContentDownload } from '@nmit-coursition/utils'
import { CheckCircle, Copy, Download } from 'lucide-react'
Expand All @@ -16,6 +15,8 @@ import {
useRef,
} from 'react'
import { toast } from 'sonner'
import { Button } from './button'
import { Tooltip } from './tooltip'

type Position = 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'

Expand Down
76 changes: 38 additions & 38 deletions libs/ui/design-system/src/nmit-colors.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
/* Raw colours */
:root {
--color-amber-50: #fffbeb;
--color-amber-50-15: rgba(var(--color-amber-50), 0.15);
--color-amber-50-30: rgba(var(--color-amber-50), 0.30);
--color-amber-50-75: rgba(var(--color-amber-50), 0.75);
--color-amber-100: #fef3c7;
--color-amber-600: #d97706;
--color-amber-700: #b45309;
--color-red-500: #ff0000;
--color-red-600: #dc2626;
--color-red-700: #b91c1c;
--color-yellow-400: #facc15;
--color-yellow-500: #eab308;
--color-nmit-yellow: #faff00;
--color-nmit-turquoise: #00ffe0;
--color-nmit-dark-turquoise: #00caff;
--color-nmit-green: #9eff00;
--color-fuchsia-100: #fae8ff;
--color-fuchsia-200: #f5d0fe;
--color-fuchsia-200-80: rgba(var(--color-fuchsia-200), 0.80);
--color-fuchsia-300: #f1b9ff;
--color-fuchsia-400: #e879f9;
--color-fuchsia-600: #c026d3;
--color-fuchsia-600-30: rgba(var(--color-fuchsia-600), 0.30);
--color-fuchsia-600-50: rgba(var(--color-fuchsia-600), 0.50);
--color-fuchsia-900: #701a75;
--color-fuchsia-950: #4a044e;
--color-fuchsia-950-50: rgba(var(--color-fuchsia-950), 0.50);
--color-fuchsia-950-75: rgba(var(--color-fuchsia-950), 0.75);
--color-stone-50: #fafaf9;
--color-stone-400: #a8a29e;
--color-stone-500: #78716c;
--color-stone-600: #57534e;
--color-stone-800: #292524;
--color-stone-900: #1c1917;
--color-stone-950: #0a0a0a;
}
/* Raw colours */
:root {
--color-amber-50: #fffbeb;
--color-amber-50-15: rgba(var(--color-amber-50), 0.15);
--color-amber-50-30: rgba(var(--color-amber-50), 0.3);
--color-amber-50-75: rgba(var(--color-amber-50), 0.75);
--color-amber-100: #fef3c7;
--color-amber-600: #d97706;
--color-amber-700: #b45309;
--color-red-500: #ff0000;
--color-red-600: #dc2626;
--color-red-700: #b91c1c;
--color-yellow-400: #facc15;
--color-yellow-500: #eab308;
--color-nmit-yellow: #faff00;
--color-nmit-turquoise: #00ffe0;
--color-nmit-dark-turquoise: #00caff;
--color-nmit-green: #9eff00;
--color-fuchsia-100: #fae8ff;
--color-fuchsia-200: #f5d0fe;
--color-fuchsia-200-80: rgba(var(--color-fuchsia-200), 0.8);
--color-fuchsia-300: #f1b9ff;
--color-fuchsia-400: #e879f9;
--color-fuchsia-600: #c026d3;
--color-fuchsia-600-30: rgba(var(--color-fuchsia-600), 0.3);
--color-fuchsia-600-50: rgba(var(--color-fuchsia-600), 0.5);
--color-fuchsia-900: #701a75;
--color-fuchsia-950: #4a044e;
--color-fuchsia-950-50: rgba(var(--color-fuchsia-950), 0.5);
--color-fuchsia-950-75: rgba(var(--color-fuchsia-950), 0.75);
--color-stone-50: #fafaf9;
--color-stone-400: #a8a29e;
--color-stone-500: #78716c;
--color-stone-600: #57534e;
--color-stone-800: #292524;
--color-stone-900: #1c1917;
--color-stone-950: #0a0a0a;
}
5 changes: 3 additions & 2 deletions oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"browser": true
},
"settings": {},
"plugins": ["nursery", "typescript-eslint"],
"rules": {
"import/no-cycle": "error",
"react-perf/jsx-no-new-function-as-prop": "off",
Expand All @@ -21,9 +22,9 @@
"no-null": "off",
"no-unexpected-multiline": "off",
"max-classes-per-file": "off",
"consistent-type-imports": "warn",
"typescript/no-unsafe-function-type": "error",
"typescript/no-wrapper-object-types": "error",
"typescript/no-unsafe-declaration-merging": "error",
"@typescript-eslint/ban-types": "off"
"typescript/no-unsafe-declaration-merging": "error"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"validateEnv": "bun libs/env/src/index.ts",
"postinstall": "bunx prisma generate --schema ./libs/db/src/schema.prisma",
"check:biome": "bunx @biomejs/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true",
"check:oxlint": "bunx oxlint@latest -c oxlintrc.json --ignore-path=.oxlintignore --jsx-a11y-plugin --nextjs-plugin --react-perf-plugin --promise-plugin --node-plugin --import-plugin --tsconfig=tsconfig.base.json -D all -D nursery -A explicit-function-return-type -A no-optional-chaining -A react-in-jsx-scope -A no-rest-spread-properties -A no-ternary -A prefer-ts-expect-error -A no-async-await -A no-side-effects-in-initialization -A no-undef -A no-magic-numbers -A max-lines -A no-empty-interface -A ban-ts-comment -A filename-case -A prefer-dom-node-remove -A sort-keys -A sort-imports"
"check:oxlint": "bunx oxlint@latest -c oxlintrc.json --ignore-path=.oxlintignore --jsx-a11y-plugin --nextjs-plugin --react-perf-plugin --promise-plugin --node-plugin --import-plugin --tsconfig=tsconfig.base.json -A explicit-function-return-type -A no-optional-chaining -A react-in-jsx-scope -A no-rest-spread-properties -A no-ternary -A prefer-ts-expect-error -A no-async-await -A no-side-effects-in-initialization -A no-undef -A no-magic-numbers -A max-lines -A no-empty-interface -A ban-ts-comment -A filename-case -A prefer-dom-node-remove -A sort-keys -A sort-imports"
},
"trustedDependencies": [
"@biomejs/biome",
Expand Down

0 comments on commit 904cbd4

Please sign in to comment.