Browse Source

hop

migration_from_v1
Kayn Ty 2 years ago
parent
commit
e98ac442c8
  1. 4
      .env
  2. 4
      .env.production
  3. 0
      .gitignore
  4. 0
      .gitmodules
  5. 0
      .htaccess
  6. 0
      README.md
  7. 0
      composer.json
  8. 23
      composer.lock
  9. 0
      config/bootstrap.php
  10. 0
      config/bundles.php
  11. 0
      config/packages/cache.yaml
  12. 0
      config/packages/dev/jms_serializer.yaml
  13. 0
      config/packages/dev/swiftmailer.yaml
  14. 0
      config/packages/doctrine.yaml
  15. 0
      config/packages/doctrine_migrations.yaml
  16. 0
      config/packages/fos_rest.yaml
  17. 0
      config/packages/framework.yaml
  18. 0
      config/packages/jms_serializer.yaml
  19. 0
      config/packages/nelmio_api_doc.yaml
  20. 0
      config/packages/nelmio_cors.yaml
  21. 0
      config/packages/nelmio_cors.yaml~
  22. 0
      config/packages/prod/doctrine.yaml
  23. 0
      config/packages/prod/jms_serializer.yaml
  24. 0
      config/packages/prod/routing.yaml
  25. 0
      config/packages/routing.yaml
  26. 0
      config/packages/sensio_framework_extra.yaml
  27. 0
      config/packages/swiftmailer.yaml
  28. 0
      config/packages/test/framework.yaml
  29. 0
      config/packages/test/swiftmailer.yaml
  30. 0
      config/packages/test/twig.yaml
  31. 0
      config/packages/test/validator.yaml
  32. 0
      config/packages/twig.yaml
  33. 0
      config/packages/validator.yaml
  34. 0
      config/routes.yaml
  35. 0
      config/routes/annotations.yaml
  36. 0
      config/routes/dev/twig.yaml
  37. 0
      config/routes/nelmio_api_doc.yaml
  38. 0
      config/services.yaml
  39. 0
      doc/examples.md
  40. 0
      doc/nginx.md
  41. 0
      doc/nginx/base-framadate-api.conf
  42. 0
      doc/nginx/base-symfony.conf
  43. 0
      doc/nginx/framadate-api.conf
  44. 0
      doc/nginx/setup.sh
  45. 1
      funky-framadate-front
  46. 16
      public/3rdpartylicenses.txt
  47. 0
      public/assets/css/bootstrap-reboot-4.3.1.css
  48. 0
      public/assets/fonts/proza_libre/prozalibre-bold-webfont.woff
  49. 0
      public/assets/fonts/proza_libre/prozalibre-bold-webfont.woff2
  50. 0
      public/assets/fonts/proza_libre/prozalibre-medium-webfont.woff
  51. 0
      public/assets/fonts/proza_libre/prozalibre-medium-webfont.woff2
  52. 0
      public/assets/fonts/proza_libre/prozalibre-regular-webfont.woff
  53. 0
      public/assets/fonts/proza_libre/prozalibre-regular-webfont.woff2
  54. 0
      public/assets/fonts/proza_libre/prozalibre-semibold-webfont.woff
  55. 0
      public/assets/fonts/proza_libre/prozalibre-semibold-webfont.woff2
  56. 0
      public/assets/fonts/pt_sans/pt_sans_bold-webfont.woff
  57. 0
      public/assets/fonts/pt_sans/pt_sans_bold-webfont.woff2
  58. 0
      public/assets/fonts/pt_sans/pt_sans_regular-webfont.woff
  59. 0
      public/assets/fonts/pt_sans/pt_sans_regular-webfont.woff2
  60. 0
      public/assets/i18n/en.json
  61. 0
      public/assets/i18n/fr.json
  62. 0
      public/assets/img/check-2.svg
  63. 0
      public/assets/img/check.svg
  64. 0
      public/assets/img/croix.svg
  65. 0
      public/assets/img/fleche_bas.png
  66. 0
      public/assets/img/fleche_bas.svg
  67. 0
      public/assets/img/icone-langue.svg
  68. 0
      public/assets/img/icone-menu.svg
  69. 0
      public/assets/img/votant-pas-sur.svg
  70. 0
      public/assets/img/votant-sur.svg
  71. 0
      public/assets/scss/atoms/_buttons.scss
  72. 0
      public/assets/scss/atoms/_fonts.scss
  73. 0
      public/assets/scss/atoms/_forms.scss
  74. 0
      public/assets/scss/atoms/_headings.scss
  75. 0
      public/assets/scss/atoms/_images.scss
  76. 0
      public/assets/scss/atoms/_links.scss
  77. 0
      public/assets/scss/atoms/_lists.scss
  78. 0
      public/assets/scss/atoms/_main.scss
  79. 0
      public/assets/scss/atoms/_section.scss
  80. 0
      public/assets/scss/default.scss
  81. 0
      public/assets/scss/molecules/_debug.scss
  82. 0
      public/assets/scss/molecules/_flex-line.scss
  83. 0
      public/assets/scss/molecules/_logo.scss
  84. 0
      public/assets/scss/useful_classes.scss
  85. 0
      public/assets/scss/variables.scss
  86. 0
      public/color.png
  87. 0
      public/favicon.ico
  88. 0
      public/fleche_bas.svg
  89. 0
      public/fontawesome-webfont.eot
  90. 0
      public/fontawesome-webfont.svg
  91. 0
      public/fontawesome-webfont.ttf
  92. 0
      public/fontawesome-webfont.woff
  93. 0
      public/fontawesome-webfont.woff2
  94. 2
      public/framadate-scripts-bundled.js
  95. 0
      public/hue.png
  96. 0
      public/index.html
  97. 0
      public/index.php
  98. 0
      public/line.gif
  99. 0
      public/loading.gif
  100. 2
      public/main-es2018.js
  101. Some files were not shown because too many files have changed in this diff Show More

