diff --git a/railsignal-app/index.html b/railsignal-app/index.html index e6c5ec9..ecca371 100644 --- a/railsignal-app/index.html +++ b/railsignal-app/index.html @@ -4,7 +4,7 @@ - RailSignal + Rail Signal
diff --git a/railsignal-app/package-lock.json b/railsignal-app/package-lock.json index 2f97e8a..6e6691a 100644 --- a/railsignal-app/package-lock.json +++ b/railsignal-app/package-lock.json @@ -8,8 +8,9 @@ "name": "railsignal-app", "version": "0.0.0", "dependencies": { + "@popperjs/core": "^2.11.5", "axios": "^0.27.2", - "bootstrap": "^4.6.1", + "bootstrap": "^5.1.3", "pinia": "^2.0.14", "three": "^0.140.0", "vue": "^3.2.33", @@ -73,6 +74,15 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.5", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", + "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@vitejs/plugin-vue": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-2.3.2.tgz", @@ -287,16 +297,15 @@ "dev": true }, "node_modules/bootstrap": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz", - "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "funding": { "type": "opencollective", "url": "https://opencollective.com/bootstrap" }, "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.10.2" } }, "node_modules/brace-expansion": { @@ -1262,12 +1271,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1520,17 +1523,6 @@ } } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.13", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz", @@ -1978,6 +1970,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@popperjs/core": { + "version": "2.11.5", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", + "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" + }, "@vitejs/plugin-vue": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-2.3.2.tgz", @@ -2162,9 +2159,9 @@ "dev": true }, "bootstrap": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz", - "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "requires": {} }, "brace-expansion": { @@ -2781,12 +2778,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -2967,12 +2958,6 @@ } } }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "peer": true - }, "postcss": { "version": "8.4.13", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz", diff --git a/railsignal-app/package.json b/railsignal-app/package.json index 0e3ecc6..61184a9 100644 --- a/railsignal-app/package.json +++ b/railsignal-app/package.json @@ -8,7 +8,9 @@ "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" }, "dependencies": { + "@popperjs/core": "^2.11.5", "axios": "^0.27.2", + "bootstrap": "^5.1.3", "pinia": "^2.0.14", "three": "^0.140.0", "vue": "^3.2.33", diff --git a/railsignal-app/public/android-chrome-192x192.png b/railsignal-app/public/android-chrome-192x192.png new file mode 100644 index 0000000..8805d9e Binary files /dev/null and b/railsignal-app/public/android-chrome-192x192.png differ diff --git a/railsignal-app/public/android-chrome-512x512.png b/railsignal-app/public/android-chrome-512x512.png new file mode 100644 index 0000000..cdaaf8f Binary files /dev/null and b/railsignal-app/public/android-chrome-512x512.png differ diff --git a/railsignal-app/public/apple-touch-icon.png b/railsignal-app/public/apple-touch-icon.png new file mode 100644 index 0000000..2d3fad7 Binary files /dev/null and b/railsignal-app/public/apple-touch-icon.png differ diff --git a/railsignal-app/public/favicon-16x16.png b/railsignal-app/public/favicon-16x16.png new file mode 100644 index 0000000..04cca12 Binary files /dev/null and b/railsignal-app/public/favicon-16x16.png differ diff --git a/railsignal-app/public/favicon-32x32.png b/railsignal-app/public/favicon-32x32.png new file mode 100644 index 0000000..f6c9b79 Binary files /dev/null and b/railsignal-app/public/favicon-32x32.png differ diff --git a/railsignal-app/public/favicon.ico b/railsignal-app/public/favicon.ico index df36fcf..e6e52ff 100644 Binary files a/railsignal-app/public/favicon.ico and b/railsignal-app/public/favicon.ico differ diff --git a/railsignal-app/public/site.webmanifest b/railsignal-app/public/site.webmanifest new file mode 100644 index 0000000..45dc8a2 --- /dev/null +++ b/railsignal-app/public/site.webmanifest @@ -0,0 +1 @@ +{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/railsignal-app/src/App.vue b/railsignal-app/src/App.vue index c2becb2..bce83e1 100644 --- a/railsignal-app/src/App.vue +++ b/railsignal-app/src/App.vue @@ -1,21 +1,17 @@ + + \ No newline at end of file diff --git a/railsignal-app/src/components/ConfirmModal.vue b/railsignal-app/src/components/ConfirmModal.vue new file mode 100644 index 0000000..9df94b8 --- /dev/null +++ b/railsignal-app/src/components/ConfirmModal.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/RailSystem.vue b/railsignal-app/src/components/RailSystem.vue index 11a5da4..a7870e8 100644 --- a/railsignal-app/src/components/RailSystem.vue +++ b/railsignal-app/src/components/RailSystem.vue @@ -1,26 +1,25 @@ - - \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/AddRailSystemModal.vue b/railsignal-app/src/components/railsystem/AddRailSystemModal.vue new file mode 100644 index 0000000..d5e93fc --- /dev/null +++ b/railsignal-app/src/components/railsystem/AddRailSystemModal.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/AddSegment.vue b/railsignal-app/src/components/railsystem/AddSegment.vue deleted file mode 100644 index f3c3aa1..0000000 --- a/railsignal-app/src/components/railsystem/AddSegment.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/AddSegmentModal.vue b/railsignal-app/src/components/railsystem/AddSegmentModal.vue new file mode 100644 index 0000000..2133137 --- /dev/null +++ b/railsignal-app/src/components/railsystem/AddSegmentModal.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/MapView.vue b/railsignal-app/src/components/railsystem/MapView.vue index 8a61c5c..3ce9e1a 100644 --- a/railsignal-app/src/components/railsystem/MapView.vue +++ b/railsignal-app/src/components/railsystem/MapView.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue b/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue new file mode 100644 index 0000000..29c1edd --- /dev/null +++ b/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue @@ -0,0 +1,73 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/SegmentsView.vue b/railsignal-app/src/components/railsystem/SegmentsView.vue index 65e5673..e8237c9 100644 --- a/railsignal-app/src/components/railsystem/SegmentsView.vue +++ b/railsignal-app/src/components/railsystem/SegmentsView.vue @@ -1,22 +1,22 @@ - - \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue b/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue new file mode 100644 index 0000000..7b1add1 --- /dev/null +++ b/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/AddSignal.vue b/railsignal-app/src/components/railsystem/component/AddSignal.vue deleted file mode 100644 index 6313c47..0000000 --- a/railsignal-app/src/components/railsystem/component/AddSignal.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/AddSignalModal.vue b/railsignal-app/src/components/railsystem/component/AddSignalModal.vue new file mode 100644 index 0000000..dcfe659 --- /dev/null +++ b/railsignal-app/src/components/railsystem/component/AddSignalModal.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue b/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue new file mode 100644 index 0000000..0a95194 --- /dev/null +++ b/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/ComponentView.vue b/railsignal-app/src/components/railsystem/component/ComponentView.vue index d6fc2ed..d830c21 100644 --- a/railsignal-app/src/components/railsystem/component/ComponentView.vue +++ b/railsignal-app/src/components/railsystem/component/ComponentView.vue @@ -1,23 +1,42 @@ \ No newline at end of file diff --git a/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue b/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue index 7fa0f01..6be36af 100644 --- a/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue +++ b/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue @@ -1,22 +1,39 @@ diff --git a/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue b/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue index b2f3ba9..18a2dfa 100644 --- a/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue +++ b/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue @@ -1,10 +1,17 @@