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.

Sign up for GitHub

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

Jump to bottom

Bindu |add npm dependencies instead of fetching it from cdnjs #1022

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Bindu |add npm dependencies instead of fetching it from cdnjs #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb5ebe8
Bindu |add npm dependencies instead of fetching it from cdnjs
binduak Nov 6, 2024
516f091
Bindu | Added html2pdf.bundle.min.js in the lib folder to fix Uglific…
binduak Nov 13, 2024
a2060cd
Bindu | Ignore lib folder for Uglify task
binduak Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ui/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ module.exports = function (grunt) {
'components/crypto-js/crypto-js.js',
'components/jquery-ui/ui/minified/jquery-ui.custom.min.js',
'components/angular-ivh-treeview/dist/ivh-treeview.min.js',
'components/html2pdf/dist/html2pdf.bundle.min.js',
'components/pdfmake/build/pdfmake.min.js',
'components/pdfmake/build/vfs_fonts.js',
'components/html2canvas/build/html2canvas.min.js',
'micro-frontends-dist/*.min.js'
];

Expand Down Expand Up @@ -486,7 +490,7 @@ module.exports = function (grunt) {
files: {
expand: true,
cwd: '<%= yeoman.dist %>',
src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js'],
src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js', '!lib/**/*.js'],
dest: '<%= yeoman.dist %>'
}
},
Expand Down
17 changes: 10 additions & 7 deletions ui/app/clinical/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ <h3 class="close" ng-click="closeTeleConsultation()">
</div>
<link rel="stylesheet" href="../components/offline/themes/{{getLocaleCSS()}}.css">

<script src='https://meet.jit.si/external_api.js'></script>

<script src="../components/jquery/jquery.min.js"></script>
<script src="../lib/jquery/jquery-ui-1.10.4.custom.min.js"></script>
<script src="../lib/modernizr.custom.80690.js"></script>
Expand Down Expand Up @@ -81,6 +79,16 @@ <h3 class="close" ng-click="closeTeleConsultation()">
<script src="../components/angular-file-upload/dist/angular-file-upload.min.js"></script>
<script src="../components/angular-elastic/elastic.js"></script>
<script src="../lib/angular-workers/dist/angular-workers.js"></script>
<script src="../lib/jitsi-meet/external_api.js"></script>
<script src="../lib/html2pdf/html2pdf.bundle.min.js"></script>



<!-- HTML to PDF -->

<script src="../components/pdfmake/build/pdfmake.min.js"></script>
<script src="../components/pdfmake/build/vfs_fonts.js"></script>
<script src="../components/html2canvas/build/html2canvas.min.js"></script>

<!-- Adding react since an micro-frontend will be used -->
<script src="../components/react/react.production.min.js"></script>
Expand Down Expand Up @@ -567,10 +575,5 @@ <h3 class="close" ng-click="closeTeleConsultation()">
<script src="/implementation_config/openmrs/apps/clinical/formConditions.js"></script>
<script src="/bahmni_config/openmrs/apps/clinical/common/diagnosisServiceConfig.js"></script>

<!-- HTML to PDF -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.41/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.min.js"></script>
</body>
</html>
3 changes: 3 additions & 0 deletions ui/app/lib/html2pdf/html2pdf.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ui/app/lib/jitsi-meet/external_api.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@bower_components/fastclick": "ftlabs/fastclick#1.0.2",
"@bower_components/fullcalendar": "fullcalendar/fullcalendar#~2.7.1",
"@bower_components/fullcalendar-scheduler": "fullcalendar/fullcalendar-scheduler#1.3.2",

"@bower_components/jquery": "jquery/jquery-dist#1.9.1",
"@bower_components/jquery-ui": "components/jqueryui#1.10.2",
"@bower_components/jquery.cookie": "carhartl/jquery-cookie#1.4.0",
Expand All @@ -50,7 +51,9 @@
"@bower_components/purl": "allmarkedup/purl#2.3.1",
"@bower_components/select2": "ivaynberg/select2#~3.4",
"@bower_components/stacktrace-js": "stacktracejs/stacktrace.js#0.6.4",
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0"
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0",
"@bower_components/pdfmake": "bpampuch/pdfmake#~0.1.41",
"@bower_components/html2canvas": "niklasvh/html2canvas#~0.4.1"
},
"devDependencies": {
"@bower_components/Cortana": "Yago31/Cortana#~1.2.6",
Expand Down
2 changes: 2 additions & 0 deletions ui/test/config/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ module.exports = function (config) {
'app/components/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
'app/components/hustle/hustle.js',
'app/lib/modernizr.custom.80690.js',
'app/lib/jitsi-meet/external_api.js',
'app/lib/html2pdf/html2pdf.bundle.min.js',
'app/lib/angular-workers/dist/angular-workers.js',
'app/common/constants.js',
'app/common/util/init.js',
Expand Down
Loading