Skip to content

Commit

Permalink
merge pull request #167 from kenedyolisi/dev
Browse files Browse the repository at this point in the history
update from dev
  • Loading branch information
kenedyolisi authored Aug 21, 2024
2 parents f5ee476 + 52e1280 commit 4fba246
Show file tree
Hide file tree
Showing 18 changed files with 669 additions and 1,161 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Deploy to GitHub Pages

on:
# Trigger the workflow every time you push to the `main` branch
# Using a different branch name? Replace `main` with your branch’s name
push:
branches: [main]
# Allows you to run this workflow manually from the Actions tab on GitHub.
workflow_dispatch:

# Allow this job to clone the repo and create a page deployment
permissions:
contents: read
pages: write
id-token: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout your repository using git
uses: actions/checkout@v4
- name: Install, build, and upload your site output
uses: withastro/action@v2
# with:
# path: . # The root location of your Astro project inside the repository. (optional)
# node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 18. (optional)
# package-manager: pnpm@latest # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)

deploy:
needs: build
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ out
.nuxt
dist

# Astro build/generate output
/.astro

# vuepress build output
.vuepress/dist
Expand Down Expand Up @@ -151,4 +153,4 @@ src/__generated__
dist
dist-ssr
dev-dist
*.local
*.local
3 changes: 0 additions & 3 deletions .prettierrc.json

This file was deleted.

20 changes: 20 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
$schema: https://json.schemastore.org/prettierrc.json
arrowParens: always
bracketSameLine: false
bracketSpacing: true
editorconfig: true
trailingComma: all
endOfLine: crlf
plugins:
- prettier-plugin-astro
- prettier-plugin-svelte
- prettier-plugin-organize-imports
- prettier-plugin-tailwindcss
overrides:
- files: "*.astro"
options:
parser: astro
- files: "*.svelte"
options:
parser: svelte
5 changes: 2 additions & 3 deletions astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import PWA from "@vite-pwa/astro";
import { defineConfig } from "astro/config";
import tailwind from "@astrojs/tailwind";

// https://astro.build/config
export default defineConfig({
integrations: [PWA(), svelte(), tailwind()]
});
integrations: [PWA(), svelte(), tailwind()],
});
27 changes: 7 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"version": "0.0.0",
"type": "module",
"packageManager": "[email protected]+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
Expand All @@ -15,36 +16,22 @@
"astro": "^4.14.2",
"bootstrap": "^5.3.3",
"mathjs": "^12.2.1",
"react": "^18.2.0",
"react-bootstrap": "^2.10.1",
"react-dom": "^18.2.0",
"svelte": "5.0.0-next.225"
},
"devDependencies": {
"@types/bootstrap": "^5",
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.25",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.18.0",
"@vite-pwa/astro": "^0.4.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.57.0",
"eslint-plugin-astro": "^1.2.3",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-svelte": "^2.43.0",
"sass": "^1.71.1",
"stylelint": "^16.2.1",
"stylelint-config-twbs-bootstrap": "^14.1.0",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-organize-imports": "^4.0.0",
"prettier-plugin-svelte": "^3.2.6",
"prettier-plugin-tailwindcss": "^0.6.6",
"tailwindcss": "^3.4.10",
"typescript": "^5.5.4",
"vite": "^5.1.7",
"vite-plugin-pwa": "^0.17.4"
},
"peerDependencies": {
"@popperjs/core": "*"
},
"packageManager": "[email protected]+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf"
"vitest": "^2.0.5"
}
}
Loading

0 comments on commit 4fba246

Please sign in to comment.