Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EscherLabs/Graphene
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0
Choose a base ref
...
head repository: EscherLabs/Graphene
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jan 14, 2020

  1. Copy the full SHA
    f8551d8 View commit details

Commits on Jan 17, 2020

  1. Copy the full SHA
    184ac61 View commit details
  2. Copy the full SHA
    1376dbd View commit details
  3. Copy the full SHA
    768d1b2 View commit details
  4. merge latest form changes

    Cloverstone committed Jan 17, 2020
    Copy the full SHA
    91b6325 View commit details
  5. Copy the full SHA
    1f599b4 View commit details

Commits on Jan 20, 2020

  1. Refactoring Workflow Submissions

    Refactoring of action function.
    Move Permissions for Action from policy to Submission Controller (Action function)
    Allow action specific permissions.
    timcortesi committed Jan 20, 2020
    Copy the full SHA
    395ef07 View commit details
  2. Copy the full SHA
    ed4d9d8 View commit details

Commits on Jan 21, 2020

  1. Changes to Workflow Submissions (See Details)

    Minor Code Cleanup / Refactoring
    Changed "Initiated" to "Submitted" on list of workflows
    Optimized "Bell" counter code / query
    timcortesi committed Jan 21, 2020
    Copy the full SHA
    d080bcb View commit details
  2. Split WorkflowSubmissionController

    WorkflowSubmissionController is now WorkflowSubmissionController and WorkflowSubmissionActionController.  All action logic is now in the action controller and all other logic is in the generic submission controller
    timcortesi committed Jan 21, 2020
    Copy the full SHA
    623e9d9 View commit details

Commits on Jan 22, 2020

  1. Copy the full SHA
    693ca4c View commit details
  2. Copy the full SHA
    322ba46 View commit details
  3. Copy the full SHA
    f7d01a4 View commit details
  4. Copy the full SHA
    8c21c8c View commit details

Commits on Jan 23, 2020

  1. Install Node on AWS ELB

    timcortesi committed Jan 23, 2020
    Copy the full SHA
    2a8ace7 View commit details
  2. Copy the full SHA
    ce7482c View commit details
  3. Copy the full SHA
    ecc7f54 View commit details
  4. Add Node.js to readme

    timcortesi committed Jan 23, 2020
    Copy the full SHA
    e2f2d71 View commit details
  5. Copy the full SHA
    39ec163 View commit details
  6. Copy the full SHA
    71339c3 View commit details

Commits on Jan 28, 2020

  1. utf8encode xml

    timcortesi committed Jan 28, 2020
    Copy the full SHA
    0e768ef View commit details
  2. fix xml parsing

    timcortesi committed Jan 28, 2020
    Copy the full SHA
    7dc5010 View commit details
  3. Copy the full SHA
    3dc42dc View commit details

Commits on Jan 30, 2020

  1. Copy the full SHA
    15c6e62 View commit details
  2. Copy the full SHA
    73f920f View commit details

Commits on Feb 4, 2020

  1. Copy the full SHA
    a52f20d View commit details

Commits on Feb 18, 2020

  1. Copy the full SHA
    7d5ce74 View commit details
  2. Copy the full SHA
    a574c8c View commit details
  3. Copy the full SHA
    b0cc329 View commit details
  4. add php artisan compile

    timcortesi committed Feb 18, 2020
    Copy the full SHA
    7ff2906 View commit details

Commits on Feb 19, 2020

  1. Compile Template Literals

    run "php artisan compile"
    timcortesi committed Feb 19, 2020
    Copy the full SHA
    0d24a0c View commit details
  2. Rename to php artisan compile:templates

    Added widget templates to config
    timcortesi committed Feb 19, 2020
    Copy the full SHA
    5bb78d2 View commit details
  3. Restore old widget.js file

    timcortesi committed Feb 19, 2020
    Copy the full SHA
    18fc065 View commit details
  4. Copy the full SHA
    0055c63 View commit details
  5. Swap out Hogan for Mustache

    This commit replaces the existing compiled admin.js, widget.js, and workflow Hogan compiled js files for gform.m.
    
    If this breaks a bunch of shit -- this change can be reverted. ... but I think crazily enough this looks like it actually works.
    timcortesi committed Feb 19, 2020
    Copy the full SHA
    1c0f21f View commit details
  6. Copy the full SHA
    7a9db70 View commit details
  7. Copy the full SHA
    ed52e5e View commit details
  8. Copy the full SHA
    bf58aaa View commit details
  9. Copy the full SHA
    8eae4f5 View commit details
  10. Copy the full SHA
    80dcd20 View commit details
  11. Copy the full SHA
    e01a579 View commit details

