Skip to content

Commit 737573a

Browse files
Merge pull request #1 from FlamingoLindo/version_mismatch
Version mismatch
2 parents 9ff1f71 + c792607 commit 737573a

48 files changed

Lines changed: 4690 additions & 397 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Add information from latest push in a branch into main readme
2+
on:
3+
push:
4+
branches:
5+
- '**'
6+
jobs:
7+
update-readme:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout main branch
11+
uses: actions/checkout@v4
12+
with:
13+
ref: main
14+
token: ${{secrets.GITHUB_TOKEN}}
15+
- name: Get latest commit
16+
id: commit_info
17+
run: |
18+
git fetch origin "${{ github.ref_name }}"
19+
BRANCH="${{ github.ref_name }}"
20+
MESSAGE=$(git log origin/"${{ github.ref_name }}" -1 --pretty=%s)
21+
ID=$(git log origin/"${{ github.ref_name }}" -1 --pretty=%H)
22+
SHORT_ID=$(git log origin/"${{ github.ref_name }}" -1 --pretty=%h)
23+
URL="${{github.server_url}}/${{github.repository}}"
24+
echo "branch=$BRANCH" >> $GITHUB_OUTPUT
25+
echo "message=$MESSAGE" >> $GITHUB_OUTPUT
26+
echo "id=$ID" >> $GITHUB_OUTPUT
27+
echo "short_id=$SHORT_ID" >> $GITHUB_OUTPUT
28+
echo "url=$URL" >> $GITHUB_OUTPUT
29+
# Handle description with heredoc to support multiline and special characters
30+
{
31+
echo 'description<<EOF'
32+
git log origin/"${{ github.ref_name }}" -1 --pretty=%b # ← was hardcoded "front-end"
33+
echo EOF
34+
} >> $GITHUB_OUTPUT
35+
- name: Update README
36+
run: |
37+
cat > dev-info.md << 'EOF'
38+
## Currently in Development
39+
**Branch:** ${{ steps.commit_info.outputs.branch }}
40+
**Commit:** ${{ steps.commit_info.outputs.message }}
41+
**Description:** ${{ steps.commit_info.outputs.description }}
42+
**Commit ID:** `${{ steps.commit_info.outputs.short_id }}`
43+
[View Branch](${{ steps.commit_info.outputs.url }}/tree/${{ steps.commit_info.outputs.branch }}) | [View Commit](${{ steps.commit_info.outputs.url }}/commit/${{ steps.commit_info.outputs.id }})
44+
---
45+
EOF
46+
if [ -f README.md ]; then
47+
sed -i '/## Currently in Development/,/^---$/d' README.md
48+
cat dev-info.md README.md > temp.md
49+
mv temp.md README.md
50+
else
51+
mv dev-info.md README.md
52+
fi
53+
rm -f dev-info.md
54+
- name: Commit and push changes
55+
run: |
56+
git config user.name "github-actions[bot]"
57+
git config user.email "github-actions[bot]@users.noreply.github.com"
58+
git add README.md
59+
git diff --quiet && git diff --staged --quiet || (git commit -m "Update README with latest ${{ github.ref_name }} branch commit info" && git push)

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ node_modules
88
!.env.example
99
vite.config.js.timestamp-*
1010
vite.config.ts.timestamp-*
11+
12+
settings.toml

.prettierrc

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"plugins": ["prettier-plugin-svelte"],
3+
"pluginSearchDirs": ["."],
4+
5+
"tabWidth": 2,
6+
"useTabs": false,
7+
"semi": true,
8+
"singleQuote": true,
9+
10+
"printWidth": 80,
11+
"proseWrap": "preserve",
12+
13+
"trailingComma": "es5",
14+
"bracketSpacing": true,
15+
"arrowParens": "always",
16+
17+
"htmlWhitespaceSensitivity": "css",
18+
"bracketSameLine": false,
19+
"singleAttributePerLine": false,
20+
21+
"quoteProps": "as-needed",
22+
"jsxSingleQuote": false,
23+
24+
"endOfLine": "lf",
25+
26+
"overrides": [
27+
{
28+
"files": "*.svelte",
29+
"options": {
30+
"parser": "svelte",
31+
"svelteSortOrder": "options-scripts-markup-styles",
32+
"svelteStrictMode": false,
33+
"svelteIndentScriptAndStyle": true,
34+
"svelteAllowShorthand": true
35+
}
36+
}
37+
]
38+
}

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88

99
# Tauri + SvelteKit + TypeScript
1010

11-
This template should help get you started developing with Tauri, SvelteKit and TypeScript in Vite.
11+
**Disclaimer.:** Color schema will change I'm just leaving black, white, and red because its easier for me to see any changes this way
1212

13-
## Recommended IDE Setup
13+
![1](https://media.discordapp.net/attachments/827008047054192720/1469060326875074694/image.png?ex=6986488b&is=6984f70b&hm=5cbad18df5204344f066b90c2c499ca8b2f13d53a530ab14ee3417475c5ad30a&=&format=webp&quality=lossless)
1414

15-
[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer).
15+
![2](https://media.discordapp.net/attachments/827008047054192720/1469060375533195274/image.png?ex=69864897&is=6984f717&hm=49508ae006f4c702cd2f87a94d49d0b1a03f6f728b2785313e63144e99aef1eb&=&format=webp&quality=lossless)
16+
17+
![3](https://media.discordapp.net/attachments/827008047054192720/1469060434605904146/image.png?ex=698648a5&is=6984f725&hm=4be0bf9afb81bf4b9578be7c62a09909b884c9f241208e8a0fe274d200cd0759&=&format=webp&quality=lossless)
18+
19+
<https://dev.twitch.tv/docs/api/reference>

cspell.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@
44
"dictionaryDefinitions": [],
55
"dictionaries": [],
66
"words": [
7+
"cdylib",
78
"chatingo",
9+
"criticalrole",
10+
"emiru",
11+
"forsen",
12+
"Graffle",
13+
"lindo",
14+
"nymn",
15+
"paymoneywubby",
16+
"qwertyuiopasdfghjklçzxcvbnm",
17+
"rlib",
18+
"robcdee",
19+
"serde",
20+
"smol",
21+
"staticlib",
822
"TAURI",
923
"vite"
1024
],

package.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,27 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@tauri-apps/api": "^2.9.1",
17-
"@tauri-apps/plugin-opener": "^2"
16+
"@tauri-apps/api": "^2.10.2",
17+
"@tauri-apps/plugin-log": "~2",
18+
"@tauri-apps/plugin-opener": "~2",
19+
"graffle": "^8.0.0-next.223",
20+
"graphql": "^16.12.0",
21+
"smol-toml": "^1.6.0",
22+
"tailwindcss": "^4.1.18"
1823
},
1924
"devDependencies": {
2025
"@sveltejs/adapter-static": "^3.0.6",
2126
"@sveltejs/kit": "^2.9.0",
2227
"@sveltejs/vite-plugin-svelte": "^5.0.0",
28+
"@tailwindcss/forms": "^0.5.11",
29+
"@tailwindcss/typography": "^0.5.19",
30+
"@tailwindcss/vite": "^4.1.18",
2331
"@tauri-apps/cli": "^2.10.0",
32+
"prettier": "^3.8.1",
33+
"prettier-plugin-svelte": "^3.4.1",
2434
"svelte": "^5.0.0",
2535
"svelte-check": "^4.0.0",
2636
"typescript": "~5.6.2",
2737
"vite": "^6.0.3"
2838
}
29-
}
39+
}

0 commit comments

Comments
 (0)