4
.env

@ -17,7 +17,7 @@
APP_ENV=dev
APP_SECRET=597b0529ac702d27dcb9089f7e69c362
# Base website url, should contain https:// and having no trailing slash. example: BASE_URL=https://framadate.org
BASE_URL=http://localhost/
BASE_URL=https://framadate-api.cipherbliss.com
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS='^localhost|example\.com$'
###< symfony/framework-bundle ###
@ -27,7 +27,7 @@ BASE_URL=http://localhost/
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11"
# IMPORTANT: You MUST also configure your db driver and server_version in config/packages/doctrine.yaml
DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
DATABASE_URL=mysql://root:plopplop01@127.0.0.1:5432/symfony
###< doctrine/doctrine-bundle ###
###> nelmio/cors-bundle ###

4
.env.production

@ -17,7 +17,7 @@
APP_ENV=prod
APP_SECRET=597b0529ac702d27dcb9089f7e69c362
# Base website url, should contain https:// and having no trailing slash. example: BASE_URL=https://framadate.org
BASE_URL=https://framadate.org
BASE_URL=https://framadate-api.cipherbliss.com
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS='^localhost|example\.com$'
###< symfony/framework-bundle ###
@ -28,6 +28,6 @@ BASE_URL=https://framadate.org
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11"
# IMPORTANT: You MUST also configure your db driver and server_version in config/packages/doctrine.yaml
# CHANGE THIS TO SUIT YOUR PRODUCTION ENV
DATABASE_URL=mysql://db_user:db_password@127.0.0.1:5432/db_name
DATABASE_URL=mysql://root:plopplop01@127.0.0.1:5432/symfony
###< doctrine/doctrine-bundle ###

0
.gitignore vendored

0
.gitmodules vendored

0
composer.json

23
composer.lock generated