Commits on Feb 20, 2020

  1. Copy the full SHA
    2f983fb View commit details

Commits on Feb 21, 2020

  1. Copy the full SHA
    e4fa9f9 View commit details
  2. Copy the full SHA
    7d86830 View commit details

Commits on Feb 24, 2020

  1. fix assignment issue

    Cloverstone committed Feb 24, 2020
    Copy the full SHA
    868f434 View commit details

Commits on Feb 25, 2020

  1. Copy the full SHA
    d840ab6 View commit details
  2. Fix Permissions Issue

    timcortesi committed Feb 25, 2020
    Copy the full SHA
    89be6b4 View commit details
  3. Copy the full SHA
    c36d370 View commit details
  4. Fix 500 Error on Submit

    timcortesi committed Feb 25, 2020
    Copy the full SHA
    10aea86 View commit details
  5. Copy the full SHA
    f95364d View commit details
Showing with 24,564 additions and 25,333 deletions.
  1. +2 −7 .ebextensions/01migrate.config
  2. +7 −9 .ebextensions/02mountfs.config
  3. +9 −0 .ebextensions/03installnode.config
  4. +14 −0 .ebextensions/04installcron.config
  5. +0 −38 .github/ISSUE_TEMPLATE/bug_report.md
  6. +3 −6 .github/ISSUE_TEMPLATE/{feature_request.md → feature-request.md}
  7. +32 −0 .github/ISSUE_TEMPLATE/issue-report.md
  8. +8 −2 .gitignore
  9. +27 −0 .platform/confighooks/postdeploy/99_write_env_file.sh
  10. +27 −0 .platform/hooks/postdeploy/99_write_env_file.sh
  11. +0 −1 Procfile
  12. +0 −1 _config.yml
  13. +1 −1 app/BulkUser.php
  14. +26 −0 app/Console/Commands/Compile.php
  15. +42 −0 app/Console/Commands/CompileCSS.php
  16. +43 −0 app/Console/Commands/CompileJavaScript.php
  17. +85 −0 app/Console/Commands/CompileTemplates.php
  18. +45 −0 app/Console/Commands/EnvSet.php
  19. +12 −1 app/Console/Kernel.php
  20. +13 −21 app/Exceptions/Handler.php
  21. +11 −5 app/Http/Controllers/APIServerController.php
  22. +20 −2 app/Http/Controllers/AdminController.php
  23. +4 −3 app/Http/Controllers/AppController.php
  24. +66 −51 app/Http/Controllers/AppInstanceController.php
  25. +5 −1 app/Http/Controllers/EllucianMobileController.php
  26. +2 −23 app/Http/Controllers/EndpointController.php
  27. +27 −6 app/Http/Controllers/GroupController.php
  28. +16 −8 app/Http/Controllers/PageController.php
  29. +170 −0 app/Http/Controllers/PublicAPIWorkflowController.php
  30. +108 −0 app/Http/Controllers/ReportController.php
  31. +0 −6 app/Http/Controllers/SiteController.php
  32. +72 −7 app/Http/Controllers/UserController.php
  33. +6 −0 app/Http/Controllers/UserDashboardController.php
  34. +73 −10 app/Http/Controllers/WorkflowController.php
  35. +142 −50 app/Http/Controllers/WorkflowInstanceController.php
  36. +707 −0 app/Http/Controllers/WorkflowSubmissionActionController.php
  37. +153 −429 app/Http/Controllers/WorkflowSubmissionController.php
  38. +45 −26 app/Http/Controllers/WorkflowSubmissionFileController.php
  39. +1 −0 app/Http/Kernel.php
  40. +6 −0 app/Http/Middleware/Initialization.php
  41. +8 −1 app/Http/Middleware/PublicAPIAuth.php
  42. +5 −2 app/Libraries/CASAuth.php
  43. +1 −1 app/Libraries/CustomAuth.php
  44. +59 −10 app/Libraries/HTTPHelper.php
  45. +91 −0 app/Libraries/JSExecHelper.php
  46. +10 −4 app/Libraries/PageRenderer.php
  47. +316 −0 app/Libraries/ResourceService.php
  48. +3 −0 app/Policies/AppInstancePolicy.php
  49. +1 −1 app/Policies/GroupPolicy.php
  50. +0 −1 app/Policies/SitePolicy.php
  51. +22 −0 app/Policies/WorkflowInstancePolicy.php
  52. +14 −10 app/Policies/WorkflowSubmissionPolicy.php
  53. +0 −19 app/ResourceCache.php
  54. +1 −20 app/SiteMember.php
  55. +23 −3 app/WorkflowActivityLog.php
  56. +1 −1 app/WorkflowDeveloper.php
  57. +16 −1 app/WorkflowInstance.php
  58. +71 −6 app/WorkflowSubmission.php
  59. +16 −5 app/WorkflowSubmissionFile.php
  60. +1 −1 app/WorkflowVersion.php
  61. +0 −3 build.sh
  62. +46 −39 composer.json
  63. +4,697 −2,513 composer.lock
  64. +10 −12 config/app.php
  65. +0 −58 config/google.php
  66. +78 −0 config/includes.php
  67. +8 −0 config/mail.php
  68. +30 −0 database/migrations/2020_01_22_000001_add_internal_to_assignment_type.php
  69. +32 −0 database/migrations/2020_05_26_130450_drop_groups_slug_unique_constraint.php
  70. +32 −0 database/migrations/2020_10_21_155739_add_signature_to_workflow_activity_log_table.php
  71. +34 −0 database/migrations/2021_01_06_000000_add_title_comment_to_workflow_submissions_table.php
  72. +0 −19 gulpfile.js
  73. +0 −10,441 package-lock.json
  74. +0 −21 package.json
  75. BIN public/.DS_Store
  76. +27 −2 public/.htaccess
  77. BIN public/assets/.DS_Store
  78. 0 public/assets/compiled/css/graphenecore.body.min.css
  79. BIN public/assets/compiled/css/graphenecore.body.min.css.gz
  80. +16 −0 public/assets/compiled/css/graphenecore.head.min.css
  81. +3,306 −0 public/assets/compiled/js/graphenecore.body.min.js
  82. BIN public/assets/compiled/js/graphenecore.body.min.js.gz
  83. 0 public/assets/compiled/js/graphenecore.head.min.js
  84. +0 −420 public/assets/css/admin.css
  85. +10 −0 public/assets/css/colorpicker.min.css
  86. +416 −393 public/assets/css/dropzone.css
  87. +46 −2 public/assets/css/graphene.css
  88. BIN public/assets/img/.DS_Store
  89. BIN public/assets/img/bootstrap-colorpicker/alpha-horizontal.png
  90. BIN public/assets/img/bootstrap-colorpicker/alpha.png
  91. BIN public/assets/img/bootstrap-colorpicker/hue-horizontal.png
  92. BIN public/assets/img/bootstrap-colorpicker/hue.png
  93. BIN public/assets/img/bootstrap-colorpicker/saturation.png
  94. +60 −328 public/assets/js/APIServer_api_edit.js
  95. +317 −0 public/assets/js/appEngines/gAE_0001.js
  96. +89 −48 public/assets/js/{ → appEngines}/grapheneAppEngine.js
  97. +32 −0 public/assets/js/appEngines/vue_0001.js
  98. +33 −14 public/assets/js/cob/cob.js
  99. +2 −1 public/assets/js/cob/content.cob.js
  100. +0 −1 public/assets/js/cob/{form.cob.js → deprecated_form.cob.js}
  101. +0 −64 public/assets/js/cob/email_flow.cob.js
  102. +941 −742 public/assets/js/cob/flow.cob.js
  103. +519 −623 public/assets/js/cob/flow.report.cob.js
  104. +11 −10 public/assets/js/cob/image.cob.js
  105. +1 −1 public/assets/js/cob/links.cob.js
  106. +45 −26 public/assets/js/cob/uapp.cob.js
  107. 0 public/assets/js/{paged.js → deprecated_paged.js}
  108. +421 −128 public/assets/js/editApp.js
  109. +733 −202 public/assets/js/editWorkflow.js
  110. +0 −815 public/assets/js/editWorkflowOld.js
  111. +1 −3 public/assets/js/fileManager.js
  112. +6 −0 public/assets/js/grapheneWorker.js
  113. +1,283 −33 public/assets/js/lib.js
  114. +4 −0 public/assets/js/lodash.shim.js
  115. +1 −1 public/assets/js/resources/APIServer_activity_log.js
  116. +9 −42 public/assets/js/resources/APIServer_api_instance.js
  117. +12 −35 public/assets/js/resources/APIServer_api_instances.js
  118. +1 −1 public/assets/js/resources/APIServer_api_versions.js
  119. +7 −14 public/assets/js/resources/APIServer_apis.js
  120. +10 −10 public/assets/js/resources/APIServer_environments.js
  121. +15 −17 public/assets/js/resources/APIServer_resources.js
  122. +67 −58 public/assets/js/resources/APIServer_schedule.js
  123. +16 −10 public/assets/js/resources/APIServer_users.js
  124. +16 −98 public/assets/js/resources/admins.js
  125. +8 −10 public/assets/js/resources/api_users.js
  126. +139 −124 public/assets/js/resources/app_instance.js
  127. +13 −63 public/assets/js/resources/appdevelopers.js
  128. +48 −152 public/assets/js/resources/appinstances.js
  129. +25 −26 public/assets/js/resources/apps.js
  130. +12 −39 public/assets/js/resources/composites.js
  131. +429 −173 public/assets/js/resources/creators.js
  132. +23 −22 public/assets/js/resources/endpoints.js
  133. +4 −6 public/assets/js/resources/group.js
  134. +38 −48 public/assets/js/resources/groups.js
  135. +34 −35 public/assets/js/resources/images.js
  136. +43 −20 public/assets/js/resources/links.js
  137. +23 −67 public/assets/js/resources/members.js
  138. +37 −116 public/assets/js/resources/pages.js
  139. +162 −96 public/assets/js/resources/site.js
  140. +11 −10 public/assets/js/resources/sites.js
  141. +8 −10 public/assets/js/resources/tags.js
  142. +59 −44 public/assets/js/resources/users.js
  143. +151 −134 public/assets/js/resources/workflow_instance.js
  144. +40 −0 public/assets/js/resources/workflow_instance_raw_data.js
  145. +75 −35 public/assets/js/resources/workflow_instance_report.js
  146. +14 −63 public/assets/js/resources/workflowdevelopers.js
  147. +57 −148 public/assets/js/resources/workflowinstances.js
  148. +30 −26 public/assets/js/resources/workflows.js
  149. +18 −15 public/assets/js/templates/admin.js
  150. +18 −15 public/assets/js/templates/widget.js
  151. +17 −16 public/assets/js/templates/workflow.js
  152. +205 −194 public/assets/js/vendor/GrapheneDataGrid.min.js
  153. +0 −1 public/assets/js/vendor/berry.full.js
  154. +31 −0 public/assets/js/vendor/bluebird.min.js
  155. +5 −1 public/assets/js/vendor/colorpicker.min.js
  156. +394 −377 public/assets/js/vendor/dropzone/dropzone.min.css
  157. +1 −2 public/assets/js/vendor/dropzone/dropzone.min.js
  158. +5,483 −3 public/assets/js/vendor/gform_bootstrap.min.js
  159. +0 −36 public/assets/js/vendor/moment_datepicker.js
  160. +5 −0 public/assets/js/vendor/popper.min.js
  161. +1 −0 public/assets/js/vendor/signaturePad.min.js
  162. +200 −64 public/assets/js/workflow.cob.js
  163. +8 −5 readme.md
  164. +0 −20 resources/assets/js/app.js
  165. +0 −45 resources/assets/js/bootstrap.js
  166. +0 −23 resources/assets/js/components/Example.vue
  167. +23 −11 resources/assets/mustache/admin/admin_dashboard.mustache
  168. +1 −1 resources/assets/mustache/admin/api_instance.mustache
  169. +2 −2 resources/assets/mustache/admin/group_summary.mustache
  170. +29 −11 resources/assets/mustache/admin/site.mustache
  171. +1 −1 resources/assets/mustache/admin/workflow_instance.mustache
  172. +2 −2 resources/assets/mustache/workflow/assignments.js
  173. +1 −1 resources/assets/mustache/workflow/file_summary.js
  174. +1 −1 resources/assets/mustache/workflow/history.js
  175. +1 −1 resources/assets/mustache/workflow/links.js
  176. +6 −3 resources/assets/mustache/workflow/report.js
  177. +0 −1 resources/assets/mustache/workflow/status.js
  178. +0 −1 resources/assets/mustache/workflow/workflow.js
  179. +19 −19 resources/assets/mustache/workflow/workflows.js
  180. +0 −37 resources/assets/sass/_variables.scss
  181. +0 −9 resources/assets/sass/app.scss
  182. +57 −95 resources/views/APIServer.blade.php
  183. +135 −33 resources/views/admin.blade.php
  184. +8 −27 resources/views/adminAPI.blade.php
  185. +12 −39 resources/views/adminApp.blade.php
  186. +46 −97 resources/views/adminDashboard.blade.php
  187. +16 −41 resources/views/adminWorkflow.blade.php
  188. +2 −2 resources/views/auth/login.blade.php
  189. +11 −17 resources/views/dashboard.blade.php
  190. +22 −21 resources/views/default/APIServer.blade.php
  191. +22 −22 resources/views/default/admin.blade.php
  192. +1 −1 resources/views/default/guest.blade.php
  193. +67 −102 resources/views/mustache/partials/core_engine.mustache
  194. +22 −13 resources/views/mustache/partials/core_head.mustache
  195. +1 −1 resources/views/mustache/partials/notifications.mustache
  196. +3 −3 resources/views/mustache/partials/titlebar.mustache
  197. +4 −7 resources/views/setup.blade.php
  198. +15 −0 routes/api.php
  199. +3 −3 routes/web.php
  200. +33 −6 routes/workflows.php
  201. +0 −19 widget_templates.js
  202. +0 −4,351 yarn.lock
