Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"ignorePatterns": ["/root/webpack.config.js"],
"ignorePatterns": ["/root/vite.config.ts"],
"rules": {
"no-console": ["error"],
"import/extensions": "off",
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
</head>
<body class="dark:bg-dark-frame-bg">
<div id="tree"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
<!DOCTYPE html>
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-dupe-keys */
/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
module.exports = {
export default {
preset: 'ts-jest',
testEnvironment: 'jsdom',
verbose: true,
Expand Down
7,454 changes: 3,219 additions & 4,235 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
"name": "atlp-pulse-fn",
"version": "2.0.0",
"description": "Dev pulse app",
"type": "module",
"main": "src/index.tsx",
"scripts": {
"dev": "webpack server",
"build": "webpack",
"dev": "vite",
"build": "vite build",
"test": "npm run update-snapshots && npx jest --runInBand",
"update-snapshots": "jest --updateSnapshot",
"coverage": "jest --collect-coverage --silent -u",
Expand Down Expand Up @@ -50,6 +51,7 @@
"@testing-library/dom": "^8.20.1",
"@testing-library/user-event": "^14.4.3",
"@types/node": "^20.4.2",
"@vitejs/plugin-react": "^4.3.1",
"ajv": "^8.12.0",
"apollo-upload-client": "^17.0.0",
"autoprefixer": "^10.4.14",
Expand All @@ -58,7 +60,6 @@
"cleave.js": "^1.6.0",
"cloudinary": "^1.39.0",
"cloudinary-react": "^1.8.1",
"copy-webpack-plugin": "^11.0.0",
"crypto-browserify": "^3.12.0",
"date-fns": "^2.30.0",
"dotenv": "^16.3.1",
Expand Down Expand Up @@ -109,6 +110,8 @@
"subscriptions-transport-ws": "^0.11.0",
"tailwindcss": "^3.3.3",
"url-polyfill": "^1.1.12",
"vite": "^5.4.7",
"vite-tsconfig-paths": "^5.0.1",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down Expand Up @@ -150,7 +153,6 @@
"faker": "5.5.3",
"file-loader": "^6.2.0",
"graphql": "^16.7.1",
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.3",
"install": "^0.13.0",
"jest": "^28.1.3",
Expand All @@ -171,10 +173,7 @@
"tailwindcss": "^3.1.4",
"ts-jest": "^28.0.8",
"ts-loader": "^9.4.4",
"typescript": "^4.9.5",
"webpack": "^5.88.1",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1"
"typescript": "^4.9.5"
},
"lint-staged": {
"*.{js,ts,tsx}": "eslint --fix",
Expand Down
10 changes: 5 additions & 5 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const tailwindcss = require('tailwindcss');
const autoprefixer = require('autoprefixer');

module.exports = {
plugins: [tailwindcss('./tailwind.config.js'), autoprefixer],
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};
2 changes: 1 addition & 1 deletion src/components/InvitationTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ function DataTableStats({ data, columns, error, loading }: TableData) {
);
}

export default DataTableStats;
export default DataTableStats;
15 changes: 8 additions & 7 deletions src/pages/GradingSystem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import GRADING_SYSTEM_QUERY from './GradingSystemQuery';
import MAKE_DEFAULT_GRADING_SYSTEM from '../Mutations/MakeDefault';
import GRADING_SYSTEM_MUTATION from './GradingSystemMutation';
import AddGradingSystem from './gradeSystem/addNew';
import GradingSkeleton from '../Skeletons/gradingSkeleton'
import GradingSkeleton from '../Skeletons/gradingSkeleton';

type grade = {
grade?: string;
range?: string;
Expand Down Expand Up @@ -278,12 +279,12 @@ function GradingSystem() {
{value === '' && (
<div className="">
<div className="max-w-full">
<DataTable
columns={GradingsColumn}
loading={gradeLoading}
data={gradingData}
title={t('Gradings List')}
/>
<DataTable
columns={GradingsColumn}
loading={gradeLoading}
data={gradingData}
title={t('Gradings List')}
/>
</div>
</div>
)}
Expand Down
1 change: 0 additions & 1 deletion target/npmlist.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"chart.js": { "version": "4.3.0" },
"cleave.js": { "version": "1.6.0" },
"cloudinary-react": { "version": "1.8.1" },
"copy-webpack-plugin": { "version": "11.0.0" },
"crypto-browserify": { "version": "3.12.0" },
"date-fns": { "version": "2.30.0" },
"dotenv": { "version": "16.3.1" },
Expand Down
29 changes: 29 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import dotenv from 'dotenv';
import path from 'path';
import viteTsconfigPaths from 'vite-tsconfig-paths';

dotenv.config();

export default defineConfig({
plugins: [react(), viteTsconfigPaths()],
resolve: {
alias: {
'chart.js': 'chart.js/auto',
crypto: 'crypto-browserify',
},
},
server: {
port: 3001,
open: true,
strictPort: true,
},
build: {
outDir: 'build',
sourcemap: true,
},
define: {
'process.env': JSON.stringify(process.env),
},
});
Loading