Skip to content

More sassy #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

More sassy #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fb3451c
added anguler to previous assignment
Nov 24, 2015
ebaf1f3
branch for crud
Nov 25, 2015
938a293
added auth
Nov 30, 2015
f90ae5b
work in progress
Dec 2, 2015
6864f76
fixed issue
Dec 2, 2015
b758935
set up for gulp css
Dec 3, 2015
82f0978
start of angular testing
Dec 3, 2015
36f851c
fix to test, now working
Dec 3, 2015
56a877f
updated assignment, crud tests passing
Dec 7, 2015
8fc6c44
turning in now although it is not complete
Dec 7, 2015
51d48a7
save sassy changes
Dec 8, 2015
3ed76be
almost there, responsive doesnt seem to be reacting just yet
Dec 8, 2015
c27d5fa
not right, but my gulpfile should be correct!
Dec 8, 2015
a3170fe
fixed responsive
Dec 8, 2015
c05c319
all css is now scss
Dec 9, 2015
1eb92b0
fixed sass and completed assignment
Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions jordan_bundy/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.
..
**/.DS_Store
../.DS_Store
**/*.swp
node_modules
/db
/build
**/test_bundle.js
**/*bundle.js
41 changes: 41 additions & 0 deletions jordan_bundy/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" type="text/css" href="application.css">
</head>
<body class="center-column" data-ng-app="CaffeineApp">
<header class="app">
<h1>Welcome, thirsty Developer</h1>
</header>
<main class="app shadow" data-ng-controller="DevelopersController" data-ng-init="getAll()">
<h2>{{greeting}}</h2>

<section class="form">
<h2 class="title common">New Developer:</h2>
<div class="fields common">
<label for="newDeveloperName">Name:</label>
<input type="text" id="newDeveloperName" required data-ng-model="newDeveloper.name">
<label for="newDeveloperLanguage">Language:</label>
<input type="text" id="newDeveloperLanguage" data-ng-model="newDeveloper.language">
</div>
<button data-ng-click="processForm(newDeveloper)" data-ng-disabled>Process</button>
<button data-ng-if="newDeveloper.edit" data-ng-click="cancel()">Cancel</button>
</section>
<section>
<ul>
<li class="list" data-ng-repeat="developer in developers">
<div class="list-item background{{$index}}">
{{developer.name}}
</div>
<div class="list-buttons">
<button data-ng-click="editForm(developer)">Edit</button>
<button data-ng-click="remove(developer)">Delete</button>
</div>
</li>
</ul>
</section>
</main>
<script src="bundle.js"></script>
</body>
</html>

72 changes: 72 additions & 0 deletions jordan_bundy/app/js/developers/controllers/developers_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
module.exports = function(app) {
app.controller('DevelopersController', ['$scope', '$http', function($scope, $http) {
$scope.errors = [];
$scope.developers = [];
$scope.defaults = {language: 'javascript'};
$scope.newDeveloper = angular.copy($scope.defaults);
$scope.developer = {};

// create function to resuse same form
$scope.editForm = function(developer) {
$scope.newDeveloper = {
_id: developer._id,
name: developer.name,
language: developer.language,
edit: true,
index: $scope.developers.indexOf(developer)
};
};

$scope.processForm = function(developer) {
developer.edit ? $scope.update(developer) :
$scope.create(developer);
};

$scope.cancel = function() {
$scope.newDeveloper = null;
};

$scope.getAll = function() {
$http.get('/drip/developers')
.then(function(res) {
console.log(res);
$scope.developers = res.data;
}, function(res) {
console.log(res.data)
});
};

$scope.create = function(developer) {
$http.post('/drip/developer', developer)
.then(function(res) {
$scope.developers.push(res.data);
$scope.newDeveloper = angular.copy($scope.defaults);
}, function(err) {
console.log(err);
});
};

$scope.update = function(developer) {
$scope.developers[developer.index] = developer;
$http.put('/drip/developer/' + developer._id, developer)
.then(function(res) {
console.log('is update');
$scope.newDeveloper = angular.copy($scope.defaults);
}, function(err) {
console.log(err)
});
};

$scope.remove = function(developer) {
$scope.developers.splice($scope.developers.indexOf(developer), 1);
$http.delete('/drip/developer/' + developer._id)
.then(function(res) {
console.log('developer removed');
}, function(err) {
console.log(err);
$scope.getAll();
});
};
}]);
};

4 changes: 4 additions & 0 deletions jordan_bundy/app/js/developers/developers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = function(app) {
require('./controllers/developers_controller')(app);
};

6 changes: 6 additions & 0 deletions jordan_bundy/app/js/entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
require('angular/angular');
var angular = window.angular;

var caffeineApp = angular.module('CaffeineApp', []);
require('./developers/developers')(caffeineApp);

Loading