senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Senad Uka
2015-07-05 13:24:09 +02:00
parent f5664dee88 94be4b0fbd
commit 96a2fba535
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
front-api/app.rb
View File

@@ -16,7 +16,8 @@ before do
content_type :json content_type :json
# TODO: before running to production change this so that only specific # TODO: before running to production change this so that only specific
# domain is allowed # domain is allowed
headers 'Access-Control-Allow-Origin' => 'http://192.168.1.35:3001',
headers 'Access-Control-Allow-Origin' => 'http://localhost:3001',
'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST','PUT'], 'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST','PUT'],
'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept', 'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept',
'Access-Control-Expose-Headers' => 'X-Total-Count', 'Access-Control-Expose-Headers' => 'X-Total-Count',

2
front-api/db/schema.rb
View File

@@ -130,8 +130,8 @@ ActiveRecord::Schema.define(version: 20150614050336) do
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.string "tags" t.string "tags"
t.json "traits" t.json "traits"
t.integer "supplier_id"
t.decimal "weight", precision: 5, scale: 3 t.decimal "weight", precision: 5, scale: 3
t.integer "supplier_id"
t.integer "delivery_time_estimation_id" t.integer "delivery_time_estimation_id"
t.integer "brand_id" t.integer "brand_id"
end end

2
front-ui/.gitignore vendored
View File

@@ -18,6 +18,8 @@ coverage
# Compiled binary addons (http://nodejs.org/api/addons.html) # Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release build/Release
build/**/*.js
build/**/*.css
build/*.js build/*.js
build/*.css build/*.css

22
front-ui/Gruntfile.js
View File

@@ -1,7 +1,7 @@
module.exports = function(grunt) { module.exports = function(grunt) {
grunt.initConfig({ grunt.initConfig({
browserify: { browserify: {
basic: { dev: {
src: ['app/ribica.js'], src: ['app/ribica.js'],
dest: 'build/ribica.bundle.js', dest: 'build/ribica.bundle.js',
options: { options: {
@@ -12,7 +12,16 @@ module.exports = function(grunt) {
}, },
watch: true watch: true
} }
},
prod: {
src: ['app/ribica.js'],
dest: 'build/ribica.bundle.js',
options: {
transform: ['reactify'],
browserifyOptions: {
standalone: 'RIBICA'
}
}
} }
}, },
watch: { watch: {
@@ -39,7 +48,7 @@ module.exports = function(grunt) {
uglify: { uglify: {
my_target: { my_target: {
files: { files: {
'build/ribica.min.js': ['build/ribica.js'] 'build/ribica.js': ['build/ribica.js']
} }
} }
}, },
@@ -47,7 +56,8 @@ module.exports = function(grunt) {
dev: { dev: {
options: { options: {
variables: { variables: {
apiEndpoint: 'http://192.168.1.35:4567' apiEndpoint: 'http://localhost:4567'
} }
} }
}, },
@@ -103,7 +113,7 @@ module.exports = function(grunt) {
grunt.registerTask('default', []); grunt.registerTask('default', []);
grunt.registerTask('config-dev', ['config:dev', 'replace']); grunt.registerTask('config-dev', ['config:dev', 'replace']);
grunt.registerTask('config-prod', ['config:prod', 'replace']); grunt.registerTask('config-prod', ['config:prod', 'replace']);
grunt.registerTask('dev', ['browserify', 'config-dev', 'concat:css', 'concat:js', 'connect:server:keepalive']); grunt.registerTask('dev', ['browserify:dev', 'config-dev', 'concat:css', 'concat:js', 'connect:server:keepalive']);
grunt.registerTask('build', ['browserify', 'config-prod', 'concat:css', 'concat:js']); grunt.registerTask('build', ['browserify:prod', 'config-prod', 'concat:css', 'concat:js', 'uglify']);
}; };