Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
d72c370
Add async redux
btholt Dec 1, 2016
f832b4c
git ignore
btholt Dec 1, 2016
bd181be
Add Preact!!
btholt Dec 1, 2016
dbbf3ec
Ignore Intellij IDE configuration files
drapetomaniac Feb 6, 2017
cbfaf7f
small typo
newswim Feb 13, 2017
ddacbec
Merge pull request #46 from newswim/patch-1
btholt Mar 8, 2017
73328a7
Merge pull request #45 from drapetomaniac/master
btholt Mar 8, 2017
e8bac9f
Clearing out code to make v3 commit easier
May 29, 2017
4c761e0
thing
btholt May 16, 2017
a87aa15
Finished. Finally
May 29, 2017
d66d8de
Rewrite for v3
May 29, 2017
038d8a6
Sorted shows
May 29, 2017
b9cfd6d
Create .nojekyll
btholt May 29, 2017
865811d
Delete .nojekyll
btholt May 29, 2017
698151b
Removed coverage
btholt May 30, 2017
03296d5
Merge pull request #59 from btholt/v3-master
btholt May 30, 2017
8693e2d
complete intro to react watch to React paradigm
matthiashaefeli Jul 24, 2017
66001a1
Merge pull request #1 from matthiashaefeli/start
matthiashaefeli Jul 24, 2017
8fe2415
add props
matthiashaefeli Jul 24, 2017
5bc45e6
add colors to h1
matthiashaefeli Jul 24, 2017
ef7e3bf
Merge pull request #2 from matthiashaefeli/start
matthiashaefeli Jul 24, 2017
62e49da
change file client app
matthiashaefeli Jul 25, 2017
51d2842
Merge pull request #3 from matthiashaefeli/start
matthiashaefeli Jul 25, 2017
ca45958
after installation prettier
matthiashaefeli Jul 26, 2017
e157cf5
prettier
matthiashaefeli Jul 26, 2017
4de6128
change on package.json
matthiashaefeli Jul 26, 2017
b4b655b
Merge pull request #4 from matthiashaefeli/start
matthiashaefeli Jul 26, 2017
f720b23
stuck in eslint
matthiashaefeli Jul 27, 2017
ad832c9
Merge pull request #5 from matthiashaefeli/start
matthiashaefeli Jul 27, 2017
4ed82dc
add eslint
matthiashaefeli Jul 30, 2017
0cb8497
add eslint a package.json
matthiashaefeli Jul 30, 2017
f20b3b7
Merge pull request #6 from matthiashaefeli/start
matthiashaefeli Jul 30, 2017
4254ea3
add import to client app
matthiashaefeli Jul 30, 2017
25a6e13
webpack installed
matthiashaefeli Jul 31, 2017
ac515e1
Merge pull request #7 from matthiashaefeli/start
matthiashaefeli Jul 31, 2017
6f021ca
new start
matthiashaefeli Jul 31, 2017
57c040f
Merge pull request #8 from matthiashaefeli/start
matthiashaefeli Jul 31, 2017
e6799f4
Delete .DS_Store
matthiashaefeli Jul 31, 2017
65d9fa1
Delete .babelrc
matthiashaefeli Jul 31, 2017
c6cfdca
Delete .editorconfig
matthiashaefeli Jul 31, 2017
7951ab5
Delete .eslintignore
matthiashaefeli Jul 31, 2017
d9c9d41
Delete .eslintrc.json
matthiashaefeli Jul 31, 2017
3a2021a
Delete .flowconfig
matthiashaefeli Jul 31, 2017
f56fb0e
Delete .gitignore
matthiashaefeli Jul 31, 2017
85a1a7b
start over react lesson 1
matthiashaefeli Jul 31, 2017
8526e2a
simple react components
matthiashaefeli Jul 31, 2017
ed862d7
refactor
matthiashaefeli Jul 31, 2017
3a9a8a3
add js folder and clientapp.js
matthiashaefeli Jul 31, 2017
c93910d
change file to jsx
matthiashaefeli Jul 31, 2017
f81e900
add prettier in package jason
matthiashaefeli Jul 31, 2017
35c974b
add eslitrc file
matthiashaefeli Aug 1, 2017
9526a21
add eslint. installed also in sublime
matthiashaefeli Aug 2, 2017
e06c59d
config webpack
matthiashaefeli Aug 2, 2017
aa368ba
type error change bundel to bundle
matthiashaefeli Aug 2, 2017
0d94770
add babelrc
matthiashaefeli Aug 2, 2017
1a0b475
add webpack.config.js
matthiashaefeli Aug 2, 2017
662e3f9
change file extencion
matthiashaefeli Aug 2, 2017
85a8cfd
add build to package.json
matthiashaefeli Aug 2, 2017
1375192
add watch to package.json'
matthiashaefeli Aug 3, 2017
04db777
eslintignore works
matthiashaefeli Aug 3, 2017
4a36829
change on clientapp file
matthiashaefeli Aug 3, 2017
9cf82fa
change on clientapp file
matthiashaefeli Aug 3, 2017
07dc5d3
add link to style.css
matthiashaefeli Aug 4, 2017
6f53b17
change index.html file
matthiashaefeli Aug 4, 2017
11fc300
add a rule to webpack.config
matthiashaefeli Aug 4, 2017
f353794
add pics
matthiashaefeli Aug 4, 2017
55be9f2
add landing.jsx and changing clientApp file
matthiashaefeli Aug 6, 2017
d6ec9fd
add dev to package.json
matthiashaefeli Aug 6, 2017
1f6a09b
add link in landing.jsx to search.jsx
matthiashaefeli Aug 6, 2017
785fcdc
change to browserRouter
matthiashaefeli Aug 6, 2017
f30fc86
add comment in clientApp
matthiashaefeli Aug 6, 2017
63ee574
import data from data.json to search.jsx
matthiashaefeli Aug 6, 2017
12b005f
show just the title. map over array
matthiashaefeli Aug 6, 2017
575458e
show title year description and img poster
matthiashaefeli Aug 6, 2017
4df2f12
add showcard.jsx file
matthiashaefeli Aug 6, 2017
28f0677
add shape description
matthiashaefeli Aug 6, 2017
f7da476
comment change in clientapp
matthiashaefeli Aug 6, 2017
7c21cde
add posibility to delete show in showcard.jsx
matthiashaefeli Aug 7, 2017
5472f07
add other way to do show.title
matthiashaefeli Aug 7, 2017
7b1d354
fix unique key error
matthiashaefeli Aug 7, 2017
b9f4500
styled components
matthiashaefeli Aug 8, 2017
68a5d45
add header to search
matthiashaefeli Aug 8, 2017
676dec7
changes on search.jsx class
matthiashaefeli Aug 8, 2017
ad4eba0
fix class state error in eslint
matthiashaefeli Aug 8, 2017
951af3c
change on search.jsx and showcar
matthiashaefeli Aug 8, 2017
3ad4959
managing state
matthiashaefeli Aug 8, 2017
4d88238
change on babelrc and search.jsx
matthiashaefeli Aug 9, 2017
7b70b3b
fix babel eslint error
matthiashaefeli Aug 9, 2017
cf2fbdb
change search to search
matthiashaefeli Aug 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 11 additions & 10 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"presets": [
"react",
["es2015", {modules: false, loose: true}]
["env", {
"targets": {
"browsers": "last 2 versions"
},
"loose": true,
"modules": false
}]
],
"env": {
"server": {
"plugins": ["transform-es2015-modules-commonjs"]
},
"test": {
"plugins": ["transform-es2015-modules-commonjs"]
}
}
}
"plugins": [
"babel-plugin-transform-class-properties"
]
}
9 changes: 0 additions & 9 deletions .editorconfig

