Update devapp1.yml (#1262)

* Update devapp1.yml

* latest from last rel (#1263)

* latest from last rel

* latest nginx

---------

Co-authored-by: gloriajw <aagg@comcast.net>
Co-authored-by: Upstage system user <upstage@app1.upstage.org.nz-1621696771938-s-2vcpu-4gb-nyc1-01>

* #1271 "delete scene" doesn't work until stage reloaded

* #1270 message window doesn't disappear

* need interim pop-up message #1274

* problems with creating a new stage #1267

* upload new image option has disappeared #1269

* unable to put video on stage #1277

* random x appears & doesn't go away #1278

* small updates

---------

Co-authored-by: gloriajw <aagg@comcast.net>
Co-authored-by: Upstage system user <upstage@app1.upstage.org.nz-1621696771938-s-2vcpu-4gb-nyc1-01>
Co-authored-by: webdev604 <webdev.604@hotmail.com>

.github/workflows/devapp1.yml

@@ -6,7 +6,7 @@ name: DEVAPP1 CI
 on:
  # Triggers the workflow on push or approved pull request on R1-2021 branch
  push:
- branches: [Sapporo-2.0.7]
+ branches: [Erdinger-2.0.8]
 
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
@@ -32,7 +32,7 @@ jobs:
  script: |
  cd /home/upstage/upstage/dashboard/
  git fetch
- git checkout Sapporo-2.0.7
+ git checkout Erdinger-2.0.8
  git pull
  yarn
  yarn build:dev

.gitignore

@@ -45,3 +45,9 @@ pnpm-debug.log*
 __pycache__
 *.pyc
 *.pyo
+
+# vuejs generated files
+studio/components.d.ts
+studio/src/genql/*
+studio/package-lock.json
+studio/yarn.lock

studio/package.json

@@ -27,7 +27,7 @@
  "@vueuse/core": "^6.7.3",
  "@yeger/vue-masonry-wall": "^3.0.29",
  "animejs": "^3.2.1",
- "ant-design-vue": "^4.0.3",
+ "ant-design-vue": "^4.2.1",
  "autoprefixer": "^10.3.7",
  "axios": "^1.6.0",
  "bulma": "^0.9.4",

studio/src/components/Tabs.vue

@@ -0,0 +1,47 @@
+<template>
+ <div class="tabs is-boxed" :class="{ 'is-centered': centered }">
+ <ul>
+ <li
+ v-for="item in items"
+ :key="item.key"
+ :class="{ 'is-active': tab === item.key }"
+ @click="tab = item.key"
+ >
+ <a>
+ <span v-if="item.icon" class="icon is-small">
+ <i :class="item.icon" aria-hidden="true"></i>
+ </span>
+ <span>{{ item.label }}</span>
+ </a>
+ </li>
+ <slot name="extras"></slot>
+ </ul>
+ </div>
+ <div class="tab-content">
+ <div :class="`tab-${item.key}`" v-for="item in items" :key="item.key">
+ <template v-if="tab === item.key">
+ <slot :name="item.key"></slot>
+ </template>
+ </div>
+ </div>
+ </template>
+
+ <script>
+ import { ref } from "@vue/reactivity";
+ export default {
+ props: ["items", "centered"],
+ setup: (props) => {
+ const tab = ref(props.items[0].key);
+ return { tab };
+ },
+ };
+ </script>
+
+ <style>
+ .tabs {
+ position: sticky;
+ top: 0;
+ background-color: white;
+ z-index: 10;
+ }
+ </style>

studio/src/components/form/ImagePicker.vue

@@ -6,15 +6,19 @@
  }" />
  <button v-else class="button">{{ $t("choose_an_image") }}</button>
  </template>
- <template #header>{{
+ <template #header><span>{{
  $t("choose_an_existing_image_or_upload_new")
- }}</template>
+ }}</span></template>
  <template #content="{ closeModal }">
  <Loading v-if="loading" />
  <div v-else class="columns is-multiline">
  <div class="column is-12">
  <div class="columns">
- <div class="column panel-heading">
+ <div class="column uploadbtn">
+ <MediaUpload />
+ </div>
+
+ <div class="column">
  <p class="control has-icons-left">
  <input class="input" type="text" placeholder="Search Media" v-model="filter.name" />
  <span class="icon is-left">
@@ -46,16 +50,17 @@
 import Modal from "components/Modal.vue";
 import Loading from "components/Loading.vue";
 import Asset from "components/Asset.vue";
-import { computed, provide, reactive } from "vue";
+import { computed, provide, reactive, onMounted } from "vue";
 import Dropdown from "./Dropdown.vue";
 import { displayName } from "utils/common";
 import { stageGraph } from "services/graphql";
 import { useQuery } from "services/graphql/composable";
+import MediaUpload from "./Media/MediaUpload.vue";
 
 export default {
  props: ["modelValue"],
  emits: ["update:modelValue"],
- components: { Modal, Loading, Asset, Dropdown },
+ components: { Modal, Loading, Asset, Dropdown, MediaUpload },
  setup: (props, { emit }) => {
  const {
  loading,
@@ -65,6 +70,10 @@ export default {
  const type_dis = ["avatar", "prop", "backdrop", "shape", "curtain"];
  provide("refresh", refresh);
 
+ onMounted(() => {
+ refresh();
+ });
+
  const select = (item, closeModal) => {
  emit("update:modelValue", item.src);
  closeModal();
@@ -151,6 +160,14 @@ export default {
 </script>
 
 <style>
+.modal-card-title {
+ margin-bottom: 0px;
+}
+
+.modal-card {
+ border-top: none;
+}
+
 .dropdown .button {
  width: 95%;
 }
@@ -174,4 +191,8 @@ export default {
  height: 10vw;
  width: auto;
 }
+
+.uploadbtn {
+ flex-grow: 0;
+}
 </style>