Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App #95

Merged
merged 4 commits into from
Nov 3, 2023
Merged

App #95

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/app-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ jobs:
- name: Build packages
run: ${{ steps.detect-package-manager.outputs.manager }} run build:package

- name: React App build test
run: ${{ steps.detect-package-manager.outputs.manager }} workspace react-app build

- name: Gallery build test
run: ${{ steps.detect-package-manager.outputs.manager }} workspace gallery build

- name: App build test
run: ${{ steps.detect-package-manager.outputs.manager }} run build:app

6 changes: 4 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,14 @@ jobs:

- name: Build
run: |
${{ steps.detect-package-manager.outputs.manager }} workspace gallery build
${{ steps.detect-package-manager.outputs.manager }} workspace gallery build -- \
--site "${{ steps.pages.outputs.origin }}" \
--base "${{ steps.pages.outputs.base_path }}"

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
with:
path: ./app/gallery/out
path: ./app/gallery/dist

# Deployment job
deploy:
Expand Down
12 changes: 11 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
{}
{
"plugins": ["prettier-plugin-astro"],
"overrides": [
{
"files": "*.astro",
"options": {
"parser": "astro"
}
}
]
}
50 changes: 50 additions & 0 deletions app/gallery/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
module.exports = {
extends: [
"airbnb-base",
"airbnb-typescript/base",
"plugin:astro/recommended",
"prettier",
],
parser: "@typescript-eslint/parser",
parserOptions: {
project: "./tsconfig.json",
},
env: {
node: true,
browser: true,
es6: true,
},
overrides: [
{
files: ["*.astro"],
parser: "astro-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
extraFileExtensions: [".astro"],
},
rules: {
"import/prefer-default-export": "off",
"import/no-extraneous-dependencies": "off",
"import/no-unresolved": "warn",
},
},
{
files: ["astro.config.ts", "panda.config.ts"],
rules: {
"import/no-extraneous-dependencies": "off",
},
},
{
files: ["src/components/scripts/**/*"],
rules: {
"@typescript-eslint/naming-convention": "warn",
},
},
{
files: ["src/content/config.ts"],
rules: {
"import/prefer-default-export": "off",
},
},
],
};
14 changes: 0 additions & 14 deletions app/gallery/.eslintrc.json

This file was deleted.

6 changes: 6 additions & 0 deletions app/gallery/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

# panda
styled-system

# astro
.astro
13 changes: 13 additions & 0 deletions app/gallery/astro.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { defineConfig } from "astro/config";
import mdx from "@astrojs/mdx";
import pandacss from "@pandacss/astro";
import rehypeClassNames from "rehype-class-names";
import { rehypeClassNamesOptions } from "./src/utils/rehypeClassNamesOptions";

export default defineConfig({
integrations: [pandacss(), mdx()],
markdown: {
// @ts-ignore
rehypePlugins: [[rehypeClassNames, rehypeClassNamesOptions]],
},
});
23 changes: 0 additions & 23 deletions app/gallery/next.config.js

This file was deleted.

46 changes: 22 additions & 24 deletions app/gallery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,36 @@
"version": "1.1.2",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start -p 4000",
"lint": "next lint",
"prepare": "panda codegen",
"dev": "astro dev",
"start": "astro start",
"build": "astro build",
"preview": "astro preview",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/next-js": "^2.1.5",
"@chakra-ui/react": "^2.8.1",
"@cieloazul310/astro-sarkara-utils": "^1.0.0",
"@cieloazul310/ol-gsi-vt": "^1.1.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mdx-js/loader": "^2",
"@mdx-js/react": "^2",
"@next/mdx": "^14.0.1",
"@types/mdx": "^2",
"framer-motion": "^10.16.4",
"next": "^14.0.1",
"ol": "^8.1.0",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"remark-prism": "^1.3.6"
"@types/mdx": "^2.0.9",
"astro": "^3.4.2",
"astro-icon": "^0.8.1",
"ol": "^8.1.0"
},
"devDependencies": {
"@astrojs/mdx": "^1.1.3",
"@cieloazul310/tsconfig": "^1.1.2",
"@pandacss/astro": "^0.17.5",
"@pandacss/dev": "^0.17.5",
"@types/node": "^20.8.10",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"eslint": "^8.52.0",
"eslint-config-next": "^14.0.1",
"@cieloazul310/tsconfig": "^1.1.2",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-astro": "^0.29.1",
"eslint-plugin-import": "^2.29.0",
"rehype-class-names": "^1.0.14",
"typescript": "^5.2.2"
}
}
Loading