🎉 Merge Templates

mergerocks · Nov 28, 2022 · 3467cbf · 3467cbf
1 parent e1a9c87
commit 3467cbf
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -1,24 +1,2 @@
-# Relaypay Web App
+# Merge Development Templates
 
-**Required**: [Tailwind CSS IntelliSense](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)
-<hr>
-
-## Development:
-```bash
-yarn dev
-```
-
-## Run linter:
-```bash
-yarn lint
-```
-
-## Production  build:
-```bash
-yarn build
-```
-
-## Production start:
-```bash
-yarn start
-```
diff --git a/.eslintrc.json → next-tailwind/.eslintrc.json b/.eslintrc.json → next-tailwind/.eslintrc.json
diff --git a/.gitignore → next-tailwind/.gitignore b/.gitignore → next-tailwind/.gitignore
@@ -34,3 +34,5 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+storybook-static
diff --git a/.husky/pre-commit → next-tailwind/.husky/pre-commit b/.husky/pre-commit → next-tailwind/.husky/pre-commit
diff --git a/.prettierrc → next-tailwind/.prettierrc b/.prettierrc → next-tailwind/.prettierrc
diff --git a/.storybook/main.js → next-tailwind/.storybook/main.js b/.storybook/main.js → next-tailwind/.storybook/main.js
diff --git a/.storybook/preview.js → next-tailwind/.storybook/preview.js b/.storybook/preview.js → next-tailwind/.storybook/preview.js
diff --git a/.vscode/settings.json → next-tailwind/.vscode/settings.json b/.vscode/settings.json → next-tailwind/.vscode/settings.json
diff --git a/next-tailwind/README.md b/next-tailwind/README.md
@@ -0,0 +1,75 @@
+# Next.JS + Tailwind
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Version</th>
+      <th>Link</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Next.js</td>
+      <td><code>13.0.1</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <td>Typescript</td>
+      <td><code>4.8.4</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <td>Tailwindcss</td>
+      <td><code>^3.2.1</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <td>Vitest</td>
+      <td><code>^0.24.5</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <td>Eslint</td>
+      <td><code>8.26.0</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <td>Storybook</td>
+      <td><code>^6.5.13</code></td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+  </tbody>
+</table>
+<br>
+
+**🥋 Required VS Code Plugin**: [Tailwind CSS IntelliSense](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)
+<br>
+<br>
+
+## Development:
+```bash
+yarn dev
+```
+
+## Run linter:
+```bash
+yarn lint
+```
+
+## Production  build:
+```bash
+yarn build
+```
+
+## Production start:
+```bash
+yarn start
+```
diff --git a/components/common/Button/Button.module.css → ...omponents/common/Button/Button.module.css b/components/common/Button/Button.module.css → ...omponents/common/Button/Button.module.css
diff --git a/components/common/Button/Button.stories.tsx → ...mponents/common/Button/Button.stories.tsx b/components/common/Button/Button.stories.tsx → ...mponents/common/Button/Button.stories.tsx
diff --git a/components/common/Button/Button.test.tsx → .../components/common/Button/Button.test.tsx b/components/common/Button/Button.test.tsx → .../components/common/Button/Button.test.tsx
diff --git a/components/common/Button/Button.tsx → ...lwind/components/common/Button/Button.tsx b/components/common/Button/Button.tsx → ...lwind/components/common/Button/Button.tsx
diff --git a/...Button/__snapshots__/Button.test.tsx.snap → ...Button/__snapshots__/Button.test.tsx.snap b/...Button/__snapshots__/Button.test.tsx.snap → ...Button/__snapshots__/Button.test.tsx.snap
diff --git a/components/common/Button/index.ts → ...ailwind/components/common/Button/index.ts b/components/common/Button/index.ts → ...ailwind/components/common/Button/index.ts
diff --git a/components/common/index.ts → next-tailwind/components/common/index.ts b/components/common/index.ts → next-tailwind/components/common/index.ts
diff --git a/next.config.js → next-tailwind/next.config.js b/next.config.js → next-tailwind/next.config.js
diff --git a/package.json → next-tailwind/package.json b/package.json → next-tailwind/package.json
diff --git a/pages/_app.tsx → next-tailwind/pages/_app.tsx b/pages/_app.tsx → next-tailwind/pages/_app.tsx
diff --git a/pages/api/hello.ts → next-tailwind/pages/api/hello.ts b/pages/api/hello.ts → next-tailwind/pages/api/hello.ts
diff --git a/pages/index.tsx → next-tailwind/pages/index.tsx b/pages/index.tsx → next-tailwind/pages/index.tsx
diff --git a/postcss.config.js → next-tailwind/postcss.config.js b/postcss.config.js → next-tailwind/postcss.config.js
diff --git a/public/favicon.ico → next-tailwind/public/favicon.ico b/public/favicon.ico → next-tailwind/public/favicon.ico
diff --git a/styles/globals.css → next-tailwind/styles/globals.css b/styles/globals.css → next-tailwind/styles/globals.css
diff --git a/tailwind.config.js → next-tailwind/tailwind.config.js b/tailwind.config.js → next-tailwind/tailwind.config.js
diff --git a/tsconfig.json → next-tailwind/tsconfig.json b/tsconfig.json → next-tailwind/tsconfig.json
diff --git a/vitest.config.ts → next-tailwind/vitest.config.ts b/vitest.config.ts → next-tailwind/vitest.config.ts
diff --git a/yarn.lock → next-tailwind/yarn.lock b/yarn.lock → next-tailwind/yarn.lock