From bf8b7fe65484ad1eb7daad34eabe3ab6ba5e6b13 Mon Sep 17 00:00:00 2001 From: jh3y Date: Tue, 6 Dec 2016 03:44:40 +0000 Subject: [PATCH] Resolves #60 and #61 --- .bowerrc | 3 - .travis.yml | 1 - LICENSE | 2 +- LOG.md | 1 + README.md | 7 +- bower.json | 45 - build-tasks/assets.js | 5 - gulp-config.js | 13 +- package.json | 18 +- src/markup/layout-blocks/layout.pug | 5 +- src/script/app.js | 1 - src/script/config/tyto.js | 3 - src/style/_typography.styl | 8 - src/style/modules/column.styl | 1 + src/style/modules/task.styl | 1 + test/index.html | 7 +- yarn.lock | 5301 +++++++++++++++++++++++++++ 17 files changed, 5336 insertions(+), 86 deletions(-) delete mode 100644 .bowerrc delete mode 100644 bower.json create mode 100644 yarn.lock diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index a7f03cd..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "src/vendor/" -} diff --git a/.travis.yml b/.travis.yml index 63b7002..56d8172 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ sudo: false install: - npm install -g mocha-phantomjs - npm install -g gulp - - npm install -g bower - npm install - bower install before_script: diff --git a/LICENSE b/LICENSE index ca59abf..69f2a96 100644 --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ tyto - http://jh3y.github.io/tyto Licensed under the MIT license -jh3y (c) 2015 +jh3y (c) 2016 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/LOG.md b/LOG.md index 796cdb7..f77b0bb 100644 --- a/LOG.md +++ b/LOG.md @@ -9,3 +9,4 @@ Log ![alt tag](https://raw.github.com/jh3y/tyto/master/src/img/tyto.png) * __05/10/15__: Add markdown support + bug fixes. * __17/10/15__: Implement dynamic linking between entities via Markdown `#`. * __16/09/16__: V3.0.0 Removal of CoffeeScript in favor of Babel ES6 + various bug fixes/improvements. +* __06/12/16__: V3.0.1 Removal of Bower in favor of just npm use with Yarn. Fix issues #60 and #61 diff --git a/README.md b/README.md index dc9b5cd..9e68f37 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ This is where Tyto came from, It's my personal intuitive and minimal TodoMVC. No ### Who's it for? Developer and project managers were the original target audience. A means to share project progression on a more _personal_ level. As opposed to publicly through an internal system. Almost like a complimentary attachment to an email. -![alt tag](https://raw.github.com/jh3y/pics/master/tyto/linking.gif) +![alt tag](https://raw.github.com/jh3y/pics/master/tyto/change_color.gif) There are no restrictions though, it's open source. Not quite right out of the box? Change it :smile: @@ -46,7 +46,6 @@ Extensibility provides a means to create a bespoke version based on theme or fun Tyto is a personal pet of mine and if it can help others, that's great! -![alt tag](https://raw.github.com/jh3y/pics/master/tyto/change_color.gif) ###Using tyto @@ -56,6 +55,10 @@ GitHub flavored markdown is supported thanks to `marked`. ![alt tag](https://raw.github.com/jh3y/pics/master/tyto/markdown.gif) +This also enables you to link to boards, columns and other tasks by using the `#` character + +![alt tag](https://raw.github.com/jh3y/pics/master/tyto/linking.gif) + Changes are persistent thanks to `localStorage`. Want to move to a different browser or machine though? Use the export utility to export a json file. Load this using the import utility. diff --git a/bower.json b/bower.json deleted file mode 100644 index b109cf1..0000000 --- a/bower.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "tyto", - "version": "3.0.0", - "homepage": "https://github.com/jh3y/tyto", - "authors": [ - "jh3y " - ], - "description": "manage and organise things", - "keywords": [ - "tyto", - "js", - "task", - "manager", - "manage", - "organise", - "customise", - "templates" - ], - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "src/vendor/", - "test", - "tests" - ], - "devDependencies": { - "jquery": "~2.1.3", - "backbone": "~1.1.2", - "Backbone.localStorage": "~1.1.16", - "marionette": "~2.4.1", - "yap": "jh3y/yap#~0.1.2", - "jquery-ui": "~1.11.4", - "jqueryui-touch-punch": "*", - "normalize.css": "~3.0.3", - "mocha": "~2.2.5", - "chai": "~2.3.0", - "lodash": "~3.9.3", - "material-design-icons": "~2.0.0", - "roboto": "google/roboto", - "material-design-lite": "~1.0.0", - "marked": "chjj/marked#~0.3.5" - } -} diff --git a/build-tasks/assets.js b/build-tasks/assets.js index 309b80d..1c0fd21 100644 --- a/build-tasks/assets.js +++ b/build-tasks/assets.js @@ -8,13 +8,8 @@ var gulp = require('gulp'), var assets = { scripts: function() { - var yapFilter = plugins.filter([ - '**/*.js', - '!**/yap.min.js' - ]); return gulp.src(sources.vendor.js) .pipe(plugins.plumber()) - .pipe(env.dist ? yapFilter: plugins.gUtil.noop()) .pipe(plugins.concat('vendor.js')) .pipe(gulp.dest(destinations.js)) .pipe(plugins.uglify(pluginOpts.uglify)) diff --git a/gulp-config.js b/gulp-config.js index c5eb129..1e1ed2b 100644 --- a/gulp-config.js +++ b/gulp-config.js @@ -1,5 +1,5 @@ var env = 'public/', - vendorDir = 'src/vendor/', + vendorDir = 'node_modules/', pkg = require('./package.json'); module.exports = { pkg: { @@ -75,13 +75,13 @@ module.exports = { vendor: { js: [ vendorDir + 'jquery/dist/jquery.js', - vendorDir + 'lodash/lodash.js', + vendorDir + 'lodash/index.js', vendorDir + 'backbone/backbone.js', - vendorDir + 'Backbone.localStorage/backbone.localStorage.js', - vendorDir + 'marionette/lib/backbone.marionette.js', - vendorDir + 'yap/dist/yap.min.js', + vendorDir + 'backbone.wreqr/lib/backbone.wreqr.js', + vendorDir + 'backbone.localstorage/backbone.localStorage.js', + vendorDir + 'backbone.marionette/lib/backbone.marionette.js', vendorDir + 'jquery-ui/jquery-ui.js', - vendorDir + 'jqueryui-touch-punch/jquery.ui.touch-punch.min.js', + vendorDir + 'jquery-ui-touch-punch/jquery.ui.touch-punch.min.js', vendorDir + 'material-design-lite/material.js', vendorDir + 'marked/marked.min.js' ], @@ -90,7 +90,6 @@ module.exports = { vendorDir + 'material-design-lite/material.css' ], fonts: [ - vendorDir + 'roboto/hinted/Roboto-Regular.ttf', vendorDir + 'material-design-icons/iconfont/**/*.{eot,ttf,woff,woff2}' ] }, diff --git a/package.json b/package.json index 1e81e4a..7e45873 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tyto", - "version": "3.0.0", + "version": "3.0.1", "description": "tyto - manage and organise", "engines": { "node": "0.10", @@ -24,9 +24,13 @@ "babel-preset-es2015": "^6.14.0", "babel-preset-react": "^6.11.1", "babelify": "^7.3.0", + "backbone": "1.1.2", + "backbone.localstorage": "^1.1.16", + "backbone.marionette": "2.4.1", + "backbone.wreqr": "^1.4.0", "browser-sync": "^2.6.4", "browserify": "^10.2.0", - "chai": "^2.3.0", + "chai": "^3.5.0", "gulp": "^3.8.11", "gulp-autoprefixer": "^2.2.0", "gulp-concat": "^2.5.2", @@ -46,8 +50,16 @@ "gulp-uglify": "^1.4.1", "gulp-util": "^3.0.4", "gulp-wrap": "^0.11.0", - "mocha": "^2.2.5", + "jquery": "^3.1.1", + "jquery-ui": "components/jqueryui", + "jquery-ui-touch-punch": "^0.2.3", + "lodash": "3.9.3", + "marked": "^0.3.6", + "material-design-icons": "^3.0.1", + "material-design-lite": "^1.2.1", + "mocha": "^3.2.0", "mocha-phantomjs": "^4.0.1", + "normalize.css": "^5.0.0", "vinyl-buffer": "^1.0.0", "vinyl-file": "^2.0.0", "vinyl-source-stream": "^1.1.0" diff --git a/src/markup/layout-blocks/layout.pug b/src/markup/layout-blocks/layout.pug index b107dbd..b122d31 100644 --- a/src/markup/layout-blocks/layout.pug +++ b/src/markup/layout-blocks/layout.pug @@ -6,11 +6,10 @@ head meta(name="viewport", content="width=device-width, initial-scale=1, user-scalable=0, maximum-scale=1.0") meta(name="description", content="tyto: manage and organise things") link(rel="stylesheet", href="css/vendor.css") + link(href="https://fonts.googleapis.com/css?family=Roboto", rel="stylesheet") link(rel="stylesheet", href="https://storage.googleapis.com/code.getmdl.io/1.0.0/material.yellow-red.min.css") link(rel="stylesheet", href=`css/${name}.min.css`) body#tyto-app.tyto-app block content - script(src="js/vendor.min.js") - script. - yap.muzzle(false); + script(src="js/vendor.js") script(src=`js/${name}.js`) diff --git a/src/script/app.js b/src/script/app.js index 6c91a93..f1c89d5 100644 --- a/src/script/app.js +++ b/src/script/app.js @@ -11,7 +11,6 @@ Tyto.TemplateStore = Templates; // Import requirements import TytoCtrl from './controllers/tyto'; import TytoViews from './views/tyto'; -// const TytoViews = require('./views/tyto'); import TytoModels from './models/tyto'; import TytoUtils from './utils/utils'; import TytoSuggestions from './utils/suggestions'; diff --git a/src/script/config/tyto.js b/src/script/config/tyto.js index d1f12dc..f488d6c 100644 --- a/src/script/config/tyto.js +++ b/src/script/config/tyto.js @@ -23,7 +23,4 @@ const App = Marionette.Application.extend({ SELECTED_CLASS : 'is--selected', CONFIRM_MESSAGE : '[tyto] are you sure you wish to delete this item?' }); - export default App; - -/*Some thing*/ diff --git a/src/style/_typography.styl b/src/style/_typography.styl index abd56ba..9f8afcb 100644 --- a/src/style/_typography.styl +++ b/src/style/_typography.styl @@ -1,11 +1,3 @@ -@font-face - font-family 'Roboto' - font-style normal - font-weight 400 - src url('../fonts/Roboto-Regular.ttf') format('truetype') - - - /*** Material Icons integration. ***/ diff --git a/src/style/modules/column.styl b/src/style/modules/column.styl index a4eefc9..89f3d07 100644 --- a/src/style/modules/column.styl +++ b/src/style/modules/column.styl @@ -51,6 +51,7 @@ columnWidth = 320px &__title max-width 200px + min-width 150px margin 0 display inline-block diff --git a/src/style/modules/task.styl b/src/style/modules/task.styl index 4cb10c0..0f01c41 100644 --- a/src/style/modules/task.styl +++ b/src/style/modules/task.styl @@ -34,6 +34,7 @@ taskMinHeight = 150px &__title display inline-block max-width 200px + min-width 150px margin 0 font-size 24px line-height 32px diff --git a/test/index.html b/test/index.html index 0cb566d..04c19c9 100644 --- a/test/index.html +++ b/test/index.html @@ -5,7 +5,7 @@ tyto: manage and organise things - + @@ -22,14 +22,13 @@
- - + + -