9 changes: 2 additions & 7 deletions .ebextensions/01migrate.config
Original file line number Diff line number Diff line change
@@ -8,12 +8,6 @@ container_commands:
leader_only: true
04set_time_zone:
command: "ln -f -s /usr/share/zoneinfo/US/Eastern /etc/localtime"
# 05optimization:
# command: "php artisan config:cache"
# 06optimization:
# command: "php artisan route:cache"
# 07optimization:
# command: "php artisan optimize --force"
files:
"/etc/php.d/project.ini" :
mode: "000644"
@@ -23,4 +17,5 @@ files:
upload_max_filesize = 64M
post_max_size = 64M
max_input_vars = 1000000
memory_limit = 256M
memory_limit = 256M
default_socket_timeout = 150
16 changes: 7 additions & 9 deletions .ebextensions/02mountfs.config
Original file line number Diff line number Diff line change
@@ -30,17 +30,16 @@

option_settings:
aws:elasticbeanstalk:application:environment:
FILE_SYSTEM_ID: '`{"Ref" : "FileSystem"}`'
MOUNT_DIRECTORY: '/efs'

##############################################
#### Do not modify values below this line ####
##############################################
REGION: '`{"Ref": "AWS::Region"}`'

packages:
yum:
nfs-utils: []
jq: []
amazon-efs-utils: []

