.github/workflows/linux-arm64.yml

@@ -57,4 +57,6 @@ jobs:
         CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       if: startsWith(github.ref, 'refs/tags/')

.github/workflows/linux-x64.yml

@@ -55,4 +55,6 @@ jobs:
         CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -1,12 +1,17 @@
 # Translatium [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](LICENSE)
 
+## Archived
+This repository is archived. To help us better improve the product and protect our intellectual assets, Translatium's development has been moved to a **closed source** universal code base that runs across macOS, Windows, Linux, Android, iOS and iPadOS.
+
+## Introduction
+
 |macOS|Linux|Windows|
 |---|---|---|
 |[![GitHub Actions Build Status](https://github.com/quanglam2807/translatium/workflows/macOS/badge.svg)](https://github.com/quanglam2807/translatium/actions)|[![GitHub Actions Build Status](https://github.com/quanglam2807/translatium/workflows/Linux/badge.svg)](https://github.com/quanglam2807/translatium/actions)|[![GitHub Actions Build Status](https://github.com/quanglam2807/translatium/workflows/Windows/badge.svg)](https://github.com/quanglam2807/translatium/actions)|
 
-**[Translatium](https://webcatalog.io/translatium/)** - Translate Any Languages like a Pro.
+The legacy code of **[Translatium](https://webcatalog.io/translatium/)** for desktop (version 20 and earlier).
 
-**master** branch only includes the source code of Translatium 9 & up. For older versions, check out the **legacy-** branches.
+**master** branch only includes the source code of Translatium 9+. For older versions, check out the **legacy-** branches.
 
 ---
 ## Development

main-src/preload/default.js → config-overrides.js

@@ -1,4 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-require('./shared');
+
+/* eslint-disable no-param-reassign */
+module.exports = (config) => {
+  config.target = 'electron-renderer';
+  return config;
+};

dist.js

@@ -107,6 +107,18 @@ const opts = {
         'github',
       ],
     },
+    appImage: {
+      publish: [
+        {
+          provider: 's3',
+          channel: 'latest',
+          bucket: 'cdn-2.webcatalog.io',
+          region: 'us-east-2',
+          path: '/translatium',
+        },
+        'github',
+      ],
+    },
     afterPack: (context) => Promise.resolve()
       .then(() => new Promise((resolve, reject) => {
         const { appOutDir } = context;

main-src/electron.js

@@ -290,9 +290,6 @@ if (!gotTheLock) {
           nodeIntegration: true,
           contextIsolation: false,
           webSecurity: false,
-          preload: process.env.NODE_ENV === 'production'
-            ? path.join(__dirname, 'preload-default.js')
-            : path.join(__dirname, 'preload', 'default.js'),
         },
       };
 

main-src/preload/menubar.js

@@ -2,5 +2,3 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 window.mode = 'menubar';
-
-require('./shared');

package.json

@@ -2,9 +2,9 @@
   "name": "translatium",
   "productName": "Translatium",
   "description": "Translate 100+ Languages Instantly",
-  "version": "20.4.0",
+  "version": "20.5.0",
   "main": "main-src/electron.js",
-  "repository": "https://github.com/webcatalog/translatium",
+  "repository": "https://github.com/webcatalog/translatium-desktop",
   "author": {
     "name": "WebCatalog Ltd",
     "email": "contact@webcatalog.io"
@@ -16,12 +16,12 @@
   "scripts": {
     "postinstall": "npx patch-package && yarn generate-open-source-notices",
     "generate-open-source-notices": "yarn licenses generate-disclaimer > public/open-source-notices.txt",
-    "start": "cross-env BROWSER=none react-scripts start",
+    "start": "cross-env BROWSER=none react-app-rewired start",
     "electron-dev": "concurrently \"yarn start\" \"wait-on http://localhost:3000 && electron .\" -k",
-    "build": "react-scripts build && webpack",
+    "build": "react-app-rewired build && webpack",
     "webpack": "webpack",
-    "test-ui": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject",
+    "test-ui": "react-app-rewired test --env=jsdom",
+    "eject": "react-app-rewired eject",
     "dist": "yarn run build && babel-node dist.js",
     "dist-dev": "cross-env FORCE_DEV=1 yarn dist",
     "lint": "eslint ./src ./main-src ./*.js ./test --ext js",
@@ -31,7 +31,7 @@
     "node-mac-permissions": "2.2.0"
   },
   "devDependencies": {
-    "@electron/remote": "2.0.5",
+    "@electron/remote": "2.0.8",
     "@fontsource/roboto": "4.5.3",
     "@material-ui/core": "4.12.3",
     "@material-ui/icons": "4.11.2",
@@ -48,7 +48,7 @@
     "cross-env": "7.0.3",
     "del": "6.0.0",
     "dotenv": "10.0.0",
-    "electron": "16.0.9",
+    "electron": "16.1.0",
     "electron-builder": "22.14.13",
     "electron-is-dev": "2.0.0",
     "electron-settings": "4.0.2",
@@ -59,9 +59,9 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsx-a11y": "6.5.1",
-    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react": "7.29.4",
     "eslint-plugin-react-hooks": "1.7.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.0.1",
     "glob": "7.2.0",
     "lunr": "2.3.9",
     "lunr-languages": "1.9.0",
@@ -72,6 +72,7 @@
     "pouchdb-quick-search": "1.3.0",
     "prop-types": "15.8.1",
     "react": "16.14.0",
+    "react-app-rewired": "2.2.1",
     "react-dom": "16.14.0",
     "react-redux": "7.2.6",
     "react-scripts": "3.4.4",

public/open-source-notices.txt

@@ -562,6 +562,31 @@ SOFTWARE.
 
 -----
 
+The following software may be included in this product: @electron/remote. A copy of the source code may be downloaded from https://github.com/electron/remote. This software contains the following license and notice below:
+
+Copyright (c) 2019-2022 Electron contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: @emotion/hash. A copy of the source code may be downloaded from https://github.com/emotion-js/emotion/tree/master/packages/hash. This software contains the following license and notice below:
 
 MIT License
@@ -588,6 +613,20 @@ SOFTWARE.
 
 -----
 
+The following software may be included in this product: @gar/promisify. A copy of the source code may be downloaded from https://github.com/wraithgar/gar-promisify.git. This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright © 2020-2022 Michael Garvin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: @hapi/address. A copy of the source code may be downloaded from git://github.com/hapijs/address. This software contains the following license and notice below:
 
 Copyright (c) 2019, Project contributors
@@ -4988,7 +5027,7 @@ SOFTWARE.
 The following software may be included in this product: boolean. A copy of the source code may be downloaded from git://github.com/thenativeweb/boolean.git. This software contains the following license and notice below:
 
 The MIT License (MIT)
-Copyright (c) 2014-2021 the native web.
+Copyright (c) 2014-2022 the native web.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -15316,6 +15355,34 @@ THE SOFTWARE.
 
 -----
 
+The following software may be included in this product: mime-db. A copy of the source code may be downloaded from https://github.com/jshttp/mime-db.git. This software contains the following license and notice below:
+
+(The MIT License)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: minimalistic-assert. A copy of the source code may be downloaded from https://github.com/calvinmetcalf/minimalistic-assert.git. This software contains the following license and notice below:
 
 Copyright 2015 Calvin Metcalf
@@ -18312,6 +18379,32 @@ limitations under the License.
 
 -----
 
+The following software may be included in this product: react-app-rewired. A copy of the source code may be downloaded from git+https://github.com/timarney/react-app-rewired. This software contains the following license and notice below:
+
+MIT License
+
+Copyright (c) 2016 Tim Arney
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----
+
 The following software may be included in this product: react-redux, redux, redux-thunk. A copy of the source code may be downloaded from https://github.com/reduxjs/react-redux.git (react-redux), https://github.com/reduxjs/redux.git (redux), https://github.com/reduxjs/redux-thunk.git (redux-thunk). This software contains the following license and notice below:
 
 The MIT License (MIT)

src/components/app-wrapper.js

@@ -2,16 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 import React from 'react';
-import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
 
-import { ThemeProvider as MuiThemeProvider, createMuiTheme, withStyles } from '@material-ui/core/styles';
+import { ThemeProvider as MuiThemeProvider, createTheme, withStyles } from '@material-ui/core/styles';
 import pink from '@material-ui/core/colors/blue';
 import red from '@material-ui/core/colors/pink';
 import grey from '@material-ui/core/colors/grey';
 import green from '@material-ui/core/colors/green';
 
-import connectComponent from '../helpers/connect-component';
-
 import App from './app';
 
 const GlobalCss = withStyles({
@@ -33,7 +31,9 @@ const GlobalCss = withStyles({
   },
 })(() => null);
 
-const AppWrapper = ({ shouldUseDarkColors }) => {
+const AppWrapper = () => {
+  const shouldUseDarkColors = useSelector((state) => state.general.shouldUseDarkColors);
+
   const themeObj = {
     typography: {
       fontSize: 13.5,
@@ -64,7 +64,7 @@ const AppWrapper = ({ shouldUseDarkColors }) => {
     };
   }
 
-  const theme = createMuiTheme(themeObj);
+  const theme = createTheme(themeObj);
 
   return (
     <MuiThemeProvider theme={theme}>
@@ -74,17 +74,4 @@ const AppWrapper = ({ shouldUseDarkColors }) => {
   );
 };
 
-AppWrapper.propTypes = {
-  shouldUseDarkColors: PropTypes.bool.isRequired,
-};
-
-const mapStateToProps = (state) => ({
-  shouldUseDarkColors: state.general.shouldUseDarkColors,
-});
-
-export default connectComponent(
-  AppWrapper,
-  mapStateToProps,
-  null,
-  null,
-);
+export default AppWrapper;