Skip to content
This repository has been archived by the owner on Sep 27, 2020. It is now read-only.

Version 1.3.0 #76

Merged
merged 198 commits into from
Apr 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
80a3f82
implementation of securing the integrity of the virtualbox id
marcelkilian Dec 1, 2015
d4fab04
added proto implementation of creating new ssh
marcelkilian Dec 1, 2015
7df8256
refactoring + tests of rsa key generation
marcelkilian Dec 2, 2015
7b4bc5d
refactoring + tests of vagrant ssh logic
marcelkilian Dec 4, 2015
7dcaf89
refactoring + tests of virtualbox logic
marcelkilian Dec 4, 2015
ae8f3f4
moved getSSHConfig to vagrant run model to simplify require chain
marcelkilian Dec 4, 2015
7b57a64
added windows switch to additionally call VBoxManage on a fixed path …
marcelkilian Dec 9, 2015
4f96a3f
removed error Message prerequisite for 2nd VBoxManage call on windows
marcelkilian Dec 9, 2015
1ec026e
fixed direct VBoxManage cmd on windows
marcelkilian Dec 9, 2015
eb43f1b
fixed getMachine function for shell returns with \r\n
marcelkilian Dec 10, 2015
fe6b38a
windows fixes
Jan 11, 2016
5b7dab1
added error page for uncaught errors (currently used only on EADDRINU…
marcelkilian Feb 5, 2016
46fbf56
Added start/stop action into the project sidebar
eisenkolb Feb 6, 2016
891557a
Updated last project tab stat to 'protocol' and changed tooltip text…
eisenkolb Feb 6, 2016
f77af5e
CSS: Added hover icons for sidebar action
eisenkolb Feb 6, 2016
758f674
Implemented singleton design pattern
eisenkolb Feb 8, 2016
d3d4e7f
Updated electron version 0.33.8 to 0.34.1
eisenkolb Feb 8, 2016
e90bd9c
moved setting NODE_ENV from package.json into start-dev script to sup…
marcelkilian Feb 8, 2016
131ee3d
Merge pull request #69 from eisenkolb/singleton
marcelkilian Feb 8, 2016
1aec079
electron version upgrade from 0.34.1 to 0.36.7
marcelkilian Feb 8, 2016
a35f1cd
removed test output
marcelkilian Feb 8, 2016
16a6598
Merge pull request #71 from mazehall/electronUpgrade
marcelkilian Feb 8, 2016
4636926
start replacement socket.io with native ipc module
marcelkilian Feb 8, 2016
2d50fea
fixed storage angular factory
marcelkilian Feb 9, 2016
f2283c0
fixed partials loading
marcelkilian Feb 9, 2016
8bee1dc
fixed open external links in main browser
marcelkilian Feb 9, 2016
8a539fc
fixed readme tab in project detail view
marcelkilian Feb 9, 2016
c805bb4
added missing bower files
marcelkilian Feb 9, 2016
8cc5e1d
design
kpatzelt Feb 9, 2016
c63fd13
design popover
kpatzelt Feb 9, 2016
6a8670c
implemented panel content buttons and some cleanup
marcelkilian Feb 10, 2016
a9dfbed
design popover
kpatzelt Feb 10, 2016
af60a03
design popover
kpatzelt Feb 10, 2016
0fdc7d5
Merge pull request #70 from eisenkolb/improvement/quick-start-stop
marcelkilian Feb 11, 2016
e974c65
Merge remote-tracking branch 'origin/master' into development
marcelkilian Feb 11, 2016
00b44e4
changelog update
marcelkilian Feb 11, 2016
621c2fd
Merge remote-tracking branch 'origin/development' into design
marcelkilian Feb 11, 2016
b5d2fde
- cleanup bower deps
marcelkilian Feb 11, 2016
d071305
- added bower ui-router-extras
marcelkilian Feb 11, 2016
73bcfba
fixed reload errors on project quick start/stop
marcelkilian Feb 11, 2016
8e21582
design beginn start/stop
kpatzelt Feb 11, 2016
c8985cf
Merge remote-tracking branch 'origin/design' into design
kpatzelt Feb 11, 2016
354694f
Merge remote-tracking branch 'origin/experimental/replaceSocketIO' in…
marcelkilian Feb 11, 2016
11e91ce
Merge remote-tracking branch 'origin/development' into design
marcelkilian Feb 11, 2016
b2a2a2b
fixed angular modules merge issue
marcelkilian Feb 11, 2016
006cd44
design beginn start/stop
kpatzelt Feb 11, 2016
69d7281
Merge remote-tracking branch 'origin/design' into design
kpatzelt Feb 11, 2016
34d2c87
removed unused node modules
marcelkilian Feb 11, 2016
92e02f2
design start/stop final
kpatzelt Feb 11, 2016
3784612
fixed/removed unused mazehall usage
marcelkilian Feb 12, 2016
08dfc31
fixed build (linux), test-e2e + more file moving
marcelkilian Feb 16, 2016
3f0c7ac
added missing postinstall.js
marcelkilian Feb 16, 2016
10231f0
added --no-optional flag to app-install installation to avoid node ve…
marcelkilian Feb 16, 2016
6ca07d0
fixed not working custom project actions
marcelkilian Feb 16, 2016
adac3f7
added EINTOPF_HOME switch in vagrant default file for project src mounts
marcelkilian Feb 16, 2016
1f42e38
removed unused socket.io bower lib
marcelkilian Feb 17, 2016
9445dff
replaced angular.panels with angular-pageslide-directive because of a…
marcelkilian Feb 17, 2016
335e26a
added panel labeling
marcelkilian Feb 18, 2016
312d87d
improved panel overlay
marcelkilian Feb 18, 2016
9b6e118
added apps and containers counter in panel overview
marcelkilian Feb 18, 2016
b54178d
extended nspopover functionality to add/remove active class on show/hide
marcelkilian Feb 19, 2016
1224716
angular ui router cleanup
marcelkilian Feb 19, 2016
91414e1
refactoring docker model + popup state implementation
marcelkilian Feb 22, 2016
4a74b12
fixed html get error with dynamic img src in project creation page
marcelkilian Feb 22, 2016
8959f1d
added runtime Stream handler model and moved all runtime streams to it
marcelkilian Feb 23, 2016
cc59395
added regular internet connection test
marcelkilian Feb 23, 2016
ddbd930
created one interval emitter for all interval stream
marcelkilian Feb 23, 2016
23ba74f
design popup
kpatzelt Feb 23, 2016
30b5d25
Merge remote-tracking branch 'origin/design' into design
kpatzelt Feb 23, 2016
4c2d015
design popup
kpatzelt Feb 23, 2016
9aacb0a
added vagrant state monitoring + refactoring setup model
marcelkilian Feb 23, 2016
5a57731
design panelcontent
kpatzelt Feb 23, 2016
f6574ea
Merge remote-tracking branch 'origin/design' into design
kpatzelt Feb 23, 2016
a1fd1e7
design panelcontent
kpatzelt Feb 23, 2016
37c4d50
implemented project running label in project detail view
marcelkilian Feb 24, 2016
a233d44
design panelcontent
kpatzelt Feb 24, 2016
affe811
fixed ng-even/odd for apps listing
marcelkilian Feb 24, 2016
814decb
implemented basic pattern cloning
marcelkilian Feb 24, 2016
b551389
fixed incorrect vagrant up terminal linebreak in frontend
marcelkilian Feb 25, 2016
04bd363
added update and hide actions as default actions + removed # in href
marcelkilian Feb 25, 2016
f3da3a1
fixed page reload on project start/stop when already in project page
marcelkilian Feb 25, 2016
f727995
design
kpatzelt Feb 25, 2016
e5174fe
removed test output
marcelkilian Feb 25, 2016
11edf2b
Merge remote-tracking branch 'origin/design' into development
marcelkilian Feb 26, 2016
4fe3a27
Merge remote-tracking branch 'origin/development' into feature/patter…
marcelkilian Feb 26, 2016
6913196
fixed merge conflict in feature/patternCloning
marcelkilian Feb 26, 2016
af8ab4a
simplified npm package installation against electrons node
marcelkilian Feb 26, 2016
d3b7272
moved window menu into seperate file and added dev menu for dev Tools…
marcelkilian Feb 26, 2016
3434e19
fixed error when clicking the about menu item
marcelkilian Feb 26, 2016
ef1d0a7
colorpicker test
kpatzelt Feb 29, 2016
50cb842
colorpicker test
kpatzelt Feb 29, 2016
d45dd8c
fixed jquery initialization
marcelkilian Feb 29, 2016
976c646
colorpicker test
kpatzelt Feb 29, 2016
a3f2bd6
design clone
kpatzelt Mar 2, 2016
9e414c8
include base64
kpatzelt Mar 2, 2016
940ebc3
updated project variables in cooking.projects.clone.html
marcelkilian Mar 2, 2016
982d309
moved clone default Image into partial and added saving more stuff in…
marcelkilian Mar 2, 2016
fce1d19
formular clone
kpatzelt Mar 2, 2016
04af6f9
formular clone
kpatzelt Mar 2, 2016
8ed0c3a
fixed ng-model - placeholder issue in cooking.projects.clone.html
marcelkilian Mar 2, 2016
e0a8ad6
implemented image select/upload in clone project page + removed unuse…
marcelkilian Mar 4, 2016
f5453ac
implemented loading animation for project start/stop actions
marcelkilian Mar 7, 2016
f972ef8
colorpicker test
kpatzelt Feb 29, 2016
f8fe1a1
colorpicker test
kpatzelt Feb 29, 2016
248f254
fixed jquery initialization
marcelkilian Feb 29, 2016
1d78367
colorpicker test
kpatzelt Feb 29, 2016
bc3a281
design clone
kpatzelt Mar 2, 2016
fd7234e
include base64
kpatzelt Mar 2, 2016
dec7d4c
updated project variables in cooking.projects.clone.html
marcelkilian Mar 2, 2016
1837a67
moved clone default Image into partial and added saving more stuff in…
marcelkilian Mar 2, 2016
360511a
formular clone
kpatzelt Mar 2, 2016
6651bfa
formular clone
kpatzelt Mar 2, 2016
c85f172
fixed ng-model - placeholder issue in cooking.projects.clone.html
marcelkilian Mar 2, 2016
ed3a96a
implemented image select/upload in clone project page + removed unuse…
marcelkilian Mar 4, 2016
c6ba611
implemented loading animation for project start/stop actions
marcelkilian Mar 7, 2016
50a268e
added lock for all project actions + minor refactoring
marcelkilian Mar 7, 2016
f84b9f9
added containers loading animation
marcelkilian Mar 8, 2016
85a6f84
fixed flickering of container panel list when main view is in details
marcelkilian Mar 8, 2016
a4203c5
removed angular-spectrum-colorpicker
marcelkilian Mar 8, 2016
de8fd7c
fixed wrong timing of the loading animation in the container tab of d…
marcelkilian Mar 8, 2016
f2cfd73
minor refactoring frontend js controller/factories
marcelkilian Mar 8, 2016
fd241bc
Merge remote-tracking branch 'origin/fix/vagrant-backup' into colorpi…
marcelkilian Mar 9, 2016
fb457c7
fixed some merge issues
marcelkilian Mar 9, 2016
e98c012
fixed try again button on vagrant ssh installation -> merge issue
marcelkilian Mar 9, 2016
0d2fa41
fixed not showing error icon on vagrant up error
marcelkilian Mar 9, 2016
282772e
Merge remote-tracking branch 'origin/development' into colorpicker
marcelkilian Mar 9, 2016
2bf5118
removed unused frontend error state
marcelkilian Mar 9, 2016
d914ecb
design anpassungen
kpatzelt Mar 10, 2016
15058df
Merge remote-tracking branch 'origin/development' into recipedesign
marcelkilian Mar 10, 2016
df3f295
design anpassungen
kpatzelt Mar 10, 2016
6dd4d29
streamlined recipe installation + added recipe pattern configuration …
marcelkilian Mar 11, 2016
e6afd80
design anpassungen
kpatzelt Mar 14, 2016
9b9f896
implemented local registry + refactoring
marcelkilian Mar 14, 2016
2257939
recipe detail: actions tab is now only shown when there are actions
marcelkilian Mar 14, 2016
b6b8b5b
fixed external links not opening anymore
marcelkilian Mar 15, 2016
d0ebf7c
panel asynchron switchlabel design
kpatzelt Mar 15, 2016
74c0b00
fixed recipe edit controller error
marcelkilian Mar 15, 2016
f9cd7e4
anpassung
kpatzelt Mar 15, 2016
d0d64ee
Merge remote-tracking branch 'origin/recipedesign' into recipedesign
kpatzelt Mar 15, 2016
76bdcbf
created property for combined registry from local and private
marcelkilian Mar 15, 2016
dc6300b
new design private recipe
kpatzelt Mar 15, 2016
4eccdbd
Merge remote-tracking branch 'origin/development' into recipedesign
marcelkilian Mar 16, 2016
68e8e77
incomplete fix for cloning recipe ids
marcelkilian Mar 16, 2016
28144a2
improved uniqueness of registry ids
marcelkilian Mar 16, 2016
5800a7b
fixed redirect after project installation
marcelkilian Mar 16, 2016
1591ac3
tooltip private recipe
kpatzelt Mar 16, 2016
566b25a
replaced registry:local with reused projects:list -> now shows local …
marcelkilian Mar 17, 2016
946b257
tooltip private recipe
kpatzelt Mar 17, 2016
e1db810
action button do
kpatzelt Mar 17, 2016
f3e0453
fixed not showing private registry when no projects were installed
marcelkilian Mar 17, 2016
55e638a
followup fix exception when evaluating installed projects
marcelkilian Mar 17, 2016
ffa9c03
improved sort order of private project recipes
marcelkilian Mar 17, 2016
3822db9
fixed loading animation for project creation
marcelkilian Mar 17, 2016
709df58
fixed scroll-glue implementation in project log
marcelkilian Mar 18, 2016
074806e
disabled project locking on custom action
marcelkilian Mar 21, 2016
88fa4ea
replaced vagrant ssh call for vm ip with native VBox call
marcelkilian Mar 21, 2016
f192ad6
fixed unordered list of guest ips
marcelkilian Mar 21, 2016
c21b5c1
replaced vagrant ssh-config call with extracting the options directly…
marcelkilian Mar 21, 2016
920cc51
removed unused spectrum bower components
marcelkilian Mar 21, 2016
0082792
media screen design
kpatzelt Mar 21, 2016
3e3fccb
added loading animation when cloning a recipe
marcelkilian Mar 22, 2016
7a4d336
refactoring recipe logging and ansi support
marcelkilian Mar 22, 2016
178d655
Merge remote-tracking branch 'origin/development' into recipedesign
marcelkilian Mar 22, 2016
764ec21
Fix: ansi-to-html has broken deps
jensklose Mar 22, 2016
9a86156
Merge branch 'development' into recipedesign
jensklose Mar 22, 2016
3b055e3
FIX: test require/rewire paths
jensklose Mar 22, 2016
f9bc867
fixed occasional reseting of .vagrant files because 2 vagrant comman…
marcelkilian Mar 23, 2016
86330f0
replaced isVagrantInstalled cmd from slow vagrant command to which co…
marcelkilian Mar 23, 2016
a00c5ef
improved isVagrantInstalled with better windows compatibility
marcelkilian Mar 23, 2016
4581edd
replaced log prefixing with a start and done line
marcelkilian Mar 23, 2016
92f4c4a
implemented edit/customize projects
marcelkilian Mar 23, 2016
0a834d8
fixed missing redirect after deleting a project
marcelkilian Mar 23, 2016
06ed79d
improved usage of coffee`s 'for' with fallback array
marcelkilian Mar 30, 2016
f9669a3
fixed registry fallback not getting ids
marcelkilian Mar 30, 2016
b9e3b87
fixed Project container/app mapping with upper case letters in projec…
marcelkilian Mar 31, 2016
8974340
fixed registry model tests
marcelkilian Apr 1, 2016
548cbd7
fixed possible memory leak on project:log stream
marcelkilian Apr 1, 2016
ace8e14
removed pretty much unused node-vagrant model
marcelkilian Apr 4, 2016
0d79216
basic implementation of adding local registry entry through project url
marcelkilian Apr 5, 2016
e130f6a
updated tests
marcelkilian Apr 6, 2016
b937e2d
improved tmp cleanup on registry url install
marcelkilian Apr 7, 2016
5cda452
fixed created projects do not use decorators
marcelkilian Apr 8, 2016
2e592d6
fixed editing project decorators overwrites existing decorators
marcelkilian Apr 8, 2016
65d7040
installing from url now triggers an error when the installed project …
marcelkilian Apr 8, 2016
157e30c
update electron-prebuild + fix travis config
marcelkilian Apr 8, 2016
1c7f4ed
Merge pull request #75 from mazehall/registerUrl
marcelkilian Apr 11, 2016
be19bd9
updated e2e tests
marcelkilian Apr 12, 2016
718052b
cleanup e2e tests
marcelkilian Apr 12, 2016
1d176a4
added windows support for e2e tests
Apr 12, 2016
4928a9f
Unquoted code startup e2e-tests because app could start to fast
Apr 12, 2016
2e8825d
fixed running apps listing issue when multiple apps with the same nam…
marcelkilian Apr 13, 2016
94e0321
fixed faulty redirect after cloning with upper case letters in id
marcelkilian Apr 13, 2016
739b3c2
fixed project id issues when having projects with the same dir name b…
marcelkilian Apr 13, 2016
a80376f
updated readme + changelog
marcelkilian Apr 13, 2016
51be33d
updated readme img
marcelkilian Apr 13, 2016
a683e5b
disabled not implemented html parts
marcelkilian Apr 13, 2016
a082a41
increased version to 1.3.0
marcelkilian Apr 13, 2016
3ccb5e5
Merge remote-tracking branch 'origin/master' into development
marcelkilian Apr 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "src/public/bower_components"
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Thumbs.db
/build/
/releases/
/tmp/
/config/local*
4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
; electron build options - build packages against electrons node
disturl = "https://atom.io/download/atom-shell";
runtime = "electron";
target = "0.36.9";
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js
node_js:
- "4.2"
- "4.1"
script: cd app && npm test
- "5.0"
- "5.10"
script: npm test
# requirements for building on node.js 4.0 / io.js v3
addons:
apt:
Expand Down
31 changes: 28 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,35 @@
## 1.2.2
## 1.3

Added:

- projects can now be cloned
- installed projects can be partially edited
- loading animations for async actions
- minimal height for the browser window

Changed:

- installing through a project url now creates a local registry entry
- replaced vagrant backup with logic that repairs the broken vagrant
- removed Express Server Layer, so now native electron
- replaced most vagrant shell calls with a more durable solution
- improved Eintopf start time
- design

Fixed:

- issue when starting multiple Eintopf instances
- incorrect vagrant ssh config values
- issues when having projects with the same dir name but different upper case letters


## 1.2.2 (08.03.2016)

Changed:

- upgraded eintopf proxy to version 1.0.2
- upgrade eintopf proxy to version 1.0.2

## 1.2.1
## 1.2.1 (10.02.2016)

Fixed:

Expand Down
53 changes: 10 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ For MacOS homebrewer:
---|---|---
__4480__ | __4480__ | Proxy that provides all started docker container
__4443__ | __4443__ | Proxy SSL termination point
__31313__ | __31313__ | Eintopf GUI server


The containers being proxied must [expose](https://docs.docker.com/reference/run/#expose-incoming-ports) the port to be proxied, either by using the `EXPOSE` directive in their `Dockerfile` or by using the `--expose` flag to `docker run` or `docker create`.
Expand All @@ -70,8 +69,9 @@ The configuration works partially, so you only have to set what you want to over
"pathDefaultVagrantFile": "config/Vagrantfile.default" # relative path to the Vagrant configuration
},
"registry": {
"url": "http://registry.eintopf.io/files/projects.json", # set your own registry definition url here
"refreshInterval": "900000" # set the interval in milliseconds to load the registry
"url": "http://registry.eintopf.io/files/projects.json", # overwrite community registry
"refreshInterval": "900000", # set the interval in milliseconds to load the registry
"private": ["http://127.0.0.1/eintopf-projects.json"] # use your team registry
}
}

Expand All @@ -94,7 +94,7 @@ The following settings are necessary so that Eintopf can use Vagrant :
- REGISTRY_INTERVAL # set your own registry definition url here
- REGISTRY_URL # set the interval in milliseconds to load the registry

## Project pattern development
## Project description development

A pattern is a project configuration which can be used by Eintopf.

Expand All @@ -106,7 +106,7 @@ Minimal file system:
The file package.json defines this package as a Eintopf pattern. Minimal package.json:

{
"name": "example-pattern", # pattern id
"name": "example-pattern",
"eintopf": {
"name": "Example-pattern", # pattern name
"description": "This is my example-pattern. It can be used as ..." # pattern description
Expand Down Expand Up @@ -251,28 +251,9 @@ File system:

# Development

## Structure of the project

There are **two** `package.json` files:

__1. For development__

Sits on path: `eintopf/package.json`. Here you declare dependencies for your development environment and build scripts. **This file is not distributed with real application!**

Also here you declare the version of Electron runtime you want to use:
```json
"devDependencies": {
"electron-prebuilt": "^0.24.0"
}
```

__2. For the application__

Sits on path: `eintopf/app/package.json`. This is **real** manifest of the application. Declare your app dependencies here.

## Project's folders

- `app` - code of your application goes here.
- `src` - application code
- `releases` - ready for distribution installers will land here.
- `resources` - resources for particular operating system.
- `tasks` - build and development environment scripts.
Expand All @@ -282,31 +263,17 @@ Sits on path: `eintopf/app/package.json`. This is **real** manifest of the appli
```
npm install
```
It will also download Electron runtime, and install dependencies for second `package.json` file inside `app` folder.

Installs package dependencies.

### Starting the app

```
npm start
```
### Npm package building

### Adding pure-js npm modules to your app

Remember to add your dependency to `app/package.json` file, so do:
```
cd app
npm install name_of_npm_module --save
```

### Adding native npm modules to your app

If you want to install native module you need to compile it agains Electron, not Node.js you are firing in command line by typing `npm install` [(Read more)](https://github.com/atom/electron/blob/master/docs/tutorial/using-native-node-modules.md).
```
npm run app-install -- name_of_npm_module
```
Of course this method works also for pure-js modules, so you can use it all the time if you're able to remember such an ugly command.

All npm packages are build against the electron node version. This is configured in the .npmrc file.
Look [(here)](https://github.com/atom/electron/blob/master/docs/tutorial/using-native-node-modules.md) for more info.

### Making a release

Expand Down
20 changes: 0 additions & 20 deletions app/app.js

This file was deleted.

3 changes: 0 additions & 3 deletions app/app_modules/gui/.bowerrc

This file was deleted.

5 changes: 0 additions & 5 deletions app/app_modules/gui/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions app/app_modules/gui/bower.json

This file was deleted.

45 changes: 0 additions & 45 deletions app/app_modules/gui/gulpfile.js

This file was deleted.

21 changes: 0 additions & 21 deletions app/app_modules/gui/index.js

This file was deleted.

17 changes: 0 additions & 17 deletions app/app_modules/gui/package.json

This file was deleted.

This file was deleted.

Loading