commands:
01_mount:
@@ -52,11 +51,10 @@ files:
content : |
#!/bin/bash

EFS_REGION=$(/opt/elasticbeanstalk/bin/get-config environment | jq -r '.REGION')
EFS_MOUNT_DIR=$(/opt/elasticbeanstalk/bin/get-config environment | jq -r '.MOUNT_DIRECTORY')
EFS_FILE_SYSTEM_ID=$(/opt/elasticbeanstalk/bin/get-config environment | jq -r '.FILE_SYSTEM_ID')
EFS_MOUNT_DIR=$(/opt/elasticbeanstalk/bin/get-config environment -k MOUNT_DIRECTORY)
EFS_FILE_SYSTEM_ID=$(/opt/elasticbeanstalk/bin/get-config environment -k FILE_SYSTEM_ID)

echo "Mounting EFS filesystem ${EFS_DNS_NAME} to directory ${EFS_MOUNT_DIR} ..."
echo "Mounting EFS filesystem ${EFS_FILE_SYSTEM_ID} to directory ${EFS_MOUNT_DIR} ..."

echo 'Stopping NFS ID Mapper...'
service rpcidmapd status &> /dev/null
@@ -84,8 +82,8 @@ files:

mountpoint -q ${EFS_MOUNT_DIR}
if [ $? -ne 0 ]; then
echo "mount -t nfs4 -o nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2 ${EFS_FILE_SYSTEM_ID}.efs.${EFS_REGION}.amazonaws.com:/ ${EFS_MOUNT_DIR}"
mount -t nfs4 -o nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2 ${EFS_FILE_SYSTEM_ID}.efs.${EFS_REGION}.amazonaws.com:/ ${EFS_MOUNT_DIR}
echo "mount -t efs -o tls ${EFS_FILE_SYSTEM_ID}:/ ${EFS_MOUNT_DIR}"
mount -t efs -o tls ${EFS_FILE_SYSTEM_ID}:/ ${EFS_MOUNT_DIR}
if [ $? -ne 0 ] ; then
echo 'ERROR: Mount command failed!'
exit 1
9 changes: 9 additions & 0 deletions .ebextensions/03installnode.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
commands:
01_add_node_repo:
cwd: /tmp
test: '[ ! -f /etc/yum.repos.d/nodesource-el7.repo ] && echo "node repo does not exist"'
command: 'curl -sL https://rpm.nodesource.com/setup_12.x | sudo -E bash -'
02_node_install:
cwd: /tmp
test: '[ ! -f /usr/bin/node ] && echo "node not installed"'
command: 'yum -y install nodejs'
14 changes: 14 additions & 0 deletions .ebextensions/04installcron.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
files:
"/etc/cron.d/graphene_every_minute":
mode: "000644"
owner: root
group: root
content: |
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

