Skip to content

Commit

Permalink
Merge pull request #7 from MAlshaik/main
Browse files Browse the repository at this point in the history
Added the functionality of viewing a video and using the transcript to traverse it
  • Loading branch information
MAlshaik authored Feb 9, 2023
2 parents a9e5158 + d812be9 commit 881c980
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 126 deletions.
9 changes: 5 additions & 4 deletions Frontend/Home.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<html>
<head>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link rel="stylesheet" href="styles.css">
<link rel="stylesheet" href="home.css">
</head>
<body>
<div id="navbar">
<nav>
<img src="images/menu.png" class="menu-img">
<img src="images/Logo.png" class="logo">
<ul>
<li><a href="">Start</a></li>
<!-- <li><a href="">Start</a></li> -->
<!-- <li><a href="">Hello</a></li>
<li><a href="">Contemporary</a></li>
<li><a href="">Affordable</a></li> -->
Expand All @@ -25,12 +25,13 @@
<div class="text-container">
<h1>Revolutionizing <br> Video Editing</h1>
<p>Using the latest AI technology we provide a new and improved way to edit your videos.</p>
<a href="">Upload your video</a>
<a href="video-editing.html">Upload your video</a>
</div>

<!-- <button id="center-button">Click Me</button> -->
<div id="editor"></div>
</div>

<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script>
var editor = new Quill('#editor', {
Expand All @@ -40,7 +41,7 @@ <h1>Revolutionizing <br> Video Editing</h1>
placeholder: false,
theme: 'snow'
});
editor.root.innerHTML = '<p>Test one two three </p>';
editor.root.innerHTML = '<p>What do we do?</p>';
</script>
</body>
</html>
Binary file added Frontend/assets/video.mp4
Binary file not shown.
File renamed without changes.
122 changes: 0 additions & 122 deletions Frontend/index.html

This file was deleted.

131 changes: 131 additions & 0 deletions Frontend/video-editing.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
#navbar {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 5%;
background-color: #1d2026;
display: flex;
align-items: center;
padding: 0 20px;
}

nav{
display: flex;
align-items: center;
padding: 20px 8%;
}

nav .menu-img {
width: 25px;
margin-right: 20px;
cursor: pointer;
}

nav .logo {
width: 160px;
cursor: pointer;

}

nav ul{
flex: 1;
text-align: right;

}

nav ul li{
display: inline-block;
list-style: none;
margin: 0 20px;
}

nav ul li a{
text-decoration: none;
color: white;
}


#editor-container {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background-color: #1d2026;
}

#editor-container p {
color: white;
}

.transcript-container {
width: 30%;
height: 70%;
float: left;
font-family: Arial, sans-serif;
padding: 50px;
}

.transcript-header {
font-size: 24px;
font-weight: bold;
margin-bottom: 20px;
}

/* .transcript-textarea {
width: 100%;
height: 80%;
padding: 10px;
font-size: 16px;
border: 1px solid #ddd;
border-radius: 5px;
resize: none;
} */

.transcript-controls {
margin-top: 20px;
text-align: right;
}

.transcript-controls button {
padding: 10px 20px;
font-size: 16px;
background-color: #4CAF50;
color: #fff;
border: none;
border-radius: 5px;
cursor: pointer;
}

.video-container {
width: 50%;
height: 100%;
float: right;
padding: 50px;
}

.video-header {
font-size: 24px;
font-weight: bold;
margin-bottom: 20px;
}

.video-canvas {
width: 100%;
height: 60%;
border: 1px solid #ddd;
border-radius: 5px;
}

.video-container video {
width: 100%;
}

.timeline {
width: 100%;
height: 20%;
margin-top: 20px;
background-color: grey;
border-radius: 5px;
}
75 changes: 75 additions & 0 deletions Frontend/video-editing.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<html>
<head>
<link rel="stylesheet" href="video-editing.css">
</head>
<body>



<!-- Transcript Container -->
<div id="editor-container">

<div id="navbar">
<nav>
<img src="images/menu.png" class="menu-img">
<img src="images/Logo.png" class="logo">
<ul>
<!-- <li><a href="">Start</a></li> -->
<!-- <li><a href="">Hello</a></li>
<li><a href="">Contemporary</a></li>
<li><a href="">Affordable</a></li> -->
</ul>
</nav>
</div>

<div class="transcript-container">
<div class="transcript-header">
<p>Transcript Editor</p>
</div>

<!-- <textarea class="transcript-textarea"></textarea> Will not use text area for now
since we are not ready to add the addition functionality -->

<!-- Transcript -->
<div id = "transcript">
<p data-time="0">Testing for the length of the transcript container. The ultimate competitive video game is jujetsu. Test Test Test Test Test Test Test Test Test Test Test Test </p>
<p data-time="5">This is the second line of the transcript.</p>
<p data-time="10">This is the third line of the transcript.</p>
</div>
<div class="transcript-controls">
<button id="save-transcript-button">Save</button>
</div>
</div>

<!-- Video -->
<div class="video-container">
<div class="video-header">
Video Editor
</div>
<video id="video" src="assets/video.mp4" controls></video>
<!-- <canvas class="video-canvas"></canvas> We do not need a canvas for now -->


<!-- Timeline -->
<div class="timeline">
<div class="timeline-container">
<div class="timeline-header">
Video Editor Timeline
</div>
<div class="timeline"></div>
<div class="timeline-controls">
<button id="play-button">Play</button>
<button id="pause-button">Pause</button>
<button id="stop-button">Stop</button>
</div>
</div>
</div>

</div>
</div>

<script src="video-editing.js"></script>

</body>


Loading

0 comments on commit 881c980

Please sign in to comment.