Skip to content

Commit

Permalink
Merge pull request #802 from KBVE/dev
Browse files Browse the repository at this point in the history 
Staging refs/heads/main into Main
  • Loading branch information
@h0lybyte
h0lybyte authored Sep 7, 2023
2 parents 69e695e + c40f66e commit 2fcd0c3
Show file tree
Hide file tree
Showing 41 changed files with 928 additions and 1,367 deletions.
28 changes: 28 additions & 0 deletions .astro/types.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1551,6 +1551,34 @@ declare module 'astro:content' {
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-03.md": {
id: "09-03.md";
slug: "09-03";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-04.md": {
id: "09-04.md";
slug: "09-04";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-05.md": {
id: "09-05.md";
slug: "09-05";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-06.md": {
id: "09-06.md";
slug: "09-06";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"asset.mdx": {
id: "asset.mdx";
slug: "asset";
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
trailingComma: 'all',

// Place Bracket in the same line
bracketSameLine:true,
bracketSameLine: true,

// See: https://github.com/prettier/prettier/issues/7475
useTabs: true,
Expand Down
6 changes: 2 additions & 4 deletions .svelte-kit/ambient.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ declare module '$env/static/private' {
export const INIT_CWD: string;
export const LANG: string;
export const LOCALAPPDATA: string;
export const LOCAL_GIT_DIRECTORY: string;
export const LOGONSERVER: string;
export const NDI_RUNTIME_DIR_V2: string;
export const NDI_RUNTIME_DIR_V3: string;
Expand Down Expand Up @@ -81,7 +82,6 @@ declare module '$env/static/private' {
export const npm_package_dependencies_alpinejs: string;
export const npm_package_dependencies_appwrite: string;
export const npm_package_dependencies_astro: string;
export const npm_package_dependencies_astro_compress: string;
export const npm_package_dependencies_cookie: string;
export const npm_package_dependencies_crypto_js: string;
export const npm_package_dependencies_devalue: string;
Expand All @@ -96,7 +96,6 @@ declare module '$env/static/private' {
export const npm_package_dependencies_magic_string: string;
export const npm_package_dependencies_mermaid: string;
export const npm_package_dependencies_micromodal: string;
export const npm_package_dependencies_million: string;
export const npm_package_dependencies_mime: string;
export const npm_package_dependencies_nanostores: string;
export const npm_package_dependencies_openpgp: string;
Expand Down Expand Up @@ -338,6 +337,7 @@ declare module '$env/dynamic/private' {
INIT_CWD: string;
LANG: string;
LOCALAPPDATA: string;
LOCAL_GIT_DIRECTORY: string;
LOGONSERVER: string;
NDI_RUNTIME_DIR_V2: string;
NDI_RUNTIME_DIR_V3: string;
Expand Down Expand Up @@ -368,7 +368,6 @@ declare module '$env/dynamic/private' {
npm_package_dependencies_alpinejs: string;
npm_package_dependencies_appwrite: string;
npm_package_dependencies_astro: string;
npm_package_dependencies_astro_compress: string;
npm_package_dependencies_cookie: string;
npm_package_dependencies_crypto_js: string;
npm_package_dependencies_devalue: string;
Expand All @@ -383,7 +382,6 @@ declare module '$env/dynamic/private' {
npm_package_dependencies_magic_string: string;
npm_package_dependencies_mermaid: string;
npm_package_dependencies_micromodal: string;
npm_package_dependencies_million: string;
npm_package_dependencies_mime: string;
npm_package_dependencies_nanostores: string;
npm_package_dependencies_openpgp: string;
Expand Down
6 changes: 3 additions & 3 deletions astro.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import sitemap from '@astrojs/sitemap';
//TODO <import vue>

import react from '@astrojs/react';
import compress from 'astro-compress';

//* Prefetch for AstroJS
import prefetch from '@astrojs/prefetch';
Expand All @@ -32,7 +31,7 @@ import partytown from '@astrojs/partytown';
import svelte from '@astrojs/svelte';

//! [Million.js]
import million from 'million/compiler';
//import million from 'million/compiler';

// https://astro.build/config
export default defineConfig({
Expand Down Expand Up @@ -69,7 +68,8 @@ export default defineConfig({
],
// Vite
vite: {
plugins: [million.vite({ mode: 'react', optimize: false, server: true })],
//plugins: [million.vite({ mode: 'react', optimize: false, server: true })],
plugins: [],
ssr: {
//external: ["@11ty/eleventy-img", "svgo"],
//external: ["@11ty/eleventy-img"]
Expand Down
17 changes: 8 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@astrojs/prefetch": "^0.4.0",
"@astrojs/react": "^3.0.0",
"@astrojs/sitemap": "^3.0.0",
"@astrojs/svelte": "^4.0.0",
"@astrojs/svelte": "^4.0.1",
"@astrojs/tailwind": "^5.0.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
Expand All @@ -52,9 +52,9 @@
"@mui/material": "^5.14.7",
"@nanostores/persistent": "^0.9.1",
"@nanostores/react": "^0.7.1",
"@react-three/fiber": "^8.13.7",
"@react-three/fiber": "^8.14.0",
"@supabase/supabase-js": "^2.33.1",
"@sveltejs/kit": "^1.24.0",
"@sveltejs/kit": "^1.24.1",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/line-clamp": "^0.4.4",
Expand All @@ -63,35 +63,34 @@
"@types/react-router-dom": "^5.3.3",
"alpinejs": "^3.13.0",
"appwrite": "^12.0.0",
"astro": "^3.0.7",
"astro-compress": "^2.0.15",
"astro": "^3.0.8",
"crypto-js": "^4.1.1",
"dompurify": "^3.0.5",
"flowbite": "^1.8.1",
"flowbite-react": "^0.5.0",
"flowbite-svelte": "^0.44.10",
"interweave": "^13.1.0",
"jquery": "^3.7.1",
"lodash": "^4.17.21",
"mermaid": "^10.4.0",
"micromodal": "^0.4.10",
"million": "^2.6.0-beta.12",
"nanostores": "^0.9.3",
"openpgp": "^5.10.1",
"react": "^18.2.0",
"react-cookie": "^6.1.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.45.4",
"react-hook-form": "^7.46.0",
"react-icons": "^4.10.1",
"react-router-dom": "^6.15.0",
"react-unity-webgl": "^9.4.3",
"rehype-autolink-headings": "^6.1.1",
"rehype-external-links": "^2.1.0",
"rehype-external-links": "^3.0.0",
"rehype-slug": "^6.0.0",
"rehype-stringify": "^10.0.0",
"rehype-toc": "^3.0.2",
"remark-toc": "^8.0.1",
"sharp": "^0.32.5",
"svelte": "^4.2.0",
"svelte": "^4.0.0",
"tailwindcss": "^3.3.3",
"tailwindcss-fluid-type": "^2.0.3",
"three": "^0.156.0",
Expand Down
Binary file added public/assets/img/astronaut.avif
View file
Binary file not shown.
40 changes: 0 additions & 40 deletions src/components/Card/IntroductionCard.astro
View file

This file was deleted.

39 changes: 0 additions & 39 deletions src/components/Card/NewsCard.astro
View file

This file was deleted.

37 changes: 0 additions & 37 deletions src/components/Card/NullCard.astro
View file

This file was deleted.

51 changes: 0 additions & 51 deletions src/components/Card/Yugi.astro
View file

This file was deleted.

Loading

0 comments on commit 2fcd0c3

Please sign in to comment.