# Run Manually Via Artisan (Requires PHP Config exists in command line PHP)
* * * * * webapp cd /var/app/current; /usr/bin/php artisan schedule:run >> /var/app/current/storage/logs/cron.log 2>&1

commands:
remove_old_cron:
command: "rm -f /etc/cron.d/graphene_every_minute.bak"
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: Feature request
about: Suggest an idea for this project
name: Feature Request
about: Suggest a new feature for Graphene or one of its subsystems
title: ''
labels: ''
labels: enhancement
assignees: ''

---
@@ -13,8 +13,5 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Issue Report
about: Information regarding a behavior which is unexpected or incorrect
title: ''
labels: bug
assignees: ''

---

**Description**
A clear and concise description of the issue you are experiencing, as well as how that behavior deviated from what you expected to occur.

**Feature / Subsystem**
What Graphene feature or subsystem does this pertain to? (Examples: Workflows, MicroApps, Forms, Data Grids, API Gateway, etc)

**To Reproduce**
Steps to reproduce the behavior.
(This should be as detailed as possible and should, if possible, reference an example where this behavior is easily reproducible and happens consistently. Do not provide vague steps that are difficult to understand or yield inconsistent results)
1. Go to '...'
2. Click on '...'
3. Scroll down to '...'
4. See error

