diff --git a/app/assets/javascripts/adapters/application_adapter.js.coffee b/app/assets/javascripts/adapters/application_adapter.js.coffee deleted file mode 100644 index 2c37fec..0000000 --- a/app/assets/javascripts/adapters/application_adapter.js.coffee +++ /dev/null @@ -1,5 +0,0 @@ -# Override the default adapter with the `DS.ActiveModelAdapter` which - -Inventory.ApplicationAdapter = DS.ActiveModelAdapter.extend({ - -}) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index 1d2fccd..0000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,17 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. -// -// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require jquery -//= require jquery_ujs -//= require turbolinks -//= require_tree . -//= require bootstrap-sprockets diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee deleted file mode 100644 index eeea482..0000000 --- a/app/assets/javascripts/application.js.coffee +++ /dev/null @@ -1,11 +0,0 @@ -#= require jquery -#= require jquery_ujs -#= require ember -#= require ember-data -#= require active-model-adapter -#= require_self -#= require inventory - -# for more details see: http://emberjs.com/guides/application/ -window.Inventory = Ember.Application.create() - diff --git a/app/assets/javascripts/inventory.js.coffee b/app/assets/javascripts/inventory.js.coffee deleted file mode 100644 index 2c25aec..0000000 --- a/app/assets/javascripts/inventory.js.coffee +++ /dev/null @@ -1,11 +0,0 @@ -#= require_tree ./adapters -#= require_tree ./mixins -#= require_tree ./models -#= require_tree ./controllers -#= require_tree ./views -#= require_tree ./helpers -#= require_tree ./components -#= require_tree ./templates -#= require_tree ./routes -#= require ./router -#= require_self diff --git a/app/assets/javascripts/items.coffee b/app/assets/javascripts/items.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/items.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/router.js.coffee b/app/assets/javascripts/router.js.coffee deleted file mode 100644 index 0d9865f..0000000 --- a/app/assets/javascripts/router.js.coffee +++ /dev/null @@ -1,5 +0,0 @@ -# For more information see: http://emberjs.com/guides/routing/ - -Inventory.Router.map ()-> - # @resource('posts') - diff --git a/app/assets/javascripts/views/.gitkeep b/app/assets/javascripts/views/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/ember/.bowerrc b/ember/.bowerrc new file mode 100644 index 0000000..959e169 --- /dev/null +++ b/ember/.bowerrc @@ -0,0 +1,4 @@ +{ + "directory": "bower_components", + "analytics": false +} diff --git a/ember/.editorconfig b/ember/.editorconfig new file mode 100644 index 0000000..47c5438 --- /dev/null +++ b/ember/.editorconfig @@ -0,0 +1,34 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.hbs] +insert_final_newline = false +indent_style = space +indent_size = 2 + +[*.css] +indent_style = space +indent_size = 2 + +[*.html] +indent_style = space +indent_size = 2 + +[*.{diff,md}] +trim_trailing_whitespace = false diff --git a/ember/.ember-cli b/ember/.ember-cli new file mode 100644 index 0000000..ee64cfe --- /dev/null +++ b/ember/.ember-cli @@ -0,0 +1,9 @@ +{ + /** + Ember CLI sends analytics information by default. The data is completely + anonymous, but there are times when you might want to disable this behavior. + + Setting `disableAnalytics` to true will prevent any data from being sent. + */ + "disableAnalytics": false +} diff --git a/ember/.gitignore b/ember/.gitignore new file mode 100644 index 0000000..86fceae --- /dev/null +++ b/ember/.gitignore @@ -0,0 +1,17 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp + +# dependencies +/node_modules +/bower_components + +# misc +/.sass-cache +/connect.lock +/coverage/* +/libpeerconnection.log +npm-debug.log +testem.log diff --git a/ember/.jshintrc b/ember/.jshintrc new file mode 100644 index 0000000..08096ef --- /dev/null +++ b/ember/.jshintrc @@ -0,0 +1,32 @@ +{ + "predef": [ + "document", + "window", + "-Promise" + ], + "browser": true, + "boss": true, + "curly": true, + "debug": false, + "devel": true, + "eqeqeq": true, + "evil": true, + "forin": false, + "immed": false, + "laxbreak": false, + "newcap": true, + "noarg": true, + "noempty": false, + "nonew": false, + "nomen": false, + "onevar": false, + "plusplus": false, + "regexp": false, + "undef": true, + "sub": true, + "strict": false, + "white": false, + "eqnull": true, + "esnext": true, + "unused": true +} diff --git a/ember/.travis.yml b/ember/.travis.yml new file mode 100644 index 0000000..66dd107 --- /dev/null +++ b/ember/.travis.yml @@ -0,0 +1,23 @@ +--- +language: node_js +node_js: + - "0.12" + +sudo: false + +cache: + directories: + - node_modules + +before_install: + - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH + - "npm config set spin false" + - "npm install -g npm@^2" + +install: + - npm install -g bower + - npm install + - bower install + +script: + - npm test diff --git a/ember/.watchmanconfig b/ember/.watchmanconfig new file mode 100644 index 0000000..5e9462c --- /dev/null +++ b/ember/.watchmanconfig @@ -0,0 +1,3 @@ +{ + "ignore_dirs": ["tmp"] +} diff --git a/ember/README.md b/ember/README.md new file mode 100644 index 0000000..8f7af92 --- /dev/null +++ b/ember/README.md @@ -0,0 +1,53 @@ +# Inventory + +This README outlines the details of collaborating on this Ember application. +A short introduction of this app could easily go here. + +## Prerequisites + +You will need the following things properly installed on your computer. + +* [Git](http://git-scm.com/) +* [Node.js](http://nodejs.org/) (with NPM) +* [Bower](http://bower.io/) +* [Ember CLI](http://www.ember-cli.com/) +* [PhantomJS](http://phantomjs.org/) + +## Installation + +* `git clone ` this repository +* change into the new directory +* `npm install` +* `bower install` + +## Running / Development + +* `ember server` +* Visit your app at [http://localhost:4200](http://localhost:4200). + +### Code Generators + +Make use of the many generators for code, try `ember help generate` for more details + +### Running Tests + +* `ember test` +* `ember test --server` + +### Building + +* `ember build` (development) +* `ember build --environment production` (production) + +### Deploying + +Specify what it takes to deploy your app. + +## Further Reading / Useful Links + +* [ember.js](http://emberjs.com/) +* [ember-cli](http://www.ember-cli.com/) +* Development Browser Extensions + * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) + * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) + diff --git a/ember/app/app.js b/ember/app/app.js new file mode 100644 index 0000000..8d66b95 --- /dev/null +++ b/ember/app/app.js @@ -0,0 +1,18 @@ +import Ember from 'ember'; +import Resolver from 'ember/resolver'; +import loadInitializers from 'ember/load-initializers'; +import config from './config/environment'; + +var App; + +Ember.MODEL_FACTORY_INJECTIONS = true; + +App = Ember.Application.extend({ + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix, + Resolver: Resolver +}); + +loadInitializers(App, config.modulePrefix); + +export default App; diff --git a/app/assets/javascripts/adapters/.gitkeep b/ember/app/components/.gitkeep similarity index 100% rename from app/assets/javascripts/adapters/.gitkeep rename to ember/app/components/.gitkeep diff --git a/app/assets/javascripts/components/.gitkeep b/ember/app/controllers/.gitkeep similarity index 100% rename from app/assets/javascripts/components/.gitkeep rename to ember/app/controllers/.gitkeep diff --git a/app/assets/javascripts/controllers/.gitkeep b/ember/app/helpers/.gitkeep similarity index 100% rename from app/assets/javascripts/controllers/.gitkeep rename to ember/app/helpers/.gitkeep diff --git a/ember/app/index.html b/ember/app/index.html new file mode 100644 index 0000000..f9f0d92 --- /dev/null +++ b/ember/app/index.html @@ -0,0 +1,25 @@ + + + + + + Inventory + + + + {{content-for 'head'}} + + + + + {{content-for 'head-footer'}} + + + {{content-for 'body'}} + + + + + {{content-for 'body-footer'}} + + diff --git a/app/assets/javascripts/helpers/.gitkeep b/ember/app/models/.gitkeep similarity index 100% rename from app/assets/javascripts/helpers/.gitkeep rename to ember/app/models/.gitkeep diff --git a/ember/app/router.js b/ember/app/router.js new file mode 100644 index 0000000..cef554b --- /dev/null +++ b/ember/app/router.js @@ -0,0 +1,11 @@ +import Ember from 'ember'; +import config from './config/environment'; + +var Router = Ember.Router.extend({ + location: config.locationType +}); + +Router.map(function() { +}); + +export default Router; diff --git a/app/assets/javascripts/mixins/.gitkeep b/ember/app/routes/.gitkeep similarity index 100% rename from app/assets/javascripts/mixins/.gitkeep rename to ember/app/routes/.gitkeep diff --git a/app/assets/images/.keep b/ember/app/styles/app.css similarity index 100% rename from app/assets/images/.keep rename to ember/app/styles/app.css diff --git a/ember/app/templates/application.hbs b/ember/app/templates/application.hbs new file mode 100644 index 0000000..f8bc38e --- /dev/null +++ b/ember/app/templates/application.hbs @@ -0,0 +1,3 @@ +

