From 820a4b3508c323b051ee2051d389a6aba8adcbec Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 11 May 2017 00:45:10 +0000 Subject: le rebuild --- newreality.co | 19 +++++++ newreality.sup.land | 19 ------- package.json | 2 +- studio-susie/Gruntfile.js | 109 ++++++++++++++++++++++-------------- studio-susie/package.json | 21 +++++++ studio-susie/templates/index.liquid | 2 +- studiosusie.com | 19 +++++++ susie.sup.land | 19 ------- 8 files changed, 127 insertions(+), 83 deletions(-) create mode 100644 newreality.co delete mode 100644 newreality.sup.land create mode 100644 studio-susie/package.json create mode 100644 studiosusie.com delete mode 100644 susie.sup.land diff --git a/newreality.co b/newreality.co new file mode 100644 index 0000000..940fe87 --- /dev/null +++ b/newreality.co @@ -0,0 +1,19 @@ + +upstream newrealityco_cms { + server 127.0.0.1:6516; +} + +server { + listen 80; + server_name newreality.co www.newreality.co; + client_max_body_size 50M; + + location / { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://newrealityco_cms; + proxy_redirect off; + } +} diff --git a/newreality.sup.land b/newreality.sup.land deleted file mode 100644 index fd90a1c..0000000 --- a/newreality.sup.land +++ /dev/null @@ -1,19 +0,0 @@ - -upstream newreality_cms { - server 127.0.0.1:6516; -} - -server { - listen 8070; - server_name newreality.sup.land newreality.co www.newreality.co; - client_max_body_size 50M; - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://newreality_cms; - proxy_redirect off; - } -} diff --git a/package.json b/package.json index 5072c91..890d207 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": {}, "author": "OKFocus", "dependencies": { - "okcms": "git+ssh://git@github.com/okfocus/okcms.git#v0.2.5" + "okcms": "git+ssh://git@ghghgh.us/~/okcms.git#v0.2.5" }, "devDependencies": { "grunt": "^0.4.5", diff --git a/studio-susie/Gruntfile.js b/studio-susie/Gruntfile.js index 7f3fedc..553d8c1 100644 --- a/studio-susie/Gruntfile.js +++ b/studio-susie/Gruntfile.js @@ -1,42 +1,65 @@ module.exports = function(grunt) { - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - concat: { - index: { - options: { - separator: "\n;\n" - }, - src: [ - "public/js/vendor/prefixfree.min.js", - "public/js/vendor/fastclick.js", - "public/js/vendor/util.js", - - "public/js/app.js", + // Project configuration. + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + concat: { + index: { + options: { + separator: "\n;\n" + }, + src: [ +"public/assets/js/vendor/confetti.js", +"public/assets/js/vendor/es5-shim.min.js", +"public/assets/js/vendor/fastclick.js", +"public/assets/js/vendor/froogaloop.js", +"public/assets/js/vendor/hammer.min.js", +"public/assets/js/vendor/history.min.js", +"public/assets/js/vendor/html5shiv.min.js", +"public/assets/js/vendor/iscroll.js", +"public/assets/js/vendor/jquery.fullpage.js", +"public/assets/js/vendor/liquid-lite.min.js", +"public/assets/js/vendor/loader.js", +"public/assets/js/vendor/lodash.min.js", +"public/assets/js/vendor/okcms.js", +"public/assets/js/vendor/oktween.js", +"public/assets/js/vendor/prefixfree.min.js", +"public/assets/js/vendor/util.js", +"public/assets/js/vendor/view/View.js", +"public/assets/js/vendor/view/OKTmplView.js", +"public/assets/js/vendor/view/Router.js", +"public/assets/js/vendor/view/ScrollableView.js", +"public/assets/js/lib/nav/DesktopNav.js", +"public/assets/js/lib/nav/MobileNav.js", +"public/assets/js/lib/view/HomeView.js", +"public/assets/js/lib/view/ListView.js", +"public/assets/js/lib/view/PageView.js", +"public/assets/js/lib/view/PaintingView.js", +"public/assets/js/lib/_router.js", +"public/assets/js/app.js", ], - dest: 'public/app.concat.js', - }, - css: { - options: { - separator: "\n" - }, - src: [ + dest: 'public/app.concat.js', + }, + css: { + options: { + separator: "\n" + }, + src: [ "public/css/main.css", - ], - dest: 'public/app.css', - }, - }, + ], + dest: 'public/app.css', + }, + }, - uglify: { - options: { - banner: '/* okfoc.us 2016 */\n' - }, - index: { - src: 'public/app.concat.js', - dest: 'public/app.min.js' - } - }, + uglify: { + options: { + banner: '/* okfoc.us 2016 */\n' + }, + index: { + src: 'public/app.concat.js', + dest: 'public/app.min.js' + } + }, clean: { release: [ @@ -44,15 +67,15 @@ module.exports = function(grunt) { "tmp/" ], } - }); + }); - // Load tasks that we'll be using - grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.loadNpmTasks('grunt-contrib-copy'); - grunt.loadNpmTasks('grunt-dentist'); + // Load tasks that we'll be using + grunt.loadNpmTasks('grunt-contrib-concat'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-clean'); + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-dentist'); - // Default task(s). - grunt.registerTask('default', ['concat', 'uglify', 'clean']); + // Default task(s). + grunt.registerTask('default', ['concat', 'uglify', 'clean']); }; diff --git a/studio-susie/package.json b/studio-susie/package.json new file mode 100644 index 0000000..890d207 --- /dev/null +++ b/studio-susie/package.json @@ -0,0 +1,21 @@ +{ + "name": "new-reality-co", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": {}, + "author": "OKFocus", + "dependencies": { + "okcms": "git+ssh://git@ghghgh.us/~/okcms.git#v0.2.5" + }, + "devDependencies": { + "grunt": "^0.4.5", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-concat": "^0.5.1", + "grunt-dentist": "^0.3.4", + "grunt-contrib-copy": "^0.8.0", + "grunt-contrib-uglify": "^0.9.1" + } +} + diff --git a/studio-susie/templates/index.liquid b/studio-susie/templates/index.liquid index 2020a91..b28d594 100644 --- a/studio-susie/templates/index.liquid +++ b/studio-susie/templates/index.liquid @@ -157,7 +157,7 @@ {% if meta.production %} - + {% else %} diff --git a/studiosusie.com b/studiosusie.com new file mode 100644 index 0000000..13d65f5 --- /dev/null +++ b/studiosusie.com @@ -0,0 +1,19 @@ + +upstream susie_cms { + server 127.0.0.1:6517; +} + +server { + listen 80; + server_name studiosusie.com www.studiosusie.com; + client_max_body_size 50M; + + location / { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://susie_cms; + proxy_redirect off; + } +} diff --git a/susie.sup.land b/susie.sup.land deleted file mode 100644 index 6ec6dc8..0000000 --- a/susie.sup.land +++ /dev/null @@ -1,19 +0,0 @@ - -upstream susie_cms { - server 127.0.0.1:6517; -} - -server { - listen 8070; - server_name susie.sup.land studiosusie.com www.studiosusie.com; - client_max_body_size 50M; - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://susie_cms; - proxy_redirect off; - } -} -- cgit v1.2.3-70-g09d2