diff --git a/.idea/angel.iml b/.idea/angel.iml index 14099989..12eea7cb 100644 --- a/.idea/angel.iml +++ b/.idea/angel.iml @@ -5,6 +5,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index eac82ac0..c65900a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,14 +25,4 @@ - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 827c3dda..8eb418cd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ An easily-extensible web server framework in Dart. [Wiki](https://github.com/angel-dart/angel/wiki) -[API Documentation](http://www.dartdocs.org/documentation/angel_framework/1.0.0-dev) +[API Documentation](http://www.dartdocs.org/documentation/angel_framework/latest) # About @@ -25,18 +25,20 @@ Thus, the third, and perhaps most important goal of the Angel framework is to be Angel also prioritizes tooling. The app boilerplate is pre-fitted with all the plugins and configuration you need to launch an MVP in a matter of days. There is also Swagger code generator in the works. The rest is just implementation detail for you. No need to worry about the following: -* Mustache -* MongoDB -* Seeding +* [Mustache](https://github.com/angel-dart/mustache) +* [MongoDB](https://github.com/angel-dart/mongo) +* [Seeding](https://github.com/angel-dart/seeder) * Angular2 Client -* Static File Server -* Load Balancing -* Authentication -* REST and WebSockets (client and server) -* Server daemon -* Command-line code generators -* Diagnostics and Logging -* Configuration (client and server) +* [Static File Server](https://github.com/angel-dart/static) +* [Proxy Forwarding](https://github.com/angel-dart/proxy) +* [Load Balancing](https://github.com/angel-dart/multiserver) +* [Authentication](https://github.com/angel-dart/auth) +* [REST](https://github.com/angel-dart/client) (client and server) +* [WebSockets](https://github.com/angel-dart/websocket) (client and server) +* [Server daemon](https://github.com/angel-dart/dartd) +* [Command-line code generators](https://github.com/angel-dart/cli) +* [Diagnostics and Logging](https://github.com/angel-dart/diagnostics) +* [Configuration](https://github.com/angel-dart/configuration) (client and server) It's all taken care of for you. @@ -56,6 +58,6 @@ Thank you for using this library. I hope you like it. I have put months of effor into Angel. Feel free to follow me on Twitter: -[@thosakwe](http://twitter.com/thosakwe) +[@_wapaa_](http://twitter.com/_wapaa_) -Or, check out [my blog](http://blog.thosakwe.com) +Or, check out [my blog](http://blog.thosakwe.com). diff --git a/bin/packages b/bin/packages deleted file mode 120000 index a16c4050..00000000 --- a/bin/packages +++ /dev/null @@ -1 +0,0 @@ -../packages \ No newline at end of file diff --git a/bin/server.dart b/bin/server.dart index cf61b66a..a7f54d6c 100755 --- a/bin/server.dart +++ b/bin/server.dart @@ -13,6 +13,7 @@ main() async { startServer() async { var app = await createServer(); + app.normalize(); var dateFormat = new DateFormat("y-MM-dd"); var logFile = new File("logs/${dateFormat.format(new DateTime.now())}.txt"); var host = new InternetAddress(app.properties['host']); diff --git a/config/default.yaml b/config/default.yaml index fac269e3..c531e6ae 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -1,6 +1,4 @@ # Default server configuration. -host: 127.0.0.1 -mongo_db: mongodb://localhost:27017/angel db: migrate: database: angel @@ -9,4 +7,7 @@ db: web: database: angel username: username - password: password \ No newline at end of file + password: password +host: 127.0.0.1 +mongo_db: mongodb://localhost:27017/angel +port: 3000 \ No newline at end of file diff --git a/config/development.yaml b/config/development.yaml index bcfffb61..4bed71e2 100644 --- a/config/development.yaml +++ b/config/development.yaml @@ -1,2 +1,2 @@ # Development-only server configuration. -port: 3000 \ No newline at end of file +debug: true \ No newline at end of file diff --git a/config/production.yaml b/config/production.yaml index ef49edcb..0ebd21f6 100644 --- a/config/production.yaml +++ b/config/production.yaml @@ -1,2 +1,2 @@ # Production-only server configuration -port: 80 \ No newline at end of file +debug: false \ No newline at end of file diff --git a/lib/src/routes/controllers/auth.dart b/lib/src/routes/controllers/auth.dart index 3db110b5..8b0b789e 100644 --- a/lib/src/routes/controllers/auth.dart +++ b/lib/src/routes/controllers/auth.dart @@ -29,9 +29,8 @@ class AuthController extends Controller { // Wire up local authentication, connected to our User service _auth.serializer = _serializer; _auth.deserializer = _deserializer; - _auth.strategies.add(new LocalAuthStrategy( - _verifier(app.container.make(UserService)), - forceBasic: true)); + _auth.strategies + .add(new LocalAuthStrategy(_verifier(app.container.make(UserService)))); await super.call(app); await app.configure(_auth); diff --git a/lib/src/routes/routes.dart b/lib/src/routes/routes.dart index 9eb224bd..644a0975 100644 --- a/lib/src/routes/routes.dart +++ b/lib/src/routes/routes.dart @@ -10,7 +10,7 @@ configureBefore(Angel app) async {} /// Put your app routes here! configureRoutes(Angel app) async { app.get('/', (req, ResponseContext res) => res.render('hello')); - app.all('*', serveStatic()); + app.all('*', new VirtualDirectory()); } configureAfter(Angel app) async { diff --git a/pubspec.yaml b/pubspec.yaml index 1846d38c..54702952 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: angel_framework: ^1.0.0-dev angel_mongo: ^1.0.0-dev angel_mustache: ^1.0.0-dev - angel_static: ^1.0.0 + angel_static: ^1.1.0-dev json_god: ^2.0.0-beta mailer: ^1.1.0+4 validate: ^1.5.2 diff --git a/test/packages b/test/packages deleted file mode 120000 index a16c4050..00000000 --- a/test/packages +++ /dev/null @@ -1 +0,0 @@ -../packages \ No newline at end of file diff --git a/test/services/packages b/test/services/packages deleted file mode 120000 index 4b727bf6..00000000 --- a/test/services/packages +++ /dev/null @@ -1 +0,0 @@ -../../packages \ No newline at end of file diff --git a/tool/packages b/tool/packages deleted file mode 120000 index a16c4050..00000000 --- a/tool/packages +++ /dev/null @@ -1 +0,0 @@ -../packages \ No newline at end of file diff --git a/web/packages b/web/packages deleted file mode 120000 index a16c4050..00000000 --- a/web/packages +++ /dev/null @@ -1 +0,0 @@ -../packages \ No newline at end of file