Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .devcontainer/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

cd StreamAwesome
npm install
npm run render-version
npm run dev
16 changes: 16 additions & 0 deletions .devcontainer/render-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

VERSION_FILE="src/version.ts"
LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null)

if [ -z "$LATEST_TAG" ]; then
echo "No git tags found, using default version 0.0.0"
VERSION="0.0.0"
else
# Strip the 'v' prefix from the tag (e.g., v1.2.3 -> 1.2.3)
VERSION=${LATEST_TAG#v}
echo "Found git tag: $LATEST_TAG, extracted version: $VERSION"
fi

echo "export const streamAwesomeVersion = '$VERSION'" > "$VERSION_FILE"
echo "Version $VERSION has been written to $VERSION_FILE"
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ jobs:
working-directory: StreamAwesome
run: |
npm install
npm run render-version
npm run build
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
working-directory: StreamAwesome
run: npm install

- name: Render Version 🏷️
working-directory: StreamAwesome
run: npm run render-version

- name: Build for Latest 🔨
working-directory: StreamAwesome
run: npm run build
Expand Down
5 changes: 1 addition & 4 deletions StreamAwesome/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ coverage
*.njsproj
*.sln
*.sw?
.idea

# Ignore font awesome file
prototype/fontawesome/
prototype/fontawesome_free/
.idea
3 changes: 2 additions & 1 deletion StreamAwesome/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
"format": "prettier --write src/",
"prepare": "cd ../ && husky ./StreamAwesome/.husky",
"tidy": "npm run lint && npm run format"
"tidy": "npm run lint && npm run format",
"render-version": "../.devcontainer/render-version.sh"
},
"dependencies": {
"@vueuse/core": "^14.1.0",
Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/components/browser/IconBrowser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Icon from '@/components/utils/IconDisplay.vue'
import { FontAwesomeBrowser } from '@/logic/fontAwesomeBrowser'
import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon'
import type { FontAwesomeIconType } from '@/model/fontAwesomeIconType'
import { fontAwesomeVersionInfo } from '@/model/versions'
import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo'
import { useIconsStore } from '@/stores/icons'
import { ref } from 'vue'

Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/components/settings/GeneralOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { FontAwesomeIconType } from '@/model/fontAwesomeIconType'
import Icon from '@/components/utils/IconDisplay.vue'
import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon'
import { ref } from 'vue'
import { fontAwesomeVersionInfo } from '@/model/versions'
import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo'

const props = defineProps<{
icon: CustomIcon<FontAwesomePreset>
Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/components/utils/AppFooter.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { fontAwesomeVersionInfo } from '@/model/versions'
import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo'
</script>

<template>
Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/logic/generator/iconGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
type FontWeight
} from '@/model/fontAwesomeConstants'
import { FontAwesomeIconType } from '@/model/fontAwesomeIconType'
import { fontAwesomeVersionInfo } from '@/model/versions'
import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo'
import chroma from 'chroma-js'
import namer from 'color-namer'
import { addMetadata } from 'meta-png'
Expand Down
6 changes: 3 additions & 3 deletions StreamAwesome/src/logic/persistence/PersistenceHandler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CustomIcon, FontAwesomePreset } from '@/model/customIcon'
import { streamAwesomeVersionInfo } from '@/model/versions'
import { PersistentIconConverter } from './PersistentIconConverter'
import { streamAwesomeVersion } from '@/version'

export const metaDataKeyword = 'StreamAwesomeIcon'

Expand All @@ -18,7 +18,7 @@ export class PersistenceHandler {
return null
}

if (record.version !== streamAwesomeVersionInfo) {
if (record.version !== streamAwesomeVersion) {
console.error('Incompatible version found in persistent icon.')

return null
Expand All @@ -36,7 +36,7 @@ export class PersistenceHandler {
{}
)
return {
version: streamAwesomeVersionInfo,
version: streamAwesomeVersion,
...flattenedIcon
}
}
Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/model/fontAwesomeIconType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
type FontWeight
} from '@/model/fontAwesomeConstants'
import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon'
import { fontAwesomeVersionInfo } from '@/model/versions'
import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo'

export class FontAwesomeIconType {
constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export const streamAwesomeVersionInfo = '3.3.0'

export type fontLicense = 'Free' | 'Pro'
export const fontAwesomeVersionInfo: {
readonly fontFamilyBase: string
Expand Down
2 changes: 1 addition & 1 deletion StreamAwesome/src/utils/initFontAwesome.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { fontAwesomeVersionInfo, setFontAwesomeLicense } from '../model/versions'
import { fontAwesomeVersionInfo, setFontAwesomeLicense } from '../model/fontAwesomeInfo'

// Style file lists cannot be defined using named constants
// See: https://vite.dev/guide/features.html#glob-import-caveats
Expand Down
1 change: 1 addition & 0 deletions StreamAwesome/src/version.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const streamAwesomeVersion = '0.0.0'
4 changes: 2 additions & 2 deletions StreamAwesome/src/views/HomeView.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script setup lang="ts">
import MainSettings from '@/components/MainSettings.vue'
import { streamAwesomeVersionInfo } from '@/model/versions'
import { streamAwesomeVersion } from '@/version'
</script>

<template>
<main>
<h1 class="text-center text-3xl font-bold md:text-start">
Stream Awesome
<span class="text-sm text-gray-400">{{ streamAwesomeVersionInfo }}</span>
<span class="text-sm text-gray-400">{{ streamAwesomeVersion }}</span>
</h1>
<MainSettings />
</main>
Expand Down