This file was deleted.

2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
public/
18 changes: 16 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
{
"extends": ["standard", "standard-react"]
}
"extends": ["airbnb", "prettier", "prettier/react"],
"plugins": ["prettier"],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2016,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"es6": true,
"browser": true,
"node": true
}
}
8 changes: 0 additions & 8 deletions .gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions LICENSE.md

This file was deleted.

13 changes: 0 additions & 13 deletions README.md

This file was deleted.

124 changes: 124 additions & 0 deletions data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"shows": [
{
"title": "Atlanta",
"year": "2008–2013",
"description": "Two cousins, with different views on art versus commerce, on their way up through the Atlanta rap scene; \"Earnest 'Earn' Marks,\" an ambitious college drop-out and his estranged cousin, who suddenly becomes a star.",
"poster": "a.jpg",
"imdbID": "tt4288182",
"trailer": "MpEdJ-mmTlY"
},
{
"title": "Billions",
"year": "2016–",
"description": "U.S. Attorney Chuck Rhoades goes after hedge fund king, Bobby \"Axe\" Axelrod in a battle between two powerful New York figures.",
"poster": "b.jpg",
"imdbID": "tt4270492",
"trailer": "_raEUMLL-ZI"
},
{
"title": "Black Mirror",
"year": "2011–",
"description": "A television anthology series that shows the dark side of life and technology.",
"poster": "bm.jpg",
"imdbID": "tt2085059",
"trailer": "jDiYGjp5iFg"
},
{
"title": "Breaking Bad",
"year": "2008–2013",
"description": "A high school chemistry teacher diagnosed with inoperable lung cancer turns to manufacturing and selling methamphetamine in order to secure his family's future.",
"poster": "bb.jpg",
"imdbID": "tt0903747",
"trailer": "XZ8daibM3AE"
},
{
"title": "Game of Thrones",
"year": "2011–",
"description": "Nine noble families fight for control over the mythical lands of Westeros, while a forgotten race returns after being dormant for thousands of years.",
"poster": "got.jpg",
"imdbID": "tt0944947",
"trailer": "giYeaKsXnsI"
},
{
"title": "Homeland",
"year": "2011–",
"description": "A bipolar CIA operative becomes convinced a prisoner of war has been turned by al-Qaeda and is planning to carry out a terrorist attack on American soil.",
"poster": "h.jpg",
"imdbID": "tt1796960",
"trailer": "KyFmS3wRPCQ"
},
{
"title": "House of Cards",
"year": "2013–",
"description": "A Congressman works with his equally conniving wife to exact revenge on the people who betrayed him.",
"poster": "hoc.jpg",
"imdbID": "tt1856010",
"trailer": "NTzycsqxYJ0"
},
{
"title": "Master of None",
"year": "2015–",
"description": "The personal and professional life of Dev, a 30-year-old actor in New York.",
"poster": "mon.jpg",
"imdbID": "tt4635276",
"trailer": "6bFvb3WKISk"
},
{
"title": "Narcos",
"year": "2015–",
"description": "A chronicled look at the criminal exploits of Colombian drug lord Pablo Escobar.",
"poster": "n.jpg",
"imdbID": "tt2707408",
"trailer": "U7elNhHwgBU"
},
{
"title": "Orange Is the New Black",
"year": "2013–",
"description": "The story of Piper Chapman, a woman in her thirties who is sentenced to fifteen months in prison after being convicted of a decade-old crime of transporting money for her drug-dealing girlfriend.",
"poster": "oitnb.jpg",
"imdbID": "tt2372162",
"trailer": "th8WT_pxGqg"
},
{
"title": "Silicon Valley",
"year": "2014–",
"description": "Follows the struggle of Richard Hendricks, a silicon valley engineer trying to build his own company called Pied Piper.",
"poster": "sv.jpg",
"imdbID": "tt2575988",
"trailer": "69V__a49xtw"
},
{
"title": "Stranger Things",
"year": "2016–",
"description": "When a young boy disappears, his mother, a police chief, and his friends must confront terrifying forces in order to get him back.",
"poster": "st.jpg",
"imdbID": "tt4574334",
"trailer": "9Egf5U8xLo8"
},
{
"title": "The Americans",
"year": "2013–",
"description": "Two Soviet intelligence agents pose as a married couple to spy on the American government.",
"poster": "ta.jpg",
"imdbID": "tt2149175",
"trailer": "HjuUkbhsI24"
},
{
"title": "Veep",
"year": "2012–",
"description": "Former Senator Selina Meyer finds that being Vice President of the United States is nothing like she hoped and everything that everyone ever warned her about.",
"poster": "v.jpg",
"imdbID": "tt1759761",
"trailer": "I2HoCG_iyhU"
},
{
"title": "Westworld",
"year": "2016–",
"description": "Set at the intersection of the near future and the reimagined past, explore a world in which every human appetite, no matter how noble or depraved, can be indulged without consequence.",
"poster": "ww.jpg",
"imdbID": "tt0475784",
"trailer": "eX3u0IlBBO4"
}
]
}
13 changes: 6 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Vidflix</title>
<link rel="stylesheet" href="/public/normalize.css" />
<link rel="stylesheet" href="/public/style.css" />
<meta charset="UTF-8">
<title>svideo</title>
<link rel="stylesheet" href="/public/style.css">
</head>
<body>
<div id="app"><%= body %></div>
<script src="/public/bundle.js"></script>
<div id="app"></div>
<script src="/public/bundle.js"></script>
</body>
</html>
</html>
38 changes: 0 additions & 38 deletions js/App.js

