Merge pull request #41 from Tanibox/development

All developments for 1.1 are finished

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "web/vendor"
+}

.env-example

@@ -0,0 +1,20 @@
+#use 'en' for English and 'id' for Indonesia
+SYMFONY_LOCALE=en
+
+SYMFONY_SECRET=changewithyoursecretkey
+SYMFONY_ENV=dev
+
+#use '' instead of null if you want to empty the value
+SYMFONY_DB_HOST=127.0.0.1
+SYMFONY_DB_PORT=3306
+SYMFONY_DB_NAME=yourdatabasename
+SYMFONY_DB_USERNAME=yourdatabaseusername
+SYMFONY_DB_PASSWORD=yourdatabasepassword
+
+#use this default value if you don't have any mailer system
+SYMFONY_MAILER_TRANSPORT=smtp
+SYMFONY_MAILER_HOST=127.0.0.1
+SYMFONY_MAILER_USERNAME=admin
+SYMFONY_MAILER_PASSWORD=admin
+SYMFONY_MAILER_FROM_ADDRESS=youremail@yourdomain.com
+SYMFONY_MAILER_SENDER_NAME=yourname

.gitignore

@@ -33,3 +33,6 @@
 /web/uploads/seeds/*.PNG
 /web/uploads/seeds/*.JPG
 /web/uploads/seeds/*.GIF
+/web/vendor/*
+.env
+composer.phar

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [asep@tanibox.com](mailto:asep@tanibox.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+# Contributing to Tania
+
+Hello fellow contributors, we would like to thank you for taking the time to contribute!
+
+The following is a set of guidelines for contributing to Tania, which are hosted in the [Tanibox Organization](https://github.com/tanibox) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+#### Table Of Contents
+
+[Code of Conduct](#code-of-conduct)
+
+[What should I know before I get started?](#what-should-i-know-before-i-get-started)
+
+[How Can I Contribute?](#how-can-i-contribute)
+  * [Reporting Bugs](#reporting-bugs)
+  * [Suggesting Enhancements](#suggesting-enhancements)
+  * [Pull Requests](#pull-requests)
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [Tania Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [asep@tanibox.com](mailto:asep@tanibox.com).
+
+## What should I know before I get started?
+
+Always use English to communicate. Don't be shy with your English because nobody is perfect.
+
+## How Can I Contribute?
+
+### Reporting Bugs
+
+To report bugs, you can use [Github issue tracker](https://github.com/Tanibox/tania/issues). Explain the detail about how can you get the bug, your environment, or anything that can help the maintainers to reproduce it.
+
+### Suggesting Enhancements
+
+You can use [Github issue tracker](https://github.com/Tanibox/tania/issues) to suggest your enhancements proposal. We encourage you to join to our [Gitter](https://gitter.im/taniafarm/Lobby) also if you want to discuss your enhancements directly with the maintainers.
+
+### Pull Requests
+
+Never ever send your pull requests to the `master` branch. Always send it to the `development` branch. Don't forget to give a clear PR subject and explain what are you changing on the description.

README.md

@@ -27,9 +27,9 @@ git clone git@github.com:Tanibox/tania.git
 cd tania
 ```
 
-Second, setup your database and mailer parameters in `app/config/parameters.yml`. You can duplicate and rename the `app/config/parameters.yml.dist` file.
+Second, setup your database and mailer parameters in `/.env`. You can duplicate and rename the `/.env-example` file.
 
-Third, don't forget to go back to the application root directory before following these steps to setup the web application:
+Third, setup the web application:
 
 ```
 curl -sS https://getcomposer.org/installer | php
@@ -66,9 +66,8 @@ Current maintainers:
 - Retno Ika Safitri - [Linkedin](https://www.linkedin.com/in/retnoika/)
 - M. Surya Iksanudin - [Linkedin](https://www.linkedin.com/in/ihsanuddin/)
 - Didiet Noor - [Linkedin](https://www.linkedin.com/in/didiet/)
-- Aftri Marriska - [Linkedin](https://www.linkedin.com/in/aftrimarriska/)
 
-If you are interested in being a core contributor to this project, please drop me an email at __asep@asep.co__.
+If you are interested in being a core contributor to this project, please drop me an email at __asep@tanibox.com__.
 
 ## License
 

app/AppKernel.php

@@ -2,11 +2,16 @@
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Dotenv\Dotenv;
 
 class AppKernel extends Kernel
 {
     public function registerBundles()
     {
+        // load the environment variables
+        $dotenv = new Dotenv();
+        $dotenv->load(dirname(__DIR__).'/.env');
+
         $bundles = [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),

app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig

@@ -2,7 +2,7 @@
 
 <div class="be-content">
     <div class="page-head">
-        <h2 class="page-head-title">User Profile</h2>
+        <h2 class="page-head-title">{% trans from "dashboard" %}User Profile{% endtrans %}</h2>
     </div>
     <div class="main-content container-fluid">
         <div class="row">

app/Resources/FOSUserBundle/views/Registration/register_content.html.twig

@@ -6,12 +6,12 @@
             <div class="row tania">
                 <div class="col-md-6 col-xs-12">
                     <img src="{{ asset('assets/img/tania.png') }}" class="tania-img">
-                    <h2>MANAGE FARMS EASIER &amp; SMARTER</h2>
-                    <p>This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.</p>
+                    <h2>{% trans from "dashboard" %}MANAGE FARMS EASIER &amp; SMARTER{% endtrans %}</h2>
+                    <p>{% trans from "dashboard" %}This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.{% endtrans %}</p>
                 </div>
                 <div class="col-md-6 col-xs-12 loginform">
                     {{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
-                        <span class="splash-title xs-pb-20">Register New User</span>
+                        <span class="splash-title xs-pb-20">{% trans from "dashboard" %}Register New User{% endtrans %}</span>
                         <div class="form-group">
                             {{ form_label(form.email, 'Email') }}
                             {{ form_widget(form.email, {'attr': {'class': 'form-control'}}) }}
@@ -30,7 +30,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="tania-footer">&copy; 2017 Tania. Build for the ♥︎ of plants.</div>
+                <div class="tania-footer">&copy; 2017 Tania. {% trans from "dashboard" %}Build for the ♥︎ of plants.{% endtrans %}</div>
             </div>
         </div>
     </div>

app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig

@@ -9,8 +9,8 @@
             <div class="row tania">
                 <div class="col-md-6 col-xs-12">
                     <img src="{{ asset('assets/img/tania.png') }}" class="tania-img">
-                    <h2>MANAGE FARMS EASIER &amp; SMARTER</h2>
-                    <p>This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.</p>
+                    <h2>{% trans from "dashboard" %}MANAGE FARMS EASIER &amp; SMARTER{% endtrans %}</h2>
+                    <p>{% trans from "dashboard" %}This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.{% endtrans %}</p>
                 </div>
                 <div class="col-md-6 col-xs-12 loginform">
                     <p>
@@ -19,7 +19,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="tania-footer">&copy; 2017 Tania. Build for the ♥︎ of plants.</div>
+                <div class="tania-footer">&copy; 2017 Tania. {% trans from "dashboard" %}Build for the ♥︎ of plants.{% endtrans %}</div>
             </div>
         </div>
     </div>

app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig

@@ -6,12 +6,12 @@
             <div class="row tania">
                 <div class="col-md-6 col-xs-12">
                     <img src="{{ asset('assets/img/tania.png') }}" class="tania-img">
-                    <h2>MANAGE FARMS EASIER &amp; SMARTER</h2>
-                    <p>This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.</p>
+                    <h2>{% trans from "dashboard" %}MANAGE FARMS EASIER &amp; SMARTER{% endtrans %}</h2>
+                    <p>{% trans from "dashboard" %}This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.{% endtrans %}</p>
                 </div>
                 <div class="col-md-6 col-xs-12 loginform">
                     <form action="{{ path('fos_user_resetting_send_email') }}" method="POST" class="fos_user_resetting_request">
-                        <span class="splash-title xs-pb-20">Reset Password</span>
+                        <span class="splash-title xs-pb-20">{% trans from "dashboard" %}Reset Password{% endtrans %}</span>
                         <div class="form-group">
                             <label for="username">{{ 'resetting.request.username'|trans }}</label>
                             <input type="text" id="username" name="username" required="required" class="form-control" />
@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="tania-footer">&copy; 2017 Tania. Build for the ♥︎ of plants.</div>
+                <div class="tania-footer">&copy; 2017 Tania. {% trans from "dashboard" %}Build for the ♥︎ of plants.{% endtrans %}</div>
             </div>
         </div>
     </div>

app/Resources/FOSUserBundle/views/Security/login_content.html.twig

@@ -6,12 +6,12 @@
             <div class="row tania">
                 <div class="col-md-6 col-xs-12">
                     <img src="{{ asset('assets/img/tania.png') }}" class="tania-img">
-                    <h2>MANAGE FARMS EASIER &amp; SMARTER</h2>
-                    <p>This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.</p>
+                    <h2>{% trans from "dashboard" %}MANAGE FARMS EASIER &amp; SMARTER{% endtrans %}</h2>
+                    <p>{% trans from "dashboard" %}This impressive and modern farm management application will help you to manage the operations of your farm in a more intuitive, collaborative, and efficient way.{% endtrans %}</p>
                 </div>
                 <div class="col-md-6 col-xs-12 loginform">
                     <form action="{{ path("fos_user_security_check") }}" method="post">
-                        <span class="splash-title xs-pb-20">Sign In to start working.</span>
+                        <span class="splash-title xs-pb-20">{% trans from "dashboard" %}Sign In to start working.{% endtrans %}</span>
                         {% if error %}
                             <div class="alert alert-danger" role="alert">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
                         {% endif %}
@@ -34,16 +34,16 @@
                             <input type="submit" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans }}" class="btn btn-block btn-primary btn-xl" />
                         </div>
                         <div class="form-group col-xs-12 forgot-link">
-                            <a href="{{ path('fos_user_resetting_request') }}">I forgot my password</a>
+                            <a href="{{ path('fos_user_resetting_request') }}">{% trans from "dashboard" %}I forgot my password{% endtrans %}</a>
                         </div>
                         <div class="form-group col-xs-12">
-                            <p>Have no account? <a href="{{ path('fos_user_registration_register') }}">Sign Up</a> here.</p>
+                            <p>{% trans from "dashboard" %}Have no account?{% endtrans %} <a href="{{ path('fos_user_registration_register') }}">{% trans from "dashboard" %}Sign Up{% endtrans %}</a> {% trans from "dashboard" %}here.{% endtrans %}</p>
                         </div>
                     </form>
                 </div>
             </div>
             <div class="row">
-                <div class="tania-footer">&copy; 2017 Tania. Build for the ♥︎ of plants.</div>
+                <div class="tania-footer">&copy; 2017 Tania. {% trans from "dashboard" %}Build for the ♥︎ of plants.{% endtrans %}</div>
             </div>
         </div>
     </div>