@ -2594,35 +2594,34 @@
},
{
"name": "ocramius/package-versions",
"version": "1.5.1",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/Ocramius/PackageVersions.git",
"reference": "1d32342b8c1eb27353c8887c366147b4c2da673c"
"reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c",
"reference": "1d32342b8c1eb27353c8887c366147b4c2da673c",
"url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
"reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0",
"php": "^7.3.0"
"php": "^7.1.0"
},
"require-dev": {
"composer/composer": "^1.8.6",
"doctrine/coding-standard": "^6.0.0",
"composer/composer": "^1.6.3",
"doctrine/coding-standard": "^5.0.1",
"ext-zip": "*",
"infection/infection": "^0.13.4",
"phpunit/phpunit": "^8.2.5",
"vimeo/psalm": "^3.4.9"
"infection/infection": "^0.7.1",
"phpunit/phpunit": "^7.5.17"
},
"type": "composer-plugin",
"extra": {
"class": "PackageVersions\\Installer",
"branch-alias": {
"dev-master": "1.6.x-dev"
"dev-master": "2.0.x-dev"
}
},
"autoload": {
@ -2641,7 +2640,7 @@
}
],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"time": "2019-07-17T15:49:50+00:00"
"time": "2019-11-15T16:17:10+00:00"
},
{
"name": "ocramius/proxy-manager",

0
config/bootstrap.php

0
config/bundles.php

0
config/packages/cache.yaml

0
config/packages/dev/jms_serializer.yaml

0
config/packages/dev/swiftmailer.yaml

0
config/packages/doctrine.yaml

0
config/packages/doctrine_migrations.yaml

0
config/packages/fos_rest.yaml

0
config/packages/framework.yaml

0
config/packages/jms_serializer.yaml

0
config/packages/nelmio_api_doc.yaml

0
config/packages/nelmio_cors.yaml

0
config/packages/nelmio_cors.yaml~

0
config/packages/prod/doctrine.yaml

0
config/packages/prod/jms_serializer.yaml

0
config/packages/prod/routing.yaml

0
config/packages/routing.yaml

0
config/packages/sensio_framework_extra.yaml

0
config/packages/swiftmailer.yaml

0
config/packages/test/framework.yaml

0
config/packages/test/swiftmailer.yaml

0
config/packages/test/twig.yaml

0
config/packages/test/validator.yaml

0
config/packages/twig.yaml

0
config/packages/validator.yaml

0
config/routes.yaml

0
config/routes/annotations.yaml

0
config/routes/dev/twig.yaml

0
config/routes/nelmio_api_doc.yaml

0
config/services.yaml

0
doc/examples.md

0
doc/nginx.md

0
doc/nginx/base-framadate-api.conf

0
doc/nginx/base-symfony.conf

0
doc/nginx/framadate-api.conf

0
doc/nginx/setup.sh

1
funky-framadate-front

@ -1 +0,0 @@
Subproject commit 47adf12bc89e48914c8b801e34b261c23b827fd2

16
public/3rdpartylicenses.txt

@ -162,11 +162,11 @@ OTHER DEALINGS IN THE SOFTWARE.
ngx-clipboard
MIT
ngx-markdown
primeicons
MIT
MIT License
Copyright (c) 2017-2019 Jean-Francois Cere
Copyright (c) 2018 PrimeTek
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -187,14 +187,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
ngx-window-token
primeng
MIT
primeicons
undefined
ngx-markdown
MIT
MIT License
Copyright (c) 2018 PrimeTek
Copyright (c) 2017-2019 Jean-Francois Cere
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -215,11 +217,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
primeng
ngx-window-token
MIT
undefined
primeng/api
primeng/confirmdialog

0
public/assets/css/bootstrap-reboot-4.3.1.css

0
public/assets/fonts/proza_libre/prozalibre-bold-webfont.woff

0
public/assets/fonts/proza_libre/prozalibre-bold-webfont.woff2

0
public/assets/fonts/proza_libre/prozalibre-medium-webfont.woff

0
public/assets/fonts/proza_libre/prozalibre-medium-webfont.woff2

0
public/assets/fonts/proza_libre/prozalibre-regular-webfont.woff

0
public/assets/fonts/proza_libre/prozalibre-regular-webfont.woff2

0
public/assets/fonts/proza_libre/prozalibre-semibold-webfont.woff

0
public/assets/fonts/proza_libre/prozalibre-semibold-webfont.woff2

0
public/assets/fonts/pt_sans/pt_sans_bold-webfont.woff

0
public/assets/fonts/pt_sans/pt_sans_bold-webfont.woff2

0
public/assets/fonts/pt_sans/pt_sans_regular-webfont.woff

0
public/assets/fonts/pt_sans/pt_sans_regular-webfont.woff2

0
public/assets/i18n/en.json

0
public/assets/i18n/fr.json

0
public/assets/img/check-2.svg

Before

Width:  |  Height:  |  Size: 656 B

After

Width:  |  Height:  |  Size: 656 B

0
public/assets/img/check.svg

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

0
public/assets/img/croix.svg

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

0
public/assets/img/fleche_bas.png

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 158 B

0
public/assets/img/fleche_bas.svg

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 426 B

0
public/assets/img/icone-langue.svg

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
public/assets/img/icone-menu.svg

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 417 B

0
public/assets/img/votant-pas-sur.svg

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
public/assets/img/votant-sur.svg

Before

Width:  |  Height:  |  Size: 933 B

After

Width:  |  Height:  |  Size: 933 B

0
public/assets/scss/atoms/_buttons.scss

0
public/assets/scss/atoms/_fonts.scss

0
public/assets/scss/atoms/_forms.scss

0
public/assets/scss/atoms/_headings.scss

0
public/assets/scss/atoms/_images.scss

0
public/assets/scss/atoms/_links.scss

0
public/assets/scss/atoms/_lists.scss

0
public/assets/scss/atoms/_main.scss

0
public/assets/scss/atoms/_section.scss

0
public/assets/scss/default.scss

0
public/assets/scss/molecules/_debug.scss

0
public/assets/scss/molecules/_flex-line.scss

0
public/assets/scss/molecules/_logo.scss

0
public/assets/scss/useful_classes.scss

0
public/assets/scss/variables.scss

0
public/color.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
public/favicon.ico

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
public/fleche_bas.svg

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 426 B

0
public/fontawesome-webfont.eot

0
public/fontawesome-webfont.svg

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 434 KiB

0
public/fontawesome-webfont.ttf

0
public/fontawesome-webfont.woff

0
public/fontawesome-webfont.woff2

2
public/framadate-scripts-bundled.js

File diff suppressed because one or more lines are too long

0
public/hue.png

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 293 B

0
public/index.html

0
public/index.php

0
public/line.gif

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
public/loading.gif

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

2
public/main-es2018.js

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save