1 Commits

Author SHA1 Message Date
4796c05d23 Add Dockerfile for testing/CI 2017-11-28 23:06:36 +01:00
27 changed files with 68 additions and 556 deletions

View File

@@ -199,7 +199,7 @@ linters:
style: one_space # or 'at_least_one_space', or 'no_space'
SpaceBeforeBrace:
enabled: false
enabled: true
style: space # or 'new_line'
allow_single_line_padding: false

31
Dockerfile Normal file
View File

@@ -0,0 +1,31 @@
FROM node:8
# Set up the Chrome PPA
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
# Update the package list, and install Chrome and unzip
RUN apt-get update && apt-get install -y google-chrome-stable unzip
# Set up ChromeDriver environment variables
ENV CHROMEDRIVER_VERSION 2.33
ENV CHROMEDRIVER_DIR /chromedriver
# Download and install ChromeDriver
RUN mkdir $CHROMEDRIVER_DIR
RUN wget -q --continue -P $CHROMEDRIVER_DIR \
"http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip" && \
unzip $CHROMEDRIVER_DIR/chromedriver* -d $CHROMEDRIVER_DIR
# Put ChromeDriver into the PATH
ENV PATH $CHROMEDRIVER_DIR:$PATH
WORKDIR /app
# see https://git.io/vdao3
ENV JOBS 1
COPY package.json package-lock.json ./
RUN npm install
COPY . ./

View File

