-
@@ -147,8 +201,13 @@ import { format } from 'date-fns';
import EditActors from '#/components/edit/actors.vue';
import EditTags from '#/components/edit/tags.vue';
+import EditMovies from '#/components/edit/movies.vue';
+import Checkbox from '#/components/form/checkbox.vue';
-import { get, patch } from '#/src/api.js';
+import {
+ // get,
+ post,
+} from '#/src/api.js';
const pageContext = inject('pageContext');
@@ -168,6 +227,11 @@ const fields = computed(() => [
type: 'tags',
value: scene.value.tags,
},
+ {
+ key: 'movies',
+ type: 'movies',
+ value: scene.value.movies,
+ },
{
key: 'title',
type: 'string',
@@ -211,6 +275,8 @@ const fields = computed(() => [
const editing = ref(new Set());
const edits = ref({});
const comment = ref(null);
+const apply = ref(user.role !== 'user');
+const submitted = ref(false);
function toggleField(item) {
if (editing.value.has(item.key)) {
@@ -219,6 +285,7 @@ function toggleField(item) {
return;
}
+
editing.value.add(item.key);
if (Array.isArray(item.value)) {
@@ -231,6 +298,8 @@ function toggleField(item) {
function setValue(item, event) {
edits.value[item.key] = event.target.value;
+
+ console.log(edits.value);
}
const timeUnits = ['h', 'm', 's'];
@@ -241,7 +310,8 @@ function setDuration(unit, event) {
async function submit() {
try {
- await patch(`/scenes/${scene.value.id}`, {
+ await post('/revisions', {
+ sceneId: scene.value.id,
edits: {
...edits.value,
duration: edits.value.duration
@@ -249,6 +319,7 @@ async function submit() {
: undefined,
},
comment: comment.value,
+ apply: apply.value,
}, {
successFeedback: 'Your revision has been submitted for approval.',
appendErrorMessage: true,
@@ -258,9 +329,9 @@ async function submit() {
edits.value = {};
comment.value = null;
- scene.value = await get(`/scenes/${scene.value.id}`);
+ submitted.value = true;
- console.log(scene.value);
+ // scene.value = await get(`/scenes/${scene.value.id}`);
} catch (error) {
// do nothing
}
@@ -270,6 +341,7 @@ async function submit() {
diff --git a/pages/scene/revisions/+onBeforeRender.js b/pages/scene/revisions/+onBeforeRender.js
new file mode 100644
index 0000000..b96d383
--- /dev/null
+++ b/pages/scene/revisions/+onBeforeRender.js
@@ -0,0 +1,34 @@
+import { fetchScenesById, fetchSceneRevisions } from '#/src/scenes.js';
+
+export async function onBeforeRender(pageContext) {
+ const [scene] = await fetchScenesById([Number(pageContext.routeParams.sceneId)], {
+ reqUser: pageContext.user,
+ includeAssets: true,
+ includePartOf: true,
+ actorStashes: true,
+ });
+
+ const {
+ revisions,
+ actors,
+ tags,
+ movies,
+ } = await fetchSceneRevisions(null, {
+ sceneId: scene.id,
+ isFinalized: true,
+ limit: 100,
+ }, pageContext.user);
+
+ return {
+ pageContext: {
+ title: `Revisions for '${scene.title}'`,
+ pageProps: {
+ scene,
+ revisions,
+ actors,
+ tags,
+ movies,
+ },
+ },
+ };
+}
diff --git a/pages/scene/revisions/+route.js b/pages/scene/revisions/+route.js
new file mode 100644
index 0000000..bc5568a
--- /dev/null
+++ b/pages/scene/revisions/+route.js
@@ -0,0 +1 @@
+export default '/scene/revisions/@sceneId/*';
diff --git a/pages/users/@username/+Page.vue b/pages/users/@username/+Page.vue
index 17b3e5f..bb53809 100644
--- a/pages/users/@username/+Page.vue
+++ b/pages/users/@username/+Page.vue
@@ -36,6 +36,12 @@
class="domain nolink"
:class="{ active: domain === 'templates' }"
>Templates
+
+
Revisions
@@ -46,6 +52,14 @@
:release="mockupRelease"
/>