Skip to content

Commit

Permalink
Merge pull request #91 from SpaceyaTech/blog-admin-forms
Browse files Browse the repository at this point in the history
Add blog handling logic
  • Loading branch information
JimmyTron authored Dec 24, 2023
2 parents a2e0df6 + 5a612f0 commit 46377bb
Show file tree
Hide file tree
Showing 57 changed files with 4,049 additions and 4,108 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/update-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: Update Dev Branch on Main Update

on:
push:
branches:
- main

jobs:
update-dev-branch:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Update Dev branch
run: |
git checkout -B dev main # Checkout or create 'dev' branch from 'main'
git pull origin main # Pull changes from the main branch
# Make necessary changes here or use any other command to update the dev branch
git push origin dev # Push changes to the 'dev' branch
name: Update Dev Branch on Main Update

on:
push:
branches:
- main

jobs:
update-dev-branch:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Update Dev branch
run: |
git checkout -B dev main # Checkout or create 'dev' branch from 'main'
git pull origin main # Pull changes from the main branch
# Make necessary changes here or use any other command to update the dev branch
git push origin dev # Push changes to the 'dev' branch
130 changes: 65 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
{
"name": "syt_website",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"lint": "eslint --fix eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prepare": "husky install",
"start": "react-scripts start",
"test": "react-scripts test",
"eject": "react-scripts eject",
"pretty": "prettier --write ."
},
"dependencies": {
"@emailjs/browser": "^3.11.0",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@headlessui/react": "^1.7.15",
"@hookform/resolvers": "^3.3.2",
"@tanstack/react-query": "^4.35.3",
"@tanstack/react-query-devtools": "^4.35.3",
"axios": "^1.6.1",
"date-fns": "^2.30.0",
"html-react-parser": "^5.0.6",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.48.2",
"react-query": "^3.39.3",
"react-router-dom": "^6.11.2",
"react-simple-wysiwyg": "^2.2.5",
"tailwind-scrollbar-hide": "^1.1.7",
"yup": "^1.3.2"
},
"devDependencies": {
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@vitejs/plugin-react": "^4.0.0",
"autoprefixer": "^10.4.14",
"eslint": "^8.43.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.3.4",
"husky": "^8.0.0",
"lint-staged": "^13.2.2",
"postcss": "^8.4.23",
"prettier": "^2.8.8",
"tailwindcss": "^3.3.2",
"vite": "^4.3.2"
},
"lint-staged": {
"**/*.{js,jsx}": [
"npm run lint",
"prettier --write"
]
}
}
{
"name": "syt_website",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"lint": "eslint --fix eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prepare": "husky install",
"start": "react-scripts start",
"test": "react-scripts test",
"eject": "react-scripts eject",
"pretty": "prettier --write ."
},
"dependencies": {
"@emailjs/browser": "^3.11.0",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@headlessui/react": "^1.7.15",
"@hookform/resolvers": "^3.3.2",
"@tanstack/react-query": "^4.35.3",
"@tanstack/react-query-devtools": "^4.35.3",
"axios": "^1.6.1",
"date-fns": "^2.30.0",
"html-react-parser": "^5.0.6",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.48.2",
"react-query": "^3.39.3",
"react-router-dom": "^6.11.2",
"react-simple-wysiwyg": "^2.2.5",
"tailwind-scrollbar-hide": "^1.1.7",
"yup": "^1.3.2"
},
"devDependencies": {
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@vitejs/plugin-react": "^4.0.0",
"autoprefixer": "^10.4.14",
"eslint": "^8.43.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.3.4",
"husky": "^8.0.0",
"lint-staged": "^13.2.2",
"postcss": "^8.4.23",
"prettier": "^2.8.8",
"tailwindcss": "^3.3.2",
"vite": "^4.3.2"
},
"lint-staged": {
"**/*.{js,jsx}": [
"npm run lint",
"prettier --write"
]
}
}
Loading

1 comment on commit 46377bb

@vercel
Copy link

@vercel vercel bot commented on 46377bb Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.