87babed265
Merge pull request #44 from KevinMidboe/client/admin-page
Kevin2017-10-21 09:50:32 +02:00
a0565f79d2
Changed name of variable element to requestElement and now the link name of a list item is generated by generateListElements and if this element is the one selected make it visually different
#44
KevinMidboe2017-10-21 09:48:13 +02:00
277105e6df
Our selected Request is passed through props, the prop name is now changed from display to selectedRequest.
KevinMidboe2017-10-21 09:45:46 +02:00
87a2de1d0b
Reflects the changes to the url paramater for admin, is now names requestParam. Also the param is passed to Sidebar so that we can highlight the one selected.
KevinMidboe2017-10-21 09:44:12 +02:00
ebfb61d776
Renamed admin param to request from search
KevinMidboe2017-10-21 08:22:02 +02:00
4cdf368d2c
Merge pull request #43 from KevinMidboe/client/admin_page
Kevin2017-10-21 00:16:01 +02:00
5aaf0ddf84
Moved Admin and LoginForm to admin folder and deleted app and main in replacement for root.
#43
KevinMidboe2017-10-21 00:14:50 +02:00
39e363dbf3
Works together with AdminRequestInfo to display info about requested items on the admin page.
KevinMidboe2017-10-21 00:12:44 +02:00
cd58a830b5
Together with sidebar this loads the info of the selected request item on the admin page.
KevinMidboe2017-10-21 00:11:53 +02:00
d9f432a8de
Our new router, which is being directly loaded from index.js
KevinMidboe2017-10-21 00:11:24 +02:00
2a09f67248
Now index.js uses root instead of app component.
KevinMidboe2017-10-21 00:10:51 +02:00
65c1f7ad96
Changed from compDidMount to WillMount so it loads before our render function.
KevinMidboe2017-10-21 00:09:29 +02:00
2fd515d997
Fixed a bug where the json object was not being returned and fixed indentation of fetchJSON function.
KevinMidboe2017-10-21 00:08:35 +02:00
4297505861
Moved admin to a admin folder and this is now the landing page for all that admin things we want to do. It now just displays the sidebar and adminRequestInfo for a selected item in the sidebar. Also checks if user is logged in before loading view.
KevinMidboe2017-10-21 00:06:50 +02:00
5bd1041deb
Merge pull request #42 from KevinMidboe/client/update_requested
Kevin2017-10-20 18:13:30 +02:00
cdba914758
Where all our button components will recide.
KevinMidboe2017-10-20 18:11:15 +02:00
5f13ad202c
Added import of fetchJSON function in http
KevinMidboe2017-10-20 18:10:53 +02:00
8fa7f7f918
Just added a justify content variable
KevinMidboe2017-10-20 18:09:43 +02:00
b2f4151850
Movie object now uses http functions when submitting a post for a movie.
KevinMidboe2017-10-20 18:08:31 +02:00
45a84cbf85
The admin page that has all the fetched elements now prints all the elements out in a grid. Tried a cool thing on how to render the dropdown for changing the status of a element, but its not working atm.
KevinMidboe2017-10-20 17:20:43 +02:00
42d0b40825
Does not fit on this branch, but updated the key value, so it is concat of both id and index of the map function for search results. It was prev just the index, and when rapped this hits same value, which is unacceptable by react.
KevinMidboe2017-10-07 14:52:49 +02:00
d9a22f506e
When posting a request, the type is also added to the database.
KevinMidboe2017-10-06 15:38:22 +02:00
307a8352a3
Now takes both id and type because there is two different sets of id pools, and need to select the corrent one.
KevinMidboe2017-10-06 15:37:09 +02:00
3c372aab92
Added returnstatement to updateRequestedById and fixed the sql query.
KevinMidboe2017-10-06 15:19:08 +02:00
650c2603e4
Changed the input path of requestRepo
KevinMidboe2017-10-06 15:16:45 +02:00
fb479e7a37
Renamed function in requestRepo to updateRequestedById
KevinMidboe2017-10-06 15:14:31 +02:00
f54bd0f743
Added a function for updating the status from a given id in requests database.
KevinMidboe2017-10-06 15:04:18 +02:00
61c242b5eb
Passes the id from request parameter and status we want to change to from the request body.
KevinMidboe2017-10-06 15:03:47 +02:00
51d446f378
Added endpoint for updating a requested item.
KevinMidboe2017-10-06 15:02:44 +02:00
9b6e7af3ee
Merge pull request #41 from KevinMidboe/client/admin
Kevin2017-10-06 12:28:05 +02:00
42749c5b64
Now searchRequest passes a index key to movieObject so that each div object can have a separate key.
#41
KevinMidboe2017-10-06 12:20:51 +02:00
2e47324005
Merge pull request #40 from KevinMidboe/fix/api
Kevin2017-10-06 12:15:08 +02:00
f8ff71bcff
Removed a no longer used ip address for allowed origins.
#40
Kevin Midboe2017-10-06 12:14:05 +02:00
7e27e19a0d
Added more strict header allowence and was a error where endpoints for user was not using router, but app.
Kevin Midboe2017-10-06 12:12:21 +02:00
c954bd4874
Added stylesheet for requestElement
KevinMidboe2017-10-06 12:08:06 +02:00
dbb8eb4057
Added redux reducer and store for calling from the login page.
KevinMidboe2017-10-06 12:07:43 +02:00
c03449b9e9
The login form for authentication a user.
KevinMidboe2017-10-06 12:05:54 +02:00
3bc8c5912b
Loader for what pages is to be displayed based on the state of cookie: logged_in. Either displays login page or fetchrequested.
KevinMidboe2017-10-06 12:04:35 +02:00
bd74e1dee1
The first thing the index does is to load the app file in a hashrouter object and send it to the element with id root.
KevinMidboe2017-10-06 12:03:16 +02:00
ed1d0f3c39
App.jsx now loads the header and the main script that holds our routes.
KevinMidboe2017-10-06 12:01:30 +02:00
0b79c8679d
This is the landing page for viewing all requested items. One must be authenticated through the admin page, and requests need the token variable in browser storage. The returned data can be filtered and sorted.
KevinMidboe2017-10-06 12:00:51 +02:00
927352e9ae
Added react-redux, react-router and other redux packages.
KevinMidboe2017-10-06 11:59:16 +02:00
5b110b9d82
This is the main router for index page, routes to searchRequest and admin pages.
KevinMidboe2017-10-06 11:57:22 +02:00
1633be1276
Added 404 page when a request does not match any routes.
KevinMidboe2017-10-06 11:56:22 +02:00
6d5c1e8d6d
File that holds functions for retriveing and saving cookie data.
KevinMidboe2017-10-06 11:55:20 +02:00
5e50d52344
Now gitignore is working for new prefs.
Kevin Midboe2017-10-04 14:25:05 +02:00
26c1bda3df
Now when calling moveSeason python script, the python version used is python3.
Kevin Midboe2017-10-04 14:18:42 +02:00
da83b73732
Added a parent_input that can be used for constructing the move path to a different path than the destination path. Also moved from using os.move to shutil.move for cross filesystem support. Also removed owner renaming.
Kevin Midboe2017-10-04 14:07:23 +02:00
d9d8d6ab58
Merge pull request #39 from KevinMidboe/feature/api_request
Kevin2017-10-03 16:28:39 +02:00
5fbedeb4b2
Misspelled User-Agent, when should have been user-agent.
#39
KevinMidboe2017-10-03 16:26:03 +02:00
455bf565b2
Moved the ? marker in the sql query to the end of the statement.
KevinMidboe2017-10-03 16:19:55 +02:00
a819a4bbf3
Now passes the user agent that is making the post request (requesting content) so it can be saved in the db.
KevinMidboe2017-10-03 16:11:15 +02:00
f50e0b2a59
Added user_agent to be passed to and saved in db when a request is made.
KevinMidboe2017-10-03 16:10:27 +02:00
9d2c7c4c2f
Added variable for status for database request query.
KevinMidboe2017-10-03 16:01:28 +02:00
8908e36e89
Merge branch 'master' of github.com:KevinMidboe/seasonedShows
Kevin Midboe2017-09-27 21:55:33 +02:00
33aefef362
This was for some reason removed, now added again.
Kevin Midboe2017-09-27 21:55:21 +02:00
cee27fd9d2
Merge pull request #38 from KevinMidboe/bugfix/infolinkForShows
Kevin2017-09-27 20:43:54 +02:00
2bacc54687
Added a check for the type and then change the info link to end with either movie or tv.
#38
KevinMidboe2017-09-27 20:41:49 +02:00
850401fd7a
Merge pull request #37 from KevinMidboe/feature/getRequested
Kevin2017-09-27 17:58:16 +02:00
149b05ef28
Calling function for fetching all the requested items.
KevinMidboe2017-09-27 17:55:07 +02:00
e43bcbdd52
Added endpoint for getting all requests.
KevinMidboe2017-09-27 17:54:34 +02:00
509759bca8
Added a function in requestRepo to fetch out all the requested items. And a sql statement to do so.
KevinMidboe2017-09-27 17:54:01 +02:00
f1f407c71c
Merge pull request #36 from KevinMidboe/feature/authentication
Kevin2017-09-27 16:30:05 +02:00
bab4af08d9
Added the use of tokenToUser so that it is verified that a valid token is in the request header when doing actions that need login verification.
#36
KevinMidboe2017-09-27 16:27:05 +02:00
a3de70e2da
Created a middleware for requests that checks for a token in the Authentication field in the header and verifies that the token is valid for a user.
KevinMidboe2017-09-27 16:25:54 +02:00
698d2d6072
Created endpoints for user tasks like login, register and a test endpoint history. A test for checking that session token works as expected.
KevinMidboe2017-09-27 16:19:02 +02:00
6ec6c7f9cb
Added token, user, userRepository and userSecurity in user folder. This handles creating new users, loging in and creating a user specific token then returning it when logging in.
KevinMidboe2017-09-27 16:15:28 +02:00
72654fd465
Added searchHistory for adding a logged in users history trace. (More like a test function of the page)
KevinMidboe2017-09-27 16:13:39 +02:00
f4aee549be
Added bcrypt and jsonwebtoken to package list
KevinMidboe2017-09-27 16:12:20 +02:00
bb6dd1ad59
Added middleware for authentiaction, endpoints for a user and import for token handling.
KevinMidboe2017-09-27 14:02:59 +02:00
a14d9e5ec6
Merge pull request #34 from KevinMidboe/update/frontend_logic
Kevin2017-09-27 14:00:29 +02:00
5ceb19f449
Merge branch 'update/frontend_logic' of github.com:kevinmidboe/seasonedShows into update/frontend_logic
#34
KevinMidboe2017-09-27 13:51:07 +02:00
8b5b8bb0b7
Reduced the filter values to return more results.
KevinMidboe2017-09-27 13:49:49 +02:00
6b3fe8c46f
Merge pull request #33 from KevinMidboe/update/frontend_logic
Kevin2017-09-27 00:47:25 +02:00
98dafe56c4
Merge branch 'master' into update/frontend_logic
#33
Kevin2017-09-27 00:45:49 +02:00
44d8dbfe0c
Updated gitignore to include yarn.locks.
KevinMidboe2017-09-27 00:30:51 +02:00
6d0a91dc93
Changed the default filter values to be multi until a filter selector is implemented.
KevinMidboe2017-09-27 00:29:28 +02:00
8014f01766
Added stricter handling for selecting what mediaType to convert to when searching tmdb and converting to seasoned object.
KevinMidboe2017-09-27 00:28:41 +02:00
d787fba024
Changed a smellingerror (reponse -> response). Also now pass the type of the search request when converting to seasoned object. Fixed issue where number_of_items_on_page was not set to the length of the list.
KevinMidboe2017-09-27 00:22:22 +02:00
6bd1b29d5e
Changed the font size of the header, space between the search bar and result content. Also changed so that the font size in the search bar is large enough to not zoom on ios because of smaller than standard font size.
KevinMidboe2017-09-27 00:19:19 +02:00
86c479de15
Changed so that the output is split in two idependent mediaQuery items at the second most parent. This is a lazy way to controll all elements of when resizing to a smaller screen.
KevinMidboe2017-09-27 00:18:06 +02:00
daa9a7749e
Now also the ip address is passed to the sendRequest function in requestRepository so that the requesters ip address can be logged in the database.
KevinMidboe2017-09-26 20:43:56 +02:00
d47f2bf757
Added support for database operations. Now when requesting a item, it is saved to a database and sends a email from pi.midboe account.
KevinMidboe2017-09-26 20:42:49 +02:00
6f54a61223
Removed a extra / that was in the posterURL
KevinMidboe2017-09-26 20:41:25 +02:00
1321671840
Added infinite-scroller, notify-toast, urijs. Also burger-menu for later support for selecting discover lists.
KevinMidboe2017-09-26 20:40:11 +02:00
1af9368a6c
Updated stylesheets to reflect changes to request and movieObject pages.
KevinMidboe2017-09-26 20:38:13 +02:00
5341e940c6
Added viewport width to header of main index.html page.
KevinMidboe2017-09-26 20:37:24 +02:00
30226af6f6
Lots of style changes done to look neater. Now when scrolled to bottom of the page it fetches more items from the api.
KevinMidboe2017-09-26 20:36:37 +02:00
b2f9d6f5f5
Added rating and background to the class constructor. Added type variable to url when requesting a movie/show and added a notification agent. Now this page is also updated to support mobile formatting, when tilted it shows the background image instead of poster image.
KevinMidboe2017-09-26 20:34:54 +02:00
a5d270967e
Merge pull request #31 from KevinMidboe/fix/seasonedApiSearch
Kevin2017-09-21 16:39:00 +02:00
e281e73293
Now the type is checked and passed to convertTmdbToSeasoned if it is movie or show and not multiwq
#31
Kevin Midboe2017-09-21 16:37:53 +02:00