Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Commit

Permalink
Rename app to "WebCatalog Classic" (#1624)
Browse files Browse the repository at this point in the history
  • Loading branch information
quanglam2807 authored Jan 30, 2022
1 parent efce158 commit 3eca76a
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 74 deletions.
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/bug.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/feature.md

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WebCatalog [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](LICENSE)
# WebCatalog Classic [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](LICENSE)

|macOS|
|---|
Expand All @@ -12,15 +12,15 @@
|---|---|
|[![Linux (x64)](/~https://github.com/webcatalog/webcatalog-app/workflows/Linux%20(x64)/badge.svg)](/~https://github.com/webcatalog/webcatalog-app/actions?query=workflow%3A%22Linux+%28x64%29%22)|[![Linux (arm64)](/~https://github.com/webcatalog/webcatalog-app/workflows/Linux%20(arm64)/badge.svg)](/~https://github.com/webcatalog/webcatalog-app/actions?query=workflow%3A%22Linux+%28arm64%29%22)|

**[WebCatalog](https://webcatalog.io/webcatalog/)** - Turn Websites into Desktop Apps.
**[WebCatalog Classic](https://webcatalog.io/webcatalog-classic/)** - Turn Websites into Desktop Apps.

**master** branch only includes the source code of WebCatalog 13 and above. For older versions, check out the **legacy-** branches.

---

## Licensing
### Usage
**WebCatalog is a commercial product.** [Learn more about our pricing](https://webcatalog.io/webcatalog/pricing/).
**WebCatalog Classic is a commercial product.** [Learn more about our pricing](https://webcatalog.io/webcatalog-classic/pricing/).

### Source Code
On the other hand, **the source code is freely available** for use, modification and distribution under the permissions, limitations and conditions listed in the [Mozilla Public License 2.0](LICENSE).
Expand Down
2 changes: 1 addition & 1 deletion dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const opts = {
targets,
config: {
appId: 'com.webcatalog.jordan',
productName: 'WebCatalog',
productName: 'WebCatalog Classic',
asar: true,
asarUnpack: [
'default-app-icons/**/*',
Expand Down
5 changes: 5 additions & 0 deletions main-src/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ const {
const fs = require('fs');
const electronRemote = require('@electron/remote/main');

// App renamed to "WebCatalog Classic"
// but we still use "WebCatalog" as data dir name for backward compatibility
const legacyUserDataPath = path.join(app.getPath('appData'), 'WebCatalog');
app.setPath('userData', legacyUserDataPath);

const settings = require('electron-settings');

settings.configure({
Expand Down
14 changes: 3 additions & 11 deletions main-src/libs/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const createMenu = () => {
label: app.name,
submenu: [
{
label: 'About WebCatalog',
label: 'About WebCatalog Classic',
click: () => sendToAllWindows('open-dialog-about'),
},
{ type: 'separator' },
Expand Down Expand Up @@ -187,19 +187,11 @@ const createMenu = () => {
submenu: [
{
label: 'WebCatalog Help',
click: () => shell.openExternal('https://docs.webcatalog.io?utm_source=webcatalog_app'),
},
{
label: 'Request New Features',
click: () => shell.openExternal('/~https://github.com/webcatalog/webcatalog-app/issues/new?template=feature.md&title=feature%3A+'),
},
{
label: 'Submit New App to Catalog',
click: () => shell.openExternal('https://forms.gle/redZCVMwkuhvuDtb9'),
click: () => shell.openExternal('https://webcatalog.io/webcatalog-classic/help/?utm_source=webcatalog_app'),
},
{
label: 'Learn More',
click: () => shell.openExternal('https://webcatalog.io/webcatalog/?utm_source=webcatalog_app'),
click: () => shell.openExternal('https://webcatalog.io/webcatalog-classic/?utm_source=webcatalog_app'),
},
{ type: 'separator' },
{
Expand Down
4 changes: 2 additions & 2 deletions main-src/libs/updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ autoUpdater.on('update-available', (info) => {
})
.then(({ response }) => {
if (response === 1) {
shell.openExternal('https://webcatalog.io/webcatalog/changelog/?utm_source=webcatalog_app');
shell.openExternal('https://webcatalog.io/webcatalog-classic/changelog/?utm_source=webcatalog_app');
}
})
.catch(console.log); // eslint-disable-line
Expand Down Expand Up @@ -124,7 +124,7 @@ autoUpdater.on('update-downloaded', (info) => {
dialog.showMessageBox(dialogOpts)
.then(({ response }) => {
if (response === 2) {
shell.openExternal('https://webcatalog.io/webcatalog/changelog/?utm_source=webcatalog_app');
shell.openExternal('https://webcatalog.io/webcatalog-classic/changelog/?utm_source=webcatalog_app');
} else if (response === 0) {
// Fix autoUpdater.quitAndInstall() does not quit immediately
// /~https://github.com/electron/electron/issues/3583
Expand Down
4 changes: 2 additions & 2 deletions main-src/libs/windows/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ const createAsync = () => new Promise((resolve) => {

const trayContextMenu = Menu.buildFromTemplate([
{
label: 'Open WebCatalog',
label: 'Open WebCatalog CLassiC',
click: () => get().show(),
},
{
type: 'separator',
},
{
label: 'About WebCatalog',
label: 'About WebCatalog Classic',
click: () => {
sendToAllWindows('open-dialog-about');
get().show();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "WebCatalog",
"name": "WebCatalogClassic",
"description": "Turn Any Websites Into Real Desktop Apps",
"version": "40.4.1",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialogs/dialog-about.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const About = ({
</EnhancedDialogTitle>
<DialogContent className={classes.dialogContent}>
<img src={iconPng} alt="WebCatalog" className={classes.icon} />
<Typography variant="h6" className={classes.title}>WebCatalog</Typography>
<Typography variant="h6" className={classes.title}>WebCatalog Classic</Typography>
<Typography
variant="body2"
className={classes.version}
Expand All @@ -86,7 +86,7 @@ const About = ({
</Typography>

<Button
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/?utm_source=webcatalog_app')}
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/?utm_source=webcatalog_app')}
>
Website
</Button>
Expand Down
8 changes: 4 additions & 4 deletions src/components/dialogs/dialog-license-registration.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ const DialogLicenseRegistration = (props) => {
You are currently running the free version of WebCatalog which
does not include&nbsp;
<span
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/pricing/?utm_source=webcatalog_app')}
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/pricing/?utm_source=webcatalog_app')}
onKeyDown={(e) => {
if (e.key !== 'Enter') return;
requestOpenInBrowser('https://webcatalog.io/webcatalog/pricing/?utm_source=webcatalog_app');
requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/pricing/?utm_source=webcatalog_app');
}}
role="link"
tabIndex="0"
Expand Down Expand Up @@ -104,12 +104,12 @@ const DialogLicenseRegistration = (props) => {
<DialogActions className={classes.dialogActions}>
<div style={{ flex: 1 }}>
<Button
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/pricing/?utm_source=webcatalog_app')}
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/pricing/?utm_source=webcatalog_app')}
>
Purchase a License...
</Button>
<Button
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/pricing/?utm_source=webcatalog_app')}
onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/pricing/?utm_source=webcatalog_app')}
>
Learn More...
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/preferences/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ const Preferences = ({
<ChevronRightIcon color="action" />
</ListItem>
<Divider />
<ListItem button onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/?utm_source=webcatalog_app')}>
<ListItem button onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/?utm_source=webcatalog_app')}>
<ListItemText primary="Website" />
<ChevronRightIcon color="action" />
</ListItem>
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/app-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const AppCard = ({
{
label: 'What\'s New',
visible: engine === 'electron',
click: () => requestOpenInBrowser('https://webcatalog.io/webcatalog/changelog/neutron/?utm_source=webcatalog_app'),
click: () => requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/changelog/neutron/?utm_source=webcatalog_app'),
},
!engine || engine === 'electron' ? {
label: `Version ${version}${isOutdated ? ` (Latest: ${latestTemplateVersion})` : ''}`,
Expand Down Expand Up @@ -419,7 +419,7 @@ const AppCard = ({
classes={{ root: classes.topLeft }}
onClick={(e) => {
e.stopPropagation();
requestOpenInBrowser('https://webcatalog.io/webcatalog/spaces/');
requestOpenInBrowser('https://webcatalog.io/webcatalog-classic/spaces/');
}}
>
<SpaceIcon fontSize="small" />
Expand Down

0 comments on commit 3eca76a

Please sign in to comment.