Merge branch 'master' into 2023-12-28_pi-image-modifier

PhotonVision · Jan 3, 2024 · b5965ad · b5965ad
2 parents ae9a6fe + e685334
commit b5965ad
Show file tree

Hide file tree

Showing 82 changed files with 1,713 additions and 5,692 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,6 +12,7 @@ allprojects {
         mavenCentral()
         mavenLocal()
         maven { url = "https://maven.photonvision.org/repository/internal/" }
+        maven { url = "https://maven.photonvision.org/repository/snapshots/" }
     }
     wpilibRepositories.addAllReleaseRepositories(it)
     wpilibRepositories.addAllDevelopmentRepositories(it)
@@ -21,11 +22,12 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2024.1.1-beta-4"
+    wpilibVersion = "2024.1.1-beta-4-35-g141241d"
     wpimathVersion = wpilibVersion
     openCVversion = "4.8.0-2"
     joglVersion = "2.4.0-rc-20200307"
     javalinVersion = "5.6.2"
+    photonGlDriverLibVersion = "dev-v2023.1.0-8-g38bbe74"
     frcYear = "2024"
 
     pubVersion = versionString

diff --git a/photon-client/package-lock.json b/photon-client/package-lock.json
diff --git a/photon-client/package.json b/photon-client/package.json
@@ -13,35 +13,35 @@
     "format-ci": "prettier --check src/"
   },
   "dependencies": {
-    "@fontsource/prompt": "^5.0.5",
-    "@mdi/font": "^7.2.96",
+    "@fontsource/prompt": "^5.0.9",
+    "@mdi/font": "^7.4.47",
     "@msgpack/msgpack": "^3.0.0-beta2",
-    "axios": "^1.4.0",
+    "axios": "^1.6.3",
     "jspdf": "^2.5.1",
     "pinia": "^2.1.4",
-    "three": "^0.154.0",
+    "three": "^0.160.0",
     "vue": "^2.7.14",
     "vue-router": "^3.6.5",
-    "vuetify": "^2.6.15"
+    "vuetify": "^2.7.1"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.2",
-    "@vue/eslint-config-prettier": "^8.0.0",
-    "@vue/eslint-config-typescript": "^11.0.3",
-    "prettier": "^3.0.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "prettier": "^3.1.1",
     "@types/node": "^16.11.45",
-    "@types/three": "^0.154.0",
-    "@vitejs/plugin-vue2": "^2.2.0",
-    "@vue/tsconfig": "^0.1.3",
+    "@types/three": "^0.160.0",
+    "@vitejs/plugin-vue2": "^2.3.1",
+    "@vue/tsconfig": "^0.5.1",
     "deepmerge": "^4.3.1",
-    "eslint": "^8.45.0",
-    "eslint-plugin-vue": "^9.0.0",
+    "eslint": "^8.56.0",
+    "eslint-plugin-vue": "^9.19.2",
     "npm-run-all": "^4.1.5",
     "sass": "~1.32",
     "sass-loader": "^13.3.2",
     "terser": "^5.14.2",
-    "typescript": "~4.7.4",
-    "unplugin-vue-components": "^0.25.1",
-    "vite": "^4.3.9"
+    "typescript": "^5.3.3",
+    "unplugin-vue-components": "^0.26.0",
+    "vite": "^4.5.1"
   }
 }
diff --git a/photon-client/src/assets/styles/variables.scss b/photon-client/src/assets/styles/variables.scss
@@ -18,3 +18,7 @@ $heading-font-family: $default-font;
   > tr:hover:not(.v-data-table__expanded__content):not(.v-data-table__empty-wrapper) {
   background: #005281 !important;
 }
+
+.v-card__title {
+  word-break: break-word !important;
+}
diff --git a/photon-client/src/components/app/photon-log-view.vue b/photon-client/src/components/app/photon-log-view.vue
@@ -47,25 +47,33 @@ document.addEventListener("keydown", (e) => {
 <template>
   <v-dialog v-model="useStateStore().showLogModal" width="1500" dark>
     <v-card dark class="pt-3" color="primary" flat>
-      <v-card-title>
-        View Program Logs
-        <v-btn color="secondary" style="margin-left: auto" depressed @click="handleLogExport">
-          <v-icon left> mdi-download </v-icon>
-          Download Current Log
-
-          <!-- Special hidden link that gets 'clicked' when the user exports journalctl logs -->
-          <a
-            ref="exportLogFile"
-            style="color: black; text-decoration: none; display: none"
-            :href="`http://${backendHost}/api/utils/photonvision-journalctl.txt`"
-            download="photonvision-journalctl.txt"
-            target="_blank"
-          />
-        </v-btn>
-      </v-card-title>
+      <v-row class="heading-container pl-6 pr-6">
+        <v-col>
+          <v-card-title>View Program Logs</v-card-title>
+        </v-col>
+        <v-col class="align-self-center">
+          <v-btn
+            color="secondary"
+            style="margin-left: auto; max-width: 500px; width: 100%"
+            depressed
+            @click="handleLogExport"
+          >
+            <v-icon left class="open-icon"> mdi-download </v-icon>
+            <span class="open-label">Download Current Log</span>
 
+            <!-- Special hidden link that gets 'clicked' when the user exports journalctl logs -->
+            <a
+              ref="exportLogFile"
+              style="color: black; text-decoration: none; display: none"
+              :href="`http://${backendHost}/api/utils/photonvision-journalctl.txt`"
+              download="photonvision-journalctl.txt"
+              target="_blank"
+            />
+          </v-btn>
+        </v-col>
+      </v-row>
       <div class="pr-6 pl-6">
-        <v-btn-toggle v-model="selectedLogLevels" dark multiple class="fill mb-4">
+        <v-btn-toggle v-model="selectedLogLevels" dark multiple class="fill mb-4 overflow-x-auto">
           <v-btn v-for="level in [0, 1, 2, 3]" :key="level" color="secondary" class="fill">
             {{ getLogLevelFromIndex(level) }}
           </v-btn>
@@ -102,4 +110,18 @@ document.addEventListener("keydown", (e) => {
   width: 25%;
   height: 100%;
 }
+@media only screen and (max-width: 512px) {
+  .heading-container {
+    flex-direction: column;
+    padding-bottom: 14px;
+  }
+}
+@media only screen and (max-width: 312px) {
+  .open-icon {
+    margin: 0 !important;
+  }
+  .open-label {
+    display: none;
+  }
+}
 </style>