From 9ae992157493db096b83f13f8d2d0a8ceefd59f7 Mon Sep 17 00:00:00 2001
From: Sami Spets <savasp@utu.fi>
Date: Wed, 25 Sep 2019 10:55:25 +0300
Subject: [PATCH] a commit
---
web-service/client/src/Configuration.js | 5 +++++
web-service/client/src/Stream.js | 13 ++++++++++++-
web-service/client/src/Streams.js | 2 ++
web-service/server/src/seeds.js | 12 +++++++++---
4 files changed, 28 insertions(+), 4 deletions(-)
create mode 100644 web-service/client/src/Configuration.js
diff --git a/web-service/client/src/Configuration.js b/web-service/client/src/Configuration.js
new file mode 100644
index 000000000..c7e723e66
--- /dev/null
+++ b/web-service/client/src/Configuration.js
@@ -0,0 +1,5 @@
+import React from 'react';
+
+const Configuration = () => {
+
+}
\ No newline at end of file
diff --git a/web-service/client/src/Stream.js b/web-service/client/src/Stream.js
index 36feeebf1..f3046462a 100644
--- a/web-service/client/src/Stream.js
+++ b/web-service/client/src/Stream.js
@@ -1,5 +1,16 @@
+import React from 'react'
/*
Component for individual stream
Router will render to this component in path /stream
Gets specific streams object key as prop
-*/
\ No newline at end of file
+*/
+
+const Stream = () => {
+ return(
+ <div>
+ <video controls autoPlay src='https://s3.amazonaws.com/codecademy-content/courses/React/react_video-eek.mp4'/>
+ </div>
+ )
+}
+
+export default Stream;
\ No newline at end of file
diff --git a/web-service/client/src/Streams.js b/web-service/client/src/Streams.js
index 36ffa8aa0..13d0ba3cd 100644
--- a/web-service/client/src/Streams.js
+++ b/web-service/client/src/Streams.js
@@ -1,4 +1,5 @@
import React from 'react'
+import Stream from './Stream'
/* This file will contain list of streams.
The user is able to select which stream he/she will WebAuthentication.
@@ -11,6 +12,7 @@ const Streams = ({clearCookies}) => {
<h1>Streams component works!!</h1>
<h2>Namibia here we come!</h2>
<button onClick={clearCookies}>Logout</button>
+ <Stream />
</div>
)
}
diff --git a/web-service/server/src/seeds.js b/web-service/server/src/seeds.js
index 8cd4d670d..a19004517 100644
--- a/web-service/server/src/seeds.js
+++ b/web-service/server/src/seeds.js
@@ -7,12 +7,18 @@
const testData = {
thumbnail: [
{
- name: 'source2',
- frame: 'https://images.unsplash.com/photo-1564969982505-4c27fbfe7a1c?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1350&q=80'
+ name: 'source1',
+ video: 'https://s3.amazonaws.com/codecademy-content/courses/React/react_video-eek.mp4'
},
{
name: 'source2',
- frame: ''
+ video: 'https://s3.amazonaws.com/codecademy-content/courses/React/react_video-fast.mp4'
+ },
+ {
+ name: 'source3',
+ video: 'https://s3.amazonaws.com/codecademy-content/courses/React/react_video-slow.mp4'
},
+ name: 'source4',
+ video: 'https://s3.amazonaws.com/codecademy-content/courses/React/react_video-cute.mp4'
]
}
\ No newline at end of file
--
GitLab