**Console Errors**
From the developer console, please paste any _relevant_ errors you are experiencing.

**Link(s)**
Provide any relevant links which display the issue you are experiencing. Wherever possible, this should point to a purpose-built example which clearly displays the behavior in question.
(Unless there are issues related to permissions or privacy, this section should never be left blank)

**Additional context**
Add any other context about the problem here. (screenshots, etc)
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,9 +10,15 @@ Homestead.json
/storage/cache/mustache/*
!/storage/cache/mustache/.gitkeep

config/database.php

# Elastic Beanstalk Files
.elasticbeanstalk/*
!.elasticbeanstalk/*.cfg.yml
!.elasticbeanstalk/*.global.yml

# Don't Include .idea and DS_Store
.idea
.DS_Store

Procfile
_config.yml
build.sh
27 changes: 27 additions & 0 deletions .platform/confighooks/postdeploy/99_write_env_file.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env bash

## This is a post deployment script which is intended to run on
## Elastic Beanstalk: Amazon Linux 2. It copies the Elastic Beanstalk
## Environment Variables into a local .env file in the production
## app deployment directory, and allows command-line based commands
## like php artisan to function correctly.

# Target .env file location:
DOTENV_FILE="/var/app/current/.env"

# Extract the Elastic Beanstalk Environment Configuration Data
ENVIRONMENT_JSON=`/opt/elasticbeanstalk/bin/get-config environment`

# Clear out any existing .env file data
cat /dev/null > $DOTENV_FILE

# Convert the ENVIRONMENT_JSON to .env file format
while read -rd $'' line
do
echo "$line" >> $DOTENV_FILE
done < <(jq -r <<< $ENVIRONMENT_JSON \
'to_entries|map("\(.key)=\"\(.value)\"\u0000")[]')

# Run Graphene Compilation Script and Update .env
cd /var/app/current
/usr/bin/php artisan compile
27 changes: 27 additions & 0 deletions .platform/hooks/postdeploy/99_write_env_file.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env bash

## This is a post deployment script which is intended to run on
## Elastic Beanstalk: Amazon Linux 2. It copies the Elastic Beanstalk
## Environment Variables into a local .env file in the production
## app deployment directory, and allows command-line based commands
## like php artisan to function correctly.

# Target .env file location:
DOTENV_FILE="/var/app/current/.env"

# Extract the Elastic Beanstalk Environment Configuration Data
ENVIRONMENT_JSON=`/opt/elasticbeanstalk/bin/get-config environment`

# Clear out any existing .env file data
cat /dev/null > $DOTENV_FILE

# Convert the ENVIRONMENT_JSON to .env file format
while read -rd $'' line
do
echo "$line" >> $DOTENV_FILE
done < <(jq -r <<< $ENVIRONMENT_JSON \
'to_entries|map("\(.key)=\"\(.value)\"\u0000")[]')

# Run Graphene Compilation Script and Update .env
cd /var/app/current
/usr/bin/php artisan compile
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion app/BulkUser.php
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@
class BulkUser extends Authenticatable
{
protected $table = 'users';
protected $hidden = ['password', 'remember_token','created_at','updated_at','invalidate_cache','id'];
protected $hidden = ['password','remember_token','created_at','updated_at','invalidate_cache'];
protected $casts = ['params' => 'object'];
}
26 changes: 26 additions & 0 deletions app/Console/Commands/Compile.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use MatthiasMullie\Minify;
use Illuminate\Support\Str;

class Compile extends Command
{
protected $config = [];
protected $signature = 'compile';
protected $description = 'Compile Everything';

public function __construct() {
parent::__construct();
}

public function handle() {
$this->call('compile:templates');
$this->line("");
$this->call('compile:javascript');
$this->line("");
$this->call('compile:css');
}
}
42 changes: 42 additions & 0 deletions app/Console/Commands/CompileCSS.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use MatthiasMullie\Minify;
use Illuminate\Support\Str;

class CompileCSS extends Command
{
protected $config = [];
protected $signature = 'compile:css';
protected $description = 'Runs all CSS minification';

public function __construct() {
parent::__construct();
$this->config = config('includes.css');
}

public function handle() {
$this->line("<fg=green>Minifiying CSS ...</>");
$this->line("<head> tags");
$minifier = new Minify\CSS();
foreach($this->config['src']['head'] as $css) {
$minifier->add(public_path($css['file']));
}
$minifier->minify(public_path($this->config['min']['head']));

$this->line("<body> tags");
$minifier = new Minify\CSS();
foreach($this->config['src']['body'] as $css) {
$minifier->add(public_path($css['file']));
}
$minifier->minify(public_path($this->config['min']['body']));
$minifier->gzip(public_path($this->config['min']['body'].'.gz'));
$this->line("<fg=green>Complete!</>");
$this->line("<fg=yellow>Incrementing Cache Bust ID ...</>");
$this->call('env:set', [
'name' => 'CACHE_BUST_ID', 'value' => Str::random()
]);
}
}
43 changes: 43 additions & 0 deletions app/Console/Commands/CompileJavaScript.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use MatthiasMullie\Minify;
use Illuminate\Support\Str;

class CompileJavaScript extends Command
{
protected $config = [];
protected $signature = 'compile:javascript';
protected $description = 'Runs all javascript minification';

public function __construct() {
parent::__construct();
$this->config = config('includes.javascript');
}

public function handle() {
$this->line("<fg=green>Minifiying JavaScript ...</>");
$this->line("<head> tags");
$minifier = new Minify\JS();
foreach($this->config['src']['head'] as $js) {
$minifier->add(public_path($js['file']));
}
$minifier->minify(public_path($this->config['min']['head']));

$this->line("<body> tags");
$minifier = new Minify\JS();
foreach($this->config['src']['body'] as $js) {
$minifier->add(public_path($js['file']));
}
$minifier->minify(public_path($this->config['min']['body']));
$minifier->gzip(public_path($this->config['min']['body'].'.gz'));
$this->line("<fg=green>Complete!</>");

$this->line("<fg=yellow>Incrementing Cache Bust ID ...</>");
$this->call('env:set', [
'name' => 'CACHE_BUST_ID', 'value' => Str::random()
]);
}
}
Loading