Skip to content

Commit

Permalink
Merge pull request #159 from spacebarchat/dev/tauri
Browse files Browse the repository at this point in the history 
Dev/tauri
  • Loading branch information
@Puyodead1
Puyodead1 authored Sep 15, 2023
2 parents ad3a608 + d769a1d commit 91a51d8
Show file tree
Hide file tree
Showing 139 changed files with 10,791 additions and 3,368 deletions.
15 changes: 10 additions & 5 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:react-hooks/recommended"],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"plugins": ["react-refresh"],
"root": true,
"rules": {
"no-mixed-spaces-and-tabs": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": "off"
"@typescript-eslint/no-unused-vars": "off",
"react-hooks/exhaustive-deps": "off",
"react-hooks/rules-of-hooks": "warn",
"@typescript-eslint/ban-ts-comment": "warn"
},
"env": {
"node": true
}
"browser": true,
"es2020": true
},
"ignorePatterns": ["node_modules", "dist"]
}
5 changes: 2 additions & 3 deletions .github/workflows/tauri.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
platform: [macos-latest, ubuntu-latest, windows-latest]

runs-on: ${{ matrix.platform }}
if: github.ref == 'refs/heads/dev/tauri'
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
Expand All @@ -29,7 +28,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0-dev
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0-dev libjavascriptcoregtk-4.1-dev
- name: Install Frontend Dependencies
run: pnpm i
- uses: tauri-apps/tauri-action@v0
Expand All @@ -39,5 +38,5 @@ jobs:
tagName: spacebar-v__VERSION__
releaseName: "Spacebar Client v__VERSION__"
releaseBody: "See the assets to download this version and install."
releaseDraft: true
releaseDraft: false
prerelease: true
19 changes: 19 additions & 0 deletions .vscode/extensions.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"aaron-bond.better-comments",
"naumovs.color-highlight",
"usernamehw.errorlens",
"esbenp.prettier-vscode",
"rust-lang.rust-analyzer",
"tauri-apps.tauri-vscode",
"wayou.vscode-todo-highlight",
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [

]
}
18 changes: 0 additions & 18 deletions craco.config.js
View file

This file was deleted.

44 changes: 44 additions & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Primary Meta Tags -->
<meta name="title" content="Spacebar Client - For better and secure communication" />
<meta
name="description"
content="Spacebar is a free and open source software compatible with Discord. It's a chat, voice and video platform similar to Slack and Rocket.chat."
/>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#121212" />

<!-- Open Graph / Facebook -->
<meta property="og:type" content="website" />
<meta property="og:url" content="https://spacebar.chat/" />
<meta property="og:title" content="Spacebar Client - For better and secure communication" />
<meta
property="og:description"
content="Spacebar is a free and open source software compatible with Discord. It's a chat, voice and video platform similar to Slack and Rocket.chat."
/>
<meta property="og:image" content="/Spacebar.png" />

<!-- Twitter -->
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:url" content="https://spacebar.chat/" />
<meta property="twitter:title" content="Spacebar Client - For better and secure communication" />
<meta
property="twitter:description"
content="Spacebar is a free and open source software compatible with Discord. It's a chat, voice and video platform similar to Slack and Rocket.chat."
/>
<meta property="twitter:image" content="/Spacebar.png" />

<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="icon" href="/favicon.ico" />

