Archived
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Oleksandr Honcharov
|
3e5e529924 | ||
|
Oleksandr Honcharov
|
ebb2364a67 | ||
|
Oleksandr Honcharov
|
44983b4aea | ||
|
Oleksandr Honcharov
|
4da46edfb6 | ||
 rilaxik
|
fcb83f6636 | ||
|
rilaxik
|
81639386e5 |
+4
-9
@@ -1,8 +1,8 @@
|
|||||||
# Editor
|
# Editor
|
||||||
.vscode/
|
.vscode
|
||||||
.idea/
|
.idea
|
||||||
|
|
||||||
.git/
|
.git
|
||||||
|
|
||||||
# Server Files
|
# Server Files
|
||||||
server/bin
|
server/bin
|
||||||
@@ -17,9 +17,4 @@ server/ragemp-server.exe
|
|||||||
|
|
||||||
# Development
|
# Development
|
||||||
node_modules
|
node_modules
|
||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
|
|
||||||
# Build
|
|
||||||
build/
|
|
||||||
dist/
|
|
||||||
out/
|
|
||||||
+1
-1
@@ -4,4 +4,4 @@ singleQuote: true
|
|||||||
jsxSingleQuote: false
|
jsxSingleQuote: false
|
||||||
semi: false
|
semi: false
|
||||||
arrowParens: avoid
|
arrowParens: avoid
|
||||||
endOfLine: auto
|
endOfLine: auto
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
module.exports = {
|
||||||
|
root: true,
|
||||||
|
env: { browser: true, es2020: true },
|
||||||
|
extends: [
|
||||||
|
'eslint:recommended',
|
||||||
|
'plugin:@typescript-eslint/recommended',
|
||||||
|
'plugin:react-hooks/recommended',
|
||||||
|
],
|
||||||
|
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||||
|
parser: '@typescript-eslint/parser',
|
||||||
|
plugins: ['react-refresh'],
|
||||||
|
rules: {
|
||||||
|
'react-refresh/only-export-components': [
|
||||||
|
'warn',
|
||||||
|
{ allowConstantExport: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
# Logs
|
|
||||||
logs
|
|
||||||
*.log
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
pnpm-debug.log*
|
|
||||||
lerna-debug.log*
|
|
||||||
|
|
||||||
node_modules
|
|
||||||
dist
|
|
||||||
dist-ssr
|
|
||||||
*.local
|
|
||||||
|
|
||||||
# Editor directories and files
|
|
||||||
.vscode/*
|
|
||||||
!.vscode/extensions.json
|
|
||||||
.idea
|
|
||||||
.DS_Store
|
|
||||||
*.suo
|
|
||||||
*.ntvs*
|
|
||||||
*.njsproj
|
|
||||||
*.sln
|
|
||||||
*.sw?
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
tabWidth: 4
|
|
||||||
printWidth: 80
|
|
||||||
singleQuote: true
|
|
||||||
jsxSingleQuote: false
|
|
||||||
semi: false
|
|
||||||
arrowParens: avoid
|
|
||||||
endOfLine: auto
|
|
||||||
plugins:
|
|
||||||
- prettier-plugin-svelte
|
|
||||||
overrides:
|
|
||||||
- files: '*.{css,sass,scss}'
|
|
||||||
options:
|
|
||||||
tabWidth: 2
|
|
||||||
parser: scss
|
|
||||||
- files: '*.svelte'
|
|
||||||
options:
|
|
||||||
parser: 'svelte'
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
# Svelte + TS + Vite
|
|
||||||
|
|
||||||
This template should help get you started developing with Svelte and TypeScript in Vite.
|
|
||||||
|
|
||||||
## Recommended IDE Setup
|
|
||||||
|
|
||||||
[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
|
|
||||||
|
|
||||||
## Need an official Svelte framework?
|
|
||||||
|
|
||||||
Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more.
|
|
||||||
|
|
||||||
## Technical considerations
|
|
||||||
|
|
||||||
**Why use this over SvelteKit?**
|
|
||||||
|
|
||||||
- It brings its own routing solution which might not be preferable for some users.
|
|
||||||
- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
|
|
||||||
|
|
||||||
This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
|
|
||||||
|
|
||||||
Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
|
|
||||||
|
|
||||||
**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
|
|
||||||
|
|
||||||
Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
|
|
||||||
|
|
||||||
**Why include `.vscode/extensions.json`?**
|
|
||||||
|
|
||||||
Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
|
|
||||||
|
|
||||||
**Why enable `allowJs` in the TS template?**
|
|
||||||
|
|
||||||
While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant.
|
|
||||||
|
|
||||||
**Why is HMR not preserving my local component state?**
|
|
||||||
|
|
||||||
HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr).
|
|
||||||
|
|
||||||
If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
|
|
||||||
|
|
||||||
```ts
|
|
||||||
// store.ts
|
|
||||||
// An extremely simple external store
|
|
||||||
import { writable } from 'svelte/store'
|
|
||||||
export default writable(0)
|
|
||||||
```
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import globals from 'globals'
|
|
||||||
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
|
|
||||||
import tslint from 'typescript-eslint'
|
|
||||||
|
|
||||||
export default [
|
|
||||||
eslintPluginPrettierRecommended,
|
|
||||||
...tslint.configs.recommended,
|
|
||||||
{
|
|
||||||
name: 'config',
|
|
||||||
languageOptions: {
|
|
||||||
ecmaVersion: 'latest',
|
|
||||||
sourceType: 'module',
|
|
||||||
globals: {
|
|
||||||
alt: true,
|
|
||||||
...globals.browser,
|
|
||||||
...globals.node,
|
|
||||||
},
|
|
||||||
parser: '@typescript-eslint/parser',
|
|
||||||
parserOptions: {
|
|
||||||
ecmaVersion: 'latest',
|
|
||||||
sourceType: 'module',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
ignores: [
|
|
||||||
'node_modules',
|
|
||||||
'dist',
|
|
||||||
'.eslintrc.mjs',
|
|
||||||
'*.config.*',
|
|
||||||
'*.yaml',
|
|
||||||
'*.json',
|
|
||||||
'**/*.d.ts',
|
|
||||||
],
|
|
||||||
// plugins: ['prettier', '@typescript-eslint'],
|
|
||||||
rules: {
|
|
||||||
'no-console': 'off',
|
|
||||||
'no-empty': 'off',
|
|
||||||
'no-nested-ternary': 'off',
|
|
||||||
'no-underscore-dangle': 'off',
|
|
||||||
'no-unused-vars': 'off',
|
|
||||||
'@typescript-eslint/no-unused-vars': [
|
|
||||||
'warn',
|
|
||||||
{
|
|
||||||
argsIgnorePattern: '^_',
|
|
||||||
varsIgnorePattern: '^_',
|
|
||||||
caughtErrorsIgnorePattern: '^_',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
'@typescript-eslint/ban-ts-comment': 'off',
|
|
||||||
'consistent-return': 'off',
|
|
||||||
quotes: 'off',
|
|
||||||
'import/prefer-default-export': 'off',
|
|
||||||
'import/no-dynamic-require': 'off',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
|
||||||
+10
-9
@@ -1,12 +1,13 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
<title>Svelte 5 Demo</title>
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
</head>
|
<title>Vite + React + TS</title>
|
||||||
<body>
|
</head>
|
||||||
<div id="root"></div>
|
<body>
|
||||||
<script type="module" src="/src/main.ts"></script>
|
<div id="root"></div>
|
||||||
</body>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
+32
-51
@@ -1,53 +1,34 @@
|
|||||||
{
|
{
|
||||||
"scripts": {
|
"name": "rage-fw-example-browser",
|
||||||
"dev": "vite",
|
"version": "0.0.0",
|
||||||
"build": "tsc && vite build",
|
"type": "module",
|
||||||
"preview": "vite preview",
|
"author": "Entity Seven Group",
|
||||||
"lint": "eslint --c .eslintrc.yaml src",
|
"license": "MIT",
|
||||||
"check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"
|
"description": "Browser side of rage-fw-example",
|
||||||
},
|
"scripts": {
|
||||||
"dependencies": {
|
"dev": "vite",
|
||||||
"@entityseven/rage-fw-browser": "0.2.0",
|
"build": "tsc && vite build",
|
||||||
"@rage-fw/shared": "workspace:^"
|
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
||||||
},
|
"preview": "vite preview"
|
||||||
"devDependencies": {
|
},
|
||||||
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
|
"dependencies": {
|
||||||
"@tsconfig/svelte": "^5.0.4",
|
"@entityseven/rage-fw-browser": "0.2.0",
|
||||||
"@types/node": "^22.5.0",
|
"@tailwindcss/vite": "^4.0.17",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.2.0",
|
"react": "^18.2.0",
|
||||||
"@typescript-eslint/parser": "^8.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"autoprefixer": "^10.4.20",
|
"tailwindcss": "^4.0.17",
|
||||||
"eslint": "^9.3.0",
|
"zod": "^3.24.2"
|
||||||
"eslint-config-prettier": "^9.1.0",
|
},
|
||||||
"eslint-plugin-prettier": "^5.2.1",
|
"devDependencies": {
|
||||||
"globals": "^15.9.0",
|
"@types/react": "^18.2.66",
|
||||||
"prettier": "^3.3.3",
|
"@types/react-dom": "^18.2.22",
|
||||||
"prettier-plugin-svelte": "^3.3.3",
|
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
||||||
"svelte": "5.1.3",
|
"@typescript-eslint/parser": "^7.2.0",
|
||||||
"svelte-check": "^3.8.5",
|
"@vitejs/plugin-react": "^4.2.1",
|
||||||
"tslib": "^2.6.3",
|
"eslint": "^8.57.0",
|
||||||
"typescript": "^5.5.3",
|
"eslint-plugin-react-hooks": "^4.6.0",
|
||||||
"typescript-eslint": "^8.2.0",
|
"eslint-plugin-react-refresh": "^0.4.6",
|
||||||
"vite": "^5.4.1"
|
"typescript": "^5.2.2",
|
||||||
},
|
"vite": "^5.2.0"
|
||||||
"name": "src-web",
|
}
|
||||||
"private": true,
|
|
||||||
"homepage": ".",
|
|
||||||
"version": "0.0.0",
|
|
||||||
"type": "module",
|
|
||||||
"browserslist": {
|
|
||||||
"production": [
|
|
||||||
">0.2%",
|
|
||||||
"not dead",
|
|
||||||
"not op_mini all"
|
|
||||||
],
|
|
||||||
"development": [
|
|
||||||
"last 1 chrome version",
|
|
||||||
"last 1 firefox version",
|
|
||||||
"last 1 safari version"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trustedDependencies": [
|
|
||||||
"svelte-preprocess"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,32 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import LoginPage from './pages/Authorization/LoginPage'
|
||||||
|
import RegisterPage from './pages/Authorization/RegisterPage'
|
||||||
|
|
||||||
|
import './index.css'
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
const [showLogin, setShowLogin] = React.useState(true)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div className="p-4 text-center">
|
||||||
|
<button
|
||||||
|
onClick={() => setShowLogin(true)}
|
||||||
|
className={`mr-2 px-4 py-2 rounded ${showLogin ? 'bg-sky-600 text-white' : 'bg-gray-300'}`}
|
||||||
|
>
|
||||||
|
Show Login
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setShowLogin(false)}
|
||||||
|
className={`px-4 py-2 rounded ${!showLogin ? 'bg-sky-600 text-white' : 'bg-gray-300'}`}
|
||||||
|
>
|
||||||
|
Show Register
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{showLogin ? <LoginPage /> : <RegisterPage />}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { fw } from '@entityseven/rage-fw-browser'
|
|
||||||
import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
|
||||||
import { onMount } from 'svelte'
|
|
||||||
|
|
||||||
let data =
|
|
||||||
$state<ReturnType<RageFW_ICustomBrowserEvent['customBrowserEvent']>>()
|
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
try {
|
|
||||||
fw.event.register('customBrowserEvent', async greeting => {
|
|
||||||
data += greeting
|
|
||||||
return 'from cef'
|
|
||||||
})
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div style="width: '100%';color: 'white';text-align: 'center'">
|
|
||||||
<h1>Hello World!</h1>
|
|
||||||
<h2>{data}</h2>
|
|
||||||
</div>
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
@@ -0,0 +1,62 @@
|
|||||||
|
import React from 'react'
|
||||||
|
|
||||||
|
interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
|
||||||
|
isLoading?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const Button: React.FC<ButtonProps> = ({
|
||||||
|
children,
|
||||||
|
className,
|
||||||
|
isLoading = false,
|
||||||
|
disabled,
|
||||||
|
...props
|
||||||
|
}) => {
|
||||||
|
const baseClasses =
|
||||||
|
'w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white focus:outline-none focus:ring-2 focus:ring-offset-2'
|
||||||
|
const activeClasses = 'bg-sky-600 hover:bg-sky-700 focus:ring-sky-500'
|
||||||
|
const loadingClasses = 'bg-sky-400 cursor-not-allowed'
|
||||||
|
const disabledClasses = 'bg-gray-400 cursor-not-allowed'
|
||||||
|
|
||||||
|
const getButtonClasses = () => {
|
||||||
|
if (isLoading)
|
||||||
|
return `${baseClasses} ${loadingClasses} ${className || ''}`
|
||||||
|
if (disabled)
|
||||||
|
return `${baseClasses} ${disabledClasses} ${className || ''}`
|
||||||
|
return `${baseClasses} ${activeClasses} ${className || ''}`
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
className={getButtonClasses()}
|
||||||
|
disabled={disabled || isLoading}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
{isLoading ? (
|
||||||
|
<svg
|
||||||
|
className="animate-spin -ml-1 mr-3 h-5 w-5 text-white"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<circle
|
||||||
|
className="opacity-25"
|
||||||
|
cx="12"
|
||||||
|
cy="12"
|
||||||
|
r="10"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth="4"
|
||||||
|
></circle>
|
||||||
|
<path
|
||||||
|
className="opacity-75"
|
||||||
|
fill="currentColor"
|
||||||
|
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
) : (
|
||||||
|
children
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Button
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import React from 'react'
|
||||||
|
|
||||||
|
interface CheckboxProps extends React.InputHTMLAttributes<HTMLInputElement> {
|
||||||
|
label: string
|
||||||
|
id: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const Checkbox: React.FC<CheckboxProps> = ({
|
||||||
|
label,
|
||||||
|
id,
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center mb-4">
|
||||||
|
<input
|
||||||
|
id={id}
|
||||||
|
type="checkbox"
|
||||||
|
className={`h-4 w-4 rounded border-gray-300 text-sky-600 focus:ring-sky-500 ${className || ''}`}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
<label htmlFor={id} className="ml-2 block text-sm text-gray-900">
|
||||||
|
{label}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Checkbox
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import React from 'react'
|
||||||
|
|
||||||
|
interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
|
||||||
|
label: string
|
||||||
|
id: string
|
||||||
|
error?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const Input: React.FC<InputProps> = ({
|
||||||
|
label,
|
||||||
|
id,
|
||||||
|
error,
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
}) => {
|
||||||
|
const baseClasses =
|
||||||
|
'mt-1 block w-full px-3 py-2 bg-white border border-slate-300 rounded-md text-sm shadow-sm placeholder-slate-400 focus:outline-none focus:border-sky-500 focus:ring-1 focus:ring-sky-500 disabled:bg-slate-50 disabled:text-slate-500 disabled:border-slate-200 disabled:shadow-none'
|
||||||
|
const errorClasses =
|
||||||
|
'border-red-500 text-red-600 focus:border-red-500 focus:ring-red-500'
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mb-4">
|
||||||
|
<label
|
||||||
|
htmlFor={id}
|
||||||
|
className="block text-sm font-medium text-slate-700"
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id={id}
|
||||||
|
className={`${baseClasses} ${error ? errorClasses : ''} ${className || ''}`}
|
||||||
|
{...props}
|
||||||
|
aria-invalid={!!error}
|
||||||
|
aria-describedby={error ? `${id}-error` : undefined}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p
|
||||||
|
id={`${id}-error`}
|
||||||
|
className="mt-1 text-xs text-red-600"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Input
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
import React, { useState, useCallback } from 'react'
|
||||||
|
import { loginSchema, LoginFormData, FieldErrors } from '../validation'
|
||||||
|
import { ZodError } from 'zod'
|
||||||
|
|
||||||
|
interface UseLoginFormProps {
|
||||||
|
onSubmitSuccess?: (data: LoginFormData) => void // Optional callback for successful submission
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useLoginForm({ onSubmitSuccess }: UseLoginFormProps = {}) {
|
||||||
|
const [formData, setFormData] = useState<LoginFormData>({
|
||||||
|
identifier: '', // Can hold email or username
|
||||||
|
password: '',
|
||||||
|
saveLogin: false,
|
||||||
|
savePassword: false,
|
||||||
|
})
|
||||||
|
const [errors, setErrors] = useState<FieldErrors<LoginFormData>>({})
|
||||||
|
const [isLoading, setIsLoading] = useState(false)
|
||||||
|
const [submitError, setSubmitError] = useState<string | null>(null)
|
||||||
|
|
||||||
|
const handleChange = useCallback(
|
||||||
|
(e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
const { name, value, type, checked } = e.target
|
||||||
|
setFormData(prev => ({
|
||||||
|
...prev,
|
||||||
|
[name]: type === 'checkbox' ? checked : value,
|
||||||
|
}))
|
||||||
|
// Clear error for the field being edited
|
||||||
|
if (errors[name as keyof LoginFormData]) {
|
||||||
|
setErrors(prev => ({ ...prev, [name]: undefined }))
|
||||||
|
}
|
||||||
|
// Clear general submission error
|
||||||
|
if (submitError) {
|
||||||
|
setSubmitError(null)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[errors, submitError],
|
||||||
|
)
|
||||||
|
|
||||||
|
const validateForm = useCallback(() => {
|
||||||
|
try {
|
||||||
|
loginSchema.parse(formData)
|
||||||
|
setErrors({})
|
||||||
|
return true
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof ZodError) {
|
||||||
|
const fieldErrors: FieldErrors<LoginFormData> = {}
|
||||||
|
error.errors.forEach(err => {
|
||||||
|
if (err.path.length > 0) {
|
||||||
|
fieldErrors[err.path[0] as keyof LoginFormData] =
|
||||||
|
err.message
|
||||||
|
}
|
||||||
|
})
|
||||||
|
setErrors(fieldErrors)
|
||||||
|
} else {
|
||||||
|
console.error(
|
||||||
|
'An unexpected error occurred during validation:',
|
||||||
|
error,
|
||||||
|
)
|
||||||
|
setSubmitError('An unexpected validation error occurred.')
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}, [formData])
|
||||||
|
|
||||||
|
const handleSubmit = useCallback(
|
||||||
|
async (e: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
e.preventDefault()
|
||||||
|
setSubmitError(null)
|
||||||
|
|
||||||
|
if (!validateForm()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsLoading(true)
|
||||||
|
console.log('Submitting login data:', formData)
|
||||||
|
|
||||||
|
// --- TODO: Replace with actual API call to your RageMP server ---
|
||||||
|
try {
|
||||||
|
// Example: Simulate API call
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1000))
|
||||||
|
|
||||||
|
// Assuming API returns success:
|
||||||
|
console.log('Login successful!')
|
||||||
|
// Here you would typically receive a token or session info
|
||||||
|
// Handle 'saveLogin' and 'savePassword' (e.g., using localStorage/sessionStorage)
|
||||||
|
if (formData.saveLogin) {
|
||||||
|
localStorage.setItem('savedUsername', formData.identifier) // Example
|
||||||
|
} else {
|
||||||
|
localStorage.removeItem('savedUsername') // Example
|
||||||
|
}
|
||||||
|
// Password saving is generally discouraged for security reasons,
|
||||||
|
// but if required:
|
||||||
|
if (formData.savePassword) {
|
||||||
|
// Be VERY careful with storing passwords. Consider secure storage or tokens.
|
||||||
|
// localStorage.setItem('savedPassword', formData.password); // **Highly discouraged**
|
||||||
|
console.warn(
|
||||||
|
'Password saving enabled - ensure secure storage mechanism.',
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
setErrors({}) // Clear errors on success
|
||||||
|
if (onSubmitSuccess) {
|
||||||
|
onSubmitSuccess(formData) // Call success callback
|
||||||
|
}
|
||||||
|
// You might redirect the user or update application state here
|
||||||
|
|
||||||
|
// --- Mock Error Handling (remove in real implementation) ---
|
||||||
|
// if (formData.identifier === 'wrong') {
|
||||||
|
// throw new Error("Invalid credentials.");
|
||||||
|
// }
|
||||||
|
// --- End Mock Error Handling ---
|
||||||
|
} catch (apiError: unknown) {
|
||||||
|
console.error('Login API error:', apiError)
|
||||||
|
setSubmitError('Login failed. Please check your credentials.')
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false)
|
||||||
|
}
|
||||||
|
// --- End API call section ---
|
||||||
|
},
|
||||||
|
[formData, validateForm, onSubmitSuccess],
|
||||||
|
)
|
||||||
|
|
||||||
|
// Effect to potentially load saved username on initial render (example)
|
||||||
|
// useEffect(() => {
|
||||||
|
// const savedUser = localStorage.getItem('savedUsername');
|
||||||
|
// if (savedUser) {
|
||||||
|
// setFormData(prev => ({ ...prev, identifier: savedUser, saveLogin: true }));
|
||||||
|
// }
|
||||||
|
// }, []);
|
||||||
|
|
||||||
|
return {
|
||||||
|
formData,
|
||||||
|
errors,
|
||||||
|
isLoading,
|
||||||
|
submitError,
|
||||||
|
handleChange,
|
||||||
|
handleSubmit,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
import React, { useState, useCallback } from 'react'
|
||||||
|
import { registerSchema, RegisterFormData, FieldErrors } from '../validation'
|
||||||
|
import { ZodError } from 'zod'
|
||||||
|
|
||||||
|
interface UseRegisterFormProps {
|
||||||
|
onSubmitSuccess?: (data: RegisterFormData) => void // Optional callback for successful submission
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useRegisterForm({
|
||||||
|
onSubmitSuccess,
|
||||||
|
}: UseRegisterFormProps = {}) {
|
||||||
|
const [formData, setFormData] = useState<RegisterFormData>({
|
||||||
|
username: '',
|
||||||
|
email: '',
|
||||||
|
password: '',
|
||||||
|
passwordRepeat: '',
|
||||||
|
promocode: '',
|
||||||
|
})
|
||||||
|
const [errors, setErrors] = useState<FieldErrors<RegisterFormData>>({})
|
||||||
|
const [isLoading, setIsLoading] = useState(false)
|
||||||
|
const [submitError, setSubmitError] = useState<string | null>(null) // For general API errors
|
||||||
|
|
||||||
|
const handleChange = useCallback(
|
||||||
|
(e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
const { name, value } = e.target
|
||||||
|
setFormData(prev => ({ ...prev, [name]: value }))
|
||||||
|
// Clear error for the field being edited
|
||||||
|
if (errors[name as keyof RegisterFormData]) {
|
||||||
|
setErrors(prev => ({ ...prev, [name]: undefined }))
|
||||||
|
}
|
||||||
|
// Clear general submission error when user starts typing again
|
||||||
|
if (submitError) {
|
||||||
|
setSubmitError(null)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[errors, submitError],
|
||||||
|
)
|
||||||
|
|
||||||
|
const validateForm = useCallback(() => {
|
||||||
|
try {
|
||||||
|
registerSchema.parse(formData)
|
||||||
|
setErrors({}) // Clear errors if validation passes
|
||||||
|
return true
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof ZodError) {
|
||||||
|
const fieldErrors: FieldErrors<RegisterFormData> = {}
|
||||||
|
error.errors.forEach(err => {
|
||||||
|
if (err.path.length > 0) {
|
||||||
|
fieldErrors[err.path[0] as keyof RegisterFormData] =
|
||||||
|
err.message
|
||||||
|
}
|
||||||
|
})
|
||||||
|
setErrors(fieldErrors)
|
||||||
|
} else {
|
||||||
|
console.error(
|
||||||
|
'An unexpected error occurred during validation:',
|
||||||
|
error,
|
||||||
|
)
|
||||||
|
setSubmitError('An unexpected validation error occurred.') // Generic error for non-Zod issues
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}, [formData])
|
||||||
|
|
||||||
|
const handleSubmit = useCallback(
|
||||||
|
async (e: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
e.preventDefault()
|
||||||
|
setSubmitError(null) // Clear previous submit errors
|
||||||
|
|
||||||
|
if (!validateForm()) {
|
||||||
|
return // Stop submission if validation fails
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsLoading(true)
|
||||||
|
console.log('Submitting registration data:', formData)
|
||||||
|
|
||||||
|
// --- TODO: Replace with actual API call to your RageMP server ---
|
||||||
|
try {
|
||||||
|
// Example: Simulate API call
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1500))
|
||||||
|
|
||||||
|
// Assuming API returns success:
|
||||||
|
console.log('Registration successful!')
|
||||||
|
setFormData({
|
||||||
|
username: '',
|
||||||
|
email: '',
|
||||||
|
password: '',
|
||||||
|
passwordRepeat: '',
|
||||||
|
promocode: '',
|
||||||
|
}) // Reset form
|
||||||
|
setErrors({})
|
||||||
|
if (onSubmitSuccess) {
|
||||||
|
onSubmitSuccess(formData) // Call success callback if provided
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Mock Error Handling (remove in real implementation) ---
|
||||||
|
// if (formData.email.includes('fail')) {
|
||||||
|
// throw new Error("Registration failed: Email already exists.");
|
||||||
|
// }
|
||||||
|
// --- End Mock Error Handling ---
|
||||||
|
} catch (apiError: unknown) {
|
||||||
|
console.error('Registration API error:', apiError)
|
||||||
|
// Try to set a user-friendly error message
|
||||||
|
setSubmitError('Registration failed. Please try again.')
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false)
|
||||||
|
}
|
||||||
|
// --- End API call section ---
|
||||||
|
},
|
||||||
|
[formData, validateForm, onSubmitSuccess],
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
formData,
|
||||||
|
errors,
|
||||||
|
isLoading,
|
||||||
|
submitError,
|
||||||
|
handleChange,
|
||||||
|
handleSubmit,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
@import "tailwindcss";
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
import { mount } from 'svelte'
|
|
||||||
import App from './app.svelte'
|
|
||||||
|
|
||||||
const app = mount(App, { target: document.getElementById('root')! })
|
|
||||||
|
|
||||||
export default app
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import ReactDOM from 'react-dom/client'
|
||||||
|
import App from './App'
|
||||||
|
import './index.css'
|
||||||
|
|
||||||
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||||
|
<React.StrictMode>
|
||||||
|
<App />
|
||||||
|
</React.StrictMode>,
|
||||||
|
)
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import Input from '../../components/ui/Input'
|
||||||
|
import Checkbox from '../../components/ui/Checkbox'
|
||||||
|
import Button from '../../components/ui/Button'
|
||||||
|
import { useLoginForm } from '../../hooks/useLoginForm'
|
||||||
|
import { LoginFormData } from '../../validation'
|
||||||
|
|
||||||
|
const LoginPage: React.FC = () => {
|
||||||
|
const handleLoginSuccess = (data: LoginFormData) => {
|
||||||
|
console.log('Login success callback triggered:', data)
|
||||||
|
// Redirect user or update app state
|
||||||
|
alert(`Login successful for ${data.identifier}!`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
formData,
|
||||||
|
errors,
|
||||||
|
isLoading,
|
||||||
|
submitError,
|
||||||
|
handleChange,
|
||||||
|
handleSubmit,
|
||||||
|
} = useLoginForm({ onSubmitSuccess: handleLoginSuccess })
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
|
||||||
|
<div className="max-w-md w-full space-y-8 bg-white p-10 rounded-lg shadow-md">
|
||||||
|
<div>
|
||||||
|
<h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
|
||||||
|
Sign in to your account
|
||||||
|
</h2>
|
||||||
|
{/* Optional: Link to registration page */}
|
||||||
|
{/* <p className="mt-2 text-center text-sm text-gray-600">
|
||||||
|
Or{' '}
|
||||||
|
<a href="/register" className="font-medium text-sky-600 hover:text-sky-500">
|
||||||
|
create a new account
|
||||||
|
</a>
|
||||||
|
</p> */}
|
||||||
|
</div>
|
||||||
|
<form
|
||||||
|
className="mt-8 space-y-6"
|
||||||
|
onSubmit={handleSubmit}
|
||||||
|
noValidate
|
||||||
|
>
|
||||||
|
{/* Display general submission errors */}
|
||||||
|
{submitError && (
|
||||||
|
<div
|
||||||
|
className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
<strong className="font-bold">Error: </strong>
|
||||||
|
<span className="block sm:inline">
|
||||||
|
{submitError}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="rounded-md shadow-sm -space-y-px">
|
||||||
|
<Input
|
||||||
|
label="Email or Username"
|
||||||
|
id="identifier"
|
||||||
|
name="identifier"
|
||||||
|
type="text" // Use text to allow both email and username
|
||||||
|
autoComplete="username" // Browsers often use 'username' for this field
|
||||||
|
required
|
||||||
|
placeholder="Email address or Username"
|
||||||
|
value={formData.identifier}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.identifier}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
label="Password"
|
||||||
|
id="password"
|
||||||
|
name="password"
|
||||||
|
type="password"
|
||||||
|
autoComplete="current-password"
|
||||||
|
required
|
||||||
|
placeholder="Password"
|
||||||
|
value={formData.password}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.password}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between">
|
||||||
|
<div className="flex flex-col">
|
||||||
|
<Checkbox
|
||||||
|
label="Remember username"
|
||||||
|
id="saveLogin"
|
||||||
|
name="saveLogin"
|
||||||
|
checked={formData.saveLogin}
|
||||||
|
onChange={handleChange}
|
||||||
|
/>
|
||||||
|
<Checkbox
|
||||||
|
label="Remember password"
|
||||||
|
id="savePassword"
|
||||||
|
name="savePassword"
|
||||||
|
checked={formData.savePassword}
|
||||||
|
onChange={handleChange}
|
||||||
|
// Add a warning or disable based on security policy
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Optional: Forgot Password Link */}
|
||||||
|
{/* <div className="text-sm mt-2 sm:mt-0">
|
||||||
|
<a href="/forgot-password" className="font-medium text-sky-600 hover:text-sky-500">
|
||||||
|
Forgot your password?
|
||||||
|
</a>
|
||||||
|
</div> */}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
isLoading={isLoading}
|
||||||
|
disabled={isLoading}
|
||||||
|
>
|
||||||
|
{isLoading ? 'Signing In...' : 'Sign In'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default LoginPage
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import Input from '../../components/ui/Input'
|
||||||
|
import Button from '../../components/ui/Button'
|
||||||
|
import { useRegisterForm } from '../../hooks/useRegisterForm'
|
||||||
|
import { RegisterFormData } from '../../validation'
|
||||||
|
|
||||||
|
const RegisterPage: React.FC = () => {
|
||||||
|
const handleRegistrationSuccess = (data: RegisterFormData) => {
|
||||||
|
console.log('Registration success callback triggered:', data)
|
||||||
|
// Maybe show a success message or redirect
|
||||||
|
alert(`Registration successful for ${data.username}!`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
formData,
|
||||||
|
errors,
|
||||||
|
isLoading,
|
||||||
|
submitError,
|
||||||
|
handleChange,
|
||||||
|
handleSubmit,
|
||||||
|
} = useRegisterForm({ onSubmitSuccess: handleRegistrationSuccess })
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
|
||||||
|
<div className="max-w-md w-full space-y-8 bg-white p-10 rounded-lg shadow-md">
|
||||||
|
<div>
|
||||||
|
<h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
|
||||||
|
Create your account
|
||||||
|
</h2>
|
||||||
|
{/* Optional: Link to login page */}
|
||||||
|
{/* <p className="mt-2 text-center text-sm text-gray-600">
|
||||||
|
Or{' '}
|
||||||
|
<a href="/login" className="font-medium text-sky-600 hover:text-sky-500">
|
||||||
|
sign in to your existing account
|
||||||
|
</a>
|
||||||
|
</p> */}
|
||||||
|
</div>
|
||||||
|
<form
|
||||||
|
className="mt-8 space-y-6"
|
||||||
|
onSubmit={handleSubmit}
|
||||||
|
noValidate
|
||||||
|
>
|
||||||
|
{/* Display general submission errors */}
|
||||||
|
{submitError && (
|
||||||
|
<div
|
||||||
|
className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
<strong className="font-bold">Error: </strong>
|
||||||
|
<span className="block sm:inline">
|
||||||
|
{submitError}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Use hidden input for honeypot or CSRF token if needed */}
|
||||||
|
{/* <input type="hidden" name="remember" defaultValue="true" /> */}
|
||||||
|
<div className="rounded-md shadow-sm -space-y-px">
|
||||||
|
<Input
|
||||||
|
label="Username"
|
||||||
|
id="username"
|
||||||
|
name="username"
|
||||||
|
type="text"
|
||||||
|
autoComplete="username"
|
||||||
|
required
|
||||||
|
placeholder="Choose a username"
|
||||||
|
value={formData.username}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.username}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
label="Email address"
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
autoComplete="email"
|
||||||
|
required
|
||||||
|
placeholder="[email protected]"
|
||||||
|
value={formData.email}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.email}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
label="Password"
|
||||||
|
id="password"
|
||||||
|
name="password"
|
||||||
|
type="password"
|
||||||
|
autoComplete="new-password"
|
||||||
|
required
|
||||||
|
placeholder="Create a password"
|
||||||
|
value={formData.password}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.password}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
label="Repeat Password"
|
||||||
|
id="passwordRepeat"
|
||||||
|
name="passwordRepeat"
|
||||||
|
type="password"
|
||||||
|
autoComplete="new-password"
|
||||||
|
required
|
||||||
|
placeholder="Confirm your password"
|
||||||
|
value={formData.passwordRepeat}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.passwordRepeat}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
label="Promocode (Optional)"
|
||||||
|
id="promocode"
|
||||||
|
name="promocode"
|
||||||
|
type="text"
|
||||||
|
placeholder="Enter promocode if you have one"
|
||||||
|
value={formData.promocode || ''}
|
||||||
|
onChange={handleChange}
|
||||||
|
error={errors.promocode}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
isLoading={isLoading}
|
||||||
|
disabled={isLoading}
|
||||||
|
>
|
||||||
|
{isLoading ? 'Registering...' : 'Register'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default RegisterPage
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
export * from './loginSchema.ts'
|
||||||
|
export * from './registerSchema.ts'
|
||||||
|
|
||||||
|
export type FieldErrors<T> = {
|
||||||
|
[K in keyof T]?: string | undefined
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { z } from 'zod'
|
||||||
|
|
||||||
|
export const loginSchema = z.object({
|
||||||
|
identifier: z.string().min(1, { message: 'Email or Username is required' }), // Can be email or username
|
||||||
|
password: z.string().min(1, { message: 'Password is required' }),
|
||||||
|
saveLogin: z.boolean().optional().default(false),
|
||||||
|
savePassword: z.boolean().optional().default(false),
|
||||||
|
})
|
||||||
|
|
||||||
|
export type LoginFormData = z.infer<typeof loginSchema>
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import { z } from 'zod'
|
||||||
|
|
||||||
|
// --- Registration Schema ---
|
||||||
|
export const registerSchema = z
|
||||||
|
.object({
|
||||||
|
username: z
|
||||||
|
.string()
|
||||||
|
.min(3, { message: 'Username must be at least 3 characters long' })
|
||||||
|
.max(20, { message: 'Username cannot exceed 20 characters' })
|
||||||
|
.regex(/^[a-zA-Z0-9_]+$/, {
|
||||||
|
message:
|
||||||
|
'Username can only contain letters, numbers, and underscores',
|
||||||
|
}),
|
||||||
|
email: z.string().email({ message: 'Invalid email address' }),
|
||||||
|
password: z
|
||||||
|
.string()
|
||||||
|
.min(8, { message: 'Password must be at least 8 characters long' }),
|
||||||
|
// Optional: Add more complexity requirements if needed
|
||||||
|
// .regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/, { message: "Password must contain uppercase, lowercase, and number" })
|
||||||
|
passwordRepeat: z.string(),
|
||||||
|
promocode: z.string().optional(), // Promocode is optional
|
||||||
|
})
|
||||||
|
.refine(data => data.password === data.passwordRepeat, {
|
||||||
|
message: "Passwords don't match",
|
||||||
|
path: ['passwordRepeat'], // Set error path to passwordRepeat field
|
||||||
|
})
|
||||||
|
|
||||||
|
export type RegisterFormData = z.infer<typeof registerSchema>
|
||||||
Vendored
+1
-2
@@ -1,3 +1,2 @@
|
|||||||
/// <reference types="svelte" />
|
|
||||||
/// <reference types="vite/client" />
|
/// <reference types="vite/client" />
|
||||||
/// <reference types="vite-plugin-svelte-svgr" />
|
/// <reference types="../../types" />
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
|
|
||||||
|
|
||||||
const config = {
|
|
||||||
preprocess: vitePreprocess(),
|
|
||||||
kit: {},
|
|
||||||
}
|
|
||||||
|
|
||||||
export default config
|
|
||||||
+25
-29
@@ -1,33 +1,29 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2020",
|
"target": "ES2020",
|
||||||
"useDefineForClassFields": true,
|
"useDefineForClassFields": true,
|
||||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
|
|
||||||
/* Bundler mode */
|
/* Bundler mode */
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "bundler",
|
||||||
"allowImportingTsExtensions": true,
|
"allowImportingTsExtensions": true,
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
"jsx": "react-jsx",
|
"jsx": "react-jsx",
|
||||||
|
|
||||||
/* Linting */
|
/* Linting */
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"noUnusedParameters": true,
|
"noUnusedParameters": true,
|
||||||
"noFallthroughCasesInSwitch": true,
|
"noFallthroughCasesInSwitch": true,
|
||||||
"types": [
|
"types": [
|
||||||
"../../node_modules/@ragempcommunity/types-cef",
|
"../../node_modules/@ragempcommunity/types-cef",
|
||||||
"../shared/declarations/rage-fw-shared-types/"
|
"../shared/declarations/rage-fw-shared-types/"
|
||||||
],
|
]
|
||||||
"paths": {
|
},
|
||||||
"@": ["./src"],
|
"include": ["src"],
|
||||||
"@/*": ["./src/*"]
|
"references": [{ "path": "./tsconfig.node.json" }]
|
||||||
}
|
|
||||||
},
|
|
||||||
"include": ["src"],
|
|
||||||
"references": [{ "path": "./tsconfig.node.json" }]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"composite": true,
|
"composite": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"module": "ESNext",
|
||||||
"module": "ESNext",
|
"moduleResolution": "bundler",
|
||||||
"moduleResolution": "bundler",
|
"allowSyntheticDefaultImports": true,
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo"
|
"strict": true
|
||||||
},
|
},
|
||||||
"include": ["vite.config.ts"]
|
"include": ["vite.config.ts"]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,12 @@
|
|||||||
import { defineConfig } from 'vite'
|
import { defineConfig } from 'vite'
|
||||||
import { svelte } from '@sveltejs/vite-plugin-svelte'
|
import react from '@vitejs/plugin-react'
|
||||||
import path from 'path'
|
import tailwindcss from '@tailwindcss/vite'
|
||||||
|
|
||||||
// https://vitejs.dev/config/
|
// https://vitejs.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [svelte()],
|
plugins: [react(), tailwindcss()],
|
||||||
build: {
|
build: {
|
||||||
outDir: '../../server/client_packages/cef',
|
outDir: '../../server/client_packages/cef',
|
||||||
emptyOutDir: true,
|
emptyOutDir: true,
|
||||||
},
|
},
|
||||||
resolve: {
|
|
||||||
alias: {
|
|
||||||
'@': path.resolve(__dirname, './src/'),
|
|
||||||
'@/*': path.resolve(__dirname, './src/*'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|||||||
+11
-12
@@ -1,14 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "rage-fw-example-client",
|
"name": "rage-fw-example-client",
|
||||||
"description": "Client side of Rage-FW example",
|
"version": "0.1.0",
|
||||||
"scripts": {
|
"author": "Entity Seven Group",
|
||||||
"build": "esbuild src/index.ts --bundle --platform=node --outfile=../../server/client_packages/index.js --format=esm"
|
"license": "CC BY-ND",
|
||||||
},
|
"description": "Client side of rage-fw example",
|
||||||
"dependencies": {
|
"scripts": {
|
||||||
"@rage-fw/shared": "workspace:^",
|
"build": "esbuild src/index.ts --bundle --platform=node --outfile=../../server/client_packages/index.js --format=esm"
|
||||||
"@entityseven/rage-fw-client": "0.2.0"
|
},
|
||||||
},
|
"dependencies": {
|
||||||
"license": "MIT",
|
"@entityseven/rage-fw-client": "latest"
|
||||||
"author": "Entity Seven Group",
|
}
|
||||||
"version": "0.1.0"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,3 @@
|
|||||||
import { fw } from '@entityseven/rage-fw-client'
|
import { fw } from '@entityseven/rage-fw-client'
|
||||||
|
|
||||||
fw.player.browser = mp.browsers.new('package://cef/index.html')
|
fw.player.browser = mp.browsers.new('https://localhost:5173')
|
||||||
|
|
||||||
fw.event.register('cefReady', async () => {
|
|
||||||
fw.system.log.info('cefReady')
|
|
||||||
|
|
||||||
const responseBrowser = await fw.player.triggerBrowser(
|
|
||||||
'customBrowserEvent',
|
|
||||||
['from client'],
|
|
||||||
)
|
|
||||||
fw.system.log.info(responseBrowser)
|
|
||||||
|
|
||||||
await fw.player.triggerServer('customServerEvent', ['from client'])
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"extends": "../../tsconfig.json",
|
"extends": "../../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"baseUrl": "./src",
|
"baseUrl": "./src",
|
||||||
"types": [
|
"types": [
|
||||||
"../../node_modules/@ragempcommunity/types-client",
|
"../../node_modules/@ragempcommunity/types-client",
|
||||||
"../shared/declarations/rage-fw-shared-types/"
|
"../shared/declarations/rage-fw-shared-types/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-12
@@ -1,14 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "rage-fw-example-server",
|
"name": "rage-fw-example-server",
|
||||||
"description": "Server side of Rage-FW example",
|
"version": "0.1.0",
|
||||||
"scripts": {
|
"author": "Entity Seven Group",
|
||||||
"build": "esbuild src/index.ts --bundle --platform=node --target=node10.4 --outfile=../../server/packages/server/index.js"
|
"license": "CC BY-ND",
|
||||||
},
|
"description": "Server side of rage-fw example",
|
||||||
"dependencies": {
|
"scripts": {
|
||||||
"@rage-fw/shared": "workspace:^",
|
"build": "esbuild src/index.ts --bundle --platform=node --target=node14.10 --format=cjs --outfile=../../server/packages/server/index.js"
|
||||||
"@entityseven/rage-fw-server": "0.2.0"
|
},
|
||||||
},
|
"dependencies": {
|
||||||
"license": "MIT",
|
"@entityseven/rage-fw-server": "latest"
|
||||||
"author": "Entity Seven Group",
|
}
|
||||||
"version": "0.1.0"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
/**
|
||||||
|
* Calculates Pi using the Leibniz formula for a given number of iterations.
|
||||||
|
* (Identical logic to the AssemblyScript version)
|
||||||
|
* @param iterations Number of terms in the series.
|
||||||
|
* @returns Approximate value of Pi.
|
||||||
|
*/
|
||||||
|
export function calculatePiLeibnizTs(iterations: number): number {
|
||||||
|
let pi_div_4: number = 0.0
|
||||||
|
let sign: number = 1.0
|
||||||
|
|
||||||
|
for (let i: number = 0; i < iterations; i++) {
|
||||||
|
let term = sign / (2.0 * i + 1.0)
|
||||||
|
pi_div_4 += term
|
||||||
|
sign = -sign // Flip the sign
|
||||||
|
}
|
||||||
|
return pi_div_4 * 4.0
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function to check if a number is prime (Trial Division).
|
||||||
|
* (Identical logic to the AssemblyScript version)
|
||||||
|
* @param num The number to check.
|
||||||
|
* @returns True if prime, false otherwise.
|
||||||
|
*/
|
||||||
|
function isPrimeTs(num: number): boolean {
|
||||||
|
if (num <= 1) return false
|
||||||
|
if (num <= 3) return true
|
||||||
|
if (num % 2 == 0 || num % 3 == 0) return false
|
||||||
|
|
||||||
|
// Only need to check up to sqrt(num)
|
||||||
|
// Optimized loop: check 6k ± 1
|
||||||
|
for (let i: number = 5; i * i <= num; i = i + 6) {
|
||||||
|
if (num % i == 0 || num % (i + 2) == 0) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Counts prime numbers up to a given limit using trial division.
|
||||||
|
* (Identical logic to the AssemblyScript version)
|
||||||
|
* @param limit The upper bound (exclusive) to search for primes.
|
||||||
|
* @returns The count of prime numbers found.
|
||||||
|
*/
|
||||||
|
export function countPrimesTs(limit: number): number {
|
||||||
|
let count: number = 0
|
||||||
|
for (let i: number = 2; i < limit; i++) {
|
||||||
|
if (isPrimeTs(i)) {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return count
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addTs(a: number, b: number): number {
|
||||||
|
return a + b
|
||||||
|
}
|
||||||
+65
-12
@@ -1,18 +1,71 @@
|
|||||||
import { fw } from '@entityseven/rage-fw-server'
|
import { InitWasm } from './wasm'
|
||||||
|
import { addTs, calculatePiLeibnizTs, countPrimesTs } from './benchmark'
|
||||||
|
|
||||||
fw.event.register('playerJoin', async player => {
|
import { performance } from 'perf_hooks'
|
||||||
fw.system.log.info(`Connected: ${player.socialClub}`)
|
/**
|
||||||
})
|
* Runs a function, measures its execution time, and prints the result.
|
||||||
|
* @param name Name of the benchmark.
|
||||||
|
* @param func The function to execute.
|
||||||
|
* @param args Arguments to pass to the function.
|
||||||
|
*/
|
||||||
|
function runBenchmark(
|
||||||
|
name: string,
|
||||||
|
func: (...args: any[]) => any,
|
||||||
|
...args: any[]
|
||||||
|
) {
|
||||||
|
console.log(`\nRunning benchmark: ${name}`)
|
||||||
|
console.log(`Arguments: ${args.join(', ')}`)
|
||||||
|
|
||||||
fw.event.register('customServerEvent', async (player, greeting) => {
|
const startTime = performance.now()
|
||||||
fw.system.log.info(player.socialClub + ' ' + greeting)
|
const result = func(...args)
|
||||||
|
const endTime = performance.now()
|
||||||
|
const duration = endTime - startTime
|
||||||
|
|
||||||
const resFromBrowser = await fw.player.triggerBrowser(
|
console.log(`Result: ${result}`)
|
||||||
player,
|
console.log(`Execution Time: ${duration.toFixed(3)} ms`)
|
||||||
'customBrowserEvent',
|
return duration
|
||||||
['from server'],
|
}
|
||||||
|
|
||||||
|
// --- Benchmark Parameters ---
|
||||||
|
const PI_ITERATIONS = 100_000_000_000 // High number for Pi calculation
|
||||||
|
const PRIME_LIMIT = 100_000_000 // Limit for prime counting
|
||||||
|
// --- End Benchmark Parameters ---
|
||||||
|
|
||||||
|
InitWasm().then(wasm => {
|
||||||
|
// Verify AS module loaded
|
||||||
|
const sumAs = wasm.addAs(5, 7)
|
||||||
|
console.log(`AS Module Loaded Verification (addAs(5, 7)): ${sumAs}`)
|
||||||
|
if (sumAs !== 12) {
|
||||||
|
console.warn('AS addAs function did not return expected result!')
|
||||||
|
}
|
||||||
|
const sumTs = addTs(5, 7)
|
||||||
|
console.log(`TS Implementation Verification (addTs(5, 7)): ${sumTs}`)
|
||||||
|
|
||||||
|
// --- Run Benchmarks ---
|
||||||
|
|
||||||
|
// Benchmark: Calculate Pi
|
||||||
|
runBenchmark(
|
||||||
|
'TypeScript: Calculate Pi (Leibniz)',
|
||||||
|
calculatePiLeibnizTs,
|
||||||
|
PI_ITERATIONS,
|
||||||
|
)
|
||||||
|
runBenchmark(
|
||||||
|
'AssemblyScript: Calculate Pi (Leibniz)',
|
||||||
|
wasm.calculatePiLeibnizAs,
|
||||||
|
PI_ITERATIONS,
|
||||||
)
|
)
|
||||||
fw.system.log.info(player.socialClub + ' ' + resFromBrowser)
|
|
||||||
|
|
||||||
return 'from server'
|
// Benchmark: Count Primes
|
||||||
|
runBenchmark(
|
||||||
|
'TypeScript: Count Primes (Trial Division)',
|
||||||
|
countPrimesTs,
|
||||||
|
PRIME_LIMIT,
|
||||||
|
)
|
||||||
|
runBenchmark(
|
||||||
|
'AssemblyScript: Count Primes (Trial Division)',
|
||||||
|
wasm.countPrimesAs,
|
||||||
|
PRIME_LIMIT,
|
||||||
|
)
|
||||||
|
|
||||||
|
console.log('\nBenchmark finished.')
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { __AdaptedExports, instantiate } from './release'
|
||||||
|
|
||||||
|
import * as path from 'node:path'
|
||||||
|
import * as fs from 'node:fs/promises'
|
||||||
|
|
||||||
|
export async function InitWasm(): Promise<typeof __AdaptedExports> {
|
||||||
|
return new Promise(async resolve => {
|
||||||
|
const wasmFilePath = path.resolve(__dirname, 'release.wasm')
|
||||||
|
|
||||||
|
const wasm: typeof __AdaptedExports = await instantiate(
|
||||||
|
await (async () => {
|
||||||
|
return globalThis.WebAssembly.compile(
|
||||||
|
await fs.readFile(wasmFilePath),
|
||||||
|
)
|
||||||
|
})(),
|
||||||
|
{ env: '' },
|
||||||
|
)
|
||||||
|
|
||||||
|
resolve(wasm)
|
||||||
|
})
|
||||||
|
}
|
||||||
Vendored
+24
@@ -0,0 +1,24 @@
|
|||||||
|
declare namespace __AdaptedExports {
|
||||||
|
/**
|
||||||
|
* assembly/index/calculatePiLeibnizAs
|
||||||
|
* @param iterations `i32`
|
||||||
|
* @returns `f64`
|
||||||
|
*/
|
||||||
|
export function calculatePiLeibnizAs(iterations: number): number;
|
||||||
|
/**
|
||||||
|
* assembly/index/countPrimesAs
|
||||||
|
* @param limit `i32`
|
||||||
|
* @returns `i32`
|
||||||
|
*/
|
||||||
|
export function countPrimesAs(limit: number): number;
|
||||||
|
/**
|
||||||
|
* assembly/index/addAs
|
||||||
|
* @param a `i32`
|
||||||
|
* @param b `i32`
|
||||||
|
* @returns `i32`
|
||||||
|
*/
|
||||||
|
export function addAs(a: number, b: number): number;
|
||||||
|
}
|
||||||
|
/** Instantiates the compiled WebAssembly module with the given imports. */
|
||||||
|
export declare function instantiate(module: WebAssembly.Module, imports: {
|
||||||
|
}): Promise<typeof __AdaptedExports>;
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
export async function instantiate(module, imports = {}) {
|
||||||
|
const { exports } = await WebAssembly.instantiate(module, imports);
|
||||||
|
return exports;
|
||||||
|
}
|
||||||
+10
-10
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"extends": "../../tsconfig.json",
|
"extends": "../../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"lib": ["DOM", "ESNext"],
|
"resolveJsonModule": true,
|
||||||
"resolveJsonModule": true,
|
"baseUrl": "./src",
|
||||||
"baseUrl": "./src",
|
"types": [
|
||||||
"types": [
|
"node",
|
||||||
"../../node_modules/@ragempcommunity/types-server",
|
"../../node_modules/@ragempcommunity/types-server/",
|
||||||
"../shared/declarations/rage-fw-shared-types/"
|
"../shared/declarations/rage-fw-shared-types/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
declare module '@entityseven/rage-fw-shared-types' {
|
declare module '@entityseven/rage-fw-shared-types' {
|
||||||
export interface RageFW_ICustomClientEvent {}
|
export interface RageFW_ICustomClientEvent {
|
||||||
|
customClientEvent(greetings: string): string
|
||||||
|
}
|
||||||
|
|
||||||
export interface RageFW_ICustomServerEvent {
|
export interface RageFW_ICustomServerEvent {
|
||||||
customServerEvent(greetings: string): string
|
customServerEvent(greetings: string): string
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "@rage-fw/shared",
|
|
||||||
"description": "Shared data for Rage-FW example",
|
|
||||||
"version": "0.1.0",
|
|
||||||
"main": "index.ts"
|
|
||||||
}
|
|
||||||
+6
-11
@@ -1,29 +1,24 @@
|
|||||||
{
|
{
|
||||||
"name": "framework-example",
|
"name": "framework-example",
|
||||||
"description": "This project is an example of RAGE FW usage",
|
"description": "This project is example of RAGE FW usage.",
|
||||||
"workspaces": [
|
"workspaces": ["apps/*"],
|
||||||
"apps/*"
|
|
||||||
],
|
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"server:update": "cd server && rage-win64.exe",
|
"server:update": "cd server && rage-win64.exe",
|
||||||
"server:run": "cd server && ragemp-server.exe",
|
|
||||||
|
|
||||||
"build:client": "cd apps/client && pnpm build",
|
"build:client": "cd apps/client && pnpm build",
|
||||||
"build:server": "cd apps/server && pnpm build",
|
"build:server": "cd apps/server && pnpm build",
|
||||||
"build:browser": "cd apps/cef && pnpm build",
|
"build:cef": "cd apps/cef && pnpm build",
|
||||||
"build:all": "pnpm build:client && pnpm build:server && pnpm build:browser",
|
"build:all": "pnpm build:client && pnpm build:server && pnpm build:cef"
|
||||||
"build": "pnpm build:all"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@entityseven/rage-fw-shared-types": "0.2.0",
|
||||||
"@ragempcommunity/types-client": "^2.1.8",
|
"@ragempcommunity/types-client": "^2.1.8",
|
||||||
"@ragempcommunity/types-server": "^2.1.8",
|
"@ragempcommunity/types-server": "^2.1.8",
|
||||||
"@ragempcommunity/types-cef": "^2.1.8",
|
"@ragempcommunity/types-cef": "^2.1.8",
|
||||||
"@entityseven/rage-fw-shared-types": "0.2.0",
|
|
||||||
"esbuild": "^0.21.5",
|
"esbuild": "^0.21.5",
|
||||||
"typescript": "^5.4.5",
|
"typescript": "^5.4.5",
|
||||||
"prettier": "^3.3.2"
|
"prettier": "^3.3.2"
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
|
||||||
"author": "Entity Seven Group",
|
"author": "Entity Seven Group",
|
||||||
|
"license": "MIT",
|
||||||
"version": "0.1.0"
|
"version": "0.1.0"
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-1
@@ -1,2 +1,5 @@
|
|||||||
packages:
|
packages:
|
||||||
- "apps/*"
|
- "apps/browser"
|
||||||
|
- "apps/client"
|
||||||
|
- "apps/server"
|
||||||
|
- "apps/shared"
|
||||||
Binary file not shown.
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ESNext",
|
"target": "ESNext",
|
||||||
"lib": ["ESNext", "ES2019"],
|
"lib": ["ESNext", "DOM"],
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user