Merge pull request #1 from hydroshare:discoverapi

Discoverapi

.dockerignore

@@ -1,2 +1,2 @@
-dist
-node_modules
+**/dist
+**/node_modules

.env.template

@@ -1,2 +1,2 @@
 VUE_APP_BUCKET_URL_PUBLIC_PATH=/
-VUE_APP_HYDROSHARE_URL=https://beta.hydroshare.org
+VUE_APP_HYDROSHARE_URL=http://localhost:8000

.github/workflows/pages.yml

@@ -41,8 +41,8 @@ jobs:
       - name: create env file
         run: |
           touch .env
-          echo VITE_APP_API_URL=${{ secrets.VUE_APP_BUCKET_URL_PUBLIC_PATH }} >> .env
-          echo VITE_APP_FULL_URL=${{ secrets.VUE_APP_HYDROSHARE_URL }} >> .env
+          echo VUE_APP_BUCKET_URL_PUBLIC_PATH=${{ secrets.VUE_APP_BUCKET_URL_PUBLIC_PATH }} >> .env
+          echo VUE_APP_HYDROSHARE_URL=${{ secrets.VUE_APP_HYDROSHARE_URL }} >> .env
           cp .env ../.env
       - name: Install dependencies
         run: npm install

Dockerfile

@@ -1,14 +1,15 @@
-FROM node:14.14.0 as node-build
+# Build stage
+FROM node:14.14.0 as build-stage
 
-# Arg used by the node build for discovery app
-# This is the path to the bucket where the static files are stored
-# This should be the same as the STATIC_URL in the Django settings
 ARG VUE_APP_BUCKET_URL_PUBLIC_PATH
 ARG VUE_APP_HYDROSHARE_URL
 
 ADD . /
-
 WORKDIR /
-
 RUN npm install && \
-    npm run build
+    npm run build
+
+# Production stage
+FROM nginx:alpine
+
+COPY --from=build-stage /dist /dist

src/components/Search.vue

@@ -394,8 +394,9 @@ export default {
         this.typeFilter = [];
         this.availabilityFilter = [];
       }
-      const hydroshareUrl = process.env.VUE_APP_HYDROSHARE_URL;
-      axios.get(`${hydroshareUrl}/discoverapi/`, {
+      // const hydroshareUrl = process.env.VUE_APP_HYDROSHARE_URL;
+      // axios.get(`${hydroshareUrl}/discoverapi/`, {
+      axios.get('/discoverapi/', {
         params: {
           q: this.searchtext,
           sort: this.sortingBy,