<title>Spacebar</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
118 changes: 63 additions & 55 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,98 @@
{
"name": "spacebar-client",
"version": "0.1.0",
"repository": {
"type": "git",
"url": "git+https://github.com/spacebarchat/client.git"
},
"author": "Spacebar",
"license": "AGPL-3.0-only",
"bugs": {
"url": "https://github.com/spacebarchat/client/issues"
},
"homepage": "https://app.spacebar.chat",
"dependencies": {
"@emotion/react": "^11.11.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^4.5.8",
"@fontsource/source-code-pro": "^4.5.14",
"@hcaptcha/react-hcaptcha": "^1.8.1",
"@mattjennings/react-modal-stack": "^1.0.4",
"@mdi/js": "^7.2.96",
"@mdi/react": "^1.6.1",
"@mui/material": "^5.13.0",
"@mui/material": "^5.14.9",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@rollup/plugin-replace": "^5.0.2",
"@spacebarchat/spacebar-api-types": "0.37.49",
"@testing-library/jest-dom": "^5.16.5",
"@tauri-apps/api": "2.0.0-alpha.8",
"@tauri-apps/plugin-authenticator": "2.0.0-alpha.1",
"@tauri-apps/plugin-autostart": "2.0.0-alpha.1",
"@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1",
"@tauri-apps/plugin-dialog": "2.0.0-alpha.1",
"@tauri-apps/plugin-log": "2.0.0-alpha.1",
"@tauri-apps/plugin-notification": "2.0.0-alpha.1",
"@tauri-apps/plugin-process": "2.0.0-alpha.1",
"@tauri-apps/plugin-stronghold": "2.0.0-alpha.2",
"@tauri-apps/plugin-updater": "2.0.0-alpha.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.18.28",
"@types/react": "^18.2.6",
"@types/react-dom": "^18.2.4",
"framer-motion": "^10.16.1",
"dayjs": "^1.11.9",
"framer-motion": "^10.16.4",
"missing-native-js-functions": "^1.4.3",
"mobx": "^6.9.0",
"mobx": "^6.10.2",
"mobx-react-lite": "^3.4.3",
"react": "^18.2.0",
"react-advanced-cropper": "^0.18.0",
"react-colorful": "^5.6.1",
"react-device-detect": "^2.2.3",
"react-dom": "^18.2.0",
"react-error-boundary": "^3.1.4",
"react-hook-form": "^7.43.9",
"react-hook-form": "^7.46.1",
"react-infinite-scroll-component": "^6.1.0",
"react-loading-skeleton": "^3.3.1",
"react-moment": "^1.1.3",
"react-router-dom": "^6.11.1",
"react-scripts": "5.0.1",
"react-router-dom": "^6.16.0",
"react-secure-storage": "^1.3.0",
"react-select-search": "^4.1.6",
"react-spinners": "^0.13.8",
"reoverlay": "^1.0.3",
"styled-components": "^5.3.10",
"typescript": "^4.9.5"
},
"scripts": {
"start": "craco start",
"build": "craco build",
"test": "craco test",
"lint": "eslint .",
"lint:fix": "pnpx prettier . --write"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
"styled-components": "^5.3.10"
},
"devDependencies": {
"@craco/craco": "^7.1.0",
"@types/loadable__component": "^5.13.4",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.59.5",
"@typescript-eslint/parser": "^5.59.5",
"craco-esbuild": "^0.5.2",
"eslint": "^8.40.0"
"@tauri-apps/cli": "2.0.0-alpha.14",
"@types/jest": "^27.5.2",
"@types/loadable__component": "^5.13.5",
"@types/node": "^16.18.50",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/styled-components": "^5.1.27",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.49.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"internal-ip": "^7.0.0",
"typescript": "^5.0.2",
"vite": "^4.4.5",
"vite-plugin-chunk-split": "^0.4.7",
"vite-plugin-clean": "^1.0.0",
"vite-plugin-html": "^3.2.0",
"vite-plugin-progress": "^0.0.7",
"vite-plugin-svgr": "^3.2.0"
},
"homepage": "https://spacebar.chat",
"license": "AGPL-3.0-only",
"name": "spacebar-client",
"packageManager": "[email protected]",
"repository": {
"type": "git",
"url": "git+https://github.com/spacebarchat/client.git"
},
"scripts": {
"build": "tsc && vite build",
"dev": "vite",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint:fix": "pnpx prettier . --write",
"preview": "vite preview",
"tauri:dev": "tauri dev",
"tauri:build": "tauri build",
"tauri:android:dev": "tauri android dev",
"tauri:android:build": "tauri android build"
},
"packageManager": "[email protected]"
"type": "module",
"version": "0.1.1"
}
Loading

0 comments on commit 91a51d8

Please sign in to comment.