Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #42 from HR/dev
Browse files Browse the repository at this point in the history
Crypter v4.0
  • Loading branch information
HR authored Jun 30, 2019
2 parents 598d2f7 + 8369e65 commit c14ad6b
Show file tree
Hide file tree
Showing 43 changed files with 14,448 additions and 6,638 deletions.
Binary file modified .github/Crypter_main_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed .github/Crypter_screen.png
Binary file not shown.
Binary file removed .github/Crypter_screenf.png
Binary file not shown.
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.9.0
12.0.0
1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

27 changes: 19 additions & 8 deletions app/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,29 @@
* config.js
* Provides all essential config constants
******************************/
// const {app} = require('electron')

// Fixed constants
const ICONS_BASE_PATH = `${__dirname}/static/images/icons`
const VIEWS_BASE_URI = `file://${__dirname}/static`

module.exports = {
REPO: {
URL: 'https://github.com/HR/Crypter/',
RELEASES_API_URL: 'https://api.github.com/repos/HR/Crypter/releases/latest',
FORK: 'https://github.com/HR/Crypter/fork',
DOCS: 'https://github.com/HR/Crypter/blob/master/readme.md',
REPORT_ISSUE: 'https://github.com/HR/Crypter/issues/new'
},
WINDOW_OPTS: {
center: true,
show: true,
titleBarStyle: 'hidden',
resizable: false,
maximizable: false,
movable: true,
webPreferences: {
nodeIntegration: true
}
},
VIEWS: {
BASE_URI: VIEWS_BASE_URI,
MASTERPASSPROMPT: `${VIEWS_BASE_URI}/masterpassprompt.html`,
Expand Down Expand Up @@ -53,25 +64,25 @@ module.exports = {
correct: 'CORRECT MASTERPASS',
incorrect: 'INCORRECT MASTERPASS',
setSuccess: 'MASTERPASS SUCCESSFULLY SET',
empty: 'PLEASE ENTER A MASTERPASS',
empty: 'PLEASE ENTER THE MASTERPASS',
resetSuccess: 'You have successfully reset your MasterPass. You\'ll be redirected to verify it shortly.',
exportSuccess: 'Successfully exported the credentials',
importSuccess: 'Successfully imported the credentials. You will need to verify the MasterPass for the credentials imported so Crypter will relaunch shortly.'
importSuccess: 'Successfully imported the credentials. You will need to verify the MasterPass for the credentials imported after Crypter relaunches.'
},
ERRORS: {
INVALID_MP_CREDS_FILE: 'Not a valid or corrupted Crypter credentials file!',
INVALID_FILE: 'Not a valid or corrupted Crypter file!',
INVALID_FILE: 'Not a valid or corrupted CRYPTO file!',
AUTH_FAIL: 'Corrupted Crypter file or trying to decrypt on a different machine. See git.io/Crypter.info#faqs',
PROMISE: 'Oops, we encountered a problem...',
DECRYPT: 'Not a Crypter file (can not get salt, iv and authTag)',
MS: {
INVALID_FILE: 'Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?',
AUTH_FAIL: 'Unsupported state or unable to authenticate data'
AUTH_FAIL: 'Unsupported state or unable to authenticate data',
}
},
COLORS: {
bad: '#9F3A38',
good: '#2ECC71',
bad: '#dc3545',
good: '#28a745',
highlight: '#333333'
},
SETTINGS: {
Expand Down
2 changes: 1 addition & 1 deletion app/core/Db.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
******************************/

const _ = require('lodash')
const logger = require('winston')
const logger = require('electron-log')
const fs = require('fs-extra')

/**
Expand Down
Loading

0 comments on commit c14ad6b

Please sign in to comment.