Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 07174bb

Browse files
authored
Merge pull request #6 from stellar-comet/main
Overhaul codebase to fixx ffmpeg binaries issue
2 parents 4ce84ac + 2ed8e60 commit 07174bb

File tree

278 files changed

+830
-4390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+830
-4390
lines changed

.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{
2727
"code": 80
2828
}
29-
],
29+
]
3030
},
3131
"ignorePatterns": [
3232
"*.test.ts"

.github/CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ First off, thank you for considering contributing to Comet! It’s people like y
88

99
If you encounter any bugs or issues while using Comet, please report them. This helps us to maintain the quality of the project and ensures that other users have a better experience.
1010

11-
1. **Search for existing issues**: Before reporting a new issue, check if someone else has already reported it. You can search [here](https://github.com/Thavarshan/comet/issues).
12-
2. **Create a new issue**: If you don’t find a similar issue, create a new one [here](https://github.com/Thavarshan/comet/issues/new).
11+
1. **Search for existing issues**: Before reporting a new issue, check if someone else has already reported it. You can search [here](https://github.com/stellar-comet/comet/issues).
12+
2. **Create a new issue**: If you don’t find a similar issue, create a new one [here](https://github.com/stellar-comet/comet/issues/new).
1313
3. **Provide details**: Please include as much information as possible. Include the steps to reproduce the issue, the expected outcome, and the actual outcome. Providing screenshots, error messages, and relevant log files can help us resolve the issue faster.
1414

1515
### Suggesting Features
1616

1717
We welcome suggestions for new features that could enhance Comet.
1818

19-
1. **Search for existing suggestions**: Before suggesting a new feature, check if someone else has already suggested it [here](https://github.com/Thavarshan/comet/issues).
20-
2. **Create a new feature request**: If your feature is unique, create a new feature request [here](https://github.com/Thavarshan/comet/issues/new?template=feature_request.md).
19+
1. **Search for existing suggestions**: Before suggesting a new feature, check if someone else has already suggested it [here](https://github.com/stellar-comet/comet/issues).
20+
2. **Create a new feature request**: If your feature is unique, create a new feature request [here](https://github.com/stellar-comet/comet/issues/new?template=feature_request.md).
2121
3. **Describe the feature**: Provide a detailed description of the feature, why you think it’s important, and how it could benefit users. If possible, suggest how it could be implemented.
2222

2323
### Contributing Code
@@ -30,7 +30,7 @@ We love contributions, whether they’re bug fixes, new features, or improving d
3030
2. **Clone**: Clone the forked repository to your local machine.
3131

3232
```bash
33-
git clone https://github.com/Thavarshan/comet.git
33+
git clone https://github.com/stellar-comet/comet.git
3434
cd comet
3535
```
3636

@@ -102,4 +102,4 @@ We appreciate contributions to our documentation. If you’ve added a new featur
102102

103103
Your contributions make Comet better for everyone. Thank you for taking the time to improve the project. We’re thrilled to have you as part of our community, and we’re excited to see what you’ll contribute.
104104

105-
If you have any questions, feel free to [open an issue](https://github.com/Thavarshan/comet/issues/new) or reach out to us. Happy coding!
105+
If you have any questions, feel free to [open an issue](https://github.com/stellar-comet/comet/issues/new) or reach out to us. Happy coding!

.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Help & Support
4-
url: https://github.com/Thavarshan/comet/discussions
4+
url: https://github.com/stellar-comet/comet/discussions
55
about: 'This repository is only for reporting bugs. If you have a question or need help using the library, click:'

.github/SUPPORT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
GitHub issue trackers are not intended to provide Sentinel help or support. Instead, use one of the following channels:
44

5-
- [Github discussions](https://github.com/Thavarshan/comet/discussions)
5+
- [Github discussions](https://github.com/stellar-comet/comet/discussions)

.prettierrc

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"semi": true,
3+
"trailingComma": "all",
4+
"singleQuote": false,
5+
"printWidth": 120,
6+
"tabWidth": 2,
7+
"useTabs": false,
8+
"endOfLine": "auto"
9+
}

CHANGELOG.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
## [Release v0.0.1](https://github.com/Thavarshan/filterable/compare/v1.0.0...Release v0.0.1) - 2024-08-17
66

7-
## v1.0.0 - 2024-08-17
8-
9-
Initial release.
7+
Initial alpha release for public testing and feedback.

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p align="center"><a href="https://thavarshan.com" target="_blank"><img src="https://github.com/Thavarshan/comet/blob/main/src/assets/images/logo.png" width="400" height="400" alt="Comet"></a></p>
1+
<p align="center"><a href="https://thavarshan.com" target="_blank"><img src="https://github.com/stellar-comet/comet/blob/main/src/assets/images/logo.png" width="400" height="400" alt="Comet"></a></p>
22

33
## About Comet
44

@@ -107,7 +107,7 @@ To get started with development:
107107
1. **Clone the repository:**
108108

109109
```bash
110-
git clone https://github.com/Thavarshan/comet.git
110+
git clone https://github.com/stellar-comet/comet.git
111111
cd comet
112112
```
113113

@@ -157,7 +157,7 @@ To get started with development:
157157
## 🧑‍💻 Contributors
158158

159159
- **Jerome Thayananthajothy** - Project Lead & Developer
160-
- [**Contributors List**](https://github.com/Thavarshan/comet/graphs/contributors) - A big thank you to all the amazing contributors!
160+
- [**Contributors List**](https://github.com/stellar-comet/comet/graphs/contributors) - A big thank you to all the amazing contributors!
161161

162162
## 📄 License
163163

components.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"framework": "vite",
1313
"aliases": {
14-
"components": "@/components",
14+
"components": "@/ui/components",
1515
"utils": "@/lib/utils"
1616
}
17-
}
17+
}

forge.config.ts

+9-18
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,19 @@ import { VitePlugin } from '@electron-forge/plugin-vite';
77
import { FusesPlugin } from '@electron-forge/plugin-fuses';
88
import { FuseV1Options, FuseVersion } from '@electron/fuses';
99
import { PublisherGithub } from '@electron-forge/publisher-github';
10-
import path from 'path';
1110

1211
const config: ForgeConfig = {
1312
packagerConfig: {
13+
icon: 'src/assets/images/icon',
14+
executableName: 'Comet',
1415
asar: {
15-
unpack: '**/node_modules/ffmpeg-static/**',
16+
unpack: "**/node_modules/ffmpeg-static/**"
1617
},
17-
icon: process.platform === 'win32' ? 'src/assets/images/icon/icon.ico' : 'src/assets/images/icon/icon.icns',
18-
executableName: 'comet',
19-
extraResource: process.platform === 'win32'
20-
? path.resolve(__dirname, 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
21-
: path.resolve(__dirname, 'node_modules', 'ffmpeg-static', 'ffmpeg'),
22-
// Bypassing signing and notarization for now
23-
// ...(process.platform === 'darwin' && {
24-
// osxSign: {},
25-
// osxNotarize: {
26-
// appleId: process.env.APPLE_ID,
27-
// appleIdPassword: process.env.APPLE_ID_PASSWORD,
28-
// teamId: process.env.TEAM_ID,
29-
// },
30-
// }),
3118
},
3219
rebuildConfig: {},
3320
makers: [
3421
new MakerSquirrel({
35-
certificateFile: './cert.pfx',
36-
certificatePassword: process.env.CERTIFICATE_PASSWORD
22+
setupIcon: 'src/assets/images/icon/icon.ico'
3723
}),
3824
new MakerZIP({}, ['darwin']),
3925
new MakerRpm({}),
@@ -45,8 +31,11 @@ const config: ForgeConfig = {
4531
],
4632
plugins: [
4733
new VitePlugin({
34+
// `build` can specify multiple entry builds, which can be Main process, Preload scripts, Worker process, etc.
35+
// If you are familiar with Vite configuration, it will look really familiar.
4836
build: [
4937
{
38+
// `entry` is just an alias for `build.lib.entry` in the corresponding file of `config`.
5039
entry: 'src/main.ts',
5140
config: 'vite.main.config.ts',
5241
},
@@ -62,6 +51,8 @@ const config: ForgeConfig = {
6251
},
6352
],
6453
}),
54+
// Fuses are used to enable/disable various Electron functionality
55+
// at package time, before code signing the application
6556
new FusesPlugin({
6657
version: FuseVersion.V1,
6758
[FuseV1Options.RunAsNode]: false,

forge.env.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ declare global {
2424
interface Window {
2525
electron: {
2626
selectDirectory: () => Promise<string | undefined>;
27-
getDownloadsPath: () => string;
27+
getDesktopPath: () => string;
28+
getFilePath: (file: File) => string;
2829
convertVideo: (filePath: string, outputFormat: string, saveDirectory: string) => Promise<string>;
2930
on: (channel: string, callback: (event: Electron.IpcRendererEvent, ...args: unknown[]) => void) => void;
3031
removeAllListeners: (channel: string) => void;

index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8" />
55
<title>☄️ Comet | Video Converter</title>
66
</head>
7-
<body class="font-sans antialiased text-slate-600 min-h-full flex flex-col [overflow-anchor:none]" scroll-region="">
8-
<div id="app" class="overflow-hidden"></div>
7+
<body style="font-family: sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; color: #334155; background-color: #fff; min-height: 100%; display: flex; flex-direction: column; overflow-anchor: none;" scroll-region="">
8+
<div id="app" style="overflow: hidden;"></div>
99
<script type="module" src="/src/renderer.ts"></script>
1010
</body>
1111
</html>

0 commit comments

Comments
 (0)