This file was deleted.

29 changes: 0 additions & 29 deletions js/AsyncRoute.js

This file was deleted.

6 changes: 0 additions & 6 deletions js/ClientApp.js

This file was deleted.

60 changes: 60 additions & 0 deletions js/ClientApp.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import React from 'react';
import { render } from 'react-dom';
import { BrowserRouter, Route } from 'react-router-dom';
import Landing from './Landing';
import Search from './Search';

const App = () =>
<BrowserRouter>
<div className="app">
<Route exact path="/" component={Landing} />
<Route path="/search" component={Search} />
</div>
</BrowserRouter>;
render(<App />, document.getElementById('app'));

// check out <Switch> interesting

// first version
// const ce = React.createElement;

// const MyTitle = function(props) {
// return ce('div', null, ce('h1', { style: { color: props.color } }, props.title));
// };

// const MyFirstComponent = function() {
// return ce(
// 'div',
// { id: 'my-first-component' },
// ce(MyTitle, { color: 'rebeccapurple', title: 'House of Cards' }),
// ce(MyTitle, { color: 'peru', title: 'Orange is the New Black' }),
// ce(MyTitle, { color: 'burlywood', title: 'Stranger Things' }),
// ce(MyTitle, { color: 'lime', title: 'Silicon Valleys' })
// );
// };

// same lake bevor but other code

// const MyTitle = function(props) {
// return (
// <div>
// <h1 style={{ color: props.color }}>
// {props.title}
// </h1>
// </div>
// );
// };

// const MyFirstComponent = function() {
// return (
// <div id="my-first-component">
// <MyTitle title="House of Cards" color="rebeccapurple" />
// <MyTitle title="Orange is the New Black" color="peru" />
// <MyTitle title="Stranger Things" color="burlywood" />
// <MyTitle title="Silicon Valley" color="lime" />
// </div>
// );
// };

// render(ce(MyFirstComponent), document.getElementById('app'));
// render(<MyFirstComponent />, document.getElementById('app'));
Loading