Skip to content

Commit

Permalink
Merge pull request #47 from TAMULib/maintenance-2020-q1
Browse files Browse the repository at this point in the history 
Updated to @wvr/core 2.0.7
  • Loading branch information
@wwelling
wwelling committed Feb 24, 2020
2 parents e7e182a + 40063c6 commit c4d364c
Show file tree
Hide file tree
Showing 6 changed files with 1,400 additions and 2,007 deletions.
106 changes: 53 additions & 53 deletions Gruntfile.js
View file
Expand Up @@ -33,9 +33,9 @@ module.exports = function (grunt) {
all: [
'Gruntfile.js',
'<%= build.app %>/**/*.js',
'node_modules/weaver-ui-core/**/*',
'node_modules/weaver-ui-core/components/**/*',
'node_modules/weaver-ui-core/resources/**/*',
'node_modules/@wvr/core/**/*',
'node_modules/@wvr/core/components/**/*',
'node_modules/@wvr/core/resources/**/*',
'!node_modules/**/*',
'!<%= build.app %>/node_modules/**/*',
'!<%= build.app %>/components/**/*',
Expand Down Expand Up @@ -77,61 +77,61 @@ module.exports = function (grunt) {
},
core: {
src: [
'node_modules/weaver-ui-core/app/config/coreConfig.js',
'node_modules/@wvr/core/app/config/coreConfig.js',

'node_modules/weaver-ui-core/app/components/version/version.js',
'node_modules/weaver-ui-core/app/components/version/version-directive.js',
'node_modules/weaver-ui-core/app/components/version/interpolate-filter.js',
'node_modules/@wvr/core/app/components/version/version.js',
'node_modules/@wvr/core/app/components/version/version-directive.js',
'node_modules/@wvr/core/app/components/version/interpolate-filter.js',

'<%= build.app %>/config/appConfig.js',
'<%= build.app %>/config/apiMapping.js',

'node_modules/weaver-ui-core/app/core.js',
'node_modules/weaver-ui-core/app/setup.js',
'node_modules/weaver-ui-core/app/config/coreRuntime.js',
'node_modules/weaver-ui-core/app/config/coreAngularConfig.js',
'node_modules/weaver-ui-core/app/config/logging.js',

'node_modules/weaver-ui-core/app/constants/apiResponseActions.js',
'node_modules/weaver-ui-core/app/constants/httpMethodVerbs.js',

'node_modules/weaver-ui-core/app/directives/headerDirective.js',
'node_modules/weaver-ui-core/app/directives/footerDirective.js',
'node_modules/weaver-ui-core/app/directives/userDirective.js',
'node_modules/weaver-ui-core/app/directives/modalDirective.js',
'node_modules/weaver-ui-core/app/directives/alertDirective.js',
'node_modules/weaver-ui-core/app/directives/validationMessageDirective.js',
'node_modules/weaver-ui-core/app/directives/validatedSelectDirective.js',
'node_modules/weaver-ui-core/app/directives/validatedTextAreaDirective.js',

'node_modules/weaver-ui-core/app/services/accessControlService.js',
'node_modules/weaver-ui-core/app/services/wsService.js',
'node_modules/weaver-ui-core/app/services/wsApi.js',
'node_modules/weaver-ui-core/app/services/restApi.js',
'node_modules/weaver-ui-core/app/services/fileService.js',
'node_modules/weaver-ui-core/app/services/authService.js',
'node_modules/weaver-ui-core/app/services/storageService.js',
'node_modules/weaver-ui-core/app/services/utilityService.js',
'node_modules/weaver-ui-core/app/services/alertService.js',
'node_modules/weaver-ui-core/app/services/validationStore.js',
'node_modules/weaver-ui-core/app/services/userService.js',
'node_modules/weaver-ui-core/app/services/modalService.js',
'node_modules/weaver-ui-core/app/services/modelCache.js',
'node_modules/weaver-ui-core/app/services/modelUpdateService.js',

'node_modules/weaver-ui-core/app/repo/abstractRepo.js',

'node_modules/weaver-ui-core/app/model/abstractModel.js',
'node_modules/weaver-ui-core/app/model/assumedControl.js',
'node_modules/weaver-ui-core/app/model/user.js',

'node_modules/weaver-ui-core/app/controllers/abstractController.js',
'node_modules/weaver-ui-core/app/controllers/coreAdminController.js',
'node_modules/weaver-ui-core/app/controllers/authenticationController.js',
'node_modules/weaver-ui-core/app/controllers/loginController.js',
'node_modules/weaver-ui-core/app/controllers/registrationController.js',
'node_modules/weaver-ui-core/app/controllers/userController.js',
'node_modules/weaver-ui-core/app/controllers/errorPageController.js',
'node_modules/@wvr/core/app/core.js',
'node_modules/@wvr/core/app/setup.js',
'node_modules/@wvr/core/app/config/coreRuntime.js',
'node_modules/@wvr/core/app/config/coreAngularConfig.js',
'node_modules/@wvr/core/app/config/logging.js',

'node_modules/@wvr/core/app/constants/apiResponseActions.js',
'node_modules/@wvr/core/app/constants/httpMethodVerbs.js',

'node_modules/@wvr/core/app/directives/headerDirective.js',
'node_modules/@wvr/core/app/directives/footerDirective.js',
'node_modules/@wvr/core/app/directives/userDirective.js',
'node_modules/@wvr/core/app/directives/modalDirective.js',
'node_modules/@wvr/core/app/directives/alertDirective.js',
'node_modules/@wvr/core/app/directives/validationMessageDirective.js',
'node_modules/@wvr/core/app/directives/validatedSelectDirective.js',
'node_modules/@wvr/core/app/directives/validatedTextAreaDirective.js',

'node_modules/@wvr/core/app/services/accessControlService.js',
'node_modules/@wvr/core/app/services/wsService.js',
'node_modules/@wvr/core/app/services/wsApi.js',
'node_modules/@wvr/core/app/services/restApi.js',
'node_modules/@wvr/core/app/services/fileService.js',
'node_modules/@wvr/core/app/services/authService.js',
'node_modules/@wvr/core/app/services/storageService.js',
'node_modules/@wvr/core/app/services/utilityService.js',
'node_modules/@wvr/core/app/services/alertService.js',
'node_modules/@wvr/core/app/services/validationStore.js',
'node_modules/@wvr/core/app/services/userService.js',
'node_modules/@wvr/core/app/services/modalService.js',
'node_modules/@wvr/core/app/services/modelCache.js',
'node_modules/@wvr/core/app/services/modelUpdateService.js',

'node_modules/@wvr/core/app/repo/abstractRepo.js',

'node_modules/@wvr/core/app/model/abstractModel.js',
'node_modules/@wvr/core/app/model/assumedControl.js',
'node_modules/@wvr/core/app/model/user.js',

'node_modules/@wvr/core/app/controllers/abstractController.js',
'node_modules/@wvr/core/app/controllers/coreAdminController.js',
'node_modules/@wvr/core/app/controllers/authenticationController.js',
'node_modules/@wvr/core/app/controllers/loginController.js',
'node_modules/@wvr/core/app/controllers/registrationController.js',
'node_modules/@wvr/core/app/controllers/userController.js',
'node_modules/@wvr/core/app/controllers/errorPageController.js',
],
dest: '<%= build.app %>/resources/scripts/core_concat.js'
},
Expand Down
96 changes: 48 additions & 48 deletions app/index.html
View file
Expand Up @@ -111,72 +111,72 @@
<!-- Core Libraries -->

<!-- Core Configuration -->
<script src="node_modules/weaver-ui-core/app/config/coreConfig.js"></script>
<script src="node_modules/@wvr/core/app/config/coreConfig.js"></script>

<!-- Core Modules -->
<script src="node_modules/weaver-ui-core/app/components/version/version.js"></script>
<script src="node_modules/weaver-ui-core/app/components/version/version-directive.js"></script>
<script src="node_modules/weaver-ui-core/app/components/version/interpolate-filter.js"></script>
<script src="node_modules/@wvr/core/app/components/version/version.js"></script>
<script src="node_modules/@wvr/core/app/components/version/version-directive.js"></script>
<script src="node_modules/@wvr/core/app/components/version/interpolate-filter.js"></script>

<!-- Application Start -->
<script src="node_modules/weaver-ui-core/app/core.js"></script>
<script src="node_modules/weaver-ui-core/app/setup.js"></script>
<script src="node_modules/weaver-ui-core/app/config/coreRuntime.js"></script>
<script src="node_modules/weaver-ui-core/app/config/coreAngularConfig.js"></script>
<script src="node_modules/weaver-ui-core/app/config/logging.js"></script>
<script src="node_modules/@wvr/core/app/core.js"></script>
<script src="node_modules/@wvr/core/app/setup.js"></script>
<script src="node_modules/@wvr/core/app/config/coreRuntime.js"></script>
<script src="node_modules/@wvr/core/app/config/coreAngularConfig.js"></script>
<script src="node_modules/@wvr/core/app/config/logging.js"></script>

<!-- Constants -->
<script src="node_modules/weaver-ui-core/app/constants/apiResponseActions.js"></script>
<script src="node_modules/weaver-ui-core/app/constants/httpMethodVerbs.js"></script>
<script src="node_modules/@wvr/core/app/constants/apiResponseActions.js"></script>
<script src="node_modules/@wvr/core/app/constants/httpMethodVerbs.js"></script>

<!-- Directives -->
<script src="node_modules/weaver-ui-core/app/directives/headerDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/footerDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/userDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/modalDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/alertDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/accordionDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/tabsDirective.js"></script>

<script src="node_modules/weaver-ui-core/app/directives/tooltipDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/validationMessageDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/validatedInputDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/validatedSelectDirective.js"></script>
<script src="node_modules/weaver-ui-core/app/directives/validatedTextAreaDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/headerDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/footerDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/userDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/modalDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/alertDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/accordionDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/tabsDirective.js"></script>

<script src="node_modules/@wvr/core/app/directives/tooltipDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/validationMessageDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/validatedInputDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/validatedSelectDirective.js"></script>
<script src="node_modules/@wvr/core/app/directives/validatedTextAreaDirective.js"></script>

<!-- Services -->
<script src="node_modules/weaver-ui-core/app/services/accessControlService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/wsService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/wsApi.js"></script>
<script src="node_modules/weaver-ui-core/app/services/restApi.js"></script>
<script src="node_modules/weaver-ui-core/app/services/authService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/storageService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/utilityService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/alertService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/validationStore.js"></script>
<script src="node_modules/weaver-ui-core/app/services/userService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/modalService.js"></script>
<script src="node_modules/weaver-ui-core/app/services/modelCache.js"></script>
<script src="node_modules/weaver-ui-core/app/services/modelUpdateService.js"></script>
<script src="node_modules/@wvr/core/app/services/accessControlService.js"></script>
<script src="node_modules/@wvr/core/app/services/wsService.js"></script>
<script src="node_modules/@wvr/core/app/services/wsApi.js"></script>
<script src="node_modules/@wvr/core/app/services/restApi.js"></script>
<script src="node_modules/@wvr/core/app/services/authService.js"></script>
<script src="node_modules/@wvr/core/app/services/storageService.js"></script>
<script src="node_modules/@wvr/core/app/services/utilityService.js"></script>
<script src="node_modules/@wvr/core/app/services/alertService.js"></script>
<script src="node_modules/@wvr/core/app/services/validationStore.js"></script>
<script src="node_modules/@wvr/core/app/services/userService.js"></script>
<script src="node_modules/@wvr/core/app/services/modalService.js"></script>
<script src="node_modules/@wvr/core/app/services/modelCache.js"></script>
<script src="node_modules/@wvr/core/app/services/modelUpdateService.js"></script>

<!-- Factories -->

<!-- Repo -->
<script src="node_modules/weaver-ui-core/app/repo/abstractRepo.js"></script>
<script src="node_modules/@wvr/core/app/repo/abstractRepo.js"></script>

<!-- Models -->
<script src="node_modules/weaver-ui-core/app/model/abstractModel.js"></script>
<script src="node_modules/weaver-ui-core/app/model/assumedControl.js"></script>
<script src="node_modules/weaver-ui-core/app/model/user.js"></script>
<script src="node_modules/@wvr/core/app/model/abstractModel.js"></script>
<script src="node_modules/@wvr/core/app/model/assumedControl.js"></script>
<script src="node_modules/@wvr/core/app/model/user.js"></script>

<!-- Controllers -->
<script src="node_modules/weaver-ui-core/app/controllers/abstractController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/coreAdminController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/authenticationController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/loginController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/registrationController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/userController.js"></script>
<script src="node_modules/weaver-ui-core/app/controllers/errorPageController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/abstractController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/coreAdminController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/authenticationController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/loginController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/registrationController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/userController.js"></script>
<script src="node_modules/@wvr/core/app/controllers/errorPageController.js"></script>

<!-- App Libraries -->

Expand Down
4 changes: 2 additions & 2 deletions app/resources/styles/sass/app.scss
View file
Expand Up @@ -3,8 +3,8 @@ $secondary: #3c0000;
$baseFontSize: 14pt;
$linkColor: #337ab7;

@import "node_modules/weaver-ui-core/app/resources/styles/sass/main";
@import "node_modules/weaver-ui-core/app/resources/styles/sass/theme-base";
@import "node_modules/@wvr/core/app/resources/styles/sass/main";
@import "node_modules/@wvr/core/app/resources/styles/sass/theme-base";

@import "home/all";
@import "directives/all";
Expand Down
8 changes: 4 additions & 4 deletions karma.conf.js
View file
Expand Up @@ -37,13 +37,13 @@ module.exports = function (config) {

"app/node_modules/jasmine-promise-matchers/dist/jasmine-promise-matchers.js",

"app/node_modules/weaver-ui-core/app/config/coreConfig.js",
"app/node_modules/@wvr/core/app/config/coreConfig.js",

"app/node_modules/weaver-ui-core/app/components/**/*.js",
"app/node_modules/@wvr/core/app/components/**/*.js",

"app/node_modules/weaver-ui-core/app/core.js",
"app/node_modules/@wvr/core/app/core.js",

"app/node_modules/weaver-ui-core/app/**/*.js",
"app/node_modules/@wvr/core/app/**/*.js",

"tests/testSetup.js",

Expand Down

0 comments on commit c4d364c

Please sign in to comment.