Merge pull request #155 from LCOGT/update/analysis-file-org

Update/analysis file org

src/App.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, watch } from 'vue'
+import { onMounted, computed } from 'vue'
 import { useUserDataStore } from '@/stores/userData'
 import { useConfigurationStore } from './stores/configuration'
 import NavBar from './components/Global/NavBar.vue'
@@ -30,10 +30,6 @@ onMounted(async () => {
   }
 })
 
-watch(() => userDataStore.isColorblindMode, (newVal) => {
-  document.documentElement.setAttribute('colorblind', newVal)
-}, { immediate: true })
-
 </script>
 
 <template>

src/assets/css/custom-colors.css

@@ -1,16 +1,4 @@
 :root {
-	--dark-blue: rgb(44,54,63);
-	--dark-green: rgb(75,127,82);
-	--tangerine: rgb(255,90,95);
-	--tan: rgb(233,205,155);
-	--metal: rgb(36, 44, 51);
-	--light-gray: rgb(204, 208, 211);
-	--light-blue: rgb(126,155,196);
-	--cancel: rgb(254,101,79);
-}
-
-
-[colorblind="true"] {
 	--dark-blue: rgb(28, 34, 40);
 	--dark-green: rgb(245, 118, 0);
 	--tangerine: rgb(255,90,95);

src/components/Project/ImageAnalysis/ImageViewer.vue → src/components/Analysis/ImageViewer.vue

@@ -215,19 +215,19 @@ function fetchCatalog(){
 <style>
 /* Custom icons for leaflet-geoman */
 .custom-reset-zoom-icon {
-  background-image: url('../../../assets/images/resize.svg');
+  background-image: url('../../assets/images/resize.svg');
 }
 
 .leaflet-pm-toolbar .leaflet-pm-icon-delete {
-  background-image: url('../../../assets/images/delete.svg');
+  background-image: url('../../assets/images/delete.svg');
 }
 
 .leaflet-pm-toolbar .leaflet-pm-icon-polyline {
-  background-image: url('../../../assets/images/vector-line.svg');
+  background-image: url('../../assets/images/vector-line.svg');
 }
 
 .leaflet-pm-toolbar .leaflet-pm-icon-edit {
-  background-image: url('../../../assets/images/vector-polyline-edit.svg');
+  background-image: url('../../assets/images/vector-polyline-edit.svg');
 }
 /* Custom styling for toolbar */
 .leaflet-bar a:hover{

src/components/Global/FilterBadge.vue

@@ -19,9 +19,12 @@ const props = defineProps({
 </template>
 <style scoped>
 .filter-badge {
-  border-radius: 5px;
+  border-radius: 10px;
   color: var(--tan);
-  padding: 5px 10px;
+  padding: 6px 10px;
   display: inline-block;
+  user-select: none;
+  font-size: smaller;
+  font-weight: bolder;
 }
 </style>

src/components/Global/ImageGrid.vue

@@ -4,7 +4,7 @@ import { useThumbnailsStore } from '@/stores/thumbnails'
 import { useConfigurationStore } from '@/stores/configuration'
 import { useAlertsStore } from '@/stores/alerts'
 import FilterBadge from './FilterBadge.vue'
-import ImageAnalyzer from '../Project/ImageAnalysis/ImageAnalyzer.vue'
+import ImageAnalyzer from '../../views/AnalysisView.vue'
 
 const props = defineProps({
   images: {

src/components/Global/UserMenu.vue

@@ -40,17 +40,6 @@ function logOut() {
             @click="logOut"
           />
         </v-list-item>
-        <v-list-item>
-          Settings
-        </v-list-item>
-        <v-list-item>
-          <v-switch
-            v-model="userDataStore.isColorblindMode"
-            label="High Contrast"
-            color="var(--light-blue)"
-            base-color="var(--light-blue)"
-          />
-        </v-list-item>
       </v-card>
     </v-menu>
   </div>

src/components/Project/ImageList.vue

@@ -5,7 +5,7 @@ import { useAlertsStore } from '@/stores/alerts'
 import { useConfigurationStore } from '@/stores/configuration'
 import { siteIDToName } from '@/utils/common'
 import FilterBadge from '@/components/Global/FilterBadge.vue'
-import ImageAnalyzer from '../Project/ImageAnalysis/ImageAnalyzer.vue'
+import ImageAnalyzer from '../../views/AnalysisView.vue'
 
 const props = defineProps({
   images: {

src/stores/userData.js

@@ -9,7 +9,6 @@ export const useUserDataStore = defineStore('userData', {
       profile: {},
       proposals: [],
       openProposals: [],
-      isColorblindMode: false,
       gridToggle: true,
       activeSessionId: ''
     }

src/components/Project/ImageAnalysis/ImageAnalyzer.vue → src/views/AnalysisView.vue

@@ -1,14 +1,14 @@
 <script setup>
 import { ref, computed } from 'vue'
-import { fetchApiCall } from '../../../utils/api'
+import { fetchApiCall } from '../utils/api'
 import { useConfigurationStore } from '@/stores/configuration'
 import { useAlertsStore } from '@/stores/alerts'
-import ImageViewer from './ImageViewer.vue'
-import LinePlot from './LinePlot.vue'
 import FilterBadge from '@/components/Global/FilterBadge.vue'
 import NonLinearSlider from '@/components/Global/NonLinearSlider.vue'
-import ImageDownloadMenu from '@/components/Project/ImageAnalysis/ImageDownloadMenu.vue'
-import FitsHeaderTable from './FitsHeaderTable.vue'
+import ImageDownloadMenu from '@/components/Analysis/ImageDownloadMenu.vue'
+import FitsHeaderTable from '@/components/Analysis/FitsHeaderTable.vue'
+import ImageViewer from '@/components/Analysis/ImageViewer.vue'
+import LinePlot from '@/components/Analysis/LinePlot.vue'
 import { siteIDToName } from '@/utils/common'
 
 const props = defineProps({