Skip to content

Commit

Permalink
Squashed 'CRISPRessoWEB/CRISPRessoReports/' changes from 461ca93..1ef…
Browse files Browse the repository at this point in the history
…ad70

1efad70 Replace tabs with spaces and reindent template files
e7ef285 Fix hamburger menu and add -bs- to data-target and data-toggle
df896b0 Resize images and fix filepath
2f70855 Add spacing around body and footer tags
5cd6d27 Final style fixes, color circles for style files
f8d7d92 Merge commit 'e7de9b7745a71bbc9fedf2c8fc6396fcc898f2c5' as 'CRISPRessoWEB/CRISPRessoReports'
321815d Removing CRISPRessoReport files
17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes
84174e6 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93
04558fb Remove extra files
8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix
980fdc4 Styling and bootstrap changes
9d40474 Centering issue and submit button fix
aa5071c Subtree working
db30843 Jinja choice loader
3b67ac0 Path correction
3aaca48 Bootstrap 5 and partials changes
8f5d8a1 Layout.html for C2WEB and CLI
290d829 Fix error when rendering multi reports
546397a summaries partials and html updates
858a751 fig_reports and replacement
073f1fe Added a few changes from the selenium-tests branch on C2Web
1061ebb Update indentation in report.html and extract log params into partial
c3781e9 Update path to template directory to include `CRISPRessoReports`
84e0969 Use the `render_template` function for each report
ee721b3 Add function to render template partials without using Flask
08fcd4e Web updates refactoring done
99c8e22 Adding files
ef333f0 Removing reports found in subtree
1bae0df Commit before adding subtree
1fbb427 Add server file to render js
d1d6fdf Move styling to main.css file
1241569 Jinja partials for all submissions
0534637 New submission.js template file
c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial
ecd03f6 Working file upload in partial.
ce5d20f Working, missing custom label
6ba73e7 Bootstrap 5 changes
e05d146 Layout and report update
517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion
ea44128 Move where the style files are stored in Docker
7f03e98 Implement creating styles from the admin panel
9b27a2e Rename style_file references to style
a233d10 Add some default styles and rename the default to "Original"
43a8d29 Remove style file card from admin index page
1a8f332 Refactor saving style files when there is no name specified
64a7b1c Implement color pickers in style admin view
17c93c1 Succesfully implemented selecting default style
fd79cdd Restyle the colors in the admin view
3cd94b8 Fix error when the default style can't be read from the database
5e626bd Refactor `style_handler` to read the style from the database
0f66d4a Refactor styles to be part of the database instead of files
6c7d3c8 Move style folder inside of server folder
9f71f21 Add margins around style file elements
2a28549 Restyle the color pickers
2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files
dc4f2c7 Style dropdown - allow save json only for admin
15e7483 Style file check
7bd0e91 Remove style from Compare
0ab45f5 Colors function refactored and working for all types
2e24f8b Adding styling
d6621f1 Debuging
ed00c82 Merge with master
5150f9b Adding style_files to partial
957a9ca Add style files to pooled and wgs
66dc2d3 Changes to pooled and wgs, reset Dockerfile
fa6b1cf Updated Docker file and style_files.html
ee0fcfc Optional save file
229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder
0f26e2c Working style FileAdmin, access button, and further partial refactoring
b3b70bd Rough framework for style admin page
e4731d7 Style menu completed
1bb37bc New style menu with tabs
58f7e56 Tabs for different style options
3de893d Compare (#34)
e66bef1 Update AWS EB instructions.docx
658a218 Fix bug when trying to send recovery password with bad email creds
ee32e36 Adding color-picker partial to wgs and pooled
34ea688 Fix for responsiveness on cup and title
f0c4d07 Adding color routes to other versions
110fe14 Color picker input added to cmd_to_run
e732478 Names for color fields
2934631 Jinja partial for color picker and pip install in dockerfile
48bbf9c Cup animation (#33)
2905248 Selenium tests (#31)
5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides
570e42a Don't remove commas from amplicons or guides
0d70425 Add smallGenome.fa
fc33197 Writing text for pooled
dccfcb3 Files for testing
4cea67c Changes for WGS selenium tests. All tests functional.
ff05713 Changes for WGS selenium test file loading
495a98d Changes for pooled testing
0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix
127eb8f PopulatePooled error
30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests
7847687 Add link to CRISPRessoWGS from profile page and change header
666f73b Remove example block from CRISPRessoWGS submission page
27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled
8d979a4 Fix bug where files_to_delete was being replaced and standardize append
09e55fc Changes to make interleaved and pooled tests possible
f89eca8 Changes necessary for selenium tests
3efe4f9 Clean up test files
a696363 Merge pull request #28 from edilytics/s3
dcef708 Remove changes for CRISPRessoCompare
e0c79cf Add demo config file for eb
03aba8e Update AWS EB instructions.docx
a671c4e Set version to 2.6.3
3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled
da5b15b Timezone for history is displayed in user local timezone
e11691f Update history to show time of previous run
be675fb Update pooled with s3
4c7d429 Add data links to pooled report
353e88f Update admin portal landing page
712e828 Show run type in history
2802252 s3 and user updates
efc3ed8 S3 error catching
af68341 New S3 Validation
f7d64e0 AWS validation before submission
8446093 Update s3 for batch and paired modes
0e7d327 S3_Upload function imrpvoed -JF
b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3
c991d52 added s3 user database model
ab4aa54 add model for s3 bucket
853cda9 S3_Functionality improved -JF
2f060a6 Implemented front-end s3 browsing
e082a5f stub out viewing method
c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length
c85a93f Merge pull request #15 from edilytics/wgs-interface
712270a Add support for CRISPRessoWGS
deaacee Extract out function to get server files in submit_routes
151eb15 Update crispresso2_info object fields
b2a974d Bump CRISPResso verion to 2.2.4
58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2
7f2dc1c Stop trimming json error messages, fix #11
d28c03b Update reporting logic to use the new CRISPResso2_info schema
03ee46f Bump CRISPResso version in Dockerfile and download release from Github
9151c5d Add CRISPRessoPooled report template
25a6e37 Merge pull request #6 from edilytics/pooled-interface
b47d288 Check length of amplicons for hosted version, closes #4
54c28b6 Update submission file extension check
8fcadee Add a link to CRISPRessoPooled interface in user dashboard
7fd0283 Implement CRISPRessoPooled backend and report functionality
4063eb3 Modify submission.js to accept .txt and .tsv files
b770323 Create template file for CRISPRessoPooled submission interface
d4f2ed0 Merge pull request #5 from edilytics/flask-modularization
8527384 Convert some celery configurations settings to new format
962a209 Install less and vim in Dockerfile
c693668 Read CRISPResso2_info from json files instead of pickle files
a469e08 Move LoginManager to user_routes.py
f62e67a Create db tables in init_db.py
0d85c90 Move login_required to user_routes
6f5e33e Reformatting of remaining __init__.py
e615c0b Extract report routes out of __init__.py
20f2601 Extract user routes out from __init__.py
5582612 Extract status routes out from __init__.py
2406a10 Extract submit routes out from __init__.py
b562fcd Extract celery tasks from __init__.py
faa785d Extract views out from __init__.py
ff44576 Extract model classes out from __init__.py
914498f Merge pull request #3 from edilytics/2to3
86ea7da Replace RabbitMQ with Redis
adca9fb Upgrade celery to version 5.0.5
244ec33 Convert from Python 2 to Python 3
28b4f37 Refactor Docker image to use Python 3 via micromamba
2359800 Allow interleaved batches
428720b Add features: Allow admin init, server discovery depth
11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon
5062365 Update README.md
51e02f4 Update README.md
ac4a6d5 delete other images
4f3ad88 Update README.md
fc0de1d Update README.md
08defa1 Update README.md
9604983 Trycatch pickle loads
c1facd7 get rid of debug print of email
d699d4d crispresso2.0.45
e7ff079 Update param descriptions
1f12d59 2.0.44
b81febe crispresso to 2.0.42
1a967a8 update report
178c56d 2.4
e41076d Job expiration
41d1a4c check progress on setinterval
756e488 server-side files
ad19c3c Update to crispresso 2.0.40 prime editing
e3a194a update errors and ignore email config
2efb0bb Update README.md
58844a6 initial commit
8ff1878 Initial commit

git-subtree-dir: CRISPRessoWEB/CRISPRessoReports
git-subtree-split: 1efad70
  • Loading branch information
Snicker7 committed Oct 4, 2022
1 parent e7de9b7 commit 15c9fdf
Show file tree
Hide file tree
Showing 7 changed files with 1,131 additions and 1,137 deletions.
2 changes: 1 addition & 1 deletion templates/batchReport.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ <h5>{{report_data['titles'][plot_name]}}</h5>

{# data bit for web version: #}
{#
<p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a> <a href="{{report_data['crispresso_data_path']}}{{data_path}}" title="{{data_label}}" download> <span class="fas fa-download" data-toggle='tooltip' title='Download {{data_label}}'><span></a></small></p>
<p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a> <a href="{{report_data['crispresso_data_path']}}{{data_path}}" title="{{data_label}}" download> <span class="fas fa-download" data-bs-toggle='tooltip' title='Download {{data_label}}'><span></a></small></p>
#}
</div> {# jumbotron_content #} <!-- end jumbotron_content -->
</div> {# jumbrotron #} <!-- end jumbotron -->
Expand Down
444 changes: 222 additions & 222 deletions templates/layout.html

Large diffs are not rendered by default.

456 changes: 228 additions & 228 deletions templates/multiReport.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion templates/pooledReport.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h5 id="modification_summary_title">{{report_data['titles'][plot_name]}}</h5>
</div>
{# data bit for web version: #}
{#
<p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a> <a href="{{report_data['crispresso_data_path']}}{{data_path}}" title="{{data_label}}" download> <span class="fas fa-download" data-toggle='tooltip' title='Download {{data_label}}'><span></a></small></p>
<p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a> <a href="{{report_data['crispresso_data_path']}}{{data_path}}" title="{{data_label}}" download> <span class="fas fa-download" data-bs-toggle='tooltip' title='Download {{data_label}}'><span></a></small></p>
#}
</div> {# jumbotron_content #} <!-- end jumbotron_content -->
</div> {# jumbrotron #} <!-- end jumbotron -->
Expand Down
Loading

0 comments on commit 15c9fdf

Please sign in to comment.