diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100755 index 00000000..55bcd85f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ +code_quality: + image: docker:stable + variables: + DOCKER_DRIVER: overlay2 + allow_failure: true + services: + - docker:stable-dind + script: + - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') + - docker run + --env SOURCE_CODE="$PWD" + --volume "$PWD":/code + --volume /var/run/docker.sock:/var/run/docker.sock + "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code + artifacts: + paths: [gl-code-quality-report.json] diff --git a/.gitmodules b/.gitmodules index aab1e5db..0162f57f 100755 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "caisse-bliss-frontend"] - path = web/caisse-bliss-frontend - url = https://gitlab.com/tykayn1/caisse-bliss-frontend + path = caisse-bliss-frontend + url = https://framagit.org/tykayn/caisse-bliss-frontend.git diff --git a/LICENSE b/LICENSE index 049503f8..54cad125 100755 --- a/LICENSE +++ b/LICENSE @@ -629,8 +629,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fanzine-log - Copyright (C) 2018 Kayn Ty + caisse-bliss + Copyright (C) 2018 ty kayn This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/README.md b/README.md index e530df95..3a1f4f38 100755 --- a/README.md +++ b/README.md @@ -1,32 +1,48 @@ -Blueprint Cipherbliss + +![alt text][logo] + +Caisse | Cipher Bliss ==== +Self hosted mobile and desktop Cash register and money management for your small business. Made after years of experience in the art of selling home made books and drawings during events like Japan Expo. +![alt_text][screenshot_home] -A Symfony project created on March 23, 2018, 2:09 pm. +A Symfony project created on March 23, 2018. -Features: -bootstrap, font awesome, user bundle +## Features: +* live selling and stock update on phone and desktop +* multi user registration +* managing products, categories +* forecast of expenses +* events +* statistics about earnings +* history of client purchases +* import and export your products and selling history +* have a look at where your expenses go during selling events +* all in a libre software in PHP/JS -install dependencies: -```bash -bash install.sh -``` -edit parameters.yml to link to your mysql server +--- +## [Install](/docs/installation.md) +Have a look at the [Docs to install](/docs/installation.md) your own Caisse. All documentation is in the "docs" folder. +Made By Tykayn/CipherBliss under [AGPL Licence](LICENSE). +## News +Ipublish news about this app here: +https://www.cipherbliss.com -update schema with doctrine - ```bash -php bin/console doctrine:schema:update --dump-sql -php bin/console doctrine:schema:update --force -``` -compile front end assets -```bash -yarn run encore dev --watch -``` +So here is a tag: https://www.cipherbliss.com/tag/caisse/ -access the front with your browser -```bash -php bin/console server:run -firefox http://http://127.0.0.1:8000/ -``` -enjoy! +You can follow the website with RSS/atom feeds. +https://www.cipherbliss.com/feed/ -www.cipherbliss.com + +## Where to find help +Join the discussion at the Matrix Channel of CipherBliss: +[#cipherbliss:matrix.org](https://matrix.to/#/!jfoYESqTObXYlKAOVM:matrix.org?via=matrix.org) +Or contact the Author: +[Contact Choices here](https://www.cipherbliss.com/contact) + + +[logo]: https://www.cipherbliss.com/wp-content/uploads/2016/12/rond.png "Logo of CipherBliss company" +[screenshot_home]: https://www.cipherbliss.com/wp-content/uploads/2018/09/caisse_bliss_descritpion_open_source_cipherbliss-1260x709.png "Screenshot of Caisse Bliss" + +Hosted on Framagit.org +https://framagit.org/tykayn/caisse-bliss.git diff --git a/translations/.gitignore b/TEST similarity index 100% rename from translations/.gitignore rename to TEST diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig index 6c3d0cc1..dcce969a 100755 --- a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig +++ b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'FOSUserBundle' %} + {{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }} {{ form_widget(form) }} diff --git a/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig index 41af21de..3d64ae20 100755 --- a/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig @@ -1,6 +1,5 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}

{{ 'registration.check_email'|trans({'%email%': user.email}) }}

diff --git a/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig index 4402b4f7..a06915c7 100755 --- a/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig @@ -1,6 +1,5 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}

{{ 'registration.confirmed'|trans({'%username%': user.username}) }}