@@ -1,27 +1,7 @@
# RS Inspektor
# inspektor
Inspektor is a simple file browser for inspecting the contents of a
[remoteStorage](https://remotestorage.io) account. It is intended for RS app
developers and power users.
Inspektor is beta software and currently under development. You're invited to
contribute and/or give feedback: https://gitlab.com/skddc/inspektor
## Features
* [x] Connect RS accounts
* [x] Traverse/inspect directories
* [x] View document details
* [x] Render images in details
* [x] Render text content in details (e.g. JSON)
* [ ] Render other types content (e.g. audio and video)
* [ ] Edit text content (and save changes)
* [ ] Delete documents
* [ ] Delete directories
* [ ] Copy/move documents
* [ ] Copy/move directories (and enclosed files)
* [ ] Loading indicator for any view change that loads remote data
* [ ] Logo/icon
This README outlines the details of collaborating on this Ember application.
A short introduction of this app could easily go here.
## Prerequisites
@@ -60,14 +40,7 @@ Make use of the many generators for code, try `ember help generate` for more det
### Deploying
With the 5apps remote added correctly (and push access to the GitLab repo),
just run:
npm run deploy
If you want to deploy this from and to different repos, have a look at the
`scripts` section in `package.json`, as well as `scripts/deploy.sh` for how it
works.
Specify what it takes to deploy your app.
## Further Reading / Useful Links

View File

@@ -1,18 +0,0 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
export default Component.extend({
classNames: ['account-info'],
userAddress: null,
username: computed('userAddress', function() {
return this.get('userAddress').split('@')[0];
}),
host: computed('userAddress', function() {
return '@' + this.get('userAddress').split('@')[1];
})
});

View File

@@ -1,4 +0,0 @@
<span class="username">{{username}}</span>
<br><span class="host">{{host}}</span>
{{#link-to "disconnect" class="disconnect"}}disconnect{{/link-to}}

View File

@@ -1,8 +1,8 @@
import Controller from '@ember/controller';
import EmberObject from '@ember/object';
import { computed, observer } from '@ember/object';
import { inject as service } from '@ember/service';
import { alias } from '@ember/object/computed';
import { observer } from '@ember/object';
import { isEmpty } from '@ember/utils';
export default Controller.extend({
@@ -11,12 +11,10 @@ export default Controller.extend({
connecting: alias('storage.connecting'),
connected: alias('storage.connected'),
userAddress: alias('storage.userAddress'),
rootListing: alias('storage.rootListing'),
currentDirPath: null,
connectedClass: computed('connected', function() {
return this.get('connected') ? 'connected' : 'disconnected';
handleConnected: observer('connected', function() {
this.get('storage').fetchRootListing();
}),
categories: function() {
@@ -35,14 +33,8 @@ export default Controller.extend({
});
return categories;
}.property('rootListing'),
}.property('rootListing')
connectedChange: observer('connected', function() {
if (this.get('connected')) {
// console.debug('connectedChange connected');
} else {
this.set('currentDirPath', null);
}
}),
});

View File

@@ -1,6 +1,5 @@
import Controller from '@ember/controller';
import { inject as controller } from '@ember/controller';
import { observer } from '@ember/object';
import { inject as service } from '@ember/service';
import { alias } from '@ember/object/computed';
import { isPresent } from '@ember/utils';
@@ -10,7 +9,8 @@ export default Controller.extend({
application: controller(),
storage: service(),
connected: alias('storage.connected'),
// connecting: alias('storage.connecting'),
// connected: alias('storage.connected'),
rootListing: alias('storage.rootListing'),
currentDirPath: alias('application.currentDirPath'),
@@ -22,15 +22,6 @@ export default Controller.extend({
} else {
return this.get('rootListing');
}
}.property('rootListing.[]', 'model.[]'),
connectedChange: observer('connected', function() {
if (this.get('connected')) {
// console.debug('connectedChange connected');
} else {
this.set('model', null);
this.set('path', null);
}
}),
}.property('rootListing.[]', 'model.[]')
});

View File

@@ -8,8 +8,6 @@ const Router = EmberRouter.extend({
Router.map(function() {
this.route('inspect');
this.route('connect');
this.route('disconnect');
});
export default Router;

View File

@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
import BodyClassMixin from 'ember-body-class/mixins/body-class';
export default Route.extend(BodyClassMixin, {
export default Route.extend({
});

View File

@@ -1,33 +0,0 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { later } from '@ember/runloop';
import { Promise } from 'rsvp';
export default Route.extend({
storage: service(),
beforeModel() {
return this.waitForConnectionState().then(() => {
if (this.get('storage.connected')) {
this.transitionTo('index');
}
});
},
waitForConnectionState() {
let self = this;
return new Promise(resolve => {
function checkConnectingDone() {
if (self.get('storage.connecting')) {
later(checkConnectingDone, 20);
} else {
resolve();
}
}
checkConnectingDone();
});
}
});

View File

@@ -1,13 +0,0 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
export default Route.extend({
storage: service(),
beforeModel() {
this.get('storage.rs').disconnect();
this.transitionTo('connect');
}
});

View File

@@ -1,8 +1,7 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { isEmpty, isPresent } from '@ember/utils';
import { later } from '@ember/runloop';
import { hash, Promise } from 'rsvp';
import { hash } from 'rsvp';
export default Route.extend({
@@ -14,14 +13,6 @@ export default Route.extend({
}
},
beforeModel() {
return this.waitForConnectionState().then(() => {
if (this.get('storage.disconnected')) {
this.transitionTo('connect');
}
});
},
model(params) {
let path = params.path;
@@ -45,21 +36,6 @@ export default Route.extend({
if (isPresent(model)) {
controller.set('currentDirPath', model.currentDirPath);
}
},
waitForConnectionState() {
let self = this;
return new Promise(resolve => {
function checkConnectingDone() {
if (self.get('storage.connecting')) {
later(checkConnectingDone, 20);
} else {
resolve();
}
}
checkConnectingDone();
});
}
});

View File

@@ -1,5 +1,4 @@
import EmberObject from '@ember/object';
import { computed, observer } from '@ember/object';
import Service from '@ember/service';
import RemoteStorage from 'npm:remotestoragejs';
import Widget from 'npm:remotestorage-widget';
@@ -11,8 +10,6 @@ export default Service.extend({
widget: null,
connecting: true,
connected: false,
userAddress: null,
disconnected: computed.not('connected'),
client: null,
rootListing: null,
@@ -29,7 +26,7 @@ export default Service.extend({
// });
const widget = new Widget(rs, {
skipInitial: true
// leaveOpen: true
});
// Attach widget to DOM
@@ -44,7 +41,6 @@ export default Service.extend({
console.debug('rs.on connected');
this.set('connecting', false);
this.set('connected', true);
this.set('userAddress', this.get('rs').remote.userAddress);
});
rs.on('not-connected', () => {
@@ -76,21 +72,6 @@ export default Service.extend({
this.set('client', rs.scope('/'));
}.on('init'),
connectedChange: observer('connected', function() {
if (this.get('connected')) {
this.fetchRootListing();
} else {
this.clearLocalData();
}
}),
clearLocalData() {
this.setProperties({
userAddress: null,
rootListing: null
});
},
fetchRootListing() {
this.fetchListing('').then(items => {
this.set('rootListing', items.sortBy('name'));

View File

@@ -4,14 +4,7 @@ $dark-grey-3: #aaa;
$light-grey-1: #b5c3d1;
$light-grey-2: #ececec;
body {
background-color: #fff;
transition: background-color 0.2s linear;
}
#app-container {
background-color: #fff;
> aside {
background-color: $dark-grey-1;
color: $light-grey-1;
@@ -26,6 +19,7 @@ body {
}
> main {
// background-color: $dark-grey-2;
background-color: #fff;
> header {
@@ -38,8 +32,4 @@ body {
}
}
}
&.disconnected main {
background-color: $light-grey-2;
}
}

View File

@@ -3,24 +3,12 @@
}
#remotestorage-widget {
display: none;
position: absolute;
top: 20%;
left: 50%;
margin-left: -200px;
z-index: 23;
position: fixed;
top: 1rem;
right: 3rem;
z-index: 1;
}
.connect #remotestorage-widget {
display: block;
}
// .index #remotestorage-widget {
// position: fixed;
// top: 1rem;
// right: 3rem;
// }
#app-container {
position: absolute;
top: 0;
@@ -33,32 +21,15 @@
justify-content: flex-start;
align-items: stretch;
&.disconnected {
> aside {
flex: 0;
overflow: hidden;
}
}
&.connected {
> aside {
flex: 0 0 16rem;
overflow: auto;
padding: 2rem;
}
}
> aside {
transition: flex 0.2s ease-in;
flex: 0 0 16rem;
overflow: auto;
padding: 2rem;
.account-info {
height: 5rem;
nav {
margin-top: 5rem;
margin-bottom: 4rem;
}
// nav {
// margin-top: 5rem;
// margin-bottom: 4rem;
// }
}
> main {
@@ -67,7 +38,7 @@
padding: 3rem 4rem;
> header {
height: 4rem;
height: 4em;
}
}
}

View File

@@ -16,7 +16,6 @@ body {
padding: 0;
}
@import "components/account-info";
@import "components/breadcrumb-nav";
@import "components/categories-nav";
@import "components/directory-listing";

View File

@@ -1,28 +0,0 @@
.account-info {
position: relative;
.username {
font-size: 1.4rem;
}
.host {
font-size: 0.8rem;
opacity: 0.7;
}
.disconnect {
display: inline-block;
margin-left: 0.5rem;
font-size: 0.8rem;
opacity: 0;
transition: opacity 0.2s linear;
}
&:hover {
.disconnect {
font-size: 0.8rem;
opacity: 1;
}
}
}

View File

@@ -1,19 +1,18 @@
<div id="app-container" class={{connectedClass}}>
<div id="app-container">
<aside>
{{#if connected}}
{{account-info userAddress=userAddress}}
{{categories-nav categories=categories}}
{{/if}}
</aside>
<main>
<header>
{{#if connecting}}
<!-- Connecting... -->
<!-- Connecting... -->
{{else}}
{{#if connected}}
{{breadcrumb-nav currentDirPath=currentDirPath}}
{{else}}
<!-- Please connect. -->
Not connected.
{{/if}}
{{/if}}
</header>

View File

@@ -1 +0,0 @@
{{outlet}}

View File

@@ -1 +0,0 @@
{{outlet}}

228
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "inspektor",
"version": "0.5.0",
"version": "0.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -3563,232 +3563,6 @@
"ember-cli-babel": "6.8.2"
}
},
"ember-body-class": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/ember-body-class/-/ember-body-class-0.4.0.tgz",
"integrity": "sha1-CZQkP51JeMyuwofP2+3LeLRuKMU=",
"dev": true,
"requires": {
"ember-cli-babel": "5.2.4"
},
"dependencies": {
"babel-core": {
"version": "5.8.38",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz",
"integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=",
"dev": true,
"requires": {
"babel-plugin-constant-folding": "1.0.1",
"babel-plugin-dead-code-elimination": "1.0.2",
"babel-plugin-eval": "1.0.1",
"babel-plugin-inline-environment-variables": "1.0.1",
"babel-plugin-jscript": "1.0.4",
"babel-plugin-member-expression-literals": "1.0.1",
"babel-plugin-property-literals": "1.0.1",
"babel-plugin-proto-to-assign": "1.0.4",
"babel-plugin-react-constant-elements": "1.0.3",
"babel-plugin-react-display-name": "1.0.3",
"babel-plugin-remove-console": "1.0.1",
"babel-plugin-remove-debugger": "1.0.1",
"babel-plugin-runtime": "1.0.7",
"babel-plugin-undeclared-variables-check": "1.0.2",
"babel-plugin-undefined-to-void": "1.1.6",
"babylon": "5.8.38",
"bluebird": "2.11.0",
"chalk": "1.1.3",
"convert-source-map": "1.5.0",
"core-js": "1.2.7",
"debug": "2.6.9",
"detect-indent": "3.0.1",
"esutils": "2.0.2",
"fs-readdir-recursive": "0.1.2",
"globals": "6.4.1",
"home-or-tmp": "1.0.0",
"is-integer": "1.0.7",
"js-tokens": "1.0.1",
"json5": "0.4.0",
"lodash": "3.10.1",
"minimatch": "2.0.10",
"output-file-sync": "1.1.2",
"path-exists": "1.0.0",
"path-is-absolute": "1.0.1",
"private": "0.1.8",
"regenerator": "0.8.40",
"regexpu": "1.3.0",
"repeating": "1.1.3",
"resolve": "1.5.0",
"shebang-regex": "1.0.0",
"slash": "1.0.0",
"source-map": "0.5.7",
"source-map-support": "0.2.10",
"to-fast-properties": "1.0.3",
"trim-right": "1.0.1",
"try-resolve": "1.0.1"
}
},
"babylon": {
"version": "5.8.38",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
"integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
"dev": true
},
"bluebird": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
"integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
"dev": true
},
"broccoli-babel-transpiler": {
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.2.tgz",
"integrity": "sha512-vFQ+aSR9J81fm3MXXQGgDxswYINHl2p5duLvRLVnpmgPDNdpdsa30gh3xnmhzR/GwWFBfUNle7aYxthlgvsN0w==",
"dev": true,
"requires": {
"babel-core": "5.8.38",
"broccoli-funnel": "1.2.0",
"broccoli-merge-trees": "1.2.4",
"broccoli-persistent-filter": "1.4.3",
"clone": "0.2.0",
"hash-for-dep": "1.2.2",
"heimdalljs-logger": "0.1.9",
"json-stable-stringify": "1.0.1",
"rsvp": "3.6.2",
"workerpool": "2.3.0"
},
"dependencies": {
"clone": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
"dev": true
}
}
},
"core-js": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
"dev": true
},
"detect-indent": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
"integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=",
"dev": true,
"requires": {
"get-stdin": "4.0.1",
"minimist": "1.2.0",
"repeating": "1.1.3"
}
},
"ember-cli-babel": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz",
"integrity": "sha1-XOT0awjtb20h6Hhhn7aJcZ1ujhM=",
"dev": true,
"requires": {
"broccoli-babel-transpiler": "5.7.2",
"broccoli-funnel": "1.2.0",
"clone": "2.1.1",
"ember-cli-version-checker": "1.3.1",
"resolve": "1.5.0"
}
},
"ember-cli-version-checker": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz",
"integrity": "sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=",
"dev": true,
"requires": {
"semver": "5.4.1"
}
},
"globals": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz",
"integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=",
"dev": true
},
"home-or-tmp": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
"integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=",
"dev": true,
"requires": {
"os-tmpdir": "1.0.2",
"user-home": "1.1.1"
}
},
"js-tokens": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz",
"integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=",
"dev": true
},
"json5": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
"dev": true
},
"lodash": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
"integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
"dev": true
},
"minimatch": {
"version": "2.0.10",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
"dev": true,
"requires": {
"brace-expansion": "1.1.8"
}
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
},
"path-exists": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
"dev": true
},
"repeating": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
"integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
"dev": true,
"requires": {
"is-finite": "1.0.2"
}
},
"source-map-support": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
"integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
"dev": true,
"requires": {
"source-map": "0.1.32"
},
"dependencies": {
"source-map": {
"version": "0.1.32",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
"integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
"dev": true,
"requires": {
"amdefine": "1.0.1"
}
}
}
}
}
},
"ember-browserify": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ember-browserify/-/ember-browserify-1.2.0.tgz",

View File

@@ -1,27 +1,23 @@
{
"name": "inspektor",
"version": "0.5.0",
"version": "0.0.0",
"private": true,
"description": "Inspect the contents of your remote storage",
"description": "Small description for inspektor goes here",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "gitlab:skddc/inspektor",
"repository": "",
"scripts": {
"build": "ember build",
"build-prod": "ember build --environment production && npm run update-version-file",
"start": "ember server",
"test": "ember test",
"deploy": "npm run build-prod && bash scripts/deploy.sh",
"update-version-file": "bash scripts/update-version-file.sh"
"test": "ember test"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-body-class": "^0.4.0",
"ember-browserify": "^1.2.0",
"ember-cli": "~2.16.2",
"ember-cli-app-version": "^3.0.0",

View File

@@ -1,17 +0,0 @@
#!/bin/sh
set -xe
# Check out build branch
git checkout build-production
# Copy from build dir to root
cp -r dist/* .
# Add all files
git add --all
# Commit build files
git commit -m "Update build - `date -u`"
# Push to 5apps for deployment
git push 5apps build-production:master
# Push build branch to collab repo
git push origin build-production:build-production
# Go back to master branch
git checkout master

View File

@@ -1,10 +0,0 @@
#!/bin/bash
PACKAGE_VERSION=$(cat package.json \
| grep version \
| head -1 \
| awk -F: '{ print $2 }' \
| sed 's/[",]//g' \
| tr -d '[[:space:]]')
echo $PACKAGE_VERSION > dist/VERSION

View File

@@ -1,14 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
moduleForComponent('account-info', 'Integration | Component | account info', {
integration: true
});
test('it splits the user address into username and host', function(assert) {
this.set('userAddress', 'michielbdejong@unhosted.org');
this.render(hbs`{{account-info userAddress=userAddress}}`);
assert.equal(this.$('.username').text().trim(), 'michielbdejong');
assert.equal(this.$('.host').text().trim(), '@unhosted.org');
});

View File

@@ -1,10 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:connect', 'Unit | Route | connect', {
needs: ['service:storage']
});
test('it exists', function(assert) {
let route = this.subject();
assert.ok(route);
});

View File

@@ -1,10 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:disconnect', 'Unit | Route | disconnect', {
needs: ['service:storage']
});
test('it exists', function(assert) {
let route = this.subject();
assert.ok(route);
});