Last active
November 20, 2015 21:34
-
-
Save blaedj/277d878ae0987e99cacb to your computer and use it in GitHub Desktop.
Diff of changes after from `ember new`
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/index.js b/app/controllers/index.js | |
new file mode 100644 | |
index 0000000..fdf2155 | |
--- /dev/null | |
+++ b/app/controllers/index.js | |
@@ -0,0 +1,24 @@ | |
+import Ember from 'ember'; | |
+ | |
+export default Ember.Controller.extend({ | |
+ occurrences: Ember.A(), | |
+ | |
+ actions: { | |
+ calendarAddOccurrence: function(occurrence) { | |
+ this.get('occurrences').pushObject(Ember.Object.create({ | |
+ title: occurrence.get('title'), | |
+ startsAt: occurrence.get('startsAt'), | |
+ endsAt: occurrence.get('endsAt') | |
+ })); | |
+ }, | |
+ | |
+ calendarUpdateOccurrence: function(occurrence, properties) { | |
+ occurrence.setProperties(properties); | |
+ }, | |
+ | |
+ calendarRemoveOccurrence: function(occurrence) { | |
+ this.get('occurrences').removeObject(occurrence); | |
+ } | |
+ | |
+ } | |
+}); | |
diff --git a/app/styles/app.scss b/app/styles/app.scss | |
new file mode 100644 | |
index 0000000..e69de29 | |
diff --git a/app/templates/application.hbs b/app/templates/application.hbs | |
index f8bc38e..3177632 100644 | |
--- a/app/templates/application.hbs | |
+++ b/app/templates/application.hbs | |
@@ -1,3 +1,6 @@ | |
<h2 id="title">Welcome to Ember</h2> | |
{{outlet}} | |
+ | |
+ | |
+{{as-calendar}} | |
diff --git a/bower.json b/bower.json | |
index 1d251bd..b420419 100644 | |
--- a/bower.json | |
+++ b/bower.json | |
@@ -11,6 +11,11 @@ | |
"ember-resolver": "~0.1.20", | |
"jquery": "^1.11.3", | |
"loader.js": "ember-cli/loader.js#3.4.0", | |
- "qunit": "~1.20.0" | |
+ "qunit": "~1.20.0", | |
+ "interact": "1.2.5", | |
+ "jquery-simulate": "1.0.1", | |
+ "lodash": "3.10.0", | |
+ "moment": "2.10.6", | |
+ "moment-timezone": "0.4.0" | |
} | |
} | |
diff --git a/package.json b/package.json | |
index ca7f064..5563ff1 100644 | |
--- a/package.json | |
+++ b/package.json | |
@@ -20,6 +20,8 @@ | |
"license": "MIT", | |
"devDependencies": { | |
"broccoli-asset-rev": "^2.2.0", | |
+ "broccoli-sass": "^0.7.0", | |
+ "ember-calendar": "0.1.7", | |
"ember-cli": "1.13.13", | |
"ember-cli-app-version": "^1.0.0", | |
"ember-cli-babel": "^5.1.5", |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment