Skip to content

Commit

Permalink
feat: first working version
Browse files Browse the repository at this point in the history
  • Loading branch information
mtdvlpr committed Feb 25, 2024
1 parent b33c849 commit f5af82b
Show file tree
Hide file tree
Showing 142 changed files with 7,919 additions and 8,274 deletions.
30 changes: 26 additions & 4 deletions .eslintrc → .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"root": true,
"parserOptions": { "project": "./tsconfig.json" },
"extends": [
"eslint:recommended",
"@nuxt/eslint-config",
"plugin:vuetify/recommended",
"plugin:playwright/recommended",
Expand All @@ -10,12 +11,33 @@
"rules": {
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-indexed-object-style": "error",
"@typescript-eslint/no-confusing-void-expression": "error",
"@typescript-eslint/no-inferrable-types": "error",
"@typescript-eslint/no-unnecessary-condition": "error",
"@typescript-eslint/no-unnecessary-type-arguments": "error",
"@typescript-eslint/non-nullable-type-assertion-style": "error",
"@typescript-eslint/prefer-ts-expect-error": "error",
"array-callback-return": "error",
"dot-notation": "error",
"logical-assignment-operators": ["error", "always"],
"no-console": "error",
"no-constant-binary-expression": "error",
"no-debugger": "error",
"no-duplicate-imports": "error",
"no-floating-decimal": "error",
"no-lonely-if": "error",
"no-magic-numbers": [
"error",
{
"ignoreArrayIndexes": true,
"ignoreDefaultValues": true,
"ignore": [-2, -1, 0, 0.1, 0.5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100]
}
],
"no-self-compare": "error",
"no-template-curly-in-string": "error",
"no-unneeded-ternary": "error",
"no-unreachable-loop": "error",
"no-var": "error",
"object-shorthand": "error",
"one-var": ["error", "never"],
"operator-assignment": ["error", "always"],
"vue/block-order": ["error", { "order": ["template", "script", "style"] }],
"vue/component-api-style": ["error", ["script-setup"]],
"vue/component-name-in-template-casing": ["error", "kebab-case"],
Expand Down
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"cSpell.ignorePaths": [
".github/workflows/*",
".vscode/*",
"src/constants/lang.ts",
"src/locales/*",
"!src/locales/en.json",
"LICENSE.md",
Expand Down Expand Up @@ -46,6 +47,7 @@
"iasn",
"icns",
"iconify",
"Iloko",
"Italiano",
"jfif",
"jszip",
Expand All @@ -61,6 +63,7 @@
"magyar",
"mchaplyak",
"mediaitem",
"meetingsdk",
"meps",
"mtdvlpr",
"multilanguage",
Expand All @@ -72,6 +75,7 @@
"nuxt",
"nuxtjs",
"olddn",
"Pangasinan",
"panzoom",
"panzoomchange",
"pilcrow",
Expand Down Expand Up @@ -109,6 +113,10 @@
"xvfb",
"yeartext",
"zoomus",
"Ελλάδα",
"Ελληνικά",
"Νότια",
"Ρομανί",
"русский",
"українська"
]
Expand Down
672 changes: 336 additions & 336 deletions .yarn/releases/yarn-4.0.2.cjs → .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.0.2.cjs

yarnPath: .yarn/releases/yarn-4.1.0.cjs
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
# Changelog

## 24.1.0

### New or improved features

- New language: Pangasinan (thanks [@lorenpajarits](https://github.com/lorenpajarits)!)

### Bug fixes

- Exclude songs with described audio from background music playback

## 23.12.0

### New or improved features

- New language: Iloko / Ilokano (thanks [@bridenkenn](https://github.com/bridenkenn)!)
- New language: Tagalog (thanks [@bridenkenn](https://github.com/bridenkenn)!)

### Bug fixes

- Correctly process JWL playlist items with special characters
- Correctly validate video timestamp

## 23.11.0

### New or improved features

- Preparations for the new Meeting Workbook format
- Skip Bearing Witness media for Circuit Overseer visits

### Bug fixes

- Only save Meeting Workbook headings if they are actually present

## 23.10.1

### Bug fixes

- Fix edge case where mwb images would not be fetched correctly

## 23.10.0

### New or improved features
Expand Down
27 changes: 23 additions & 4 deletions config/vuetify.config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,35 @@
import { defineVuetifyConfiguration } from 'vuetify-nuxt-module/custom-configuration'

const input = {
color: 'primary',
variant: 'outlined',
density: 'comfortable',
hideDetails: 'auto',
}

export default defineVuetifyConfiguration({
date: { adapter: 'dayjs' },
directives: ['ClickOutside'],
directives: true,
icons: { defaultSet: 'unocss-mdi' },
defaults: {
VBtnToggle: { color: 'primary' },
VAlert: { ...input },
VAutocomplete: { ...input },
VBtnToggle: { color: 'primary', variant: 'outlined' },
VCheckbox: { ...input },
VCombobox: { ...input, hint: 'Druk op enter om toe te voegen.' },
VContainer: { fluid: true },
VDatePicker: { color: 'primary', showAdjacentMonths: true },
VField: { color: 'primary' },
VFileInput: { ...input },
VOtpInput: { ...input },
VProgressLinear: { color: 'primary' },
VSelect: { ...input },
VSelectionControl: { color: 'primary' },
VSlider: { color: 'primary' },
VTabs: { color: 'primary', grow: true },
VSlider: { ...input },
VSwitch: { ...input },
VTabs: { color: 'primary', grow: true, showArrows: true },
VTextarea: { rows: 4, ...input },
VTextField: { ...input },
},
theme: {
themes: {
Expand Down
2 changes: 2 additions & 0 deletions electron-builder-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ mac:
target: dmg
arch: universal
publish: github
notarize: false
dmg:
writeUpdateInfo: false
linux:
Expand All @@ -30,6 +31,7 @@ win:
icon: build/icons/main/icon.ico
target: nsis
publish: github
signAndEditExecutable: false
nsis:
oneClick: false
differentialPackage: false
2 changes: 1 addition & 1 deletion electron/BrowserWinHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
BrowserWindow,
app,
shell,
BrowserWindowConstructorOptions,
type BrowserWindowConstructorOptions,
} from 'electron'
import { appLongName } from './main'
const isDev = process.env.NODE_ENV === 'development'
Expand Down
5 changes: 3 additions & 2 deletions electron/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
nativeTheme,
shell,
dialog,
OpenDialogOptions,
RelaunchOptions,
type OpenDialogOptions,
type RelaunchOptions,
session,
} from 'electron'
import { init } from '@sentry/electron/main'
Expand Down Expand Up @@ -78,6 +78,7 @@ try {
if (existsSync(join(app.getPath('userData'), 'disableHardwareAcceleration')))
app.disableHardwareAcceleration()
} catch (e) {
// eslint-disable-next-line no-console
console.error(e)
}

Expand Down
1 change: 1 addition & 0 deletions electron/mainWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ function createMainWindow(
}

win.on('move', onMove)
// @ts-expect-error: close event does not exist
win.on('close', onClose)
})

Expand Down
2 changes: 1 addition & 1 deletion electron/mediaWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function initMediaWinListeners() {
mediaWin?.webContents.send('showMedia', media)
getMainWindow().webContents.send('showingMedia', [
!!media,
!!media?.start,
!!media?.start && !media?.end?.startsWith('00:00:00'),
])
},
)
Expand Down
4 changes: 2 additions & 2 deletions electron/websiteController.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { platform } from 'os'
import {
BrowserWindow,
BrowserWindowConstructorOptions,
type BrowserWindowConstructorOptions,
ipcMain,
Point,
type Point,
} from 'electron'
import { AR_HEIGHT, AR_WIDTH } from './main'
import BrowserWinHandler from './BrowserWinHandler'
Expand Down
8 changes: 0 additions & 8 deletions i18n.config.ts

This file was deleted.

37 changes: 25 additions & 12 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* eslint-disable no-console */
import { platform } from 'os'
import { join } from 'path'
import type { PluginOption } from 'vite'
import { sentryVitePlugin } from '@sentry/vite-plugin'
import { repository, version } from './package.json'
import { appLongName } from './src/constants/general'
import { LOCALES } from './src/constants/lang'
import { APP_LONG_NAME } from './src/constants/general'
import { LOCALES, DAYJS_LOCALES } from './src/constants/lang'
import type { PluginOption } from 'vite'

const isDev = process.env.NODE_ENV === 'development'

Expand All @@ -22,11 +23,9 @@ if (sentryInit && !process.env.SENTRY_DISABLE) {
org: process.env.SENTRY_ORG,
project: process.env.SENTRY_PROJECT,
authToken: process.env.SENTRY_AUTH_TOKEN,
sourcemaps: {
assets: ['output'],
},
sourcemaps: { assets: ['output'] },
release: {
name: `${appLongName.toLowerCase().replace(' ', '-')}@${version}`,
name: `${APP_LONG_NAME.toLowerCase().replace(' ', '-')}@${version}`,
dist: platform().replace('32', ''),
},
}),
Expand All @@ -43,13 +42,15 @@ export default defineNuxtConfig({
typeCheck: false,
tsConfig: { compilerOptions: { moduleResolution: 'bundler' } },
},
css: ['~/assets/css/main.scss'],
imports: { dirs: ['stores', 'constants'] },
router: { options: { hashMode: true } },
sourcemap: { client: false },
modules: [
'@nuxtjs/i18n',
['@unocss/nuxt', { configFile: './config/uno.config.ts' }],
'@vueuse/nuxt',
'dayjs-nuxt',
'vuetify-nuxt-module',
['@pinia/nuxt', { autoImports: ['defineStore', 'storeToRefs'] }],
[
Expand Down Expand Up @@ -77,31 +78,43 @@ export default defineNuxtConfig({
types: 'composition',
detectBrowserLanguage: false,
vueI18n: './config/i18n.config.ts',
compilation: {
strictMessage: false,
escapeHtml: true,
},
compilation: { strictMessage: false, escapeHtml: false },
},
vuetify: {
moduleOptions: { prefixComposables: true },
vuetifyOptions: './config/vuetify.config.ts',
},
dayjs: {
locales: DAYJS_LOCALES,
plugins: [
'customParseFormat',
'duration',
'isBetween',
'isSameOrBefore',
'isoWeek',
'localeData',
'localizedFormat',
],
defaultLocale: 'en',
},
vite: {
root: process.cwd(), // Fix for: https://github.com/electron-vite/vite-plugin-electron-renderer/issues/32
build: {
sourcemap: false,
cssCodeSplit: true,
target: 'chrome110',
target: 'chrome120',
rollupOptions: {
// external: ['chokidar'],
},
},
optimizeDeps: {
exclude: ['@stephen/sql.js'],
esbuildOptions: { target: 'chrome120' },
},
plugins: vitePlugins,
},
nitro: {
esbuild: { options: { target: 'chrome120' } },
output: { publicDir: join(__dirname, 'output') },
},
runtimeConfig: {
Expand Down
Loading

0 comments on commit f5af82b

Please sign in to comment.