Skip to content

Commit

Permalink
Merge branch 'main' into cr/features
Browse files Browse the repository at this point in the history
  • Loading branch information
Resaki1 committed Oct 5, 2023
2 parents a4127b7 + 5bddea7 commit b659f91
Show file tree
Hide file tree
Showing 46 changed files with 2,002 additions and 531 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
// ...
"plugin:astro/recommended",
],
ignorePatterns: ["dist/"],
ignorePatterns: ["dist/", "*.config.js"],
// ...
overrides: [
{
Expand Down
9 changes: 6 additions & 3 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { defineConfig } from 'astro/config';
import { defineConfig } from "astro/config";

import react from "@astrojs/react";

// https://astro.build/config
export default defineConfig({
integrations: [react()]
});
integrations: [react()],
redirects: {
"/legal": "/legal/privacy",
},
});
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@
},
"dependencies": {
"@astrojs/react": "^3.0.2",
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.7",
"astro": "^3.1.2",
"@types/react": "^18.2.25",
"@types/react-dom": "^18.2.8",
"astro": "^3.2.2",
"classnames": "^2.3.2",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"devDependencies": {
"@typescript-eslint/parser": "^6.7.3",
"prettier-plugin-astro": "^0.12.0",
"eslint": "^8.50.0",
"eslint-plugin-astro": "^0.29.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"@typescript-eslint/parser": "^6.7.2",
"sass": "^1.68.0"
}
}
128 changes: 83 additions & 45 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions prettier.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/** @type {import("prettier").Config} */
export default {
plugins: ["prettier-plugin-astro"],
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
};
3 changes: 0 additions & 3 deletions public/icons/facebook.svg

This file was deleted.

3 changes: 0 additions & 3 deletions public/icons/github.svg

This file was deleted.

8 changes: 0 additions & 8 deletions public/icons/inovex.svg

This file was deleted.

Loading

0 comments on commit b659f91

Please sign in to comment.