mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-04 17:38:10 +00:00
Merge pull request #15 from storytold/feature/styles-and-prompt
Feature/styles and prompt
This commit is contained in:
18 files changed
+22
-22
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { PageEnigmaComponent } from "./PageEnigmaComponent";
|
||||
import { TrackProvider } from "~/contexts/TrackContext/TrackProvider";
|
||||
import { TrackProvider } from "~/pages/PageEnigma/contexts/TrackContext/TrackProvider";
|
||||
|
||||
export const PageEnigma = () => {
|
||||
return (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useCallback, useContext, useEffect, useState } from "react";
|
||||
import { BaseClip } from "~/models/track";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
|
||||
interface Props {
|
||||
clip: BaseClip;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useContext } from "react";
|
||||
import { ClipElement } from "./ClipElement";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
|
||||
export const ClipElements = () => {
|
||||
const { animationClips } = useContext(TrackContext);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useContext } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
|
||||
|
||||
export const Audio = () => {
|
||||
@@ -9,7 +9,7 @@ export const Audio = () => {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="bg-audio-groupBg block rounded-lg pb-5 pl-2 pr-4"
|
||||
className="block rounded-lg bg-audio-groupBg pb-5 pl-2 pr-4"
|
||||
style={{ width: fullWidth + 90 }}
|
||||
>
|
||||
<div className="prevent-select mb-5 pt-2 text-xs font-medium text-white">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useContext } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
|
||||
|
||||
export const Camera = () => {
|
||||
@@ -8,7 +8,7 @@ export const Camera = () => {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="bg-camera-groupBg block rounded-lg pb-5 pl-2 pr-4"
|
||||
className="block rounded-lg bg-camera-groupBg pb-5 pl-2 pr-4"
|
||||
style={{ width: fullWidth + 90 }}
|
||||
>
|
||||
<div className="mb-5 pt-2 text-xs font-medium text-white">Camera</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useContext, useMemo } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
|
||||
|
||||
function buildUpdaters(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useContext } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
|
||||
|
||||
export const Objects = () => {
|
||||
@@ -7,7 +7,7 @@ export const Objects = () => {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="bg-objects-groupBg block rounded-lg pb-5 pl-2 pr-4"
|
||||
className="block rounded-lg bg-objects-groupBg pb-5 pl-2 pr-4"
|
||||
style={{ width: fullWidth + 90 }}
|
||||
>
|
||||
<div className="prevent-select mb-5 pt-2 text-xs font-medium text-white">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Fragment, useContext } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { LowerPanel } from "~/modules/LowerPanel";
|
||||
import { Character } from "./Character";
|
||||
|
||||
@@ -44,7 +44,7 @@ export const Timeline = ({ timelineHeight }: Props) => {
|
||||
00:{index < 10 ? "0" + index.toString() : index.toString()}
|
||||
</div>
|
||||
<div
|
||||
className="bg-ui-divider absolute block h-full"
|
||||
className="absolute block h-full bg-ui-divider"
|
||||
style={{
|
||||
width: 1,
|
||||
left: index * sectionWidth + 88,
|
||||
@@ -60,7 +60,7 @@ export const Timeline = ({ timelineHeight }: Props) => {
|
||||
00:{length < 10 ? "0" + length.toString() : length.toString()}
|
||||
</div>
|
||||
<div
|
||||
className="bg-ui-divider absolute block h-full"
|
||||
className="absolute block h-full bg-ui-divider"
|
||||
style={{
|
||||
width: 1,
|
||||
left: length * sectionWidth + 88,
|
||||
|
||||
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faVolume, faVolumeSlash } from "@fortawesome/pro-solid-svg-icons";
|
||||
import { BaseClip } from "~/models/track";
|
||||
import { useContext } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
|
||||
interface Props {
|
||||
clips: BaseClip[];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useMouseEventsClip } from "./utils/useMouseEventsClip";
|
||||
import { BaseClip } from "~/models/track";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { useContext, useState } from "react";
|
||||
|
||||
interface Props {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { useContext, useEffect, useState } from "react";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
|
||||
export const useMouseEventsAnimation = () => {
|
||||
const { currentTime, updateCurrentTime, length, scale } =
|
||||
|
||||
@@ -6,7 +6,7 @@ import React, {
|
||||
useRef,
|
||||
} from "react";
|
||||
import { BaseClip } from "~/models/track";
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
|
||||
export const useMouseEventsClip = (
|
||||
clip: BaseClip,
|
||||
|
||||
File renamed without changes.
+5
-5
@@ -1,9 +1,9 @@
|
||||
import { TrackContext } from "~/contexts/TrackContext/TrackContext";
|
||||
import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
|
||||
import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
|
||||
import useUpdateCharacters from "~/contexts/TrackContext/utils/useUpdateCharacters";
|
||||
import useUpdateCamera from "~/contexts/TrackContext/utils/useUpdateCamera";
|
||||
import useUpdateAudio from "~/contexts/TrackContext/utils/useUpdateAudio";
|
||||
import useUpdateObject from "~/contexts/TrackContext/utils/useUpdateObject";
|
||||
import useUpdateCharacters from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCharacters";
|
||||
import useUpdateCamera from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCamera";
|
||||
import useUpdateAudio from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateAudio";
|
||||
import useUpdateObject from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateObject";
|
||||
import { AnimationClip, AudioClip } from "~/models/track";
|
||||
|
||||
interface Props {
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user