N/A

Author: margox

.gitignore

@@ -17,6 +17,7 @@ node_modules
 .env.development.local
 .env.test.local
 .env.production.local
+.env
 
 npm-debug.log*
 yarn-debug.log*

build/electron-builder.js

@@ -3,16 +3,23 @@ module.exports = {
   asar: true,
   productName: 'Repic App',
   directories: {
-    output: './dist-apps'
+    output: './dist-apps',
   },
   mac: {
     category: 'public.app-category.photography',
     icon: 'assets/icon.icns',
-    target: 'dmg'
+    target: 'dmg',
+    hardenedRuntime: true,
+    gatekeeperAssess: false,
+    entitlements: './entitlements.mac.plist',
+    entitlementsInherit: './entitlements.mac.plist',
+  },
+  dmg: {
+    sign: false,
   },
   win: {
     icon: 'assets/icon.icns',
-    target: ['msi']
+    target: ['msi'],
   },
   files: [
     '**/*',
@@ -27,6 +34,6 @@ module.exports = {
     '!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}',
     '!**/{appveyor.yml,.travis.yml,circle.yml}',
     '!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}',
-    '!renderer-src'
-  ]
-}
+    '!renderer-src',
+  ],
+}

build/entitlements.mac.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>

build/sign.js

@@ -0,0 +1,18 @@
+require('dotenv').config()
+const { notarize } = require('electron-notarize')
+
+exports.default = async function notarizing(context) {
+  const { electronPlatformName, appOutDir } = context
+  if (electronPlatformName !== 'darwin') {
+    return
+  }
+
+  const appName = context.packager.appInfo.productFilename
+
+  return await notarize({
+    appBundleId: 'app.repic.repicapp',
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId: process.env.APPLEID,
+    appleIdPassword: process.env.APPLEIDPASSWORD,
+  })
+}

index.js

@@ -90,4 +90,7 @@ function makeSingleInstance() {
 
 initialize()
 
+// 处理未捕获的错误
+process.on('uncaughtException', (error) => {})
+
 // TODO

package-lock.json

@@ -13,6 +13,9 @@
     "pack": "electron-builder --config build/electron-builder.js",
     "lint": "node_modules/eslint/bin/eslint.js ."
   },
+  "build": {
+    "afterSign": "build/sign.js"
+  },
   "dependencies": {
     "@mdi/font": "^3.6.95",
     "compressorjs": "^1.0.5",
@@ -40,6 +43,7 @@
     "css-hot-loader": "^1.4.2",
     "css-loader": "^0.28.11",
     "electron": "^8.4.0",
+    "electron-notarize": "^1.0.0",
     "eslint": "^5.4.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-loader": "^2.1.0",

package.json

@@ -37,7 +37,8 @@ class Modal extends React.PureComponent {
   }
 
   handleMaskClick = () => {
-    this.props.closeOnBlur &&this.handleClose(this.props.onWillClose && this.props.onWillClose('mask-close'))
+    this.props.closeOnBlur &&
+      this.handleClose(this.props.onWillClose && this.props.onWillClose('mask-close'))
   }
 
   externalRequestClose = () => {
@@ -147,7 +148,7 @@ export const showModal = ({ onClose, ...props }) => {
   const hostNode = document.createElement('div')
   document.body.appendChild(hostNode)
 
-  const handleClose = source => {
+  const handleClose = (source) => {
     const result = onClose ? onClose(source) : true
 
     if (result !== false) {
@@ -161,7 +162,7 @@ export const showModal = ({ onClose, ...props }) => {
   ReactDOM.render(<Modal onClose={handleClose} {...props} active={true} />, hostNode)
 }
 
-export const confirm = props => {
+export const confirm = (props) => {
   return showModal({
     width: 400,
     showClose: false,
@@ -171,7 +172,7 @@ export const confirm = props => {
   })
 }
 
-export const alert = props => {
+export const alert = (props) => {
   return showModal({
     width: 400,
     showClose: false,

renderer-src/components/modal/index.jsx

@@ -105,20 +105,15 @@
       overflow: auto;
     }
     > .footer {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
       box-sizing: border-box;
       position: relative;
       z-index: 3;
       height: 60px;
       padding: 15px;
       overflow: hidden;
-      // background-color: rgba(#000, .2);
-      // box-shadow: inset 0 .5px 0 0 rgba(#000, .6);
-      .left-content {
-        float: left;
-      }
-      .buttons {
-        float: right;
-      }
       .button {
         min-width: 60px;
         margin: 0 0 0 10px;

renderer-src/components/modal/styles.scss

@@ -90,19 +90,19 @@
       width: 300px;
       height: 50px;
       border-radius: 10px;
-      background-color: $COLOR_PRIMARY;
+      background-color: darken($COLOR_PRIMARY, 5);
       background-image: linear-gradient(to bottom, rgba(#fff, 0.1), rgba(#fff, 0));
       border: none;
       border-radius: 5px;
       outline: none;
-      box-shadow: inset 0 0 0 0.5px rgba(#000, 0.2); //, 0 5px 10px rgba($COLOR_PRIMARY, 0.3);
+      box-shadow: inset 0 0 0 0.5px rgba(#000, 0.2);
       color: #fff;
       font-size: 18px;
       font-weight: 500;
       cursor: pointer;
       transition: background-color 0.3s, transform 0.5s;
       &:hover {
-        background-color: darken($COLOR_PRIMARY, 5);
+        background-color: $COLOR_PRIMARY;
       }
     }
   }
@@ -144,6 +144,6 @@ body[data-theme='dark'] .component-file-picker {
     }
   }
   .file-pick-entry .button-pick-files {
-    box-shadow: none;
+    box-shadow: 0 0 0 0.5px rgba(#000, 0.4);
   }
 }