diff --git a/resources/js/app.js b/resources/js/vue/app.js
similarity index 100%
rename from resources/js/app.js
rename to resources/js/vue/app.js
diff --git a/resources/js/components/AllProjects.vue b/resources/js/vue/components/AllProjects.vue
similarity index 100%
rename from resources/js/components/AllProjects.vue
rename to resources/js/vue/components/AllProjects.vue
diff --git a/resources/js/components/BuildConfigure.vue b/resources/js/vue/components/BuildConfigure.vue
similarity index 100%
rename from resources/js/components/BuildConfigure.vue
rename to resources/js/vue/components/BuildConfigure.vue
diff --git a/resources/js/components/BuildNotes.vue b/resources/js/vue/components/BuildNotes.vue
similarity index 100%
rename from resources/js/components/BuildNotes.vue
rename to resources/js/vue/components/BuildNotes.vue
diff --git a/resources/js/components/BuildSummary.vue b/resources/js/vue/components/BuildSummary.vue
similarity index 100%
rename from resources/js/components/BuildSummary.vue
rename to resources/js/vue/components/BuildSummary.vue
diff --git a/resources/js/components/BuildTestsPage.vue b/resources/js/vue/components/BuildTestsPage.vue
similarity index 100%
rename from resources/js/components/BuildTestsPage.vue
rename to resources/js/vue/components/BuildTestsPage.vue
diff --git a/resources/js/components/BuildUpdate.vue b/resources/js/vue/components/BuildUpdate.vue
similarity index 100%
rename from resources/js/components/BuildUpdate.vue
rename to resources/js/vue/components/BuildUpdate.vue
diff --git a/resources/js/components/EditProject.vue b/resources/js/vue/components/EditProject.vue
similarity index 100%
rename from resources/js/components/EditProject.vue
rename to resources/js/vue/components/EditProject.vue
diff --git a/resources/js/components/ManageAuthTokens.vue b/resources/js/vue/components/ManageAuthTokens.vue
similarity index 100%
rename from resources/js/components/ManageAuthTokens.vue
rename to resources/js/vue/components/ManageAuthTokens.vue
diff --git a/resources/js/components/ManageMeasurements.vue b/resources/js/vue/components/ManageMeasurements.vue
similarity index 100%
rename from resources/js/components/ManageMeasurements.vue
rename to resources/js/vue/components/ManageMeasurements.vue
diff --git a/resources/js/components/Monitor.vue b/resources/js/vue/components/Monitor.vue
similarity index 100%
rename from resources/js/components/Monitor.vue
rename to resources/js/vue/components/Monitor.vue
diff --git a/resources/js/components/SubProjectDependencies.vue b/resources/js/vue/components/SubProjectDependencies.vue
similarity index 100%
rename from resources/js/components/SubProjectDependencies.vue
rename to resources/js/vue/components/SubProjectDependencies.vue
diff --git a/resources/js/components/TestDetails.vue b/resources/js/vue/components/TestDetails.vue
similarity index 100%
rename from resources/js/components/TestDetails.vue
rename to resources/js/vue/components/TestDetails.vue
diff --git a/resources/js/components/UserHomepage.vue b/resources/js/vue/components/UserHomepage.vue
similarity index 100%
rename from resources/js/components/UserHomepage.vue
rename to resources/js/vue/components/UserHomepage.vue
diff --git a/resources/js/components/ViewDynamicAnalysis.vue b/resources/js/vue/components/ViewDynamicAnalysis.vue
similarity index 100%
rename from resources/js/components/ViewDynamicAnalysis.vue
rename to resources/js/vue/components/ViewDynamicAnalysis.vue
diff --git a/resources/js/components/page-header/HeaderLogo.vue b/resources/js/vue/components/page-header/HeaderLogo.vue
similarity index 100%
rename from resources/js/components/page-header/HeaderLogo.vue
rename to resources/js/vue/components/page-header/HeaderLogo.vue
diff --git a/resources/js/components/page-header/HeaderMenu.vue b/resources/js/vue/components/page-header/HeaderMenu.vue
similarity index 100%
rename from resources/js/components/page-header/HeaderMenu.vue
rename to resources/js/vue/components/page-header/HeaderMenu.vue
diff --git a/resources/js/components/page-header/HeaderNav.vue b/resources/js/vue/components/page-header/HeaderNav.vue
similarity index 100%
rename from resources/js/components/page-header/HeaderNav.vue
rename to resources/js/vue/components/page-header/HeaderNav.vue
diff --git a/resources/js/components/shared/ApiLoader.js b/resources/js/vue/components/shared/ApiLoader.js
similarity index 100%
rename from resources/js/components/shared/ApiLoader.js
rename to resources/js/vue/components/shared/ApiLoader.js
diff --git a/resources/js/components/shared/DataTable.vue b/resources/js/vue/components/shared/DataTable.vue
similarity index 100%
rename from resources/js/components/shared/DataTable.vue
rename to resources/js/vue/components/shared/DataTable.vue
diff --git a/resources/js/components/shared/DependencyEdgeBundling.js b/resources/js/vue/components/shared/DependencyEdgeBundling.js
similarity index 100%
rename from resources/js/components/shared/DependencyEdgeBundling.js
rename to resources/js/vue/components/shared/DependencyEdgeBundling.js
diff --git a/resources/js/components/shared/FilterBuilder.vue b/resources/js/vue/components/shared/FilterBuilder.vue
similarity index 100%
rename from resources/js/components/shared/FilterBuilder.vue
rename to resources/js/vue/components/shared/FilterBuilder.vue
diff --git a/resources/js/components/shared/FilterGroup.vue b/resources/js/vue/components/shared/FilterGroup.vue
similarity index 100%
rename from resources/js/components/shared/FilterGroup.vue
rename to resources/js/vue/components/shared/FilterGroup.vue
diff --git a/resources/js/components/shared/FilterRow.vue b/resources/js/vue/components/shared/FilterRow.vue
similarity index 100%
rename from resources/js/components/shared/FilterRow.vue
rename to resources/js/vue/components/shared/FilterRow.vue
diff --git a/resources/js/components/shared/LoadingIndicator.vue b/resources/js/vue/components/shared/LoadingIndicator.vue
similarity index 100%
rename from resources/js/components/shared/LoadingIndicator.vue
rename to resources/js/vue/components/shared/LoadingIndicator.vue
diff --git a/resources/js/components/shared/QueryParams.js b/resources/js/vue/components/shared/QueryParams.js
similarity index 100%
rename from resources/js/components/shared/QueryParams.js
rename to resources/js/vue/components/shared/QueryParams.js
diff --git a/resources/js/components/shared/TextMutator.js b/resources/js/vue/components/shared/TextMutator.js
similarity index 100%
rename from resources/js/components/shared/TextMutator.js
rename to resources/js/vue/components/shared/TextMutator.js
diff --git a/resources/js/components/shared/TimelinePlot.vue b/resources/js/vue/components/shared/TimelinePlot.vue
similarity index 100%
rename from resources/js/components/shared/TimelinePlot.vue
rename to resources/js/vue/components/shared/TimelinePlot.vue
diff --git a/resources/views/admin/manage-users.blade.php b/resources/views/admin/manage-users.blade.php
index 891970933c..5e4bee0a6c 100644
--- a/resources/views/admin/manage-users.blade.php
+++ b/resources/views/admin/manage-users.blade.php
@@ -131,7 +131,7 @@ class="textbox"
-
+
-
+
+
+
@elseif(isset($vue) && $vue === true)
@if(isset($daisyui) && $daisyui === true)
-
+
@else
-
-
-
-
+
+
+
+
@endif
-
-
+
+
@else
-
-
+
+
-
-
-
-
-
-
+
+
+
@endif
@yield('header_script')
diff --git a/resources/views/test/view-test.blade.php b/resources/views/test/view-test.blade.php
index 71d1e73c9f..1f740e16a0 100644
--- a/resources/views/test/view-test.blade.php
+++ b/resources/views/test/view-test.blade.php
@@ -118,7 +118,7 @@
@endverbatim
-
+
@verbatim
diff --git a/tests/Spec/build-configure.spec.js b/tests/Spec/build-configure.spec.js
index bda2008a47..24bf1a35ba 100644
--- a/tests/Spec/build-configure.spec.js
+++ b/tests/Spec/build-configure.spec.js
@@ -2,7 +2,7 @@ import { mount, config } from '@vue/test-utils';
import axios from 'axios';
import AxiosMockAdapter from 'axios-mock-adapter';
import expect from 'expect';
-import BuildConfigure from '../../resources/js/components/BuildConfigure.vue';
+import BuildConfigure from '../../resources/js/vue/components/BuildConfigure.vue';
config.global.mocks['$baseURL'] = 'http://localhost';
axios.defaults.baseURL = config.global.mocks['$baseURL'];
diff --git a/tests/Spec/build-summary.spec.js b/tests/Spec/build-summary.spec.js
index 6a4470d6b1..391100012e 100644
--- a/tests/Spec/build-summary.spec.js
+++ b/tests/Spec/build-summary.spec.js
@@ -2,7 +2,7 @@ import { mount, config } from '@vue/test-utils';
import axios from 'axios';
import AxiosMockAdapter from 'axios-mock-adapter';
import expect from 'expect';
-import BuildSummary from '../../resources/js/components/BuildSummary.vue';
+import BuildSummary from '../../resources/js/vue/components/BuildSummary.vue';
config.global.mocks['$baseURL'] = 'http://localhost';
axios.defaults.baseURL = config.global.mocks['$baseURL'];
diff --git a/tests/Spec/edit-project.spec.js b/tests/Spec/edit-project.spec.js
index 7378685c17..d4d9d6f8c2 100644
--- a/tests/Spec/edit-project.spec.js
+++ b/tests/Spec/edit-project.spec.js
@@ -2,7 +2,7 @@ import {mount, config, createLocalVue} from '@vue/test-utils';
import axios from 'axios';
import AxiosMockAdapter from 'axios-mock-adapter';
import expect from 'expect';
-import EditProject from '../../resources/js/components/EditProject.vue';
+import EditProject from '../../resources/js/vue/components/EditProject.vue';
// const localVue = createLocalVue();
diff --git a/tests/Spec/manage-measurements.spec.js b/tests/Spec/manage-measurements.spec.js
index 18ad9a6e3c..3d52648733 100644
--- a/tests/Spec/manage-measurements.spec.js
+++ b/tests/Spec/manage-measurements.spec.js
@@ -3,7 +3,7 @@ import axios from 'axios';
import AxiosMockAdapter from 'axios-mock-adapter';
import bootstrap from 'bootstrap';
import expect from 'expect';
-import ManageMeasurements from '../../resources/js/components/ManageMeasurements.vue';
+import ManageMeasurements from '../../resources/js/vue/components/ManageMeasurements.vue';
config.global.mocks['$baseURL'] = '';
axios.defaults.baseURL = config.global.mocks['$baseURL'];
diff --git a/tests/Spec/page-header/header-menu.spec.js b/tests/Spec/page-header/header-menu.spec.js
index 993be260dc..97a63260bb 100644
--- a/tests/Spec/page-header/header-menu.spec.js
+++ b/tests/Spec/page-header/header-menu.spec.js
@@ -1,6 +1,6 @@
import {mount, config, createWrapper} from '@vue/test-utils';
config.global.mocks['$baseURL'] = 'http://localhost';
-import HeaderMenu from '../../../resources/js/components/page-header/HeaderMenu.vue';
+import HeaderMenu from '../../../resources/js/vue/components/page-header/HeaderMenu.vue';
import expect from 'expect';
diff --git a/tests/Spec/test-details.spec.js b/tests/Spec/test-details.spec.js
index c2e4d7d360..096a02bd73 100644
--- a/tests/Spec/test-details.spec.js
+++ b/tests/Spec/test-details.spec.js
@@ -2,7 +2,7 @@ import {mount, config} from '@vue/test-utils';
import axios from 'axios';
import AxiosMockAdapter from 'axios-mock-adapter';
import expect from 'expect';
-import TestDetails from '../../resources/js/components/TestDetails.vue';
+import TestDetails from '../../resources/js/vue/components/TestDetails.vue';
config.global.mocks['$baseURL'] = 'http://localhost';
axios.defaults.baseURL = config.global.mocks['$baseURL'];
diff --git a/tests/cypress/component/data-table.cy.js b/tests/cypress/component/data-table.cy.js
index 3abf18ed0a..7fe4d50682 100644
--- a/tests/cypress/component/data-table.cy.js
+++ b/tests/cypress/component/data-table.cy.js
@@ -1,4 +1,4 @@
-import DataTable from '../../../resources/js/components/shared/DataTable.vue';
+import DataTable from '../../../resources/js/vue/components/shared/DataTable.vue';
describe('Data table component tests', () => {
it('Handles unsorted text data', () => {
diff --git a/tests/cypress/component/loading-indicator.cy.js b/tests/cypress/component/loading-indicator.cy.js
index 6ea9133f92..6e798eb111 100644
--- a/tests/cypress/component/loading-indicator.cy.js
+++ b/tests/cypress/component/loading-indicator.cy.js
@@ -1,4 +1,4 @@
-import LoadingIndicator from '../../../resources/js/components/shared/LoadingIndicator.vue';
+import LoadingIndicator from '../../../resources/js/vue/components/shared/LoadingIndicator.vue';
it('displays according to isLoading prop', () => {
cy.mount(LoadingIndicator, {
diff --git a/webpack.mix.js b/webpack.mix.js
index c4a9a7e705..71fef3d60a 100755
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -28,31 +28,39 @@ else {
// Otherwise if this is a release download, use the version from package.json.
const config = require('./package.json');
version = config.version;
- fs.writeFileSync('./public/VERSION', `v${version}`);
+ fs.writeFileSync('public/VERSION', `v${version}`);
}
// Write out version file for angular.js
-const dir = 'public/build/js';
+const dir = 'public/assets/js/angular';
if (!fs.existsSync(dir)) {
- fs.mkdirSync(dir);
+ fs.mkdirSync(dir, { recursive: true });
}
fs.writeFileSync(`${dir}/version.js`, `angular.module('CDash').constant('VERSION', '${new Date().getTime().toString()}');`);
// Copy angularjs files to build directory.
-mix.copy('public/views/*.html', 'public/build/views/');
-mix.copy('public/views/partials/*.html', 'public/build/views/partials/');
+mix.copy('resources/js/angular/views/*.html', 'public/assets/js/angular/views/');
+mix.copy('resources/js/angular/views/partials/*.html', 'public/assets/js/angular/views/partials/');
+mix.copy('resources/js/angular/controllers/*.js', 'public/assets/js/angular/controllers/');
+mix.copy('resources/js/angular/directives/*.js', 'public/assets/js/angular/directives/');
+mix.copy('resources/js/angular/filters/*.js', 'public/assets/js/angular/filters/');
+mix.copy('resources/js/angular/services/*.js', 'public/assets/js/angular/services/');
+mix.copy('resources/js/angular/*.js', 'public/assets/js/angular/');
// Copy CSS files
-mix.css('public/css/cdash.css', 'public/build/css/cdash.css');
-mix.css('public/css/colorblind.css', 'public/build/css/colorblind.css');
+mix.css('resources/css/cdash.css', 'public/assets/css/cdash.css');
+mix.css('resources/css/colorblind.css', 'public/assets/css/colorblind.css');
+mix.css('resources/css/jquery.dataTables.css', 'public/assets/css/jquery.dataTables.css');
+mix.css('resources/css/bootstrap.min.css', 'public/assets/css/bootstrap.min.css');
+mix.css('resources/css/vue_common.css', 'public/assets/css/vue_common.css');
mix.styles([
'node_modules/bootstrap/dist/css/bootstrap.css',
'node_modules/jquery-ui-dist/jquery-ui.css',
'node_modules/nvd3/build/nv.d3.min.css',
-], 'public/build/css/legacy_3rdparty.css');
+], 'public/assets/css/legacy_3rdparty.css');
-mix.sass('resources/sass/app.scss', 'public/laravel/css');
+mix.sass('resources/sass/app.scss', 'public/assets/css/app.css');
// Concatenate and minify 3rd party javascript.
mix.scripts([
@@ -62,8 +70,8 @@ mix.scripts([
'node_modules/flot/dist/es5/jquery.flot.js',
'node_modules/flot/source/jquery.flot.pie.js',
'node_modules/jquery.cookie/jquery.cookie.js',
- 'public/js/bootstrap.min.js',
- 'public/js/je_compare.js',
+ 'resources/js/angular/bootstrap.min.js',
+ 'resources/js/angular/je_compare.js',
'node_modules/angular/angular.min.js',
'node_modules/angular-animate/angular-animate.min.js',
'node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js',
@@ -75,25 +83,28 @@ mix.scripts([
'node_modules/d3/d3.js',
'node_modules/ng-file-upload/dist/ng-file-upload.js',
'node_modules/nvd3/build/nv.d3.js',
- 'public/js/ui-bootstrap-tpls-0.14.2.min.js',
-], 'public/js/3rdparty.min.js');
+ 'resources/js/angular/ui-bootstrap-tpls-0.14.2.min.js',
+], 'public/assets/js/3rdparty.min.js');
// Concatenate and minify 1st party javascript.
mix.scripts([
- 'public/js/cdashSortable.js',
- 'public/js/tabNavigation.js',
- 'public/js/linechart.js',
- 'public/js/bulletchart.js',
- 'public/js/cdash_angular.js',
- 'public/build/js/version.js',
- 'public/js/directives/**.js',
- 'public/js/filters/**.js',
- 'public/js/services/**.js',
- 'public/js/controllers/**.js',
-], 'public/js/legacy_1stparty.min.js');
+ 'resources/js/angular/cdashSortable.js',
+ 'resources/js/angular/tabNavigation.js',
+ 'resources/js/angular/linechart.js',
+ 'resources/js/angular/bulletchart.js',
+ 'resources/js/angular/cdash_angular.js',
+ 'resources/js/angular/jquery.tablesorter.js',
+ 'resources/js/angular/jquery.dataTables.min.js',
+ 'resources/js/angular/jquery.metadata.js',
+ 'public/assets/js/angular/version.js',
+ 'resources/js/angular/directives/**.js',
+ 'resources/js/angular/filters/**.js',
+ 'resources/js/angular/services/**.js',
+ 'resources/js/angular/controllers/**.js',
+], 'public/assets/js/legacy_1stparty.min.js');
// Boilerplate.
-mix.js('resources/js/app.js', 'public/laravel/js').vue();
+mix.js('resources/js/vue/app.js', 'public/assets/js').vue();
mix.webpackConfig({
plugins: webpack_plugins,