diff --git a/app/Resources/FOSUserBundle/views/Registration/email.txt.twig b/app/Resources/FOSUserBundle/views/Registration/email.txt.twig index acbc6852..d853b6d3 100755 --- a/app/Resources/FOSUserBundle/views/Registration/email.txt.twig +++ b/app/Resources/FOSUserBundle/views/Registration/email.txt.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {% block subject %} {%- autoescape false -%} {{ 'registration.email.subject'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}) }} diff --git a/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig index f05eac7b..0245476b 100755 --- a/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} {{ form_widget(form) }} diff --git a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig index 36b93037..97d0f4e7 100755 --- a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig +++ b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig @@ -1,5 +1,4 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}
diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig index a55b2b29..f06bbb7b 100755 --- a/app/Resources/FOSUserBundle/views/Security/login.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig @@ -1,5 +1,4 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}
@@ -9,37 +8,6 @@ Se connecter - {% if error %} -
{{ error.messageKey|trans(error.messageData, 'security') }}
- {% endif %} - -
- {% if csrf_token %} - - {% endif %} -
- - - -
-
- - - - -
-
- - - - -
- - -
category-listing -
@@ -61,7 +29,42 @@
+
+
+
+ + {% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+ {% endif %} + +
+ {% if csrf_token %} + + {% endif %} +
+ + + +
+
+ + + + +
+
+ + +
+ + +
+
+
+
{% endblock %} diff --git a/app/Resources/FOSUserBundle/views/Security/login_content.html.twig b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig index 6daf8b92..8b149f3a 100755 --- a/app/Resources/FOSUserBundle/views/Security/login_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig @@ -1,5 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} - {% if error %}
{{ error.messageKey|trans(error.messageData, 'security') }}
{% endif %} diff --git a/app/Resources/FOSUserBundle/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig index 40c44d0e..2731764c 100755 --- a/app/Resources/FOSUserBundle/views/layout.html.twig +++ b/app/Resources/FOSUserBundle/views/layout.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block title %}Caisse{% endblock %} {% block bigMain %} diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig index aea1b572..03a26456 100755 --- a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {% extends '@HWIOAuth/layout.html.twig' %} {% block bigMain %} {% include 'default/header.html.twig' %} diff --git a/app/Resources/HWIOAuthBundle/views/layout.html.twig b/app/Resources/HWIOAuthBundle/views/layout.html.twig index 7cefaf9b..7cbdf755 100755 --- a/app/Resources/HWIOAuthBundle/views/layout.html.twig +++ b/app/Resources/HWIOAuthBundle/views/layout.html.twig @@ -5,7 +5,6 @@

Le login

- {% trans_default_domain 'FOSUserBundle' %} {% if error %}
{{ error|trans }}
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 791250c1..b5de6a5b 100755 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,10 +1,11 @@ +{% trans_default_domain 'messages' %} - {% block title %}Fiche de compte dynamique{% endblock %} + {% block title %} {% trans %}menu.title{% endtrans %} - Fiche de compte dynamique{% endblock %} {% block stylesheets %} {% endblock %} @@ -16,13 +17,14 @@
{% block bigMain %} - {% include 'default/header.html.twig' %} -
- - {% block body %} - {% endblock %} -
- {% include 'default/footer.html.twig' %} + {% include 'default/header.html.twig' %} +
+
+ {% block body %} + {% endblock %} +
+
+ {% include 'default/footer.html.twig' %} {% endblock %}
{% block javascripts %} diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig index 46df9446..bcc69a39 100755 --- a/app/Resources/views/default/description-app.html.twig +++ b/app/Resources/views/default/description-app.html.twig @@ -1,46 +1,48 @@
-
+
-

Gratuit

-

Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un - inventaire et des feuilles de calcul faites à l'arrache.

+

{% trans %}home.specs.free{% endtrans %}

+

{% trans %}home.specs.free_text{% endtrans %}

-
+
-

Flexible

-

Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de - responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface - d'importation simplifiée.

+

{% trans %}home.specs.flex{% endtrans %}

+

{% trans %}home.specs.flex_text{% endtrans %}

-
+
-

Portable

-

Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que - simplifiée.

+

{% trans %}home.specs.portable{% endtrans %}

+

{% trans %}home.specs.portable_text{% endtrans %}

-
+
-

Open Source

-

Auto hébergeable et modifiable à volonté. Sources disponible sur - gitlab. - Développé par - CipherBliss - . +

{% trans %}home.specs.open{% endtrans %}

+

{% trans %}home.specs.open_text{% endtrans %} +

-
+
-

Statistiques

-

Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.

+

{% trans %}home.specs.stats{% endtrans %}

+

+ {% trans %}home.specs.stats_text{% endtrans %} +

-
+
-

Data Love

-

Données exportables et importables en masse librement.

+

{% trans %}home.specs.data{% endtrans %}

+

{% trans %}home.specs.data_text{% endtrans %}

diff --git a/app/Resources/views/default/footer.html.twig b/app/Resources/views/default/footer.html.twig index 31217888..44a21139 100755 --- a/app/Resources/views/default/footer.html.twig +++ b/app/Resources/views/default/footer.html.twig @@ -1,6 +1,6 @@
-
- développé par Tykayn / + + {% trans %}global.made_by{% endtrans %} Tykayn / Cipher Bliss @@ -10,5 +10,4 @@ contact -
diff --git a/app/Resources/views/default/header.html.twig b/app/Resources/views/default/header.html.twig index e1178f2a..f70fb3f3 100755 --- a/app/Resources/views/default/header.html.twig +++ b/app/Resources/views/default/header.html.twig @@ -1,15 +1,11 @@ -
-