V3

.env.example

@@ -1,20 +1,23 @@
-#webserver config
+# node server config
 HOST=0.0.0.0
 PORT=5178
 ORIGIN=http://localhost:5178
-PUBLIC_ORIGIN=https://myweb.cz
-BODY_SIZE_LIMIT=16777216 # max upload size in bytes
-#database config
+# database config
 DATABASE_IP=10.10.10.223
 DATABASE_PORT=3306
 DATABASE_USER=superclovek
 DATABASE_PASSWORD=tajnyheslo123456
-DATABASE_NAME=website
-DATABASE_URL=mysql://superclovek:tajnyheslo123456@10.10.10.223:3306/website
-#secret pro JWT (tím se bude podepisovat JWT token - https://jwt.io/)
+DATABASE_NAME=db
+DATABASE_URL=mysql://superclovek:tajnyheslo123456@10.10.10.223:3306/db
+# jwt settings
 JWT_SECRET=text
-#v sekundách (10 min =  10 * 60)
-#expiruje pouze pokud uživatel danou dobu nic nedělá (neprochází stránky)
+# marks how many seconds until session cookie expire
 COOKIE_EXPIRE=1200
-#v sekundách (5 minut = 5 * 60)
-PUBLIC_CHECK_COOKIE_INTERVAL=300
+# default account which will be created in migrations
+DEFAULT_USERNAME=patrick115
+DEFAULT_PASSWORD=test123
+HASH_ROUNDS=12
+# folder for uploaded images
+FILE_FOLDER=./uploads
+MAX_FILE_SIZE=104857600
+BODY_SIZE_LIMIT=104857600

.github/workflows/ci.yaml

@@ -0,0 +1,127 @@
+name: CI
+
+on:
+    push:
+
+jobs:
+    lint:
+        name: 'Lint code'
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install NodeJS
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+
+            - name: Install pnpm
+              run: npm install -g pnpm
+
+            - name: Cache node_modules
+              uses: actions/cache@v3
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
+                  restore-keys: |
+                      ${{ runner.os }}-pnpm-store-
+
+            - name: Install dependencies
+              run: pnpm install --frozen-lockfile
+
+            - name: Copy env
+              run: cp .env.example .env
+
+            - name: Build
+              run: pnpm run build
+
+            - name: Check lint
+              run: pnpm run lint
+
+            - name: TypeScript check
+              run: pnpm run check
+
+    deploy:
+        name: Deploy
+        runs-on: ubuntu-latest
+        needs: lint
+        if: github.ref == 'refs/heads/main'
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Deploy via SSH
+              uses: appleboy/ssh-action@v1.2.0
+              with:
+                  host: ${{ secrets.HOST }}
+                  username: ${{ secrets.USERNAME }}
+                  port: ${{ secrets.PORT }}
+                  key: ${{ secrets.SSH_KEY }}
+                  script: |
+                      cd /opt/NodeApps/Web
+
+                      echo "Setting up nvm"                
+                      export NVM_DIR="$HOME/.nvm"
+                      source "$NVM_DIR/nvm.sh"
+                      nvm use
+
+                      echo "Pulling latest changes from git"
+                      git pull
+
+                      echo "Installing dependencies"
+                      npm install -g pnpm
+
+                      echo "Installing dependencies"
+                      pnpm install --frozen-lockfile
+
+                      echo "Building the app"
+                      pnpm run build
+
+                      echo "Run migrations"
+                      pnpm run migrate
+
+                      echo "Restarting the app"
+                      sudo systemctl restart web
+                      echo "Deployment completed"
+    deploybeta:
+        name: DeployBeta
+        runs-on: ubuntu-latest
+        needs: lint
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Deploy via SSH
+              uses: appleboy/ssh-action@v1.2.0
+              with:
+                  host: ${{ secrets.HOST }}
+                  username: ${{ secrets.USERNAME }}
+                  port: ${{ secrets.PORT }}
+                  key: ${{ secrets.SSH_KEY }}
+                  script: |
+                      cd /opt/NodeApps/WebBeta
+
+                      echo "Setting up nvm"                
+                      export NVM_DIR="$HOME/.nvm"
+                      source "$NVM_DIR/nvm.sh"
+                      nvm use
+
+                      echo "Pulling latest changes from git"
+                      git pull
+
+                      echo "Installing dependencies"
+                      npm install -g pnpm
+
+                      echo "Installing dependencies"
+                      pnpm install --frozen-lockfile
+
+                      echo "Building the app"
+                      pnpm run build
+
+                      echo "Run migrations"
+                      pnpm run migrate
+
+                      echo "Restarting the app"
+                      sudo systemctl restart web-beta
+                      echo "Deployment completed"

.gitignore

@@ -1,19 +1,30 @@
-.DS_Store
 node_modules
-/build
+
+# Output
+.output
+.vercel
+.netlify
+.wrangler
 /.svelte-kit
-/package
+/build
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Env
 .env
 .env.*
 !.env.example
