bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Structure updates

Browse Source
This commit is contained in:
Benjamin ter Kuile
2019-01-31 10:44:06 -05:00
parent f879279a0a
commit da2ba6230d
11 changed files with 104 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+89 -96
View File
@@ -41,55 +41,54 @@ GEM
remote: https://rails-assets.org/
specs:
ace-rails-ap (4.1.2)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
actionview (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active-model-adapter-source (2.1.1)
ember-data-source (>= 1.13, < 3.0)
active_attr (0.10.0)
activemodel (>= 3.0.2, < 5.1)
activesupport (>= 3.0.2, < 5.1)
active_decorator (0.8.0)
active_model_serializers (0.10.4)
active_decorator (0.9.0)
active_model_serializers (0.10.5)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
jsonapi (= 0.1.1.beta6)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.7.1)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
airbrussh (1.1.2)
airbrussh (1.2.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.4)
babel-source (5.8.35)
@@ -100,31 +99,30 @@ GEM
ember-source (>= 1.0, < 3)
execjs (>= 1.2, < 3)
bcrypt (3.1.11)
bourbon (4.3.2)
bourbon (4.3.4)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.3)
cancancan (1.16.0)
capistrano (3.7.2)
capistrano (3.8.0)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.2.0)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-harrow (0.5.3)
capistrano-rails (1.2.2)
capistrano-rails (1.2.3)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano3-puma (1.2.1)
capistrano (~> 3.0)
puma (>= 2.6)
capybara (2.12.0)
capistrano3-puma (3.1.0)
capistrano (~> 3.7)
capistrano-bundler
puma (~> 3.4)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -149,7 +147,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
couch_potato (1.7.0)
activemodel (~> 4.0)
@@ -161,13 +159,13 @@ GEM
multi_json (~> 1.7)
crack (0.4.3)
safe_yaml (~> 1.0.0)
devise (4.2.0)
devise (4.2.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
devise-i18n (1.1.1)
devise-i18n (1.1.2)
diff-lcs (1.3)
docile (1.1.5)
em-http-request (1.1.5)
@@ -186,27 +184,27 @@ GEM
ember-emblem-template (0.4.0)
ember-handlebars-template (~> 0.7.0)
sprockets-rails (~> 2.0)
ember-es6_template (0.4.4)
ember-es6_template (0.6.0)
babel-transpiler (>= 0.6.0, < 0.8)
sprockets (>= 2.1, < 4)
sprockets (>= 2.2, < 4.1)
ember-handlebars-template (0.7.5)
barber (>= 0.11.0)
sprockets (>= 3.3, < 4)
ember-rails (0.20.6)
ember-rails (0.21.0)
active-model-adapter-source (>= 1.13.0)
active_model_serializers
ember-cli-assets (~> 0.0.1)
ember-data-source (>= 1.13.0)
ember-es6_template (~> 0.4.0)
ember-es6_template (>= 0.4.0, < 0.7)
ember-handlebars-template (>= 0.1.1, < 1.0)
ember-source (>= 1.8.0)
jquery-rails (>= 1.0.17)
railties (>= 3.1)
railties (>= 4.2)
ember-source (2.5.1)
ember-validations-rails (1.0.0)
railties
erubis (2.7.0)
eventmachine (1.2.2)
eventmachine (1.2.3)
exception_notification (4.2.1)
actionmailer (>= 4.0, < 6)
activesupport (>= 4.0, < 6)
@@ -216,7 +214,7 @@ GEM
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
faraday (0.10.1)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
faye (1.2.4)
cookiejar (>= 0.3.0)
@@ -226,12 +224,12 @@ GEM
multi_json (>= 1.0.0)
rack (>= 1.0.0)
websocket-driver (>= 0.5.1)
faye-websocket (0.10.6)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
foreman (0.83.0)
foreman (0.84.0)
thor (~> 0.19.1)
foundation-rails (5.5.3.2)
railties (>= 3.1.0)
@@ -239,31 +237,26 @@ GEM
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.3.7)
activesupport (>= 4.1.0)
gherkin (4.1.1)
globalid (0.4.0)
activesupport (>= 4.2.0)
hashdiff (0.3.2)
hashie (3.5.3)
hashie (3.5.5)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (0.8.0)
iso_country_codes (0.7.6)
jquery-rails (4.2.2)
i18n (0.8.1)
iso_country_codes (0.7.7)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
js-routes (1.3.2)
js-routes (1.3.3)
railties (>= 3.2)
sprockets-rails
json (1.8.6)
jsonapi (0.1.1.beta6)
jsonapi-parser (= 0.1.1.beta3)
jsonapi-renderer (= 0.1.1.beta1)
jsonapi-parser (0.1.1.beta3)
jsonapi-renderer (0.1.1.beta1)
jsonapi-renderer (0.1.2)
jwt (1.5.6)
kaminari (1.0.1)
activesupport (>= 4.1.0)
@@ -281,7 +274,7 @@ GEM
addressable (~> 2.3)
letter_opener (1.4.1)
launchy (~> 2.2)
libv8 (3.16.14.17)
libv8 (3.16.14.19)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
@@ -291,7 +284,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.6.1)
mini_magick (4.7.0)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
@@ -300,17 +293,17 @@ GEM
naught (1.1.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
nokogiri (1.7.0.1)
net-ssh (4.1.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.3.0)
faraday (>= 0.8, < 0.11)
oauth2 (1.3.1)
faraday (>= 0.8, < 0.12)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.5.0)
hashie (~> 3.5.0, < 4)
omniauth (1.6.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
@@ -329,7 +322,7 @@ GEM
mimemagic (~> 0.3.0)
pickadate-rails (3.5.6.0)
railties (>= 3.1.0)
poltergeist (1.13.0)
poltergeist (1.14.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
@@ -340,29 +333,29 @@ GEM
pry-doc (0.10.0)
pry (~> 0.9)
yard (~> 0.9)
pry-rails (0.3.5)
pry (>= 0.9.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (2.0.5)
puma (3.7.0)
puma (3.8.2)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
rack-cors (0.4.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
railties (= 4.2.8)
sprockets-rails
rails-assets-ember-qunit (1.0.0)
rails-assets-qunit (2.1.1)
rails-assets-qunit (2.3.2)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
@@ -371,9 +364,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
@@ -415,7 +408,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
simplecov (0.13.0)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
@@ -423,7 +416,7 @@ GEM
slim (3.0.7)
temple (~> 0.7.6)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.1)
slim-rails (3.1.2)
actionpack (>= 3.1)
railties (>= 3.1)
slim (~> 3.0)
@@ -439,7 +432,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkit (1.12.0)
sshkit (1.13.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
sucker_punch (2.0.2)
@@ -451,21 +444,21 @@ GEM
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.6)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.8.1)
tinymce-rails (4.5.3)
tinymce-rails (4.5.6)
railties (>= 3.1.1)
turnip (2.1.1)
gherkin (~> 2.5)
turnip (3.0.0)
gherkin (~> 4.0)
rspec (>= 3.0, < 4.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.4)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
webmock (2.3.2)
webmock (3.0.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@@ -552,4 +545,4 @@ DEPENDENCIES
webmock
BUNDLED WITH
1.13.6
1.14.6
app/assets/javascripts/supplier/app/components/number-field.js.coffee
+1 -1
View File
@@ -9,7 +9,7 @@ App.NumberFieldComponent = Ember.TextField.extend
set: (key, value)->
if value?
setValue = parseFloat(value)
@set "value", if isFinite(setValue) then setValue else null
@set "value", if Number.isFinite(setValue) then setValue else null
else
@set 'value', null
value
app/assets/javascripts/supplier/app/helpers/momentTransform.js.coffee
+2 -1
View File
@@ -8,5 +8,6 @@ App.MomentTransform = DS.Transform.extend
serialize: (deserialized)->
return deserialized unless deserialized
deserialized = moment(deserialized) unless deserialized._isAMomentObject
deserialized = moment(deserialized) unless moment.isMoment(deserialized)
return deserialized.format('YYYY-MM-DD') if deserialized._ambigTime # dates do not flip time zone!!!!!!!
deserialized.toISOString()
app/models/product.rb
+3 -3
View File
@@ -9,7 +9,7 @@ class Product
property :description
property :visible, type: :boolean, default: true
property :active, type: :boolean, default: true
property :position, type: Fixnum
property :position, type: Integer
belongs_to :product_category
#has_and_belongs_to_many :product_categories, storing_keys: false
@@ -39,8 +39,8 @@ class Product
property :image_file_name
property :image_content_type
property :image_file_size, :type => Fixnum
property :image_updated_at, :type => Time
property :image_file_size, type: Integer
property :image_updated_at, type: Time
has_attached_file :image,
url: '/system/product/:id/images/:style.:extension',
styles: {medium: '512x512>', thumb: '128x128>', large: '896x896>', small: '320x320>'},
app/models/product_category.rb
+3 -3
View File
@@ -3,10 +3,10 @@ class ProductCategory
include ActiveModel::SerializerSupport
property :name
property :position, type: Fixnum, default: 0
property :position, type: Integer, default: 0
property :full_day, type: :boolean, default: true
property :start_from, type: Fixnum, default: 1320 # 22:00
property :end_on, type: Fixnum, default: 1380 # 23:00
property :start_from, type: Integer, default: 1320 # 22:00
property :end_on, type: Integer, default: 1380 # 23:00
property :active_on_sunday, type: :boolean, default: true
property :active_on_monday, type: :boolean, default: true
property :active_on_tuesday, type: :boolean, default: true
app/models/product_order.rb
+1 -1
View File
@@ -2,7 +2,7 @@ class ProductOrder
include SimplyStored::Couch
include ActiveModel::SerializerSupport
property :quantity, type: Fixnum
property :quantity, type: Integer
property :price, type: Float
property :product_name
property :product_variant
app/models/product_variant.rb
+1 -1
View File
@@ -2,7 +2,7 @@ class ProductVariant
include SimplyStored::Couch
include ActiveModel::SerializerSupport
property :name
property :position, type: Fixnum, default: 0
property :position, type: Integer, default: 0
belongs_to :product
belongs_to :supplier
app/models/supplier.rb
+1 -1
View File
@@ -9,7 +9,7 @@ class Supplier
property :email
property :open, type: :boolean, default: false
property :time_zone, default: 'UTC'
property :night_offset, type: Fixnum, default: 0 # Minutes
property :night_offset, type: Integer, default: 0 # Minutes
property :address
property :house_number
property :house_number_addition
app/models/table.rb
+1 -1
View File
@@ -3,7 +3,7 @@ class Table
include ActiveModel::SerializerSupport
per_page_method :limit_value #kaminari
property :number, type: Fixnum, default: 1
property :number, type: Integer, default: 1
property :position_x, type: Float, default: 0
property :position_y, type: Float, default: 0
property :needs_help, type: :boolean, default: false
app/views/theme1/_footer.html.slim
+1 -1
View File
@@ -11,4 +11,4 @@
'
= link_to 'contact', main_app.page_path('contact', locale: 'en')
.clearfix
.footer-bottom &copy; mozo.bar 2015
.footer-bottom &copy; mozo.bar 2019
config/environments/production.rb
+1 -1
View File
@@ -55,7 +55,7 @@ Qwaiter::Application.configure do
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and JavaScripts from an asset server
config.action_controller.asset_host = "http://assets.mozo.bar"
config.action_controller.asset_host = "https://assets.mozo.bar"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
# config.assets.precompile += %w( search.js )