Skip to content

Commit

Permalink
Merge pull request #30 from yawetse/master
Browse files Browse the repository at this point in the history
switched to async parallel, simplified installation process, installing extension dependencies via npm instead of github
  • Loading branch information
yawetse committed Jul 15, 2014
2 parents 24b4e1a + 24ffe1d commit 84095b4
Show file tree
Hide file tree
Showing 2,935 changed files with 69,693 additions and 580,975 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_store
*.DS_store
lib-cov
*.seed
*.log
Expand Down Expand Up @@ -38,4 +39,9 @@ build/Release
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules
public/uploads/files
!content/extensions/node_modules/*
!content/extensions/node_modules/*
content/extensions/node_modules/periodicjs.ext.admin/node_modules
content/extensions/node_modules/periodicjs.ext.dbseed/node_modules
content/extensions/node_modules/periodicjs.ext.default_routes/node_modules
content/extensions/node_modules/periodicjs.ext.login/node_modules
content/extensions/node_modules/periodicjs.ext.mailer/node_modules
3 changes: 2 additions & 1 deletion app/controller/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ var applicationController = function(resources){

var getExtensionView = function(viewname,callback){
if(extname){
var exttemplatefile = path.join(path.resolve(__dirname,'../../content/extensions/node_modules',extname,'views',viewname),'.'+themefileext);
var exttemplatefile = path.join(path.resolve(__dirname,'../../content/extensions/node_modules',extname),'views',viewname+'.'+themefileext);
console.log("exttemplatefile",exttemplatefile);
fs.open(exttemplatefile,'r',function(err,file){
if(err){
callback(err,viewname,null);
Expand Down
90 changes: 83 additions & 7 deletions content/extensions/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,103 @@
"extensions": [
{
"name": "periodicjs.ext.install",
"version": "0.0.1",
"periodicCompatibility": "0.0.2",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": false,
"enabled": true,
"periodicConfig": {
"name": "periodicjs.ext.install",
"periodicCompatibility": "0.0.2",
"periodicCompatibility": "0.1.0",
"periodicDependencies": []
}
},
{
"name": "periodicjs.ext.default_routes",
"version": "0.0.1",
"periodicCompatibility": "0.0.2",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": true,
"periodicConfig": {
"name": "periodicjs.ext.default_routes",
"periodicCompatibility": "0.0.2",
"periodicCompatibility": "0.1.0",
"periodicDependencies": []
}
},
{
"name": "periodicjs.ext.mailer",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": false,
"periodicConfig": {
"name": "periodicjs.ext.mailer",
"periodicCompatibility": "0.1.0",
"periodicDependencies": [],
"periodicjs.ext.admin": {
"menu": {
"Extensions": {
"Mailer": "<a href=\"/p-admin/mailer/\">Mail Settings</a>"
}
}
}
}
},
{
"name": "periodicjs.ext.login",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": false,
"periodicConfig": {
"name": "periodicjs.ext.login",
"periodicCompatibility": "0.1.0",
"periodicDependencies": [
{
"extname": "periodicjs.ext.mailer",
"version": "0.1.0"
}
]
}
},
{
"name": "periodicjs.ext.admin",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": false,
"periodicConfig": {
"name": "periodicjs.ext.admin",
"periodicCompatibility": "0.1.0",
"periodicDependencies": [
{
"extname": "periodicjs.ext.mailer",
"version": "0.1.0"
},
{
"extname": "periodicjs.ext.login",
"version": "0.1.0"
}
]
}
},
{
"name": "periodicjs.ext.dbseed",
"version": "0.1.0",
"periodicCompatibility": "0.1.0",
"installed": true,
"enabled": false,
"periodicConfig": {
"name": "periodicjs.ext.dbseed",
"periodicCompatibility": "0.1.0",
"periodicDependencies": [],
"periodicjs.ext.admin": {
"menu": {
"Extensions": {
"seed admin": "<a href=\"/p-admin/dbseed\">DB Seed Content</a>"
}
}
}
}
}
]
}
Binary file modified content/extensions/node_modules/.DS_Store
Binary file not shown.
Binary file not shown.
25 changes: 25 additions & 0 deletions content/extensions/node_modules/periodicjs.ext.admin/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions content/extensions/node_modules/periodicjs.ext.admin/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 84095b4

Please sign in to comment.