diff --git a/.eslintrc.js b/.eslintrc.js index bfc96a8..f551104 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,9 +1,9 @@ module.exports = { - root: true, - extends: ["@developomp-site/eslint-config"], - settings: { - next: { - rootDir: ["apps/*/"], - }, - }, + root: true, + extends: ["@developomp-site/eslint-config"], + settings: { + next: { + rootDir: ["apps/*/"], + }, + }, } diff --git a/.firebaserc b/.firebaserc index d372a6f..062e644 100644 --- a/.firebaserc +++ b/.firebaserc @@ -11,11 +11,11 @@ "blog": [ "developomp-site-blog" ], - "portfolio": [ + "portfolio": [ "developomp-site-portfolio" ] } } }, "etags": {} -} \ No newline at end of file +} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7a94d32..7a951b6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,37 +2,37 @@ name: Deploy pages on: - push: - branches: - - master + push: + branches: + - master jobs: - deploy: - if: ${{ github.repository_owner == 'developomp' }} - name: Deploy - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@master + deploy: + if: ${{ github.repository_owner == 'developomp' }} + name: Deploy + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@master - - uses: pnpm/action-setup@v2 - with: - version: 8 + - uses: pnpm/action-setup@v2 + with: + version: 8 - - name: Setup Node - uses: actions/setup-node@v2 - with: - node-version: 18 - cache: pnpm + - name: Setup Node + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: pnpm - - name: Install dependencies - run: pnpm install + - name: Install dependencies + run: pnpm install - - name: Build - run: pnpm build + - name: Build + run: pnpm build - - name: Deploy to Firebase - uses: w9jds/firebase-action@master - with: - args: deploy - env: - GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} + - name: Deploy to Firebase + uses: w9jds/firebase-action@master + with: + args: deploy + env: + GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} diff --git a/.gitignore b/.gitignore index e18c506..0c14b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,10 @@ node_modules *.log .next dist +build dist-ssr *.local .env .cache -server/dist -public/dist storybook-static/ +.svelte-kit/ diff --git a/.prettierrc b/.prettierrc index 6d9b2ba..401605e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,19 @@ { - "useTabs": true, - "semi": false + "useTabs": false, + "tabWidth": 4, + "semi": false, + "overrides": [ + { + "files": "*.md", + "options": { + "tabWidth": 2 + } + }, + { + "files": ".firebaserc", + "options": { + "tabWidth": 2 + } + } + ] } diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 28839e1..ed9860d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,13 +1,13 @@ { - "recommendations": [ - "esbenp.prettier-vscode", - "dbaeumer.vscode-eslint", - "naumovs.color-highlight", - "streetsidesoftware.code-spell-checker", - "aaron-bond.better-comments", - "styled-components.vscode-styled-components", - "bradlc.vscode-tailwindcss", - "unifiedjs.vscode-mdx", - "svelte.svelte-vscode" - ] + "recommendations": [ + "esbenp.prettier-vscode", + "dbaeumer.vscode-eslint", + "naumovs.color-highlight", + "streetsidesoftware.code-spell-checker", + "aaron-bond.better-comments", + "styled-components.vscode-styled-components", + "bradlc.vscode-tailwindcss", + "unifiedjs.vscode-mdx", + "svelte.svelte-vscode" + ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index b77a548..bd3bf60 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,76 +1,76 @@ { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnPaste": true, - "editor.formatOnSave": true, - "editor.detectIndentation": false, - "editor.insertSpaces": false, - "editor.codeActionsOnSave": { - "source.fixAll": true - }, - "cSpell.words": [ - "bspwm", - "cairographics", - "classnet", - "deno", - "developomp", - "developomp's", - "dompurify", - "elasticlunr", - "Exyle", - "exyleio", - "Fontawesome", - "Fonticons", - "fontsource", - "fortawesome", - "Freedesktop", - "GDSC", - "githubactions", - "githubpages", - "gnubash", - "godotengine", - "heroicon", - "hljs", - "hongik", - "hoofd", - "inqling", - "Jimin", - "katex", - "Librewolf", - "linaria", - "nodedotjs", - "noto", - "pnpm", - "pocketbase", - "polybar", - "Pomky", - "precompress", - "rainmeter", - "sxhkd", - "tailwindcss", - "tauri", - "texmath", - "tinycolor", - "tsup", - "Turborepo", - "ungoogled", - "unixporn", - "wbtimeline", - "webassembly", - "wouter", - "YYYYMMDD" - ], - "eslint.workingDirectories": [{ "mode": "auto" }], - "[svg]": { - "editor.defaultFormatter": "jock.svg" - }, - // prevent tailwind-related warnings - "css.lint.unknownAtRules": "ignore", - "less.lint.unknownAtRules": "ignore", - "scss.lint.unknownAtRules": "ignore", - // for .ejs files - "html.validate.styles": false, - "color-highlight.markerType": "outline", - "[dotenv]": { - "editor.defaultFormatter": "foxundermoon.shell-format" - } + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.detectIndentation": false, + "editor.insertSpaces": false, + "editor.codeActionsOnSave": { + "source.fixAll": true + }, + "cSpell.words": [ + "bspwm", + "cairographics", + "classnet", + "deno", + "developomp", + "developomp's", + "dompurify", + "elasticlunr", + "Exyle", + "exyleio", + "Fontawesome", + "Fonticons", + "fontsource", + "fortawesome", + "Freedesktop", + "GDSC", + "githubactions", + "githubpages", + "gnubash", + "godotengine", + "heroicon", + "hljs", + "hongik", + "hoofd", + "inqling", + "Jimin", + "katex", + "Librewolf", + "linaria", + "nodedotjs", + "noto", + "pnpm", + "pocketbase", + "polybar", + "Pomky", + "precompress", + "rainmeter", + "sxhkd", + "tailwindcss", + "tauri", + "texmath", + "tinycolor", + "tsup", + "Turborepo", + "ungoogled", + "unixporn", + "wbtimeline", + "webassembly", + "wouter", + "YYYYMMDD" + ], + "eslint.workingDirectories": [{ "mode": "auto" }], + "[svg]": { + "editor.defaultFormatter": "jock.svg" + }, + // prevent tailwind-related warnings + "css.lint.unknownAtRules": "ignore", + "less.lint.unknownAtRules": "ignore", + "scss.lint.unknownAtRules": "ignore", + // for .ejs files + "html.validate.styles": false, + "color-highlight.markerType": "outline", + "[dotenv]": { + "editor.defaultFormatter": "foxundermoon.shell-format" + } } diff --git a/apps/blog/.eslintrc b/apps/blog/.eslintrc index e3a9cfc..46c0586 100644 --- a/apps/blog/.eslintrc +++ b/apps/blog/.eslintrc @@ -1,30 +1,30 @@ { - "root": true, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:json/recommended", - "prettier" - ], - "settings": { - "node": { - "tryExtensions": [".js", ".jsx", ".json"] - }, - "react": { - "version": "18.0" - } - }, - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaFeatures": { - "jsx": true - }, - "sourceType": "module" - }, - "plugins": ["@typescript-eslint"], - "rules": { - "@typescript-eslint/no-empty-interface": "off", - "@typescript-eslint/explicit-module-boundary-types": "off", - "react/react-in-jsx-scope": ["off"] - } + "root": true, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:json/recommended", + "prettier" + ], + "settings": { + "node": { + "tryExtensions": [".js", ".jsx", ".json"] + }, + "react": { + "version": "18.0" + } + }, + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaFeatures": { + "jsx": true + }, + "sourceType": "module" + }, + "plugins": ["@typescript-eslint"], + "rules": { + "@typescript-eslint/no-empty-interface": "off", + "@typescript-eslint/explicit-module-boundary-types": "off", + "react/react-in-jsx-scope": ["off"] + } } diff --git a/apps/blog/package.json b/apps/blog/package.json index 8d6eb14..d5faee3 100644 --- a/apps/blog/package.json +++ b/apps/blog/package.json @@ -1,71 +1,71 @@ { - "name": "@developomp-site/blog", - "version": "0.0.0", - "private": true, - "scripts": { - "cp": "cp -a ../../packages/blog-content/dist/public/. ./public", - "dev": "pnpm cp && react-scripts start", - "build": "pnpm cp && react-scripts build", - "clean": "rm -rf .turbo build node_modules" - }, - "dependencies": { - "@developomp-site/blog-content": "workspace:*", - "@developomp-site/theme": "workspace:*", - "@fontsource/noto-sans-kr": "^5.0.3", - "@fontsource/source-code-pro": "^5.0.3", - "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", - "@fortawesome/free-regular-svg-icons": "^6.2.1", - "@fortawesome/free-solid-svg-icons": "^6.2.1", - "@fortawesome/react-fontawesome": "^0.2.0", - "elasticlunr": "^0.9.5", - "highlight.js": "^11.7.0", - "katex": "^0.16.4", - "local-storage-fallback": "^4.1.2", - "react": "^18.2.0", - "react-collapse": "^5.1.1", - "react-date-range": "^1.4.0", - "react-device-detect": "^2.2.2", - "react-dnd": "^16.0.1", - "react-dnd-html5-backend": "^16.0.1", - "react-dom": "^18.2.0", - "react-helmet-async": "^1.3.0", - "react-router-dom": "^6.4.5", - "react-scripts": "^5.0.1", - "react-select": "^5.7.0", - "react-tooltip": "^4.5.1", - "styled-components": "^5.3.6" - }, - "devDependencies": { - "@developomp-site/tsconfig": "workspace:*", - "@styled/typescript-styled-plugin": "^1.0.0", - "@types/elasticlunr": "^0.9.5", - "@types/highlight.js": "^10.1.0", - "@types/jsdom": "^20.0.1", - "@types/katex": "^0.14.0", - "@types/node": "^18.11.11", - "@types/react": "^18.0.26", - "@types/react-collapse": "^5.0.1", - "@types/react-date-range": "^1.4.4", - "@types/react-dom": "^18.0.9", - "@types/react-select": "^5.0.1", - "@types/styled-components": "^5.1.26", - "jsdom": "^20.0.3", - "prettier": "^2.8.1", - "simple-icons": "^7.21.0", - "tslint-config-prettier": "^1.18.0", - "typescript": "^4.9.4" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } + "name": "@developomp-site/blog", + "version": "0.0.0", + "private": true, + "scripts": { + "cp": "cp -a ../../packages/blog-content/dist/public/. ./public", + "dev": "pnpm cp && react-scripts start", + "build": "pnpm cp && react-scripts build", + "clean": "rm -rf .turbo build node_modules" + }, + "dependencies": { + "@developomp-site/blog-content": "workspace:*", + "@developomp-site/theme": "workspace:*", + "@fontsource/noto-sans-kr": "^5.0.3", + "@fontsource/source-code-pro": "^5.0.3", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-regular-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", + "elasticlunr": "^0.9.5", + "highlight.js": "^11.7.0", + "katex": "^0.16.4", + "local-storage-fallback": "^4.1.2", + "react": "^18.2.0", + "react-collapse": "^5.1.1", + "react-date-range": "^1.4.0", + "react-device-detect": "^2.2.2", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", + "react-dom": "^18.2.0", + "react-helmet-async": "^1.3.0", + "react-router-dom": "^6.4.5", + "react-scripts": "^5.0.1", + "react-select": "^5.7.0", + "react-tooltip": "^4.5.1", + "styled-components": "^5.3.6" + }, + "devDependencies": { + "@developomp-site/tsconfig": "workspace:*", + "@styled/typescript-styled-plugin": "^1.0.0", + "@types/elasticlunr": "^0.9.5", + "@types/highlight.js": "^10.1.0", + "@types/jsdom": "^20.0.1", + "@types/katex": "^0.14.0", + "@types/node": "^18.11.11", + "@types/react": "^18.0.26", + "@types/react-collapse": "^5.0.1", + "@types/react-date-range": "^1.4.4", + "@types/react-dom": "^18.0.9", + "@types/react-select": "^5.0.1", + "@types/styled-components": "^5.1.26", + "jsdom": "^20.0.3", + "prettier": "^2.8.1", + "simple-icons": "^7.21.0", + "tslint-config-prettier": "^1.18.0", + "typescript": "^4.9.4" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + } } diff --git a/apps/blog/public/index.html b/apps/blog/public/index.html index d890ba3..aea458d 100644 --- a/apps/blog/public/index.html +++ b/apps/blog/public/index.html @@ -1,22 +1,22 @@ - - - - + + + + - - - + + + - pomp - - - -
- + pomp + + + +
+ diff --git a/apps/blog/src/App.tsx b/apps/blog/src/App.tsx index a799e6e..e264100 100644 --- a/apps/blog/src/App.tsx +++ b/apps/blog/src/App.tsx @@ -21,74 +21,77 @@ import GlobalStyle from "./styles/globalStyle" import { globalContext } from "./globalContext" const IENotSupported = styled.p` - margin: auto; - font-size: 2rem; - margin-top: 2rem; - text-align: center; - font-family: ${(props) => props.theme.theme.font.sansSerif}; + margin: auto; + font-size: 2rem; + margin-top: 2rem; + text-align: center; + font-family: ${(props) => props.theme.theme.font.sansSerif}; ` const StyledContentContainer = styled.div` - flex: 1 1 auto; - margin-bottom: 3rem; - margin-top: 5rem; + flex: 1 1 auto; + margin-bottom: 3rem; + margin-top: 5rem; ` export default function App() { - const { globalState } = useContext(globalContext) + const { globalState } = useContext(globalContext) - const [isLoading, setIsLoading] = useState(true) + const [isLoading, setIsLoading] = useState(true) - useEffect(() => { - // set loading to false if all fonts are loaded - // checks if document.fonts.onloadingdone is supported on the browser - if (typeof document.fonts.onloadingdone != undefined) { - document.fonts.onloadingdone = () => { - setIsLoading(false) - } - } else { - setIsLoading(false) - } - }, []) + useEffect(() => { + // set loading to false if all fonts are loaded + // checks if document.fonts.onloadingdone is supported on the browser + if (typeof document.fonts.onloadingdone != undefined) { + document.fonts.onloadingdone = () => { + setIsLoading(false) + } + } else { + setIsLoading(false) + } + }, []) - if (isIE) - return ( - - Internet Explorer is not supported. - - ) + if (isIE) + return ( + + Internet Explorer is not supported. + + ) - return ( - - - - - - - + return ( + + + + + + + - + -
- - {isLoading ? ( - - ) : ( - - } /> - } /> - } /> - } /> - } /> - - )} - -