Skip to content

Commit

Permalink
🐛 💚 fix bugs and deploy!
Browse files Browse the repository at this point in the history
  • Loading branch information
jlandure committed Oct 14, 2024
1 parent c5580b9 commit 85b25d1
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/remotion/components/scary-elevator-remotion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const ScaryElevatorRemotion: typeof DefaultRemotion = (props) => {
// }
// }, [])
return <>
<div style={{height: '100%', width: '100%', position: 'absolute', zIndex: 1000}} onClick={() => sound.play()}></div>
<div style={{height: '100%', width: '100%', position: 'absolute', zIndex: 1000}} /*onClick={() => sound.play()}*/></div>
<DefaultRemotion {...props}/>
</>
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import React from 'react';
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Img, Sequence, staticFile,
Easing,
interpolate,
useCurrentFrame,} from 'remotion';
import {AbsoluteFill, Img, Sequence, staticFile} from 'remotion';

import {GhostBackground} from './GhostBackground';
import {Logo} from './Logo';
Expand All @@ -13,14 +9,7 @@ import {Trees} from './Trees';
const {fontFamily} = loadFont();

export const DevfestNantesDefaultTotem = () => {
const frame = useCurrentFrame();

const SlideDown = interpolate(frame, [300, 330], [0, 1300], {
extrapolateRight: 'clamp',
extrapolateLeft: 'clamp',
easing: Easing.bezier(0.51, -0.75, 0.99, 0.75),
});


return (
<AbsoluteFill
style={{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Sequence, staticFile,} from 'remotion';
import {AbsoluteFill, Sequence} from 'remotion';

import {BackgroundFiller} from '../../../design/atoms/BackgroundFiller';
import {Logo} from './Logo';
import {Direction} from "src/types.ts";
import {DirectionComponent} from "src/remotion/compositions/showcases/devfestNantes/DirectionComponent.tsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Sequence, staticFile,} from 'remotion';

import {BackgroundFiller} from '../../../design/atoms/BackgroundFiller';
import {AbsoluteFill, Sequence} from 'remotion';

import { Moon } from './Moon';
import { Trees } from './Trees';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Img, Sequence, staticFile,} from 'remotion';
import {AbsoluteFill, Img, staticFile,} from 'remotion';

import {BackgroundFiller} from '../../../design/atoms/BackgroundFiller';

const {fontFamily} = loadFont();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Img, Sequence, staticFile,} from 'remotion';
import {AbsoluteFill, Img, staticFile,} from 'remotion';


import {DirectionComponent} from "src/remotion/compositions/showcases/devfestNantes/DirectionComponent.tsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {loadFont} from '@remotion/google-fonts/CrimsonText';
import {AbsoluteFill, Easing, interpolate, Sequence, staticFile, useCurrentFrame,} from 'remotion';
import {AbsoluteFill, Easing, interpolate, Sequence, useCurrentFrame,} from 'remotion';

import {DefaultProps} from '../../../types/defaultProps.types';

Expand Down Expand Up @@ -59,7 +59,7 @@ return (
}}
>
<Sequence name="Speakers" from={30}>
<Speakers speakers={speakers} isTotemDisplayMode />
<Speakers speakers={speakers ?? []} isTotemDisplayMode />
<TalkTitle
title={title}
style={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ import {
Easing,
interpolate,
Sequence,
staticFile,
useCurrentFrame,
} from 'remotion';

import { BackgroundFiller } from '../../../design/atoms/BackgroundFiller';
import { DefaultProps } from '../../../types/defaultProps.types';

import {Logo} from './Logo';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const DevfestNantesTalk = ({
}}
>
<Sequence name="Speakers" from={30}>
<Speakers speakers={speakers} />
<Speakers speakers={speakers ?? []} />
<TalkTitle
title={title}
style={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import {ComponentDisplayMode} from '../../../types/defaultProps.types';

export const GhostBackground = ({
isTotemDisplayMode = false,
//isTotemDisplayMode = false,
}: ComponentDisplayMode) => {
const {durationInFrames} = useVideoConfig();
const frame = useCurrentFrame();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {loadFont} from '@remotion/google-fonts/Creepster';
import {loadLocalFont} from '../../../../../src/utils/loadFont';

import {interpolate, spring, useCurrentFrame, useVideoConfig} from 'remotion';
Expand Down
6 changes: 1 addition & 5 deletions src/remotion/types/defaultProps.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type Speaker = {

export type DefaultProps = {
title: string;
speakers: Speaker[];
speakers?: Speaker[];
date?: string;
time?: string;
location?: string;
Expand All @@ -14,7 +14,3 @@ export type DefaultProps = {
export type ComponentDisplayMode = {
isTotemDisplayMode?: boolean;
};

export const ShowcaseDevfestNantes2024Schema = DefaultProps.extend({
titleFontSize: z.number().optional(),
});
4 changes: 0 additions & 4 deletions src/utils/loadFont.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import {continueRender, delayRender, staticFile} from 'remotion';

type RemotionFont = {
loadFont: () => void;
};

export function loadLocalFont(
fontName: string,
fontLocalPath: string,
Expand Down

0 comments on commit 85b25d1

Please sign in to comment.