Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap integration [B: 1791] #525

Closed
wants to merge 126 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
0c4a822
Removed extra dependencies and eslint
droberts-ctrlo Jan 2, 2025
9302204
Updated libraries and tooling
droberts-ctrlo Jan 2, 2025
e91d1b3
Upgraded react version
droberts-ctrlo Jan 2, 2025
c95be37
Refactoring React components - tests to follow
droberts-ctrlo Jan 7, 2025
05130f5
Package changes (should have been in previous commit)
droberts-ctrlo Jan 7, 2025
d0242cc
In retrospect, changes to the react components isn't necessary
droberts-ctrlo Jan 9, 2025
a67726e
Added Jest setup script rather than having to import every time
droberts-ctrlo Jan 9, 2025
5c90124
Further button tests
droberts-ctrlo Jan 13, 2025
4d6bccb
Working on BS4 - 5 migration
droberts-ctrlo Jan 13, 2025
32ab0c1
Update of files - *currently tests are broken due to BS5 setup*
droberts-ctrlo Jan 16, 2025
9a730bd
Updated Cypress tests
droberts-ctrlo Jan 16, 2025
d19ff93
Merge branch 'dev' into js-fixes
droberts-ctrlo Jan 20, 2025
98084a7
Cypress tests now pass
droberts-ctrlo Jan 20, 2025
022100c
Updated styling
droberts-ctrlo Jan 21, 2025
2f0f51f
Merged in current v2.6
droberts-ctrlo Jan 21, 2025
564b495
Update .gitignore
droberts-ctrlo Jan 21, 2025
821be46
Undo accidental staging of public directory
droberts-ctrlo Jan 21, 2025
4a65544
Merge remote-tracking branch 'origin/js-fixes' into js-fixes
droberts-ctrlo Jan 21, 2025
e93c7d3
Removed incorrect unit test
droberts-ctrlo Jan 21, 2025
640c270
Removed extra changes to webpack.config
droberts-ctrlo Jan 21, 2025
e91e5c1
Added definitions for jQuery and test to ensure it's defined correctly
droberts-ctrlo Jan 21, 2025
76e7bfc
Added build stage to Cypress tests
droberts-ctrlo Jan 21, 2025
5acf741
Updates to webdriver tests
droberts-ctrlo Jan 21, 2025
5f204da
`webpack.config` changes
droberts-ctrlo Jan 21, 2025
54a3674
Updated modal close button and added fileDrag component to code
droberts-ctrlo Jan 21, 2025
f064e8c
DataTables display fixes
droberts-ctrlo Jan 21, 2025
59cb863
Updated dashboard components
droberts-ctrlo Jan 23, 2025
4afd8c3
Updated view and removed logging from tests where it wasn't needed
droberts-ctrlo Jan 23, 2025
51a5bc0
Added tests to dashboard
droberts-ctrlo Jan 23, 2025
197a27f
Fixes for styling in react components
droberts-ctrlo Jan 24, 2025
2c553c9
Added further dashboard tests
droberts-ctrlo Jan 24, 2025
7590502
Merge branch 'dev' into js-fixes
droberts-ctrlo Jan 24, 2025
0e7a3ac
Removed edits from BS changes
droberts-ctrlo Jan 24, 2025
12887aa
Merge remote-tracking branch 'origin/js-fixes' into js-fixes
droberts-ctrlo Jan 24, 2025
bca6579
Test updates and fixes for Jest
droberts-ctrlo Jan 24, 2025
3698fa5
Fix for header overflow causing excess page width
droberts-ctrlo Jan 29, 2025
3a64204
Updated dashboard components to use `react-bootstrap`
droberts-ctrlo Feb 6, 2025
770c19a
Bootstrap changes
droberts-ctrlo Feb 6, 2025
b30508f
Bootstrap Changes
droberts-ctrlo Feb 7, 2025
f59c24c
Updated failing tests on React components
droberts-ctrlo Feb 10, 2025
2c7d7ef
React fixes
droberts-ctrlo Feb 10, 2025
f6c9629
Fixes for failing Cypress tests
droberts-ctrlo Feb 10, 2025
2325e0f
DataTables table view fix
droberts-ctrlo Feb 13, 2025
465334f
Started work on cards
droberts-ctrlo Feb 14, 2025
2de548f
Fixed tests and removed skipped tests
droberts-ctrlo Feb 14, 2025
b2d2b23
Cards finished
droberts-ctrlo Feb 24, 2025
5a85f41
Fixed header row
droberts-ctrlo Feb 24, 2025
86cd4c2
Updated view to align items correctly in edit
droberts-ctrlo Feb 24, 2025
b8537a4
Cleaned up sidebar
droberts-ctrlo Feb 24, 2025
8c9148d
Added component for bootstrap popover
droberts-ctrlo Feb 27, 2025
bb97ae7
Modified button config for btn-info
droberts-ctrlo Feb 27, 2025
514c5d4
Add undefined check to bootstrap-select
droberts-ctrlo Feb 27, 2025
4509460
Removed extra logging
droberts-ctrlo Feb 27, 2025
12fb67b
Moved DataTables styling out of general CSS
droberts-ctrlo Feb 27, 2025
4e115cd
Added bootstrap popover and moved init code into closure
droberts-ctrlo Feb 27, 2025
e0e6722
Completed DataTables code
droberts-ctrlo Mar 3, 2025
8e3a415
Further updates to cards for editing and other changes
droberts-ctrlo Mar 3, 2025
c31345e
Fixes for Cypress tests
droberts-ctrlo Mar 4, 2025
93dcaa5
Further Cypress fixes
droberts-ctrlo Mar 4, 2025
21e6e9f
Removed comments containing old code from `_card.scss`
droberts-ctrlo Mar 4, 2025
07363f6
Removed old popover component
droberts-ctrlo Mar 4, 2025
0228c4b
Moved over to Bootstrap 5 tabs
droberts-ctrlo Mar 4, 2025
1cc5949
Updated table permissions view
droberts-ctrlo Mar 5, 2025
aa4d2a1
Updated data-table with hover and clickable rows
droberts-ctrlo Mar 6, 2025
51820e0
Removed collapsible component as this can be handled by BS5
droberts-ctrlo Mar 6, 2025
9305808
Modified bootstrap popover to use more complex content
droberts-ctrlo Mar 6, 2025
ca8f5a1
Various changes
droberts-ctrlo Mar 6, 2025
6993c6a
Removed screenshots for Cypress tests
droberts-ctrlo Mar 7, 2025
76d0e93
Removed transitions that were causing rendering issues
droberts-ctrlo Mar 10, 2025
eaadc19
Merge branch 'dev' into js-fixes
droberts-ctrlo Mar 14, 2025
ab8cda4
Merge branch 'dev' into js-fixes
droberts-ctrlo Mar 14, 2025
c4d4722
Merge branch 'js-fixes' into bootstrap-integration
droberts-ctrlo Mar 14, 2025
cfffff6
Added ts-expect-error for `window.test`
droberts-ctrlo Mar 14, 2025
cb2798c
Typescript changes
droberts-ctrlo Mar 20, 2025
d0e06f6
Updated cards in views where they were missed
droberts-ctrlo Mar 20, 2025
fb39aaf
Updated jest code and added some tests
droberts-ctrlo Mar 26, 2025
75d3465
Added extra tests that didn't go in previous commit
droberts-ctrlo Mar 26, 2025
491c63a
Merge branch 'jest-code-cleanup' into js-fixes
droberts-ctrlo Mar 26, 2025
931bf15
Updated and reformatted Button code
droberts-ctrlo Mar 26, 2025
44cb833
Reformatted the calculator component
droberts-ctrlo Mar 26, 2025
a6c58f8
Reformatted the card component
droberts-ctrlo Mar 26, 2025
27e7b77
Reformatted the collapsible component
droberts-ctrlo Mar 26, 2025
02923ef
Reformatted the dashboard graph component
droberts-ctrlo Mar 26, 2025
77731b7
Updated and formatted data-table component
droberts-ctrlo Mar 27, 2025
7430a0f
Updated datepicker helper
droberts-ctrlo Mar 27, 2025
2170f90
Updated and formatted the globe component
droberts-ctrlo Mar 27, 2025
94a310c
Updated and formatted the graph component
droberts-ctrlo Mar 27, 2025
f853dc2
Updated and formatted the help view component
droberts-ctrlo Mar 27, 2025
429b23f
Updated and formatted the markdown component
droberts-ctrlo Mar 27, 2025
6744719
Updated and formatted the base modal components
droberts-ctrlo Mar 27, 2025
96ff09f
Updated and formatted the curval modal component
droberts-ctrlo Mar 27, 2025
606231b
Updated and formatted the new table modal component
droberts-ctrlo Mar 27, 2025
ad32fa0
Updated and formatted the user modal component
droberts-ctrlo Mar 27, 2025
0fe1d78
Updated and formatted the more/less component
droberts-ctrlo Mar 27, 2025
397f6c1
Updated and formatted the popover component
droberts-ctrlo Mar 27, 2025
605f9e9
Updated and formatted the record popup component
droberts-ctrlo Mar 27, 2025
fc3a33a
Updated and formatted the select all component
droberts-ctrlo Mar 27, 2025
200a1b2
Updated and formatted the sidebar components
droberts-ctrlo Mar 27, 2025
818a01e
Updated and formatted the sortable components
droberts-ctrlo Mar 27, 2025
ae06cbb
Updated and formatted the summernote component
droberts-ctrlo Mar 27, 2025
4616a8f
Updated and formatted the timeline component
droberts-ctrlo Mar 27, 2025
98d1c61
Updated and formatted the autosave component
droberts-ctrlo Mar 27, 2025
e620706
Updated and formatted the calc fields component
droberts-ctrlo Mar 27, 2025
d7546bf
Updated and formatted the checkbox field component
droberts-ctrlo Mar 27, 2025
bd0df32
Updated and formatted the bootstrap select common component
droberts-ctrlo Mar 27, 2025
f5e0a7e
Updated and formatted the dependent fields component
droberts-ctrlo Mar 27, 2025
01d4b01
Updated and formatted the display conditions component
droberts-ctrlo Mar 27, 2025
aec1611
Updated and formatted the filter component
droberts-ctrlo Mar 27, 2025
182d369
Updated and formatted the input components
droberts-ctrlo Mar 27, 2025
94fe821
Updated and formatted the multiple select component
droberts-ctrlo Mar 27, 2025
fb16ebd
Updated and formatted the people filter component
droberts-ctrlo Mar 27, 2025
463a20c
Updated and formatted the people radio group component
droberts-ctrlo Mar 27, 2025
edc19e7
Updated and formatted the people select component
droberts-ctrlo Mar 27, 2025
772dc4c
Updated and formatted the select widget component
droberts-ctrlo Mar 27, 2025
9f56839
Updated and formatted the value lookup component
droberts-ctrlo Mar 27, 2025
9472e80
Updated actions handler
droberts-ctrlo Mar 27, 2025
464436d
Updated the DOM utilities
droberts-ctrlo Mar 27, 2025
ecfd7a9
Updated and formatted file drag
droberts-ctrlo Mar 27, 2025
f460f15
Updated and formatted the utilities
droberts-ctrlo Mar 27, 2025
6314f89
Updated globe component usage in dashboard
droberts-ctrlo Mar 27, 2025
3208cdc
Removed typings from TS where not necessary
droberts-ctrlo Mar 28, 2025
4a0733e
Merge branch 'js-cleanup' into js-fixes
droberts-ctrlo Mar 28, 2025
c3f2f43
Reformatted where formatting was lost in merge
droberts-ctrlo Mar 28, 2025
8509d30
Fixed failing tests and build
droberts-ctrlo Mar 28, 2025
c78293f
Fixed attributes
droberts-ctrlo Mar 28, 2025
92416e9
Merge branch 'js-fixes' into bootstrap-integration
droberts-ctrlo Mar 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 0 additions & 11 deletions .eslintignore

This file was deleted.

46 changes: 0 additions & 46 deletions .eslintrc.js

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ jobs:
echo '*:*:*:postgres:postgrespassword' > ~/.pgpass
chmod 600 ~/.pgpass
- name: 'Install YARN dependencies'
# If the code isn't built (public dir) then the tests will fail
run: |
sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
yarn
yarn build --no-watch
- name: 'Start the application'
env:
DANCER_CONFDIR: 'webdriver'
Expand Down
1 change: 0 additions & 1 deletion .gitigore

This file was deleted.

22 changes: 0 additions & 22 deletions .jshintrc

This file was deleted.

233 changes: 0 additions & 233 deletions .stylelintrc.js

This file was deleted.

Loading
Loading