Skip to content

Commit

Permalink
Merge branch 'develop' into alex/implement-email-notification-functio…
Browse files Browse the repository at this point in the history
…nality
  • Loading branch information
ryandotfurrer authored Oct 14, 2024
2 parents e85408c + 068997a commit b4f7874
Show file tree
Hide file tree
Showing 17 changed files with 508 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { StorybookConfig } from '@storybook/nextjs';

const config: StorybookConfig = {
stories: [
'../stories/*.mdx',
'../stories/**/*.mdx',
'../components/**/*.stories.@(js|jsx|mjs|ts|tsx)',
],
Expand All @@ -12,6 +13,7 @@ const config: StorybookConfig = {
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
'@storybook/manager-api',
],
framework: {
name: '@storybook/nextjs',
Expand Down
8 changes: 8 additions & 0 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { addons } from '@storybook/manager-api';

addons.setConfig({
sidebar: {
showRoots: true,
collapsedRoots: ['about', 'technical-planning-documents'],
},
});
9 changes: 2 additions & 7 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Preview } from '@storybook/react';
import '../app/globals.css';
import '../stories/styles.css';

const preview: Preview = {
parameters: {
Expand All @@ -9,13 +10,7 @@ const preview: Preview = {
date: /Date$/i,
},
},
backgrounds: {
default: 'dark',
values: [
{ name: 'dark', value: '#09090B' },
{ name: 'light', value: '#fff' },
],
},
layout: 'centered',
},
};

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
"clsx": "^2.1.0",
"geist": "^1.2.2",
"immer": "^10.1.1",
"lucide-react": "^0.312.0",
"lucide-react": "^0.447.0",
"next": "^14.1.1",
"node-appwrite": "^13.0.0",
"postcss": "8.4.29",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.51.3",
"react-hot-toast": "^2.4.1",
"react-icons": "^5.3.0",
"tailwind-merge": "^2.2.2",
"tailwindcss": "3.3.3",
"tailwindcss-animate": "^1.0.7",
Expand Down
24 changes: 18 additions & 6 deletions pnpm-lock.yaml

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

9 changes: 9 additions & 0 deletions public/assets/appwriteLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions public/assets/blogRecorderLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/fonts/Geist[wght].ttf
Binary file not shown.
6 changes: 6 additions & 0 deletions public/assets/frontendMentorLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/assets/gitkrakenLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/pastelLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b4f7874

Please sign in to comment.