Skip to content

Photo viewer #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Follow Block Photos on Twitter: [@Block_Photos](https://twitter.com/Block_Photos

Read my introduction article about this project: [Building a decentralized Photos app on Blockstack with React](https://nerdic-coder.com/2018/06/22/building-a-decentralized-photos-app-on-blockstack-with-react/)


## Donations

If you like this project please donate to preferred cryptocurrency below:
Expand All @@ -35,27 +34,31 @@ If you like this project please donate to preferred cryptocurrency below:
### Bitcoin

3JkxUQ763fbf1cYVAitqpWUMeY4QLaBU8M

<p>
<img src="https://github.com/nerdic-coder/block-photos/blob/master/resources/btc-qrcode.png?raw=true">
</p>

### Etherium
### Etherium

0x6e54183E7b22dA87fb48e0d79ADaDa4f665A4D5a

<p>
<img src="https://github.com/nerdic-coder/block-photos/blob/master/resources/etherium-qrcode.png?raw=true">
</p>

### XRP
### XRP

rGaGGSbeF8HmmrLnTg8gaT92Wa77qg3Y8k

<p>
<img src="https://github.com/nerdic-coder/block-photos/blob/master/resources/xrp-qrcode.png?raw=true">
</p>

### IOTA

HTPB9JVTMCDHEDMCIPOJELELVLNWLGMHVGZJUCKOYNBZGN9EVCDKFEIUJKINPCBWZI9BKAVIHRVRNWPFC9CQXJYQSZ

<p>
<img src="https://github.com/nerdic-coder/block-photos/blob/master/resources/iota-qrcode.png?raw=true">
</p>
Expand All @@ -69,64 +72,81 @@ ALNbr6NSuEkWE7ASNB9iB5VcpZmhz1FaAg
To test this project do the following...

Installation:

```bash
git clone https://github.com/nerdic-coder/block-photos.git block-photos
cd block-photos
npm install
```

Starting Test server:

```bash
npm run serve
```

Starting Electron app:

```bash
npm start
```

Build and package Electron app:

```bash
npm run package
```

Build and package for web app distribution:

```bash
npm run build:web
```

Build for Android app distribution:

```bash
npm run build:android
```

Build for iOS app distribution:

```bash
npm run build:ios
```

Test ESLint:

```bash
npm run lint
```

Run unit tests:

```bash
npm test
```

Run e2e tests:

1. Start the apps dev server:

```bash
npm run serve
```

2. Start selenium

```bash
npm run selenium
```

3. Run the tests

```bash
npm run e2e
```

## Uglify

Uglify javascript files with: https://www.npmjs.com/package/uglify-es
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
applicationId "com.nerdiccoder.blockphotos"
minSdkVersion 21
targetSdkVersion 27
versionCode 4
versionCode 5
versionName "2.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down
20 changes: 9 additions & 11 deletions electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,20 @@ if (!gotTheLock) {
mainWindow.restore();
}

mainWindow.close();

mainWindow = new BrowserWindow({
width: 500,
height: 810,
icon: path.join(__dirname, 'icons/png/64x64.png')
});

var request = commandLine[1].split(':');

if (request[1] && currentAuthResponse !== request[1]) {
currentAuthResponse = request[1];

mainWindow.focus();
mainWindow.loadURL(BASE_URL + '?authResponse=' + request[1]);
secondWindow = new BrowserWindow({
width: 500,
height: 810,
icon: path.join(__dirname, 'icons/png/64x64.png')
});

secondWindow.focus();
secondWindow.loadURL(BASE_URL + '?authResponse=' + request[1]);
mainWindow.close();
return true;
}
}
Expand All @@ -56,7 +55,6 @@ if (!gotTheLock) {

// Handle creating/removing shortcuts on Windows when installing/uninstalling.
if (require('electron-squirrel-startup')) {
// eslint-disable-line global-require
app.quit();
}

Expand Down
Loading