Skip to content

Commit 7b487a6

Browse files
committed
Merge branch 'feat/soft-licenses' into chore/all-my-stuffs
# Conflicts: # package.json # pnpm-lock.yaml # src/tools/index.ts
2 parents 89c35b4 + 3dde9f3 commit 7b487a6

File tree

5 files changed

+394
-4
lines changed

5 files changed

+394
-4
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
"@types/js-beautify": "^1.14.3",
106106
"@types/libmime": "^5.0.3",
107107
"@types/emscripten": "^1.39.10",
108+
"@types/spdx-satisfies": "^0.1.2",
108109
"@vicons/material": "^0.12.0",
109110
"@vicons/tabler": "^0.12.0",
110111
"@vueuse/core": "^10.11.1",
@@ -277,6 +278,8 @@
277278
"qrcode": "^1.5.1",
278279
"rtf-stream-parser": "^3.8.0",
279280
"slashes": "^3.0.12",
281+
"safe-license-list": "^0.1.2",
282+
"spdx-satisfies": "^5.0.1",
280283
"sql-formatter": "^13.0.0",
281284
"sshpk": "^1.18.0",
282285
"turndown": "^7.1.2",

pnpm-lock.yaml

Lines changed: 43 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/tools/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import { tool as ansibleVaultCryptDecrypt } from './ansible-vault-crypt-decrypt'
7575
import { tool as gzipConverter } from './gzip-converter';
7676
import { tool as htpasswdGenerator } from './htpasswd-generator';
7777
import { tool as mimeConverter } from './mime-converter';
78+
import { tool as softwareLicenceCompatibility } from './software-licence-compatibility';
7879
import { tool as safelinkDecoder } from './safelink-decoder';
7980
import { tool as mongoObjectidConverter } from './mongo-objectid-converter';
8081
import { tool as removeExif } from './remove-exif';
@@ -348,6 +349,7 @@ export const toolsByCategory: ToolCategory[] = [
348349
userAgentParser,
349350
httpStatusCodes,
350351
jsonDiff,
352+
softwareLicenceCompatibility,
351353
safelinkDecoder,
352354
apiTester,
353355
bounceParser,
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { License } from '@vicons/tabler';
2+
import { defineTool } from '../tool';
3+
4+
export const tool = defineTool({
5+
name: 'Software licence compatibility',
6+
path: '/software-licence-compatibility',
7+
description: 'Software Licence compatibility checker and information',
8+
keywords: ['software', 'licence', 'compatibility'],
9+
component: () => import('./software-licence-compatibility.vue'),
10+
icon: License,
11+
createdAt: new Date('2024-03-17'),
12+
});

0 commit comments

Comments
 (0)