Skip to content

Commit

Permalink
Worked on Button, Styled Storybook, worked on workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
JackatDJL committed Mar 15, 2024
1 parent e5e5ad0 commit 820554b
Show file tree
Hide file tree
Showing 13 changed files with 1,475 additions and 202 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/WEBCI.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Scripts 🧾 for Web Branches ✔
name: CI Scripts 🧾 for Web Branches ✔

on:
push:
Expand Down Expand Up @@ -121,4 +121,4 @@ jobs:
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.ref }}
branch: ${{ github.ref }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,6 @@ blank

# Ignore backup files

/backup/*
/backup/*

dev.bash
11 changes: 9 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
],
"terminal.integrated.shellArgs.linux": ["-c", "cd /noplus-web; exec bash"],
"terminal.integrated.shellArgs.windows": ["-NoExit", "-Command", "cd /noplus-web"]
"terminal.integrated.shellArgs.linux": ["-c", "cd /noplus-web; exec bash"],
"terminal.integrated.shellArgs.windows": ["-NoExit", "-Command", "cd /noplus-web"],
"terminal.integrated.profiles.windows": {
"PowerShell": {
"source": "PowerShell",
"args": ["-NoExit", "-Command", "Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass; powershell; cd /noplus-web"]
}
},
"terminal.integrated.fontFamily": "Cascadia Code",
}
2 changes: 2 additions & 0 deletions noplus-web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ next-env.d.ts
storybook-static
.env
*.log

*storybook.log
7 changes: 5 additions & 2 deletions noplus-web/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ 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",
"@storybook/addon-onboarding",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
"@chromatic-com/storybook"
"@storybook/addon-styling-webpack",
"@storybook/addon-themes"
],
framework: {
name: "@storybook/nextjs",
Expand All @@ -16,5 +18,6 @@ const config: StorybookConfig = {
docs: {
autodocs: "tag",
},
staticDirs: ["..\\public"],
};
export default config;
28 changes: 25 additions & 3 deletions noplus-web/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,40 @@
import type { Preview } from "@storybook/react";
import "tailwindcss/tailwind.css"; // Add this line to import Tailwind CSS
import "../src/app/globals.css"; // Add this line to import global styles
import "../src/app/globals.css";

import { withThemeByClassName } from "@storybook/addon-themes";

const preview: Preview = {
parameters: {
actions: {},
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
backgrounds: {
default: "light",
values: [
{
name: "light",
value: "#e5e5eb",
},
{
name: "dark",
value: "#14141a",
className: "dark",
},
],
},
},

decorators: [withThemeByClassName({
themes: {
// nameOfTheme: 'classNameForTheme',
light: '',
dark: 'dark',
},
defaultTheme: 'light',
})]
};

export default preview;
9 changes: 9 additions & 0 deletions noplus-web/.storybook/theme.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { create } from '@storybook/theming/create';

export default create({
base: 'dark',
brandTitle: 'JnMProjects NoPlus',
brandUrl: 'https://jnmprojects.github.io', // muss ich mir mal die vercel url claimen
brandImage: 'https://avatars.githubusercontent.com/u/145216129?s=400&u=8227fa15efacf3efea9866433888038611dce9c6&v=4',
brandTarget: '_self',
});
Loading

0 comments on commit 820554b

Please sign in to comment.