Skip to content

Commit

Permalink
Merge pull request #22 from isaiahdaviscom/development
Browse files Browse the repository at this point in the history
Development Brute Test
  • Loading branch information
isaiahdaviscom authored Apr 17, 2023
2 parents 38ba565 + 7974450 commit 47939d6
Showing 68 changed files with 64,957 additions and 30,312 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -24,4 +24,7 @@ yarn-debug.log*
yarn-error.log*

# Local Netlify folder
.netlify
.netlify

#vscode
myportfolio.code-workspace
16 changes: 16 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"@storybook/preset-create-react-app"
],
"framework": "@storybook/react",
"core": {
"builder": "@storybook/builder-webpack5"
}
}
9 changes: 9 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
}
21 changes: 21 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build:app",
"group": "build",
"problemMatcher": [],
"label": "npm: build:app",
"detail": "react-scripts build"
},
{
"type": "npm",
"script": "npm serve -s build",
"group": "build",
"problemMatcher": [],
"label": "serve -s build",
"detail": "serve -s build"
}
]
}
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# MyPortfolio
<<<<<<< HEAD

My portfolio website
=======
>>>>>>> master
- [MyPortfolio](#myportfolio)
![HTML5](https://img.shields.io/badge/html5-%23E34F26.svg?style=for-the-badge&logo=html5&logoColor=white)

![CSS3](https://img.shields.io/badge/css3-%231572B6.svg?style=for-the-badge&logo=css3&logoColor=white)

![JavaScript](https://img.shields.io/badge/javascript-%23323330.svg?style=for-the-badge&logo=javascript&logoColor=%23F7DF1E)

![React](https://img.shields.io/badge/react-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB)

![Bootstrap](https://img.shields.io/badge/bootstrap-%23563D7C.svg?style=for-the-badge&logo=bootstrap&logoColor=white)

[Design System](https://xd.adobe.com/view/a7af9364-9671-4278-96a0-b5e1b6f3b690-f2fc/)
[Live Site](https://isaiahdavis.com/)
@@ -14,10 +20,6 @@ Issue:
Failed retrieving user account: Unauthorized. Double-check your login status with 'netlify status' or contact support with details of your error.
Resolution:
<<<<<<< HEAD
=======
>>>>>>> master
## Create-React-App-Lambda
This project is a reference demo showing you how to use [Create React App v3](https://github.com/facebookincubator/create-react-app) and [netlify-lambda v1](https://github.com/netlify/netlify-lambda) together in a [Netlify Dev](https://www.netlify.com/docs/cli/?utm_source=github&utm_medium=swyx-CRAL&utm_campaign=devex#netlify-dev-beta) workflow. You can clone this and immediately be productive with a React app with serverless Netlify Functions in the same repo. Alternatively you can deploy straight to Netlify with this one-click Deploy:
Loading

0 comments on commit 47939d6

Please sign in to comment.