Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/vitejs svelte #43

Merged
merged 37 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e67f32f
Set revision for arklib and load metadata to be able to see title. Ar…
gwendalF Sep 3, 2023
8de2a62
Update readme
gwendalF Sep 4, 2023
b985263
Move to other arklib repo
gwendalF Sep 6, 2023
982cac5
Add description on hover
gwendalF Sep 6, 2023
ad431ca
Remove unneeded deps
mberry Sep 6, 2023
97e5455
Change ark-shelf folder to hidden
mberry Sep 6, 2023
a2553b9
Svelte and vitejs
gwendalF Sep 7, 2023
ce86206
rebuild UI
gwendalF Sep 8, 2023
5b04d9a
Add buttons
gwendalF Sep 8, 2023
f6d36d7
Ready except score buttons
gwendalF Sep 11, 2023
95e1c38
Update scores
gwendalF Sep 15, 2023
800ec82
Add sorting and tooltips
gwendalF Sep 17, 2023
3007fb1
Set mode and links in same store to simplify updates
gwendalF Sep 17, 2023
3de8018
Add info of selected sorting
gwendalF Sep 17, 2023
08e40a4
Update readme
mberry Sep 18, 2023
def6b81
CI wasn't using pnpm tauri build (#42)
mberry Sep 18, 2023
53a8515
Prevent issue with same url
gwendalF Sep 18, 2023
0c56390
Error message when URL already exist
gwendalF Sep 18, 2023
646da2a
Add errors
gwendalF Sep 18, 2023
08494d6
Fix issues of double creation on form
gwendalF Sep 18, 2023
b8efacb
Forget Cargo.lock
gwendalF Sep 18, 2023
dc9cc1f
Forget dist folder, date fix and width of form. Sort with lowercase
gwendalF Sep 19, 2023
ec8ccc9
Typo fix
kirillt Sep 19, 2023
3d6e0a4
Paste url clear title/description
gwendalF Sep 19, 2023
0163503
WIP: Fast creation time
gwendalF Sep 20, 2023
6e0a5a2
Create link wihout requesting preview
gwendalF Sep 21, 2023
b018d3b
Fix pckage errors
gwendalF Sep 21, 2023
b95f142
Renaming of metadata and id
gwendalF Sep 21, 2023
8333b94
Fix linting errors
gwendalF Sep 21, 2023
c232503
Set scores on .ark folder
gwendalF Sep 21, 2023
3f7e1f6
Fix error loading file
gwendalF Sep 21, 2023
60a12c5
Update github actions
gwendalF Sep 21, 2023
48c1284
Minor renamings
kirillt Sep 22, 2023
f2fea8e
Fix scores at launch
gwendalF Sep 22, 2023
d022457
Typo fix + cargo fmt
kirillt Sep 22, 2023
c664123
Remove alphabetical sorting and erase inputs fields of form when link…
gwendalF Sep 22, 2023
395217e
preview after reload
gwendalF Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist/
node_modules/
src-tauri/
21 changes: 21 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"env": {
"node": true,
"es2021": true
},
"root": true,
"plugins": ["@typescript-eslint"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{ "ignoreRestSiblings": true, "argsIgnorePattern": "(^_)" }
]
}
}
106 changes: 55 additions & 51 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,61 @@
name: Build

env:
CARGO_TERM_COLOR: always
CARGO_TERM_COLOR: always

on: [push]
on: pull_request

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: '16.x'

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev \
webkit2gtk-4.0 libappindicator3-dev \
librsvg2-dev patchelf libdbus-1-dev \
pkg-config

- name: Fetch Node.js Dependencies
run: yarn

- name: Build Release version
run: yarn tauri build

- name: Upload AppImage
uses: actions/[email protected]
with:
name: ark-shelf-desktop.AppImage
path: ./target/release/bundle/appimage/ark-shelf-desktop_*_amd64.AppImage

- name: Upload .deb build
uses: actions/[email protected]
with:
name: ark-shelf-desktop.deb
path: ./target/release/bundle/deb/ark-shelf-desktop_*_amd64.deb

- name: Upload binary build
uses: actions/[email protected]
with:
name: ark-shelf-desktop
path: ./target/release/ark-shelf-desktop
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: '16.x'

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev \
webkit2gtk-4.0 libappindicator3-dev \
librsvg2-dev patchelf libdbus-1-dev \
pkg-config

- name: Fetch Node.js Dependencies
uses: pnpm/action-setup@v2
with:
version: 8
run_install: true

- name: Check style
run: pnpm lint

- name: Build Release version
run: pnpm tauri build

- name: Upload AppImage
uses: actions/[email protected]
with:
name: ark-shelf-desktop.AppImage
path: ./src-tauri/target/release/bundle/appimage/*.AppImage

- name: Upload .deb build
uses: actions/[email protected]
with:
name: ark-shelf-desktop.deb
path: ./src-tauri/target/release/bundle/deb/*.deb

- name: Upload binary build
uses: actions/[email protected]
with:
name: ark-shelf-desktop
path: ./src-tauri/target/release/ark-shelf-desktop
84 changes: 44 additions & 40 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,49 @@
name: Release the app

on:
push:
tags:
- '*'
push:
tags:
- '*'

jobs:
release:
runs-on: ubuntu-latest
environment: Development
steps:
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: '16.x'

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev \
webkit2gtk-4.0 libappindicator3-dev \
librsvg2-dev patchelf libdbus-1-dev \
pkg-config

- name: Fetch Node.js dependencies
run: yarn

- name: Build Release version
run: yarn tauri build

- name: Release AppImage
uses: ncipollo/release-action@v1
with:
artifacts: "./target/release/bundle/appimage/*.AppImage"
token: ${{ secrets.GITHUB_TOKEN }}
release:
runs-on: ubuntu-latest
environment: Development
steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: '16.x'

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev \
webkit2gtk-4.0 libappindicator3-dev \
librsvg2-dev patchelf libdbus-1-dev \
pkg-config

- name: Fetch Node.js Dependencies
uses: pnpm/action-setup@v2
with:
version: 8
run_install: true

- name: Check style
run: pnpm lint

- name: Build Release version
run: pnpm build
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pnpm tauri build


- name: Release AppImage
uses: ncipollo/release-action@v1
with:
artifacts: './src-tauri/target/release/bundle/appimage/*.AppImage'
token: ${{ secrets.GITHUB_TOKEN }}
53 changes: 21 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,24 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
target
# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
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?
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
src-tauri/
src/assets/
17 changes: 17 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"printWidth": 100,
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "avoid",
"endOfLine": "auto",
"bracketSameLine": true,
"plugins": [
"prettier-plugin-svelte",
"prettier-plugin-organize-imports",
"prettier-plugin-tailwindcss"
],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
}
11 changes: 11 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[svelte]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.tabSize": 4
}
Loading