Welcome to Ember

+ +{{outlet}} diff --git a/app/assets/javascripts/models/.gitkeep b/ember/app/templates/components/.gitkeep similarity index 100% rename from app/assets/javascripts/models/.gitkeep rename to ember/app/templates/components/.gitkeep diff --git a/ember/bower.json b/ember/bower.json new file mode 100644 index 0000000..0c7d27e --- /dev/null +++ b/ember/bower.json @@ -0,0 +1,16 @@ +{ + "name": "inventory", + "dependencies": { + "ember": "1.13.7", + "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", + "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", + "ember-data": "1.13.8", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.9", + "ember-qunit-notifications": "0.0.7", + "ember-resolver": "~0.1.18", + "jquery": "^1.11.3", + "loader.js": "ember-cli/loader.js#3.2.1", + "qunit": "~1.18.0" + } +} diff --git a/ember/config/environment.js b/ember/config/environment.js new file mode 100644 index 0000000..dcfe6dc --- /dev/null +++ b/ember/config/environment.js @@ -0,0 +1,47 @@ +/* jshint node: true */ + +module.exports = function(environment) { + var ENV = { + modulePrefix: 'inventory', + environment: environment, + baseURL: '/', + locationType: 'auto', + EmberENV: { + FEATURES: { + // Here you can enable experimental features on an ember canary build + // e.g. 'with-controller': true + } + }, + + APP: { + // Here you can pass flags/options to your application instance + // when it is created + } + }; + + if (environment === 'development') { + // ENV.APP.LOG_RESOLVER = true; + // ENV.APP.LOG_ACTIVE_GENERATION = true; + // ENV.APP.LOG_TRANSITIONS = true; + // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; + } + + if (environment === 'test') { + // Testem prefers this... + ENV.baseURL = '/'; + ENV.locationType = 'none'; + + // keep test console output quieter + ENV.APP.LOG_ACTIVE_GENERATION = false; + ENV.APP.LOG_VIEW_LOOKUPS = false; + + ENV.APP.rootElement = '#ember-testing'; + } + + if (environment === 'production') { + + } + + return ENV; +}; diff --git a/ember/ember-cli-build.js b/ember/ember-cli-build.js new file mode 100644 index 0000000..a0c0b84 --- /dev/null +++ b/ember/ember-cli-build.js @@ -0,0 +1,23 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-app'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + }); + + // Use `app.import` to add additional libraries to the generated + // output files. + // + // If you need to use different assets in different + // environments, specify an object as the first parameter. That + // object's keys should be the environment name and the values + // should be the asset to use in that environment. + // + // If the library that you are including contains AMD or ES6 + // modules that you would like to import into your application + // please specify an object with the list of modules as keys + // along with the exports of each module as its value. + + return app.toTree(); +}; diff --git a/ember/package.json b/ember/package.json new file mode 100644 index 0000000..c0851ed --- /dev/null +++ b/ember/package.json @@ -0,0 +1,40 @@ +{ + "name": "inventory", + "version": "0.0.0", + "description": "Small description for inventory goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "build": "ember build", + "start": "ember server", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 0.10.0" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.1.2", + "ember-cli": "1.13.8", + "ember-cli-app-version": "0.5.0", + "ember-cli-babel": "^5.1.3", + "ember-cli-content-security-policy": "0.4.0", + "ember-cli-dependency-checker": "^1.0.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.2.0", + "ember-cli-ic-ajax": "0.2.1", + "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-qunit": "^1.0.0", + "ember-cli-release": "0.2.3", + "ember-cli-sri": "^1.0.3", + "ember-cli-uglify": "^1.2.0", + "ember-data": "1.13.8", + "ember-disable-proxy-controllers": "^1.0.0", + "ember-export-application-global": "^1.0.3" + } +} diff --git a/ember/public/crossdomain.xml b/ember/public/crossdomain.xml new file mode 100644 index 0000000..0c16a7a --- /dev/null +++ b/ember/public/crossdomain.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/ember/public/robots.txt b/ember/public/robots.txt new file mode 100644 index 0000000..f591645 --- /dev/null +++ b/ember/public/robots.txt @@ -0,0 +1,3 @@ +# http://www.robotstxt.org +User-agent: * +Disallow: diff --git a/ember/testem.json b/ember/testem.json new file mode 100644 index 0000000..0f35392 --- /dev/null +++ b/ember/testem.json @@ -0,0 +1,12 @@ +{ + "framework": "qunit", + "test_page": "tests/index.html?hidepassed", + "disable_watching": true, + "launch_in_ci": [ + "PhantomJS" + ], + "launch_in_dev": [ + "PhantomJS", + "Chrome" + ] +} diff --git a/ember/tests/.jshintrc b/ember/tests/.jshintrc new file mode 100644 index 0000000..6ec0b7c --- /dev/null +++ b/ember/tests/.jshintrc @@ -0,0 +1,52 @@ +{ + "predef": [ + "document", + "window", + "location", + "setTimeout", + "$", + "-Promise", + "define", + "console", + "visit", + "exists", + "fillIn", + "click", + "keyEvent", + "triggerEvent", + "find", + "findWithAssert", + "wait", + "DS", + "andThen", + "currentURL", + "currentPath", + "currentRouteName" + ], + "node": false, + "browser": false, + "boss": true, + "curly": true, + "debug": false, + "devel": false, + "eqeqeq": true, + "evil": true, + "forin": false, + "immed": false, + "laxbreak": false, + "newcap": true, + "noarg": true, + "noempty": false, + "nonew": false, + "nomen": false, + "onevar": false, + "plusplus": false, + "regexp": false, + "undef": true, + "sub": true, + "strict": false, + "white": false, + "eqnull": true, + "esnext": true, + "unused": true +} diff --git a/ember/tests/helpers/resolver.js b/ember/tests/helpers/resolver.js new file mode 100644 index 0000000..28f4ece --- /dev/null +++ b/ember/tests/helpers/resolver.js @@ -0,0 +1,11 @@ +import Resolver from 'ember/resolver'; +import config from '../../config/environment'; + +var resolver = Resolver.create(); + +resolver.namespace = { + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix +}; + +export default resolver; diff --git a/ember/tests/helpers/start-app.js b/ember/tests/helpers/start-app.js new file mode 100644 index 0000000..0f7aab1 --- /dev/null +++ b/ember/tests/helpers/start-app.js @@ -0,0 +1,18 @@ +import Ember from 'ember'; +import Application from '../../app'; +import config from '../../config/environment'; + +export default function startApp(attrs) { + var application; + + var attributes = Ember.merge({}, config.APP); + attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; + + Ember.run(function() { + application = Application.create(attributes); + application.setupForTesting(); + application.injectTestHelpers(); + }); + + return application; +} diff --git a/ember/tests/index.html b/ember/tests/index.html new file mode 100644 index 0000000..a76b9cb --- /dev/null +++ b/ember/tests/index.html @@ -0,0 +1,33 @@ + + + + + + Inventory Tests + + + + {{content-for 'head'}} + {{content-for 'test-head'}} + + + + + + {{content-for 'head-footer'}} + {{content-for 'test-head-footer'}} + + + + {{content-for 'body'}} + {{content-for 'test-body'}} + + + + + + + {{content-for 'body-footer'}} + {{content-for 'test-body-footer'}} + + diff --git a/ember/tests/test-helper.js b/ember/tests/test-helper.js new file mode 100644 index 0000000..e6cfb70 --- /dev/null +++ b/ember/tests/test-helper.js @@ -0,0 +1,6 @@ +import resolver from './helpers/resolver'; +import { + setResolver +} from 'ember-qunit'; + +setResolver(resolver); diff --git a/app/assets/javascripts/routes/.gitkeep b/ember/tests/unit/.gitkeep similarity index 100% rename from app/assets/javascripts/routes/.gitkeep rename to ember/tests/unit/.gitkeep diff --git a/app/assets/javascripts/templates/.gitkeep b/ember/vendor/.gitkeep similarity index 100% rename from app/assets/javascripts/templates/.gitkeep rename to ember/vendor/.gitkeep diff --git a/.gitignore b/rails/.gitignore similarity index 100% rename from .gitignore rename to rails/.gitignore diff --git a/Gemfile b/rails/Gemfile similarity index 96% rename from Gemfile rename to rails/Gemfile index 609f826..9051155 100644 --- a/Gemfile +++ b/rails/Gemfile @@ -18,9 +18,6 @@ gem 'therubyracer', platforms: :ruby gem 'devise', '~> 3.5.1' # Bootstrap-Sass gem 'bootstrap-sass', '~> 3.3.5' -# EmberJS -gem 'ember-rails' -gem 'ember-source', '~> 2.0.0' # active_link_to gem 'active_link_to' diff --git a/Gemfile.lock b/rails/Gemfile.lock similarity index 86% rename from Gemfile.lock rename to rails/Gemfile.lock index 44f9d86..4e7c76f 100644 --- a/Gemfile.lock +++ b/rails/Gemfile.lock @@ -20,12 +20,8 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active-model-adapter-source (1.13.6) - ember-data-source (>= 1.13, < 3.0) active_link_to (1.0.3) actionpack - active_model_serializers (0.9.3) - activemodel (>= 3.2) activejob (4.2.3) activesupport (= 4.2.3) globalid (>= 0.3.0) @@ -48,9 +44,6 @@ GEM autoprefixer-rails (5.2.1) execjs json - barber (0.9.2) - ember-source (>= 1.0, < 3) - execjs (>= 1.2, < 3) bcrypt (3.1.10) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) @@ -76,21 +69,6 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - ember-data-source (1.13.9) - ember-source (>= 1.8, < 3.0) - ember-handlebars-template (0.3.2) - barber (>= 0.9.0) - sprockets (>= 2.1, < 3.4) - tilt - ember-rails (0.19.1) - active-model-adapter-source (>= 1.13.0) - active_model_serializers - ember-data-source (>= 1.13.0) - ember-handlebars-template (>= 0.1.1, < 1.0) - ember-source (>= 1.8.0) - jquery-rails (>= 1.0.17) - railties (>= 3.1) - ember-source (2.0.0) erubis (2.7.0) execjs (2.5.2) globalid (0.3.5) @@ -199,8 +177,6 @@ DEPENDENCIES byebug coffee-rails (~> 4.1.0) devise (~> 3.5.1) - ember-rails - ember-source (~> 2.0.0) jbuilder (~> 2.0) jquery-rails rails (= 4.2.3) diff --git a/README.rdoc b/rails/README.rdoc similarity index 100% rename from README.rdoc rename to rails/README.rdoc diff --git a/Rakefile b/rails/Rakefile similarity index 100% rename from Rakefile rename to rails/Rakefile diff --git a/app/controllers/concerns/.keep b/rails/app/assets/images/.keep similarity index 100% rename from app/controllers/concerns/.keep rename to rails/app/assets/images/.keep diff --git a/app/assets/stylesheets/application.scss b/rails/app/assets/stylesheets/application.scss similarity index 100% rename from app/assets/stylesheets/application.scss rename to rails/app/assets/stylesheets/application.scss diff --git a/app/assets/stylesheets/items.scss b/rails/app/assets/stylesheets/items.scss similarity index 100% rename from app/assets/stylesheets/items.scss rename to rails/app/assets/stylesheets/items.scss diff --git a/app/controllers/application_controller.rb b/rails/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application_controller.rb rename to rails/app/controllers/application_controller.rb diff --git a/app/mailers/.keep b/rails/app/controllers/concerns/.keep similarity index 100% rename from app/mailers/.keep rename to rails/app/controllers/concerns/.keep diff --git a/app/controllers/items_controller.rb b/rails/app/controllers/items_controller.rb similarity index 100% rename from app/controllers/items_controller.rb rename to rails/app/controllers/items_controller.rb diff --git a/app/helpers/application_helper.rb b/rails/app/helpers/application_helper.rb similarity index 100% rename from app/helpers/application_helper.rb rename to rails/app/helpers/application_helper.rb diff --git a/app/helpers/items_helper.rb b/rails/app/helpers/items_helper.rb similarity index 100% rename from app/helpers/items_helper.rb rename to rails/app/helpers/items_helper.rb diff --git a/app/models/.keep b/rails/app/mailers/.keep similarity index 100% rename from app/models/.keep rename to rails/app/mailers/.keep diff --git a/app/models/concerns/.keep b/rails/app/models/.keep similarity index 100% rename from app/models/concerns/.keep rename to rails/app/models/.keep diff --git a/lib/assets/.keep b/rails/app/models/concerns/.keep similarity index 100% rename from lib/assets/.keep rename to rails/app/models/concerns/.keep diff --git a/app/models/item.rb b/rails/app/models/item.rb similarity index 100% rename from app/models/item.rb rename to rails/app/models/item.rb diff --git a/app/models/user.rb b/rails/app/models/user.rb similarity index 100% rename from app/models/user.rb rename to rails/app/models/user.rb diff --git a/app/views/devise/confirmations/new.html.erb b/rails/app/views/devise/confirmations/new.html.erb similarity index 100% rename from app/views/devise/confirmations/new.html.erb rename to rails/app/views/devise/confirmations/new.html.erb diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/rails/app/views/devise/mailer/confirmation_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/confirmation_instructions.html.erb rename to rails/app/views/devise/mailer/confirmation_instructions.html.erb diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/rails/app/views/devise/mailer/reset_password_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/reset_password_instructions.html.erb rename to rails/app/views/devise/mailer/reset_password_instructions.html.erb diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/rails/app/views/devise/mailer/unlock_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/unlock_instructions.html.erb rename to rails/app/views/devise/mailer/unlock_instructions.html.erb diff --git a/app/views/devise/menu/_login_items.html.erb b/rails/app/views/devise/menu/_login_items.html.erb similarity index 100% rename from app/views/devise/menu/_login_items.html.erb rename to rails/app/views/devise/menu/_login_items.html.erb diff --git a/app/views/devise/menu/_registration_items.html.erb b/rails/app/views/devise/menu/_registration_items.html.erb similarity index 100% rename from app/views/devise/menu/_registration_items.html.erb rename to rails/app/views/devise/menu/_registration_items.html.erb diff --git a/app/views/devise/passwords/edit.html.erb b/rails/app/views/devise/passwords/edit.html.erb similarity index 100% rename from app/views/devise/passwords/edit.html.erb rename to rails/app/views/devise/passwords/edit.html.erb diff --git a/app/views/devise/passwords/new.html.erb b/rails/app/views/devise/passwords/new.html.erb similarity index 100% rename from app/views/devise/passwords/new.html.erb rename to rails/app/views/devise/passwords/new.html.erb diff --git a/app/views/devise/registrations/edit.html.erb b/rails/app/views/devise/registrations/edit.html.erb similarity index 100% rename from app/views/devise/registrations/edit.html.erb rename to rails/app/views/devise/registrations/edit.html.erb diff --git a/app/views/devise/registrations/new.html.erb b/rails/app/views/devise/registrations/new.html.erb similarity index 100% rename from app/views/devise/registrations/new.html.erb rename to rails/app/views/devise/registrations/new.html.erb diff --git a/app/views/devise/sessions/new.html.erb b/rails/app/views/devise/sessions/new.html.erb similarity index 100% rename from app/views/devise/sessions/new.html.erb rename to rails/app/views/devise/sessions/new.html.erb diff --git a/app/views/devise/shared/_links.html.erb b/rails/app/views/devise/shared/_links.html.erb similarity index 100% rename from app/views/devise/shared/_links.html.erb rename to rails/app/views/devise/shared/_links.html.erb diff --git a/app/views/devise/unlocks/new.html.erb b/rails/app/views/devise/unlocks/new.html.erb similarity index 100% rename from app/views/devise/unlocks/new.html.erb rename to rails/app/views/devise/unlocks/new.html.erb diff --git a/app/views/items/_form.html.erb b/rails/app/views/items/_form.html.erb similarity index 100% rename from app/views/items/_form.html.erb rename to rails/app/views/items/_form.html.erb diff --git a/app/views/items/edit.html.erb b/rails/app/views/items/edit.html.erb similarity index 100% rename from app/views/items/edit.html.erb rename to rails/app/views/items/edit.html.erb diff --git a/app/views/items/index.html.erb b/rails/app/views/items/index.html.erb similarity index 100% rename from app/views/items/index.html.erb rename to rails/app/views/items/index.html.erb diff --git a/app/views/items/index.json.jbuilder b/rails/app/views/items/index.json.jbuilder similarity index 100% rename from app/views/items/index.json.jbuilder rename to rails/app/views/items/index.json.jbuilder diff --git a/app/views/items/label.pdf.erbtex b/rails/app/views/items/label.pdf.erbtex similarity index 100% rename from app/views/items/label.pdf.erbtex rename to rails/app/views/items/label.pdf.erbtex diff --git a/app/views/items/new.html.erb b/rails/app/views/items/new.html.erb similarity index 100% rename from app/views/items/new.html.erb rename to rails/app/views/items/new.html.erb diff --git a/app/views/items/show.html.erb b/rails/app/views/items/show.html.erb similarity index 100% rename from app/views/items/show.html.erb rename to rails/app/views/items/show.html.erb diff --git a/app/views/items/show.json.jbuilder b/rails/app/views/items/show.json.jbuilder similarity index 100% rename from app/views/items/show.json.jbuilder rename to rails/app/views/items/show.json.jbuilder diff --git a/app/views/layouts/_messages.html.erb b/rails/app/views/layouts/_messages.html.erb similarity index 100% rename from app/views/layouts/_messages.html.erb rename to rails/app/views/layouts/_messages.html.erb diff --git a/app/views/layouts/application.html.erb b/rails/app/views/layouts/application.html.erb similarity index 100% rename from app/views/layouts/application.html.erb rename to rails/app/views/layouts/application.html.erb diff --git a/bin/bundle b/rails/bin/bundle similarity index 100% rename from bin/bundle rename to rails/bin/bundle diff --git a/bin/rails b/rails/bin/rails similarity index 100% rename from bin/rails rename to rails/bin/rails diff --git a/bin/rake b/rails/bin/rake similarity index 100% rename from bin/rake rename to rails/bin/rake diff --git a/bin/setup b/rails/bin/setup similarity index 100% rename from bin/setup rename to rails/bin/setup diff --git a/config.ru b/rails/config.ru similarity index 100% rename from config.ru rename to rails/config.ru diff --git a/config/application.rb b/rails/config/application.rb similarity index 100% rename from config/application.rb rename to rails/config/application.rb diff --git a/config/boot.rb b/rails/config/boot.rb similarity index 100% rename from config/boot.rb rename to rails/config/boot.rb diff --git a/config/database.yml b/rails/config/database.yml similarity index 100% rename from config/database.yml rename to rails/config/database.yml diff --git a/config/environment.rb b/rails/config/environment.rb similarity index 100% rename from config/environment.rb rename to rails/config/environment.rb diff --git a/config/environments/development.rb b/rails/config/environments/development.rb similarity index 100% rename from config/environments/development.rb rename to rails/config/environments/development.rb diff --git a/config/environments/production.rb b/rails/config/environments/production.rb similarity index 100% rename from config/environments/production.rb rename to rails/config/environments/production.rb diff --git a/config/environments/test.rb b/rails/config/environments/test.rb similarity index 100% rename from config/environments/test.rb rename to rails/config/environments/test.rb diff --git a/config/initializers/assets.rb b/rails/config/initializers/assets.rb similarity index 100% rename from config/initializers/assets.rb rename to rails/config/initializers/assets.rb diff --git a/config/initializers/backtrace_silencers.rb b/rails/config/initializers/backtrace_silencers.rb similarity index 100% rename from config/initializers/backtrace_silencers.rb rename to rails/config/initializers/backtrace_silencers.rb diff --git a/config/initializers/cookies_serializer.rb b/rails/config/initializers/cookies_serializer.rb similarity index 100% rename from config/initializers/cookies_serializer.rb rename to rails/config/initializers/cookies_serializer.rb diff --git a/config/initializers/devise.rb b/rails/config/initializers/devise.rb similarity index 100% rename from config/initializers/devise.rb rename to rails/config/initializers/devise.rb diff --git a/config/initializers/filter_parameter_logging.rb b/rails/config/initializers/filter_parameter_logging.rb similarity index 100% rename from config/initializers/filter_parameter_logging.rb rename to rails/config/initializers/filter_parameter_logging.rb diff --git a/config/initializers/inflections.rb b/rails/config/initializers/inflections.rb similarity index 100% rename from config/initializers/inflections.rb rename to rails/config/initializers/inflections.rb diff --git a/config/initializers/mime_types.rb b/rails/config/initializers/mime_types.rb similarity index 100% rename from config/initializers/mime_types.rb rename to rails/config/initializers/mime_types.rb diff --git a/config/initializers/session_store.rb b/rails/config/initializers/session_store.rb similarity index 100% rename from config/initializers/session_store.rb rename to rails/config/initializers/session_store.rb diff --git a/config/initializers/wrap_parameters.rb b/rails/config/initializers/wrap_parameters.rb similarity index 100% rename from config/initializers/wrap_parameters.rb rename to rails/config/initializers/wrap_parameters.rb diff --git a/config/locales/devise.en.yml b/rails/config/locales/devise.en.yml similarity index 100% rename from config/locales/devise.en.yml rename to rails/config/locales/devise.en.yml diff --git a/config/locales/en.yml b/rails/config/locales/en.yml similarity index 100% rename from config/locales/en.yml rename to rails/config/locales/en.yml diff --git a/config/routes.rb b/rails/config/routes.rb similarity index 100% rename from config/routes.rb rename to rails/config/routes.rb diff --git a/config/secrets.yml b/rails/config/secrets.yml similarity index 100% rename from config/secrets.yml rename to rails/config/secrets.yml diff --git a/db/migrate/20150713184441_create_items.rb b/rails/db/migrate/20150713184441_create_items.rb similarity index 100% rename from db/migrate/20150713184441_create_items.rb rename to rails/db/migrate/20150713184441_create_items.rb diff --git a/db/migrate/20150713191401_devise_create_users.rb b/rails/db/migrate/20150713191401_devise_create_users.rb similarity index 100% rename from db/migrate/20150713191401_devise_create_users.rb rename to rails/db/migrate/20150713191401_devise_create_users.rb diff --git a/db/migrate/20150713192857_modify_description_to_text.rb b/rails/db/migrate/20150713192857_modify_description_to_text.rb similarity index 100% rename from db/migrate/20150713192857_modify_description_to_text.rb rename to rails/db/migrate/20150713192857_modify_description_to_text.rb diff --git a/db/migrate/20150713192950_modify_item_set_code_unique.rb b/rails/db/migrate/20150713192950_modify_item_set_code_unique.rb similarity index 100% rename from db/migrate/20150713192950_modify_item_set_code_unique.rb rename to rails/db/migrate/20150713192950_modify_item_set_code_unique.rb diff --git a/db/migrate/20150714130813_remove_code_from_items.rb b/rails/db/migrate/20150714130813_remove_code_from_items.rb similarity index 100% rename from db/migrate/20150714130813_remove_code_from_items.rb rename to rails/db/migrate/20150714130813_remove_code_from_items.rb diff --git a/db/migrate/20150714133724_add_ancestry_to_items.rb b/rails/db/migrate/20150714133724_add_ancestry_to_items.rb similarity index 100% rename from db/migrate/20150714133724_add_ancestry_to_items.rb rename to rails/db/migrate/20150714133724_add_ancestry_to_items.rb diff --git a/db/migrate/20150719110809_modify_ancestry_from_items.rb b/rails/db/migrate/20150719110809_modify_ancestry_from_items.rb similarity index 100% rename from db/migrate/20150719110809_modify_ancestry_from_items.rb rename to rails/db/migrate/20150719110809_modify_ancestry_from_items.rb diff --git a/db/schema.rb b/rails/db/schema.rb similarity index 100% rename from db/schema.rb rename to rails/db/schema.rb diff --git a/db/seeds.rb b/rails/db/seeds.rb similarity index 100% rename from db/seeds.rb rename to rails/db/seeds.rb diff --git a/doc/app/ApplicationController.html b/rails/doc/app/ApplicationController.html similarity index 100% rename from doc/app/ApplicationController.html rename to rails/doc/app/ApplicationController.html diff --git a/doc/app/ApplicationHelper.html b/rails/doc/app/ApplicationHelper.html similarity index 100% rename from doc/app/ApplicationHelper.html rename to rails/doc/app/ApplicationHelper.html diff --git a/doc/app/Item.html b/rails/doc/app/Item.html similarity index 100% rename from doc/app/Item.html rename to rails/doc/app/Item.html diff --git a/doc/app/ItemsController.html b/rails/doc/app/ItemsController.html similarity index 100% rename from doc/app/ItemsController.html rename to rails/doc/app/ItemsController.html diff --git a/doc/app/ItemsHelper.html b/rails/doc/app/ItemsHelper.html similarity index 100% rename from doc/app/ItemsHelper.html rename to rails/doc/app/ItemsHelper.html diff --git a/doc/app/README_rdoc.html b/rails/doc/app/README_rdoc.html similarity index 100% rename from doc/app/README_rdoc.html rename to rails/doc/app/README_rdoc.html diff --git a/doc/app/User.html b/rails/doc/app/User.html similarity index 100% rename from doc/app/User.html rename to rails/doc/app/User.html diff --git a/doc/app/created.rid b/rails/doc/app/created.rid similarity index 100% rename from doc/app/created.rid rename to rails/doc/app/created.rid diff --git a/doc/app/css/fonts.css b/rails/doc/app/css/fonts.css similarity index 100% rename from doc/app/css/fonts.css rename to rails/doc/app/css/fonts.css diff --git a/doc/app/css/rdoc.css b/rails/doc/app/css/rdoc.css similarity index 100% rename from doc/app/css/rdoc.css rename to rails/doc/app/css/rdoc.css diff --git a/doc/app/fonts/Lato-Light.ttf b/rails/doc/app/fonts/Lato-Light.ttf similarity index 100% rename from doc/app/fonts/Lato-Light.ttf rename to rails/doc/app/fonts/Lato-Light.ttf diff --git a/doc/app/fonts/Lato-LightItalic.ttf b/rails/doc/app/fonts/Lato-LightItalic.ttf similarity index 100% rename from doc/app/fonts/Lato-LightItalic.ttf rename to rails/doc/app/fonts/Lato-LightItalic.ttf diff --git a/doc/app/fonts/Lato-Regular.ttf b/rails/doc/app/fonts/Lato-Regular.ttf similarity index 100% rename from doc/app/fonts/Lato-Regular.ttf rename to rails/doc/app/fonts/Lato-Regular.ttf diff --git a/doc/app/fonts/Lato-RegularItalic.ttf b/rails/doc/app/fonts/Lato-RegularItalic.ttf similarity index 100% rename from doc/app/fonts/Lato-RegularItalic.ttf rename to rails/doc/app/fonts/Lato-RegularItalic.ttf diff --git a/doc/app/fonts/SourceCodePro-Bold.ttf b/rails/doc/app/fonts/SourceCodePro-Bold.ttf similarity index 100% rename from doc/app/fonts/SourceCodePro-Bold.ttf rename to rails/doc/app/fonts/SourceCodePro-Bold.ttf diff --git a/doc/app/fonts/SourceCodePro-Regular.ttf b/rails/doc/app/fonts/SourceCodePro-Regular.ttf similarity index 100% rename from doc/app/fonts/SourceCodePro-Regular.ttf rename to rails/doc/app/fonts/SourceCodePro-Regular.ttf diff --git a/doc/app/images/add.png b/rails/doc/app/images/add.png similarity index 100% rename from doc/app/images/add.png rename to rails/doc/app/images/add.png diff --git a/doc/app/images/arrow_up.png b/rails/doc/app/images/arrow_up.png similarity index 100% rename from doc/app/images/arrow_up.png rename to rails/doc/app/images/arrow_up.png diff --git a/doc/app/images/brick.png b/rails/doc/app/images/brick.png similarity index 100% rename from doc/app/images/brick.png rename to rails/doc/app/images/brick.png diff --git a/doc/app/images/brick_link.png b/rails/doc/app/images/brick_link.png similarity index 100% rename from doc/app/images/brick_link.png rename to rails/doc/app/images/brick_link.png diff --git a/doc/app/images/bug.png b/rails/doc/app/images/bug.png similarity index 100% rename from doc/app/images/bug.png rename to rails/doc/app/images/bug.png diff --git a/doc/app/images/bullet_black.png b/rails/doc/app/images/bullet_black.png similarity index 100% rename from doc/app/images/bullet_black.png rename to rails/doc/app/images/bullet_black.png diff --git a/doc/app/images/bullet_toggle_minus.png b/rails/doc/app/images/bullet_toggle_minus.png similarity index 100% rename from doc/app/images/bullet_toggle_minus.png rename to rails/doc/app/images/bullet_toggle_minus.png diff --git a/doc/app/images/bullet_toggle_plus.png b/rails/doc/app/images/bullet_toggle_plus.png similarity index 100% rename from doc/app/images/bullet_toggle_plus.png rename to rails/doc/app/images/bullet_toggle_plus.png diff --git a/doc/app/images/date.png b/rails/doc/app/images/date.png similarity index 100% rename from doc/app/images/date.png rename to rails/doc/app/images/date.png diff --git a/doc/app/images/delete.png b/rails/doc/app/images/delete.png similarity index 100% rename from doc/app/images/delete.png rename to rails/doc/app/images/delete.png diff --git a/doc/app/images/find.png b/rails/doc/app/images/find.png similarity index 100% rename from doc/app/images/find.png rename to rails/doc/app/images/find.png diff --git a/doc/app/images/loadingAnimation.gif b/rails/doc/app/images/loadingAnimation.gif similarity index 100% rename from doc/app/images/loadingAnimation.gif rename to rails/doc/app/images/loadingAnimation.gif diff --git a/doc/app/images/macFFBgHack.png b/rails/doc/app/images/macFFBgHack.png similarity index 100% rename from doc/app/images/macFFBgHack.png rename to rails/doc/app/images/macFFBgHack.png diff --git a/doc/app/images/package.png b/rails/doc/app/images/package.png similarity index 100% rename from doc/app/images/package.png rename to rails/doc/app/images/package.png diff --git a/doc/app/images/page_green.png b/rails/doc/app/images/page_green.png similarity index 100% rename from doc/app/images/page_green.png rename to rails/doc/app/images/page_green.png diff --git a/doc/app/images/page_white_text.png b/rails/doc/app/images/page_white_text.png similarity index 100% rename from doc/app/images/page_white_text.png rename to rails/doc/app/images/page_white_text.png diff --git a/doc/app/images/page_white_width.png b/rails/doc/app/images/page_white_width.png similarity index 100% rename from doc/app/images/page_white_width.png rename to rails/doc/app/images/page_white_width.png diff --git a/doc/app/images/plugin.png b/rails/doc/app/images/plugin.png similarity index 100% rename from doc/app/images/plugin.png rename to rails/doc/app/images/plugin.png diff --git a/doc/app/images/ruby.png b/rails/doc/app/images/ruby.png similarity index 100% rename from doc/app/images/ruby.png rename to rails/doc/app/images/ruby.png diff --git a/doc/app/images/tag_blue.png b/rails/doc/app/images/tag_blue.png similarity index 100% rename from doc/app/images/tag_blue.png rename to rails/doc/app/images/tag_blue.png diff --git a/doc/app/images/tag_green.png b/rails/doc/app/images/tag_green.png similarity index 100% rename from doc/app/images/tag_green.png rename to rails/doc/app/images/tag_green.png diff --git a/doc/app/images/transparent.png b/rails/doc/app/images/transparent.png similarity index 100% rename from doc/app/images/transparent.png rename to rails/doc/app/images/transparent.png diff --git a/doc/app/images/wrench.png b/rails/doc/app/images/wrench.png similarity index 100% rename from doc/app/images/wrench.png rename to rails/doc/app/images/wrench.png diff --git a/doc/app/images/wrench_orange.png b/rails/doc/app/images/wrench_orange.png similarity index 100% rename from doc/app/images/wrench_orange.png rename to rails/doc/app/images/wrench_orange.png diff --git a/doc/app/images/zoom.png b/rails/doc/app/images/zoom.png similarity index 100% rename from doc/app/images/zoom.png rename to rails/doc/app/images/zoom.png diff --git a/doc/app/index.html b/rails/doc/app/index.html similarity index 100% rename from doc/app/index.html rename to rails/doc/app/index.html diff --git a/doc/app/js/darkfish.js b/rails/doc/app/js/darkfish.js similarity index 100% rename from doc/app/js/darkfish.js rename to rails/doc/app/js/darkfish.js diff --git a/doc/app/js/jquery.js b/rails/doc/app/js/jquery.js similarity index 100% rename from doc/app/js/jquery.js rename to rails/doc/app/js/jquery.js diff --git a/doc/app/js/navigation.js b/rails/doc/app/js/navigation.js similarity index 100% rename from doc/app/js/navigation.js rename to rails/doc/app/js/navigation.js diff --git a/doc/app/js/navigation.js.gz b/rails/doc/app/js/navigation.js.gz similarity index 100% rename from doc/app/js/navigation.js.gz rename to rails/doc/app/js/navigation.js.gz diff --git a/doc/app/js/search.js b/rails/doc/app/js/search.js similarity index 100% rename from doc/app/js/search.js rename to rails/doc/app/js/search.js diff --git a/doc/app/js/search_index.js b/rails/doc/app/js/search_index.js similarity index 100% rename from doc/app/js/search_index.js rename to rails/doc/app/js/search_index.js diff --git a/doc/app/js/search_index.js.gz b/rails/doc/app/js/search_index.js.gz similarity index 100% rename from doc/app/js/search_index.js.gz rename to rails/doc/app/js/search_index.js.gz diff --git a/doc/app/js/searcher.js b/rails/doc/app/js/searcher.js similarity index 100% rename from doc/app/js/searcher.js rename to rails/doc/app/js/searcher.js diff --git a/doc/app/js/searcher.js.gz b/rails/doc/app/js/searcher.js.gz similarity index 100% rename from doc/app/js/searcher.js.gz rename to rails/doc/app/js/searcher.js.gz diff --git a/doc/app/table_of_contents.html b/rails/doc/app/table_of_contents.html similarity index 100% rename from doc/app/table_of_contents.html rename to rails/doc/app/table_of_contents.html diff --git a/lib/tasks/.keep b/rails/lib/assets/.keep similarity index 100% rename from lib/tasks/.keep rename to rails/lib/assets/.keep diff --git a/log/.keep b/rails/lib/tasks/.keep similarity index 100% rename from log/.keep rename to rails/lib/tasks/.keep diff --git a/test/controllers/.keep b/rails/log/.keep similarity index 100% rename from test/controllers/.keep rename to rails/log/.keep diff --git a/public/404.html b/rails/public/404.html similarity index 100% rename from public/404.html rename to rails/public/404.html diff --git a/public/422.html b/rails/public/422.html similarity index 100% rename from public/422.html rename to rails/public/422.html diff --git a/public/500.html b/rails/public/500.html similarity index 100% rename from public/500.html rename to rails/public/500.html diff --git a/public/assets/.sprockets-manifest-36cc058af4876fd14f429446390df65a.json b/rails/public/assets/.sprockets-manifest-36cc058af4876fd14f429446390df65a.json similarity index 100% rename from public/assets/.sprockets-manifest-36cc058af4876fd14f429446390df65a.json rename to rails/public/assets/.sprockets-manifest-36cc058af4876fd14f429446390df65a.json diff --git a/public/assets/application-36a7156cd7261f129811e8e79cddc45d8e62595094a6610f814df42863e63a2b.css b/rails/public/assets/application-36a7156cd7261f129811e8e79cddc45d8e62595094a6610f814df42863e63a2b.css similarity index 100% rename from public/assets/application-36a7156cd7261f129811e8e79cddc45d8e62595094a6610f814df42863e63a2b.css rename to rails/public/assets/application-36a7156cd7261f129811e8e79cddc45d8e62595094a6610f814df42863e63a2b.css diff --git a/public/assets/application-f209be1b639b7e21efc834e52215205377a0f6620ae6c55548817f6514915b55.js b/rails/public/assets/application-f209be1b639b7e21efc834e52215205377a0f6620ae6c55548817f6514915b55.js similarity index 100% rename from public/assets/application-f209be1b639b7e21efc834e52215205377a0f6620ae6c55548817f6514915b55.js rename to rails/public/assets/application-f209be1b639b7e21efc834e52215205377a0f6620ae6c55548817f6514915b55.js diff --git a/public/favicon.ico b/rails/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to rails/public/favicon.ico diff --git a/public/img/logo_sjr_vektor_hoch.pdf b/rails/public/img/logo_sjr_vektor_hoch.pdf similarity index 100% rename from public/img/logo_sjr_vektor_hoch.pdf rename to rails/public/img/logo_sjr_vektor_hoch.pdf diff --git a/public/img/logo_sjr_vektor_quer.pdf b/rails/public/img/logo_sjr_vektor_quer.pdf similarity index 100% rename from public/img/logo_sjr_vektor_quer.pdf rename to rails/public/img/logo_sjr_vektor_quer.pdf diff --git a/public/robots.txt b/rails/public/robots.txt similarity index 100% rename from public/robots.txt rename to rails/public/robots.txt diff --git a/test/fixtures/.keep b/rails/test/controllers/.keep similarity index 100% rename from test/fixtures/.keep rename to rails/test/controllers/.keep diff --git a/test/controllers/items_controller_test.rb b/rails/test/controllers/items_controller_test.rb similarity index 100% rename from test/controllers/items_controller_test.rb rename to rails/test/controllers/items_controller_test.rb diff --git a/test/helpers/.keep b/rails/test/fixtures/.keep similarity index 100% rename from test/helpers/.keep rename to rails/test/fixtures/.keep diff --git a/test/fixtures/items.yml b/rails/test/fixtures/items.yml similarity index 100% rename from test/fixtures/items.yml rename to rails/test/fixtures/items.yml diff --git a/test/fixtures/users.yml b/rails/test/fixtures/users.yml similarity index 100% rename from test/fixtures/users.yml rename to rails/test/fixtures/users.yml diff --git a/test/integration/.keep b/rails/test/helpers/.keep similarity index 100% rename from test/integration/.keep rename to rails/test/helpers/.keep diff --git a/test/mailers/.keep b/rails/test/integration/.keep similarity index 100% rename from test/mailers/.keep rename to rails/test/integration/.keep diff --git a/test/models/.keep b/rails/test/mailers/.keep similarity index 100% rename from test/models/.keep rename to rails/test/mailers/.keep diff --git a/vendor/assets/javascripts/.keep b/rails/test/models/.keep similarity index 100% rename from vendor/assets/javascripts/.keep rename to rails/test/models/.keep diff --git a/test/models/item_test.rb b/rails/test/models/item_test.rb similarity index 100% rename from test/models/item_test.rb rename to rails/test/models/item_test.rb diff --git a/test/models/user_test.rb b/rails/test/models/user_test.rb similarity index 100% rename from test/models/user_test.rb rename to rails/test/models/user_test.rb diff --git a/test/test_helper.rb b/rails/test/test_helper.rb similarity index 100% rename from test/test_helper.rb rename to rails/test/test_helper.rb diff --git a/vendor/assets/stylesheets/.keep b/rails/vendor/assets/javascripts/.keep similarity index 100% rename from vendor/assets/stylesheets/.keep rename to rails/vendor/assets/javascripts/.keep diff --git a/app/assets/javascripts/templates/components/.gitkeep b/rails/vendor/assets/stylesheets/.keep similarity index 100% rename from app/assets/javascripts/templates/components/.gitkeep rename to rails/vendor/assets/stylesheets/.keep