From d1757c1d460b035e514b30c841e777f76d9bb643 Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Sat, 7 Jul 2018 21:43:36 -0500 Subject: [PATCH] upgraded 3rd party javascript libraries --- .gitignore | 6 ++++++ docs/src/API.tex | 2 +- docs/src/Architecture.tex | 2 +- docs/src/Client.tex | 2 +- docs/src/Deployment.tex | 2 +- docs/src/Development.tex | 2 +- docs/src/Introduction.tex | 2 +- docs/src/Server.tex | 2 +- docs/src/UserGuide.tex | 2 +- docs/src/figures/NGLogo.png | Bin 47674 -> 0 bytes docs/src/macros.tex | 2 +- docs/src/portal.tex | 3 +-- portal_client/assets.js | 13 ++---------- portal_client/package.json | 38 ++++++++++++++++++------------------ portal_json/pom.xml | 2 +- 15 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 docs/src/figures/NGLogo.png diff --git a/.gitignore b/.gitignore index b6e2ed1..8484521 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,9 @@ tags **/*.iml **/git.properties /filerepo_api/ +**/*.aux +**/*.bbl +**/yarn.lock +**/*.blg +**/*.log +**/.*.out diff --git a/docs/src/API.tex b/docs/src/API.tex index c36cdcd..84b27fb 100644 --- a/docs/src/API.tex +++ b/docs/src/API.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : API.tex % SUBJECT : Document describing the api in Patch Repoistory. -% AUTHOR : (C) Copyright 2018 Northrop Grumman +% AUTHOR : (C) Copyright 2018 Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Architecture.tex b/docs/src/Architecture.tex index de41c23..c863647 100644 --- a/docs/src/Architecture.tex +++ b/docs/src/Architecture.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Architecture.tex % SUBJECT : Document describing architecture issues in the entire Patch Repository system. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Client.tex b/docs/src/Client.tex index 6ac1e26..e45c93b 100644 --- a/docs/src/Client.tex +++ b/docs/src/Client.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Client.tex % SUBJECT : Document describing design issues in Patch Repoistory. -% AUTHOR : (C) Copyright 2018 Northrop Grumman +% AUTHOR : (C) Copyright 2018 Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Deployment.tex b/docs/src/Deployment.tex index f29737d..e36f300 100644 --- a/docs/src/Deployment.tex +++ b/docs/src/Deployment.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Deployment.tex % SUBJECT : Document describing deployment issues in Patch Repository. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Development.tex b/docs/src/Development.tex index ec4a2c0..29b21ca 100644 --- a/docs/src/Development.tex +++ b/docs/src/Development.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Development.tex % SUBJECT : Document describing development issues in Patch Repository. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Introduction.tex b/docs/src/Introduction.tex index f0a0be1..ee3e898 100644 --- a/docs/src/Introduction.tex +++ b/docs/src/Introduction.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Introduction.tex % SUBJECT : Document describing the portal system in general terms. -% AUTHOR : (C) Copyright 2018 by Nortrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/Server.tex b/docs/src/Server.tex index 270fff2..3930439 100644 --- a/docs/src/Server.tex +++ b/docs/src/Server.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : Server.tex % SUBJECT : Document describing design issues in the Patch Repository Server. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/UserGuide.tex b/docs/src/UserGuide.tex index aa34b24..7f00a9e 100644 --- a/docs/src/UserGuide.tex +++ b/docs/src/UserGuide.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : User.tex % SUBJECT : Document describing design issues in Patch Repoistory. -% AUTHOR : (C) Copyright 2018 Northrop Grumman +% AUTHOR : (C) Copyright 2018 Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/figures/NGLogo.png b/docs/src/figures/NGLogo.png deleted file mode 100644 index 17fafa6cb4fc0137de25bdba18ba7632bf79a0ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47674 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 TD3C9HH!mZhC|)9J`1$_;e}Ibj diff --git a/docs/src/macros.tex b/docs/src/macros.tex index 7f5a91a..d278b41 100644 --- a/docs/src/macros.tex +++ b/docs/src/macros.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : macros.tex % SUBJECT : File to hold the macros defined in the portal project. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/docs/src/portal.tex b/docs/src/portal.tex index 9c2f68e..7f099db 100644 --- a/docs/src/portal.tex +++ b/docs/src/portal.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % FILE : portal.tex % SUBJECT : Master document for the portal documentation set. -% AUTHOR : (C) Copyright 2018 by Northrop Grumman +% AUTHOR : (C) Copyright 2018 by Locusworks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %++++++++++++++++++++ @@ -86,7 +86,6 @@ %\maketitle \begin{titlepage} \centering - \includegraphics[width=\textwidth]{figures/NGLogo.png} \includegraphics[width=\textwidth]{figures/portal.png} \vfill { diff --git a/portal_client/assets.js b/portal_client/assets.js index dc63e91..8686a52 100644 --- a/portal_client/assets.js +++ b/portal_client/assets.js @@ -1,4 +1,4 @@ -//File containing all the 3rd party css/js/font/images that need to be packaged with the application +//File containing all the 3rd party css/js/font that need to be packaged with the application const CSS = [ 'bootstrap/dist/css/bootstrap.min.css', 'jquery-ui-dist/jquery-ui.min.css', @@ -30,7 +30,6 @@ const JS = [ 'PubSub/dist/pubsub.min.js', 'sockjs-client/dist/sockjs.min.js', 'stomp-websocket-js/lib/stomp.js', - 'spark-md5/spark-md5.min.js', 'ng-material-datetimepicker/dist/angular-material-datetimepicker.min.js', 'tinymce/tinymce.min.js', 'tinymce/jquery.tinymce.min.js', @@ -54,13 +53,5 @@ const FONTS = [ 'tinymce/skins/lightgray/fonts/tinymce.woff' ]; -const IMAGES = [ - 'jquery-ui-dist/images/ui-icons_444444_256x240.png', - 'jquery-ui-dist/images/ui-icons_555555_256x240.png', - 'jquery-ui-dist/images/ui-icons_777620_256x240.png', - 'jquery-ui-dist/images/ui-icons_777777_256x240.png', - 'jquery-ui-dist/images/ui-icons_cc0000_256x240.png', - 'jquery-ui-dist/images/ui-icons_ffffff_256x240.png' -]; -module.exports =[...JS, ...CSS, ...FONTS, ...IMAGES]; \ No newline at end of file +module.exports =[...JS, ...CSS, ...FONTS]; \ No newline at end of file diff --git a/portal_client/package.json b/portal_client/package.json index a040208..e09809a 100644 --- a/portal_client/package.json +++ b/portal_client/package.json @@ -3,35 +3,35 @@ "version": "0.0.0", "private": true, "dependencies": { - "@uirouter/angularjs": "^1.0.12", + "@uirouter/angularjs": "^1.0.18", "PubSub": "^3.4.0", - "angular": "^1.6.8", - "angular-animate": "^1.6.8", - "angular-aria": "^1.6.8", + "angular": "^1.7.2", + "angular-animate": "^1.7.2", + "angular-aria": "^1.7.2", "angular-bootstrap": "^0.12.2", - "angular-cookies": "^1.6.8", - "angular-material": "^1.1.5", - "angular-messages": "^1.6.8", - "angular-mocks": "^1.6.8", - "angular-resource": "^1.6.8", - "angular-route": "^1.6.8", - "angular-sanitize": "^1.6.8", - "angular-ui-grid": "^4.1.3", + "angular-cookies": "^1.7.2", + "angular-material": "^1.1.10", + "angular-messages": "^1.7.2", + "angular-mocks": "^1.7.2", + "angular-resource": "^1.7.2", + "angular-route": "^1.7.2", + "angular-sanitize": "^1.7.2", + "angular-ui-grid": "^4.6.1", "angular-ui-tinymce": "^0.0.19", "angular-ui-utils": "^0.1.1", "bootstrap": "^3.3.7", - "jquery": "^3.2.1", + "jquery": "^3.3.1", "jquery-ui-dist": "^1.12.1", - "moment": "^2.20.1", + "moment": "^2.22.2", "ng-debounce": "^1.0.1", - "ng-material-datetimepicker": "^1.11.0", - "sockjs-client": "^1.1.4", - "spark-md5": "^3.0.0", + "ng-material-datetimepicker": "^1.16.0", + "sockjs-client": "^1.1.5", "stomp-websocket-js": "^1.0.0", - "tinymce": "^4.7.6", - "underscore": "^1.8.3" + "tinymce": "^4.7.13", + "underscore": "^1.9.1" }, "devDependencies": { + "coffee": "^4.1.0", "copy-webpack-plugin": "^4.3.1", "css-loader": "^0.28.8", "file-loader": "^1.1.6", diff --git a/portal_json/pom.xml b/portal_json/pom.xml index cb35450..a178dab 100644 --- a/portal_json/pom.xml +++ b/portal_json/pom.xml @@ -6,6 +6,6 @@ 1.0.0-RELEASE portal_json - NGAS Portal Json Objects + Portal Json Objects Json Objects to support the api \ No newline at end of file