+!.env.test
+
+# Vite
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
-#custom folders
-/projects
-.cache
+# logs
+logs/*
 
-#lock files
-pnpm-lock.yaml
-package-lock.json
-yarn.lock
+# image storage
+.cache
+uploads

.husky/pre-commit

@@ -0,0 +1 @@
+pnpx lint-staged

.prettierignore

@@ -1,4 +1,6 @@
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
+# Package Managers
 package-lock.json
+pnpm-lock.yaml
 yarn.lock
+bun.lock
+bun.lockb

.prettierrc

@@ -1,10 +1,16 @@
 {
-    "useTabs": false,
-    "tabWidth": 4,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "printWidth": 180,
-    "semi": true,
-    "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
-    "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+  "useTabs": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "printWidth": 180,
+  "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
+  "overrides": [
+    {
+      "files": "*.svelte",
+      "options": {
+        "parser": "svelte"
+      }
+    }
+  ],
+  "tabWidth": 2
 }

README.md

@@ -1,13 +1,14 @@
 # Info
 
-Source code of my main website [patrick115.eu](https://patrick115.eu)
+TODO
 
 ## Dev mode
 
 ```bash
 npm run dev
 
 # or start the server and open the app in a new browser tab
+
 npm run dev -- --open
 ```
 
@@ -19,26 +20,21 @@ Building app:
 npm run build
 ```
 
-Show builded preview: `npm run preview`.
+Show builded preview: \`npm run preview\`.
 Start builded app using `npm run start` with [Node Adapter](https://kit.svelte.dev/docs/adapter-node) or config command in package.json using your own [Adapter](https://kit.svelte.dev/docs/adapters)
 
 ## Example ENV file (.env.example)
 
 ```YAML
-#webserver config
 HOST=0.0.0.0
 PORT=5178
 ORIGIN=http://localhost:5178
-PUBLIC_ORIGIN=https://myweb.cz
-BODY_SIZE_LIMIT=16777216 # max upload size in bytes
-#database config
 DATABASE_IP=10.10.10.223
 DATABASE_PORT=3306
 DATABASE_USER=superclovek
 DATABASE_PASSWORD=tajnyheslo123456
-DATABASE_NAME=website
-DATABASE_URL=mysql://superclovek:tajnyheslo123456@10.10.10.223:3306/website
-#secret pro JWT (tím se bude podepisovat JWT token - https://jwt.io/)
+DATABASE_NAME=db
+DATABASE_URL=mysql://superclovek:tajnyheslo123456@10.10.10.223:3306/db
 JWT_SECRET=text
 #v sekundách (10 min =  10 * 60)
 #expiruje pouze pokud uživatel danou dobu nic nedělá (neprochází stránky)

config/patrick115.eu

@@ -0,0 +1,25 @@
+server {
+        listen 80;
+        listen [::]:80;
+
+        server_name beta.patrick115.eu;
+
+        return 301 https://$host$request_uri;
+
+}
+
+server {
+
+        listen [::]:443 ssl http2;
+        listen 443 ssl http2;
+
+        server_name beta.patrick115.eu;
+
+        access_log /opt/NodeApps/WebBeta/logs/access.log;
+        error_log /opt/NodeApps/WebBeta/logs/error.log;
+
+        location / {
+            proxy_set_header   X-Real-IP          $remote_addr;
+            proxy_pass "http://127.0.0.1:5188";
+        }
+}

config/web.service

@@ -0,0 +1 @@
+/etc/systemd/system/web.service

eslint.config.js

@@ -1,36 +1,48 @@
 import prettier from 'eslint-config-prettier';
 import js from '@eslint/js';
+import { includeIgnoreFile } from '@eslint/compat';
 import svelte from 'eslint-plugin-svelte';
 import globals from 'globals';
+import { fileURLToPath } from 'node:url';
 import ts from 'typescript-eslint';
+import svelteConfig from './svelte.config.js';
+
+const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
 
 export default ts.config(
+    includeIgnoreFile(gitignorePath),
     js.configs.recommended,
     ...ts.configs.recommended,
-    ...svelte.configs['flat/recommended'],
+    ...svelte.configs.recommended,
     prettier,
-    ...svelte.configs['flat/prettier'],
+    ...svelte.configs.prettier,
     {
         languageOptions: {
-            globals: {
-                ...globals.browser,
-                ...globals.node
-            }
+            globals: { ...globals.browser, ...globals.node }
+        },
+        rules: { 'no-undef': 'off' }
+    },
+    {
+        files: ['./src/lib/server/_routes/**/*.ts'],
+        rules: {
+            'no-console': ['error', { allow: ['error'] }]
         }
     },
     {
-        files: ['**/*.svelte'],
+        ignores: ['./src/lib/server/_routes/**/*.ts'],
         rules: {
-            'svelte/no-at-html-tags': 'off'
-        },
-
+            'no-console': 'error'
+        }
+    },
+    {
+        files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
         languageOptions: {
             parserOptions: {
-                parser: ts.parser
+                projectService: true,
+                extraFileExtensions: ['.svelte'],
+                parser: ts.parser,
+                svelteConfig
             }
         }
-    },
-    {
-        ignores: ['build/', '.svelte-kit/', 'dist/']
     }
 );

kysely.config.json

@@ -0,0 +1,11 @@
+{
+    "outFile": "./src/types/database.ts",
+    "overrides": {
+        "columns": {
+            "article.id": "Generated<string>",
+            "article_equipment.article_id": "string",
+            "exposure.article_id": "string",
+            "gallery_image.article_id": "string"
+        }
+    }
+}