Skip to content
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.

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

Sck rebrand #7

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
onboarding.making-sense.eu
onboarding.iscape.smartcitizen.me
36 changes: 20 additions & 16 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,32 @@
"license": "MIT",
"private": true,
"dependencies": {
"angular": "~1.5.0",
"angular-route": "~1.5.0",
"angular-loader": "~1.5.0",
"angular-mocks": "~1.5.0",
"html5-boilerplate": "^5.3.0",
"angular-ui-router": "^0.3.1",
"bootstrap-sass": "bootstrap-sass-official#^3.3.7",
"font-awesome": "fontawesome#^4.6.3",
"angular-material": "^1.0.9",
"angular-messages": "^1.5.8",
"angular": "^1.6.10",
"angular-route": "^1.6.10",
"angular-loader": "^1.6.10",
"angular-mocks": "^1.6.10",
"html5-boilerplate": "^6.0.1",
"angular-ui-router": "^1.0.15",
"bootstrap-sass": "^3.3.7",
"font-awesome": "^5.0.10",
"angular-material": "^1.1.8",
"angular-messages": "^1.6.10",
"ngGeolocation": "^0.0.8",
"angular-google-maps": "^2.3.3",
"ngmap": "^1.17.3",
"angular-google-maps": "^2.4.1",
"ngmap": "^1.18.4",
"angularjs-geolocation": "^0.1.1",
"angular-google-places-autocomplete": "^0.2.7",
"restangular": "^1.5.2",
"restangular": "^1.6.1",
"socket.io-client": "^2.1.0",
"angular-socket-io": "^0.7.0",
"socket.io-client": "^1.6.0"
"angular-lazy-img": "^1.5.1"
},
"resolutions": {
"angular": "^1.6.10"
},
"overrides": {
"socket.io-client": {
"main": "socket.io.js"
"main": ["./dist/socket.io.js"]
}
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "angular-seed",
"private": true,
"version": "0.0.0",
"description": "A starter project for AngularJS",
"repository": "https://github.com/angular/angular-seed",
"description": "Smart Citizen Onboarding App",
"repository": "https://github.com/fablabbcn/smartcitizen-onboarding-app",
"license": "MIT",
"devDependencies": {
"angular": "^1.5.8",
Expand Down
17 changes: 3 additions & 14 deletions src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ angular.module('app', [
'uiGmapgoogle-maps',
'google.places',
'restangular',
'btford.socket-io'
])
.controller('formController', function($scope) {

// we will store all of our form data in this object
$scope.formData = {};

console.log($scope.formData);

// function to process the form
$scope.processForm = function() {
alert('awesome!');
};
});
'btford.socket-io',
'angularLazyImg'
]);
Binary file added src/app/images/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 33 additions & 14 deletions src/app/images/alert.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions src/app/images/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/bg_l.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/bg_m.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/bg_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/app/images/check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/app/images/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions src/app/images/cheers-34.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/app/images/favicon.ico
Binary file not shown.
33 changes: 33 additions & 0 deletions src/app/images/forgot_pass.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/hardware_board.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/app/images/help.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/app/images/info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions src/app/images/mail.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/images/main_board.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/app/images/oops.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading