Skip to content

Commit

Permalink
gluer integration (#19)
Browse files Browse the repository at this point in the history
* ✨ Added gluer

* 🔧 Added custom error type to api gen

* 🔧 gluer runs now completely on macro expansion (compile time)

* 🔧 Added fittingly to serde metadata struct conversions

* ✨ Added more specific project routes for the api generation

* ✨ Finished integration on frontend and in build

* 🔥 Removed generated api from git

* 🔧 Improved conversion of optional fields
  • Loading branch information
nwrenger authored Aug 18, 2024
1 parent 884cf54 commit 5bce3fa
Show file tree
Hide file tree
Showing 40 changed files with 374 additions and 710 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,6 @@ env:
CARGO_TERM_COLOR: always

jobs:
build-svelte:
name: Build Svelte
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: "latest"
- name: Install Svelte
run: bun install
working-directory: lib-view
- name: Build Svelte
run: bun run build
working-directory: lib-view
- name: Upload
uses: actions/upload-artifact@v4
with:
name: lib-view
path: lib-view/build

build-rust:
name: Build ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -53,6 +31,28 @@ jobs:
name: ${{ matrix.exe }}
path: target/release/${{ matrix.exe }}

build-svelte:
name: Build Svelte
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: "latest"
- name: Install Svelte
run: bun install
working-directory: lib-view
- name: Build Svelte
run: bun run build
working-directory: lib-view
- name: Upload
uses: actions/upload-artifact@v4
with:
name: lib-view
path: lib-view/build

package:
name: Package ${{ matrix.platform }}
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ build
/test/cert/*
!/test/cert/gen.sh

# Generated API
lib-view/src/lib/api.ts

# Misc
.vscode
.DS_Store
Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "schiller-lib"
description = "Schiller library software"
version = "0.10.0"
version = "0.10.1"
authors = ["Lars Wrenger <[email protected]>", "Nils Wrenger <[email protected]>"]
edition = "2021"
readme = "README.md"
Expand All @@ -23,6 +23,7 @@ chrono = "0.4"
clap = { version = "4.5", features = ["derive"] }
csv = "1.3"
email_address = "0.2"
gluer = "0.8.2"
hyper = "1.4"
hyper-util = "0.1"
lettre = { version = "0.11", default-features = false, features = [
Expand Down
32 changes: 16 additions & 16 deletions lib-view/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "schiller-lib",
"version": "0.10.0",
"version": "0.10.1",
"private": true,
"scripts": {
"dev": "vite dev",
Expand All @@ -12,38 +12,38 @@
"format": "prettier --write ."
},
"devDependencies": {
"@sveltejs/adapter-auto": "^3.2.2",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/adapter-auto": "^3.2.3",
"@sveltejs/kit": "^2.5.21",
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.6",
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"svelte-check": "^3.8.5",
"tslib": "^2.6.3",
"typescript": "^5.5.3",
"vite": "^5.3.4",
"tailwindcss": "^3.4.6",
"postcss": "^8.4.39",
"autoprefixer": "^10.4.19",
"typescript": "^5.5.4",
"vite": "^5.4.0",
"tailwindcss": "^3.4.9",
"postcss": "^8.4.41",
"autoprefixer": "^10.4.20",
"prettier-plugin-tailwindcss": "^0.5.14"
},
"type": "module",
"dependencies": {
"@internationalized/date": "^3.5.5",
"@sveltejs/adapter-static": "^3.0.2",
"@sveltejs/adapter-static": "^3.0.3",
"@types/luxon": "^3.4.2",
"ajv": "^8.17.1",
"bits-ui": "^0.21.12",
"bits-ui": "^0.21.13",
"clsx": "^2.1.1",
"cmdk-sv": "^0.0.17",
"lucide-svelte": "^0.414.0",
"luxon": "^3.4.4",
"mode-watcher": "^0.4.0",
"lucide-svelte": "^0.427.0",
"luxon": "^3.5.0",
"mode-watcher": "^0.4.1",
"paneforge": "^0.0.5",
"sass": "^1.77.8",
"svelte-i18n": "^4.0.0",
"svelte-persisted-store": "^0.11.0",
"svelte-sonner": "^0.3.27",
"tailwind-merge": "^2.4.0",
"tailwind-merge": "^2.5.1",
"tailwind-variants": "^0.2.1"
}
}
Loading

0 comments on commit 5bce3fa

Please sign in to comment.