Skip to content

Commit

Permalink
Merge pull request #80 from schulcloud/master
Browse files Browse the repository at this point in the history
Release v0.3.0 Crystallite
  • Loading branch information
nicoknoll authored Feb 2, 2017
2 parents 4a125a5 + 53880d0 commit 9b634b8
Show file tree
Hide file tree
Showing 127 changed files with 3,894 additions and 1,060 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"no-unused-vars": [
0
],
"no-console": "off"
"no-console": "off",
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"]
}
}
74 changes: 41 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,51 +17,59 @@
"author": "",
"license": "GPL",
"dependencies": {
"babel-core": "^6.2.1",
"babel-loader": "^6.2.0",
"babel-preset-es2015": "^6.1.18",
"babel-preset-react": "^6.1.18",
"axios": "^0.15.3",
"babel-core": "^6.21.0",
"babel-loader": "^6.2.10",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0",
"crypto": "0.0.3",
"express": "^4.14.0",
"express-urlrewrite": "^1.2.0",
"feathers-authentication": "^0.7.11",
"feathers-authentication-client": "^0.1.1",
"feathers-client": "^1.7.2",
"feathers-hooks": "^1.6.1",
"feathers-subscriptions-manager": "^1.0.1",
"feathers-authentication": "^1.0.2",
"feathers-authentication-client": "^0.1.6",
"feathers-client": "^1.9.0",
"feathers-hooks": "^1.7.1",
"feathers-reactive": "^0.4.1",
"oauth-1.0a": "^2.0.0",
"jquery": "^3.1.1",
"react": "^0.14.8",
"react-dom": "^0.14.8",
"react-komposer": "^1.13.1",
"react-player": "^0.12.0",
"react-router": "^3.0.0",
"react-s-alert": "^1.2.1",
"feathers-subscriptions-manager": "^1.0.1",
"formsy-react": "^0.19.0",
"formsy-react-components": "^0.9.0",
"jquery": "^3.1.1",
"oauth-1.0a": "^2.0.0",
"rc-pagination": "^1.6.5",
"rc-select": "^6.7.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-dropzone": "^3.9.0",
"react-komposer": "^2.0.0",
"react-player": "^0.14.1",
"react-router": "^3.0.1",
"react-router-scroll": "^0.4.1",
"react-s-alert": "^1.2.2",
"react-select": "^1.0.0-rc.2",
"react-tabs": "^0.8.2",
"rxjs": "^5.0.0-rc.4",
"serve-favicon": "^2.3.0",
"socket.io-client": "^1.5.1"
"rxjs": "^5.0.3",
"serve-favicon": "^2.3.2",
"socket.io-client": "^1.7.2"
},
"devDependencies": {
"babel-polyfill": "^6.16.0",
"css-loader": "^0.25.0",
"eslint": "^3.8.1",
"eslint-plugin-react": "^6.4.1",
"babel-polyfill": "^6.20.0",
"css-loader": "^0.26.1",
"eslint": "^3.13.1",
"eslint-plugin-react": "^6.9.0",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"imports-loader": "^0.6.5",
"imports-loader": "^0.7.0",
"json-loader": "^0.5.4",
"mocha": "^3.1.2",
"node-sass": "^3.10.1",
"postcss-loader": "^1.0.0",
"request": "^2.76.0",
"resolve-url-loader": "^1.6.0",
"sass-loader": "^4.0.2",
"mocha": "^3.2.0",
"node-sass": "^4.3.0",
"postcss-loader": "^1.2.2",
"request": "^2.79.0",
"resolve-url-loader": "^1.6.1",
"sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"tether": "^1.3.7",
"tether": "^1.4.0",
"url-loader": "^0.5.7",
"webpack": "^1.13.2"
"webpack": "^1.14.0"
}
}
2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const _init = () => {
};

// Wait for server to tell us whether logged in (then) or not (catch)
Server.authenticate().then(() => {
Server.authenticateUser().then(() => {
_init();
}).catch(() => {
_init();
Expand Down
8 changes: 4 additions & 4 deletions src/modules/active-students/components/active-students.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import LayoutBackend from '../../backend/containers/layout';
import SectionTitle from '../../backend/components/title'; /* only for backend */
import LayoutBase from '../../base/containers/layout';
import SectionTitle from '../../base/components/title'; /* only for base */

import List from './list';

Expand All @@ -21,10 +21,10 @@ class ActiveStudents extends React.Component {

render() {
return (
<LayoutBackend className="route-active-students">
<LayoutBase className="route-active-students">
<SectionTitle title="Schüler" subtitle={this.getSubtitle.bind(this)()} />
<List />
</LayoutBackend>
</LayoutBase>
);
}

Expand Down
89 changes: 51 additions & 38 deletions src/modules/administration/actions/administration.js
Original file line number Diff line number Diff line change
@@ -1,56 +1,69 @@
import { Permissions, Server } from '../../core/helpers/';

const classService = Server.service('/classes');
const courseService = Server.service('/courses');
const schoolService = Server.service('/schools');
const userService = Server.service('/users');
const classService = Server.service('/classes');

export default {
updateSchool: (schoolId, data) => {
schoolService.patch(schoolId, data);
},


updateCourse: (data) => {
if(data._id) return courseService.update(data._id, data);

return courseService.create(data);
},

removeCourse: (data) => {
return courseService.remove(data._id);
},

const indexArrayByKey = (array, key) => {
const result = {};
array.forEach((obj) => {
result[obj[key]] = obj;
});
return result;
};

updateClass: (data) => {
if(data._id) return classService.update(data._id, data);
export default {

return classService.create(data);
loadContent: (serviceName, query) => {
const service = Server.service(serviceName);
return service.find({query})
.then(result => {
return Promise.resolve({
records: indexArrayByKey(result.data, '_id'),
pagination: {total: result.total, skip: result.skip}
});
});
},

removeClass: (data) => {
return classService.remove(data._id);
updateRecord: (serviceName, data) => {
const service = Server.service(serviceName);
if(data._id) return service.patch(data._id, data);
return service.create(data);
},


updateStudent: (data) => {
if(data._id) return userService.update(data._id, data);

return userService.create(data);
removeRecord: (serviceName, data) => {
const id = data._id;
if(!id) throw new Error("_id not set!");
const service = Server.service(serviceName);
return service.remove(id);
},

removeStudent: (data) => {
return userService.remove(data._id);
populateFields: (serviceName, _id, fields) => {
const service = Server.service(serviceName);
return service.find({query: {
_id,
$populate: fields
}})
.then(result => Promise.resolve(result.data[0]));
},


updateTeacher: (data) => {
if(data._id) return userService.update(data._id, data);

return userService.create(data);
_loadTeachers: (schoolId) => {
return userService.find({
query: {
schoolId,
roles: ['teacher'],
$limit: 1000
}
})
.then(result => Promise.resolve(result.data));
},

removeTeacher: (data) => {
return userService.remove(data._id);
_loadClasses: (schoolId) => {
return classService.find({
query: {
schoolId,
$limit: 1000
}
})
.then(result => Promise.resolve(result.data));
}
};
Loading

0 comments on commit 9b634b8

Please sign in to comment.