Skip to content

Upgraded to wvr 2.0.7 #164

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

Merged
2 commits merged into from
Feb 24, 2020
Merged

Upgraded to wvr 2.0.7 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad6ad6
Upgraded to wvr 2.0.7
rladdusaw Feb 21, 2020
0965ab4
version 1.4.5
tamu-sad-iii Feb 24, 2020
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
114 changes: 57 additions & 57 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,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 @@ -73,11 +73,11 @@ 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',
Expand All @@ -86,56 +86,56 @@ module.exports = function (grunt) {
'<%= build.app %>/components/version/version-directive.js',
'<%= build.app %>/components/version/interpolate-filter.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/accordionDirective.js',
'node_modules/weaver-ui-core/app/directives/tabsDirective.js',

'node_modules/weaver-ui-core/app/directives/tooltipDirective.js',
'node_modules/weaver-ui-core/app/directives/validationMessageDirective.js',
'node_modules/weaver-ui-core/app/directives/validatedInputDirective.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/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/accordionDirective.js',
'node_modules/@wvr/core/app/directives/tabsDirective.js',

'node_modules/@wvr/core/app/directives/tooltipDirective.js',
'node_modules/@wvr/core/app/directives/validationMessageDirective.js',
'node_modules/@wvr/core/app/directives/validatedInputDirective.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/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
98 changes: 49 additions & 49 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h2 class="hidden">Libraries Web Services Status</h2>
</nav>

<div ng-controller="AdminController">
<modal modal-id="assumeUserModal" modal-view="node_modules/weaver-ui-core/app/views/modals/assumeUserModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="assumeUserModal" modal-view="node_modules/@wvr/core/app/views/modals/assumeUserModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
</div>

<div ng-view class="view" autoscroll="true"></div>
Expand Down Expand Up @@ -126,72 +126,72 @@ <h2 class="hidden">Libraries Web Services Status</h2>
<!-- 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ $secondary: #3c0000;
$baseFontSize: 14pt;
$linkColor: #00569f;

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

@import "directives/all";
@import "details/all";
@import "management/all";
@import "dashboard/all";
@import "request/all";

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

body
{
Expand Down
Loading