Skip to content

Commit

Permalink
Merge branch 'feature/metrics-crud-UI' of github.com:greenpill-dev-gu…
Browse files Browse the repository at this point in the history
…ild/impact-framework-backend into develop
  • Loading branch information
Oba-One committed May 1, 2024
2 parents abcca05 + e24cc3e commit 76a012a
Show file tree
Hide file tree
Showing 85 changed files with 13,130 additions and 8,230 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.json

This file was deleted.

10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage
coverage

# next.js
/.next/
.next
/out/

# production
/build
build

# misc
.DS_Store
Expand All @@ -36,3 +36,5 @@ yarn-error.log*
next-env.d.ts

.idea/

*storybook.log
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20
3 changes: 0 additions & 3 deletions app/globals.css

This file was deleted.

22 changes: 0 additions & 22 deletions app/layout.tsx

This file was deleted.

4 changes: 0 additions & 4 deletions next.config.mjs

This file was deleted.

40 changes: 5 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,11 @@
{
"name": "impact-framework-backend",
"version": "0.1.0",
"name": "impact-framework",
"version": "0.0.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"dev": "cd packages/client && pnpm run dev",
"test": "cd packages/client && pnpm run test",
"build": "cd packages/client && pnpm run build",
"generate:supabase:types": "npx supabase gen types typescript --local > types/database-generated.types.ts"
},
"dependencies": {
"@supabase/supabase-js": "^2.42.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"global": "^4.4.0",
"lucide-react": "^0.364.0",
"next": "14.1.4",
"ra-data-json-server": "^4.16.12",
"ra-input-rich-text": "^4.16.14",
"ra-supabase": "^2.2.0",
"react": "^18",
"react-admin": "^4.16.14",
"react-dom": "^18",
"snaplet": "^0.90.0",
"tailwind-merge": "^2.2.2",
"tailwindcss-animate": "^1.0.7",
"tsx": "^4.7.2"
},
"devDependencies": {
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"autoprefixer": "^10.0.1",
"eslint": "^8",
"eslint-config-next": "14.1.4",
"postcss": "^8",
"tailwindcss": "^3.3.0",
"typescript": "^5"
}
}
21 changes: 21 additions & 0 deletions packages/client/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { StorybookConfig } from "@storybook/nextjs";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-onboarding",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
],
framework: {
name: "@storybook/nextjs",
options: {},
},
docs: {
autodocs: "tag",
},
staticDirs: ["../public"],
};
export default config;
14 changes: 14 additions & 0 deletions packages/client/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import type { Preview } from "@storybook/react";

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
File renamed without changes.
9 changes: 9 additions & 0 deletions packages/client/__tests__/app/page.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { expect, test } from "vitest";
import { render, screen } from "@testing-library/react";

import Page from "@/app/page";

test("Page", () => {
render(<Page />);
expect(screen.getByRole("heading", { level: 1, name: "Home" })).toBeDefined();
});
8 changes: 8 additions & 0 deletions packages/client/next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import withBundleAnalyzer from "@next/bundle-analyzer";

/** @type {import('next').NextConfig} */
const nextConfig = {};

export default process.env.ANALYZE === "true"
? withBundleAnalyzer(nextConfig)
: nextConfig;
73 changes: 73 additions & 0 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"name": "impact-garden",
"version": "0.0.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"test": "next build",
"start": "next start",
"lint": "next lint",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
"dependencies": {
"@supabase/supabase-js": "^2.42.7",
"@xstate/react": "4.1.1",
"lucide-react": "0.376.0",
"next": "14.2.3",
"ra-data-json-server": "^4.16.16",
"react": "^18",
"react-admin": "^4.16.14",
"react-dom": "^18",
"react-hot-toast": "2.4.1",
"react-spinners": "0.13.8",
"xstate": "5.12.0",
"viem": "2.9.28",
"zod": "3.23.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"global": "^4.4.0",
"ra-input-rich-text": "^4.16.14",
"ra-supabase": "^2.2.0",
"snaplet": "^0.90.0",
"tailwind-merge": "^2.2.2",
"tailwindcss-animate": "^1.0.7",
"tsx": "^4.7.2"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.3.3",
"@next/bundle-analyzer": "14.2.3",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-interactions": "^8.0.9",
"@storybook/addon-links": "^8.0.9",
"@storybook/addon-onboarding": "^8.0.9",
"@storybook/blocks": "^8.0.9",
"@storybook/nextjs": "^8.0.9",
"@storybook/react": "^8.0.9",
"@storybook/test": "^8.0.9",
"@testing-library/react": "^15.0.4",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.0.1",
"daisyui": "4.10.2",
"eslint": "^8",
"eslint-config-next": "14.1.4",
"eslint-plugin-storybook": "^0.8.0",
"jsdom": "^24.0.0",
"postcss": "^8",
"prettier": "3.2.5",
"storybook": "^8.0.9",
"tailwindcss": "^3.3.0",
"typescript": "^5",
"vitest": "^1.5.2"
},
"eslintConfig": {
"extends": [
"next/core-web-vitals",
"plugin:storybook/recommended"
]
}
}
Loading

0 comments on commit 76a012a

Please sign in to comment.