Merge branch 'deployment'

cmap · Oct 6, 2023 · b0b8c1e · b0b8c1e
2 parents 5d53336 + c1c596b
commit b0b8c1e
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 18 deletions.
diff --git a/docker-run.sh b/docker-run.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker run -p 9494:8080 -it prism/adc-white-paper
+docker run -p 8080:8080 -it prism/adc-white-paper
diff --git a/src/App.vue b/src/App.vue
@@ -1,5 +1,6 @@
 <template>
   <router-view />
+
 </template>
 
 <script setup>

diff --git a/src/components/AucExpressionPlots.vue b/src/components/AucExpressionPlots.vue
@@ -27,7 +27,7 @@
   import * as Vis from '../js/AucExpressionPlots.js';
 
 
-  const dataPath = "../../data/";
+  const dataPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../data/";
   export default {
         name: 'AucExpressionPlots',
         data () {

diff --git a/src/components/BiomarkerGePlots.vue b/src/components/BiomarkerGePlots.vue
@@ -24,7 +24,7 @@
   import * as Vis from '../js/BiomarkerGePlots.js';
 
 
-  const dataPath = "../../data/";
+  const dataPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../data/";
   export default {
         name: 'BiomarkerGePlots',
         data () {

diff --git a/src/components/BiomarkerShrnaPlots.vue b/src/components/BiomarkerShrnaPlots.vue
@@ -19,12 +19,10 @@
 </template>
 
 <script>
-
   import * as d3 from "d3";
   import * as Vis from '../js/BiomarkerShrnaPlots.js';
 
-
-  const dataPath = "../../data/";
+  const dataPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../data/";
   export default {
         name: 'BiomarkerShrnaPlots',
         data () {

diff --git a/src/components/CoCulturePlots.vue b/src/components/CoCulturePlots.vue
@@ -31,7 +31,7 @@
   import * as Vis from '../js/CoCulturePlots.js';
 
 
-  const dataPath = "../../data/";
+  const dataPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../data/";
   export default {
         name: 'BiomarkerGePlots',
         data () {

diff --git a/src/components/ExpressionAcrossPoolsPlots.vue b/src/components/ExpressionAcrossPoolsPlots.vue
@@ -23,7 +23,7 @@
   import * as Vis from '../js/ExpressionAcrossPoolsPlots.js';
 
 
-  const dataPath = "../../data/";
+  const dataPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../data/";
   export default {
         name: 'ExpressionAcrossPoolsPlots',
         data () {

diff --git a/src/router/index.js b/src/router/index.js
@@ -3,7 +3,7 @@ import { createRouter, createWebHistory } from 'vue-router'
 
 const routes = [
   {
-    path: '/',
+    path: '/adc-whitepaper',
     component: () => import('@/layouts/default/Default.vue'),
     children: [
       {
@@ -19,6 +19,7 @@ const routes = [
 ]
 
 const router = createRouter({
+  base: "adc-whitepaper",
   history: createWebHistory(process.env.BASE_URL),
   routes,
 })

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -21,23 +21,23 @@
             sm="3"
             md="3"
           >
-            <ImageCard title="900+ cancer cell lines" description="pooled+barcoded" img="../../graphics/01_PRISM_assay.png"/>
+            <ImageCard title="900+ cancer cell lines" description="pooled+barcoded" :img="imgPath + '01_PRISM_assay.png'"/>
           </v-col>
           <v-col
             cols="12"
             xs="7"
             sm="3"
             md="3"
           >
-            <ImageCard title="Antibody-drug conjugate" description="test agents" img="../../graphics/02_PRISM_assay.png"/>
+            <ImageCard title="Antibody-drug conjugate" description="test agents" :img="imgPath + '02_PRISM_assay.png'"/>
           </v-col>
           <v-col
             cols="12"
             xs="7"
             sm="3"
             md="3"
           >
-            <ImageCard title="5-day viability assay" description="plated+treated" img="../../graphics/03_PRISM_assay.png"/>
+            <ImageCard title="5-day viability assay" description="plated+treated" :img="imgPath + '03_PRISM_assay.png'"/>
 
           </v-col>
           <v-col
@@ -46,7 +46,7 @@
             sm="3"
             md="3"
           >
-          <ImageCard title="Target validation + discovery" description="comprehensive data" img="../../graphics/04_PRISM_assay.png"/>
+          <ImageCard title="Target validation + discovery" description="comprehensive data" :img="imgPath + '04_PRISM_assay.png'"/>
           </v-col>
 
         </v-row>
@@ -87,7 +87,7 @@
         <v-row class="py-6">
             <v-col cols="12" xs="12" sm="4" md="4" lg="3">
               <v-card elevation="1">
-                <v-img src="../../public/graphics/05_adc_components.png"></v-img>
+                <v-img :src="imgPath + '05_adc_components.png'"></v-img>
               </v-card>
             </v-col>
             <v-col cols="12" xs="12" sm="8" md="8" lg="8">
@@ -119,7 +119,7 @@
         <v-row class="py-6">
           <v-col cols="12" sm="10" md="6">
             <v-card elevation="1">
-              <v-img class="center-image" src="../../public/graphics/06_adc_killing_mechanism.png"></v-img>
+              <v-img class="center-image" :src="imgPath + '06_adc_killing_mechanism.png'"></v-img>
             </v-card>
           </v-col>
         </v-row>
@@ -245,7 +245,7 @@
       </p>
       <PaperSubSection>
         <h3>
-          Explore and interact with the data on the <a href="https://prism.clue.io/portal/projects/MRSN001/ADC_WHITEPAPER/compounds" target="_blank">PRISM Data Portal &rarr;
+          Explore and interact with the data on the <a href="https://theprismlab.org/portal/projects/MRSN001/ADC_WHITEPAPER/compounds" target="_blank">PRISM Data Portal &rarr;
           </a>
         </h3>
     </PaperSubSection>
@@ -329,8 +329,12 @@
         components: {PaperHeader, PaperSection, PaperSubSection, ImageCard, AucExpressionPlots, BiomarkerGePlots,
           BiomarkerShrnaPlots, ExpressionAcrossPoolsPlots, CoCulturePlots},
         data () {
+          const imgPath = import.meta.env.PROD ? import.meta.env.BASE_URL+"/data/" : "../../graphics/";
+          console.log(imgPath);
+          console.log(import.meta.env.BASE_URL);
+          console.log(import.meta.env.PROD);
           return {
-
+            imgPath: import.meta.env.PROD ? import.meta.env.BASE_URL + "/graphics/" : "../../graphics/",
           }
         },
         mounted(){

diff --git a/vite.config.js b/vite.config.js
@@ -9,6 +9,7 @@ import { fileURLToPath, URL } from 'node:url'
 // https://vitejs.dev/config/
 export default defineConfig({
   publicPath: '/adc-whitepaper',
+  base: '/adc-whitepaper',
   plugins: [
     vue({ 
       template: { transformAssetUrls }

diff --git a/white-paper.conf b/white-paper.conf
@@ -2,7 +2,7 @@ server {
     listen 8080;
     client_max_body_size 5000M; # It allows files below 100Mb, change it based on your use
      location /adc-whitepaper {
-        	    alias /cmap/prism/adc-white-paper/dist/;
+        	  alias /cmap/prism/adc-white-paper/dist/;
               try_files $uri $uri/ /adc-whitepaper/index.html =404;
           }
     error_page 404 /404.html;