diff --git a/README.md b/README.md index bfa4756..c79fb02 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,21 @@ Our Project Team consists of -* Backend Developer - @Lord-of-Chicken -* Backend Developer - @gonzalovsilva -* Frontend Developer - @robbertklockaerts -* Project Manager - @Yuliya-beCode +* Backend Developer - [@Lord-of-Chicken](https://github.com/Lord-of-Chicken) +* Backend Developer -[@gonzalovsilva](https://github.com/gonzalovsilva) +* Frontend Developer - [@robbertklockaerts](https://github.com/robbertklockaerts) +* Project Manager - [@Yuliya-beCode](https://github.com/Yuliya-beCode) Tasks allocation -| Heading 1 | Heading 2 | Heading 3 | -|-----------|:-----------:|-----------:| -| Cell A1 | Cell A2 | Cell A3 | -| Cell B1 | Cell B2 | Cell B3 | +| Gonçalo Silva| Gael Layeux | Robbert Klockaerts | Yuliya Bochkovskaya| +|:-----------:|:-----------:|:-----------:| :-----------:| +| right to comment on the content | a session system: registration, connection / disconnection. | right to comment on the content | General administration of the project/Figma style | +| Include a search bar and sort by filters| php footer/header include | admin dashboard | php insert video into iframe | +| page or section that displays the top movies with the movie db API| Back office for user and comment management (CRUD) | login form css | footer/header templates| +| General administration of the project drafting search flow chart| General administration of the project | General administration of the project| register form css| -If you have any questions in regards to our project, please do not hesitate to contact us directly on GitHub +If you have any questions in regards to our project, please do not hesitate to contact us directly on GitHub. Our contact details are mentioned above. # What @@ -31,13 +33,14 @@ movies. * We well spotted the similarities between these platforms (navbar, header, search tool, different categories of videos…) -Please find here below the UX prototype of our website +Please find here below the UX prototype of our website at the first stage of its creation [UX-Prototype of our website ](https://www.figma.com/proto/LZLTLgveLvyu8aBJbc3u1G/The-Theater?node-id=66%3A0&scaling=scale-down&page-id=0%3A1) ![UX-Prototype](pictures_README/img.png) + # How - A session system: registration, connection / disconnection. @@ -55,7 +58,6 @@ Please find here below the UX prototype of our website # When - # Evaluation criterias -> self check - [x] We have realized all must-have features. diff --git a/docker_env/application/source/database/GetFlix .sql b/docker_env/application/source/database/GetFlix .sql deleted file mode 100644 index 7e0731c..0000000 --- a/docker_env/application/source/database/GetFlix .sql +++ /dev/null @@ -1,107 +0,0 @@ --- phpMyAdmin SQL Dump --- version 4.8.1 --- https://www.phpmyadmin.net/ --- --- Host: database:3306 --- Gegenereerd op: 08 apr 2021 om 06:27 --- Serverversie: 10.4.2-MariaDB-1:10.4.2+maria~bionic --- PHP-versie: 7.2.5 - -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET AUTOCOMMIT = 0; -START TRANSACTION; -SET time_zone = "+00:00"; - - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; - --- --- Database: `GetFlix` --- - --- -------------------------------------------------------- - --- --- Tabelstructuur voor tabel `comments` --- - -CREATE TABLE `comments` ( - `id` int(11) NOT NULL, - `uid` varchar(128) CHARACTER SET latin1 DEFAULT NULL, - `date` datetime DEFAULT current_timestamp(), - `message` text CHARACTER SET latin1 NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Gegevens worden geëxporteerd voor tabel `comments` --- - -INSERT INTO `comments` (`id`, `uid`, `date`, `message`) VALUES -(16, 'anon', '2021-04-07 00:00:00', 'edited comment'), -(63, NULL, '2021-04-08 05:52:44', 'test'); - --- -------------------------------------------------------- - --- --- Tabelstructuur voor tabel `user` --- - -CREATE TABLE `user` ( - `id` int(11) NOT NULL, - `firstname` varchar(15) NOT NULL, - `lastname` varchar(100) NOT NULL, - `username` varchar(100) NOT NULL, - `email` varchar(100) NOT NULL, - `password` text NOT NULL, - `role` enum('guest','admin','user','') NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Gegevens worden geëxporteerd voor tabel `user` --- - -INSERT INTO `user` (`id`, `firstname`, `lastname`, `username`, `email`, `password`, `role`) VALUES -(7, 'Layeux', 'Gael', 'lordofchicken', 'gael.layeux@poulet.org', '7110eda4d09e062aa5e4a390b0a572ac0d2c0220', 'guest'), -(16, 'Rob', 'Klockaerts', 'rob', 'rob.klockaerts@hotmail.com', 'dc724af18fbdd4e59189f5fe768a5f8311527050', 'admin'), -(18, 'john', 'doe', 'john', 'john.doe@mail.com', 'dc724af18fbdd4e59189f5fe768a5f8311527050', 'guest'), -(20, 'jane', 'doe', 'jane', 'jane.doe@mail.com', 'dc724af18fbdd4e59189f5fe768a5f8311527050', 'guest'); - --- --- Indexen voor geëxporteerde tabellen --- - --- --- Indexen voor tabel `comments` --- -ALTER TABLE `comments` - ADD PRIMARY KEY (`id`); - --- --- Indexen voor tabel `user` --- -ALTER TABLE `user` - ADD PRIMARY KEY (`id`); - --- --- AUTO_INCREMENT voor geëxporteerde tabellen --- - --- --- AUTO_INCREMENT voor een tabel `comments` --- -ALTER TABLE `comments` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=64; - --- --- AUTO_INCREMENT voor een tabel `user` --- -ALTER TABLE `user` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=21; -COMMIT; - -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/docker_env/application/source/footer.css b/docker_env/application/source/footer.css new file mode 100644 index 0000000..8445fb6 --- /dev/null +++ b/docker_env/application/source/footer.css @@ -0,0 +1,6 @@ +.navbar-brand +{ + position: relative; + width: 50px; + left: 15px; +} \ No newline at end of file diff --git a/docker_env/application/source/footer.html b/docker_env/application/source/footer.html new file mode 100644 index 0000000..c3855e5 --- /dev/null +++ b/docker_env/application/source/footer.html @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + Video + + + + + + + + + + + + + + + + + + + diff --git a/docker_env/application/source/header.html b/docker_env/application/source/header.html new file mode 100644 index 0000000..fd4f700 --- /dev/null +++ b/docker_env/application/source/header.html @@ -0,0 +1,60 @@ + + + + + + + + + + + + + Video + + + + + +
+ +
+ + + + + + + + diff --git a/docker_env/application/source/index.css b/docker_env/application/source/index.css index 24606b9..3315a5f 100644 --- a/docker_env/application/source/index.css +++ b/docker_env/application/source/index.css @@ -1,23 +1,19 @@ html, body { - background: url(pictures/jake-hills-theater.png) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; + background: url(https://images.unsplash.com/photo-1503095396549-807759245b35?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1051&q=80) no-repeat center center fixed; background-size: cover; + height: 100%; + width: 100%; + margin: 0; + padding: 0; } - - .active { background-color: crimson; color: white; } - - .navbar { - padding-left: 15px; - padding-right: 15px; + padding: 0; } #logo { @@ -26,15 +22,177 @@ html, body { } - ul, p { margin: 0; } + +.card { + cursor: pointer; + overflow: hidden; + -webkit-transition: 600ms -webkit-filter linear, transform 300ms; + -moz-transition: 600ms -moz-filter linear, transform 300ms; + -moz-transition: 600ms filter linear, transform 300ms; + -ms-transition: 600ms -ms-filter linear, transform 300ms; + -o-transition: 600ms -o-filter linear, transform 300ms; + transition: 600ms filter linear, 300ms -webkit-filter linear, transform 300ms; +} + +.card:hover { + filter: grayscale(70%) brightness(150%); + -webkit-filter: grayscale(70%) brightness(150%); + transform: scale(1.03); +} + + +.searchbar button { + background: none; + border: none; + padding: 0; + outline: inherit; +} + +.searchbar { + margin-top: 20px; + height: 50px; + background-color: #353b48; + border-radius: 30px; + padding: 5px; +} + +.search_label { + color: white; + padding: 0 10px; + line-height: 40px; +} + +.search_input { + color: white; + border: 0; + outline: 0; + background: none; + width: 0; + caret-color: transparent; + line-height: 40px; + transition: width 0.4s linear; +} + +.searchbar:hover>.search_input { + padding: 0 10px; + width: 300px; + caret-color: red; + transition: width 0.4s cubic-bezier(0.645, 0.045, 0.355, 1); +} + +.searchbar:hover>.search_icon { + background: white; + color: #e74c3c; +} + +.search_icon { + height: 40px; + width: 40px; + float: right; + display: flex; + justify-content: center; + align-items: center; + border-radius: 50%; + color: white; + text-decoration: none; +} + +.row-cols-5>* { + max-width: 19%; +} + +.card { + min-height: 100%; + max-height: 100%; +} + +#filters ul { + padding: 0; +} + +#filters li { + display: inline; + list-style: none; + /* pour enlever les puces sur IE7 */ + /* margin: 2.5px; */ + margin-bottom: 15px; +} + +#filters button { + color: white; + background-color: #353b48; + border-radius: 10px; + padding: 5px 10px; + margin: 0 2.5px; + border: none; +} + +#filters button:hover { + background-color: #555c6b; +} + +#filters button.active { + background-color: #973535; +} + +#filters button.active:hover { + color: white; + background-color: #c24e4e; +} + +#switch { + margin-top: 20px; + margin-bottom: 20px; + padding: 5px; + /* background-color: #363636; */ + /* border-radius: 10px; */ +} + +#switch_ctrl { + margin-right: 20px; + background-color: rgb(48, 48, 48); + border-radius: 10px; + overflow: hidden; +} + +#switch_ctrl:first-child { + padding-left: 10px; +} + +#switch_ctrl button { + color: black; + background-color: rgb(119, 119, 119); + border-radius: 0px; + border-left: solid rgb(48, 48, 48) 3px; + margin: 0px; +} + +#switch_ctrl button.active { + color: white; + background-color: #973535; +} + +#switch_ctrl button.active:hover { + color: white; + background-color: #c24e4e; +} + +#result { + margin-bottom: 20px; +} + +#logo { + max-width: 70px; +} + + #searchbar{ margin: 0 auto; width: 80vw; - opacity: 0.8; } .searchbar button { @@ -48,7 +206,7 @@ p { /* margin-top: 20px; */ height: 50px; background-color: #353b48; - border-radius: 30px; + border-radius: 30px !important; padding: 5px; } @@ -85,7 +243,7 @@ p { display: flex; justify-content: center; align-items: center; - border-radius: 50%; + border-radius: 50% !important; color: white; text-decoration: none; } \ No newline at end of file diff --git a/docker_env/application/source/index.php b/docker_env/application/source/index.php index f1a2483..3a6536c 100644 --- a/docker_env/application/source/index.php +++ b/docker_env/application/source/index.php @@ -9,7 +9,8 @@ - + + Movie Search module @@ -25,20 +26,34 @@ Log out +
-
-
-
- + + +
+ + +
+
+ +

Welcome to the Theatre.
Unlimited movies, TV shows, + and more.

+ +

Ready to watch? Enter a keyword of your favorite + movie

+ + +
+
-
-
diff --git a/docker_env/application/source/info.css b/docker_env/application/source/info.css index 3b99580..e68979f 100644 --- a/docker_env/application/source/info.css +++ b/docker_env/application/source/info.css @@ -1,24 +1,26 @@ -body{ - background:rgb(112, 49, 49); - margin-top:10px; - - } - - .active { - background-color: crimson; - color: white; - } - - - .errors { - text-align: center; - } - - #logo { - width: 60px; - display: flex; - - } +html, body { + background: url(https://images.unsplash.com/photo-1503095396549-807759245b35?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1051&q=80) no-repeat center center fixed; + background-size: cover; + height: 100%; + width: 100%; + margin: 0; + padding: 0; +} + +.active { + background-color: crimson; + color: white; +} + +.navbar { + padding: 0; +} + +#logo { + width: 60px; + display: flex; + +} .ibox { clear: both; diff --git a/docker_env/application/source/info.php b/docker_env/application/source/info.php index c82bb1b..6d1c69a 100644 --- a/docker_env/application/source/info.php +++ b/docker_env/application/source/info.php @@ -5,7 +5,6 @@ // GET MOVIE INFO: https://api.themoviedb.org/3/movie/791373?api_key=04c35731a5ee918f014970082a0088b1&language=en-US - $domain = 'https://api.themoviedb.org'; $API_KEY = '04c35731a5ee918f014970082a0088b1'; $id = $_GET['movie']; @@ -117,7 +116,7 @@
- query("SELECT * FROM comments") or die($mysqli->error); ?> @@ -136,9 +135,9 @@ - Edit - Delete @@ -172,7 +171,7 @@ function pre_r($array){ } echo "
"; echo date('Y-m-d H:i:s'); - + ?>
diff --git a/docker_env/application/source/js/search.js b/docker_env/application/source/js/search.js index 0550bc8..4e6890b 100644 --- a/docker_env/application/source/js/search.js +++ b/docker_env/application/source/js/search.js @@ -289,7 +289,7 @@ async function getSearch(search, category = [], page = 1) { if (movie.poster_path == null) { // console.log(movie.title); - img_poster = "./placeholder.png"; + img_poster = "js/placeholder.png"; } return `
diff --git a/docker_env/application/source/login.php b/docker_env/application/source/login.php index 7e5aed9..bf2e304 100644 --- a/docker_env/application/source/login.php +++ b/docker_env/application/source/login.php @@ -56,7 +56,7 @@ integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous"> - + The theater diff --git a/docker_env/application/source/myStyles.css b/docker_env/application/source/myStyles.css deleted file mode 100644 index 3adc18a..0000000 --- a/docker_env/application/source/myStyles.css +++ /dev/null @@ -1,12 +0,0 @@ -html, body { - background: url(pictures/jake-hills-theater.png) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; -} - -.navbar { - padding-left: 15px; - padding-right: 15px; -} diff --git a/docker_env/application/source/pictures/jake-hills-theater.png b/docker_env/application/source/pictures/jake-hills-theater.png deleted file mode 100644 index 888aca0..0000000 Binary files a/docker_env/application/source/pictures/jake-hills-theater.png and /dev/null differ diff --git a/docker_env/application/source/search.css b/docker_env/application/source/search.css index 00d9baa..a35fa45 100644 --- a/docker_env/application/source/search.css +++ b/docker_env/application/source/search.css @@ -1,3 +1,28 @@ +html, body { + background: url(https://images.unsplash.com/photo-1503095396549-807759245b35?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1051&q=80) no-repeat center center fixed; + background-size: cover; + height: 100%; + width: 100%; + margin: 0; + padding: 0; +} + +.active { + background-color: crimson; + color: white; +} + +.navbar { + margin: 0; + padding: 0; +} + +#logo { + width: 60px; + display: flex; + padding: 0; +} + ul, p { margin: 0; @@ -53,14 +78,14 @@ p { transition: width 0.4s linear; } -.searchbar:hover>.search_input { +.searchbar:hover > .search_input { padding: 0 10px; width: 300px; caret-color: red; transition: width 0.4s cubic-bezier(0.645, 0.045, 0.355, 1); } -.searchbar:hover>.search_icon { +.searchbar:hover > .search_icon { background: white; color: #e74c3c; } @@ -77,7 +102,7 @@ p { text-decoration: none; } -.row-cols-5>* { +.row-cols-5 > * { max-width: 19%; } @@ -142,9 +167,9 @@ p { #switch_ctrl button { color: black; background-color: rgb(119, 119, 119); - border-radius: 0px; + border-radius: 0; border-left: solid rgb(48, 48, 48) 3px; - margin: 0px; + margin: 0; } #switch_ctrl button.active { diff --git a/docker_env/application/source/search.php b/docker_env/application/source/search.php index 3b42c43..3ffc218 100644 --- a/docker_env/application/source/search.php +++ b/docker_env/application/source/search.php @@ -6,11 +6,11 @@ - + + + - - Movie Search module @@ -48,38 +48,98 @@ -
    • -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • -
    • -
    • -
    • -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • @@ -96,11 +156,9 @@ - - + + \ No newline at end of file diff --git a/docker_env/application/source/searchbar_standalone.css b/docker_env/application/source/searchbar_standalone.css deleted file mode 100644 index 01243ca..0000000 --- a/docker_env/application/source/searchbar_standalone.css +++ /dev/null @@ -1,61 +0,0 @@ -ul, -p { - margin: 0; -} -#searchbar{ - margin: 0 auto; - width: 80vw; -} - -.searchbar button { - background: none; - border: none; - padding: 0; - outline: inherit; -} - -.searchbar { - /* margin-top: 20px; */ - height: 50px; - background-color: #353b48; - border-radius: 30px; - padding: 5px; -} - -.search_label { - color: white; - padding: 0 10px; - line-height: 40px; -} - -.search_input { - color: white; - border: 0; - outline: 0; - background: none; - width: 60%; - caret-color: transparent; - line-height: 40px; -} - -.searchbar:hover>.search_input { - /* padding: 0 10px; */ - caret-color: red; -} - -.searchbar:hover>.search_icon { - background: white; - color: #e74c3c; -} - -.search_icon { - height: 40px; - width: 40px; - float: right; - display: flex; - justify-content: center; - align-items: center; - border-radius: 50%; - color: white; - text-decoration: none; -} \ No newline at end of file diff --git a/docker_env/application/source/style.css b/docker_env/application/source/style.css index 1047492..3a6fbd3 100644 --- a/docker_env/application/source/style.css +++ b/docker_env/application/source/style.css @@ -1,10 +1,12 @@ - -html, body { - background: url(./pictures/jake-hills-theater.png) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; +body, +html { + background: url(https://images.unsplash.com/photo-1503095396549-807759245b35?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1051&q=80) no-repeat center center fixed; background-size: cover; + height: 100%; + width: 100%; + margin: 0; + padding: 0; + } @@ -30,19 +32,19 @@ h2 { font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; } - .active { background-color: crimson; color: white; } .navbar { - padding-left: 15px; - padding-right: 15px; + padding: 0; } -.errors { - text-align: center; +#logo { + width: 60px; + display: flex; + } #logo { diff --git a/docker_env/application/source/video.css b/docker_env/application/source/video.css deleted file mode 100644 index bc701f8..0000000 --- a/docker_env/application/source/video.css +++ /dev/null @@ -1,138 +0,0 @@ -body { - background: rgb(112, 49, 49); - margin-top: 10px; -} - -.active { - background-color: crimson; - color: white; -} - - -.errors { - text-align: center; -} - -#logo { - width: 60px; - display: flex; -} - -.ibox { - clear: both; - margin-bottom: 25px; - margin-top: 0; - padding: 0; -} - -.ibox.collapsed .ibox-content { - display: none; -} - -.ibox:after, -.ibox:before { - display: table; -} - -.ibox-title { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - background-color: #ffffff; - border-color: #e7eaec; - border-image: none; - border-style: solid solid none; - border-width: 3px 0 0; - color: inherit; - margin-bottom: 0; - padding: 14px 15px 7px; - min-height: 48px; -} - -.ibox-title h5 { - display: inline-block; - font-size: 14px; - margin: 0 0 7px; - padding: 0; - text-overflow: ellipsis; - -} - -.ibox-tools a { - cursor: pointer; - margin-left: 5px; - color: #c4c4c4; -} - -.ibox-tools { - display: block; - float: none; - margin-top: 0; - position: relative; - padding: 0; - text-align: right; -} - -.ibox-content { - background-color: #ffffff; - color: inherit; - padding: 15px 20px 20px 20px; - border-color: #e7eaec; - border-image: none; - border-style: solid solid none; - border-width: 1px 0; -} - -.ibox-footer { - color: inherit; - border-top: 1px solid #e7eaec; - font-size: 90%; - background: #ffffff; - padding: 10px 15px; -} - -video { - width: 100% !important; - height: auto !important; -} - -textarea { - width: 600px; - background-color: #fff; - resize: none; -} - - -.comment-box { - width: 500px; - margin-bottom: 4px; - position: relative; -} - -.comment-box p { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #282828; - font-weight: 100; -} - -.edit-form { - position: absolute; - top: 0px; - right: 0px; -} - -.edit-form button { - width: 55px; - height: 25px; - color: #282828; - background-color: #fff; - opacity: 0,5; - border: none; -} - -.edit-form button:hover { - opacity: 1; -} \ No newline at end of file diff --git a/docker_env/database/GetFlix.sql b/docker_env/database/GetFlix.sql new file mode 100644 index 0000000..f3b2569 --- /dev/null +++ b/docker_env/database/GetFlix.sql @@ -0,0 +1,108 @@ +-- phpMyAdmin SQL Dump +-- version 4.8.1 +-- https://www.phpmyadmin.net/ +-- +-- Host: database:3306 +-- Generation Time: Apr 09, 2021 at 08:22 AM +-- Server version: 10.4.2-MariaDB-1:10.4.2+maria~bionic +-- PHP Version: 7.2.5 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + +-- +-- Database: `GetFlix` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `comments` +-- + +CREATE TABLE `comments` ( + `id` int(11) NOT NULL, + `uid` varchar(128) CHARACTER SET latin1 DEFAULT NULL, + `date` datetime DEFAULT current_timestamp(), + `message` text CHARACTER SET latin1 NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Dumping data for table `comments` +-- + +INSERT INTO `comments` (`id`, `uid`, `date`, `message`) VALUES +(16, 'anon', '2021-04-07 00:00:00', 'edited comment'), +(63, NULL, '2021-04-08 05:52:44', 'test'), +(64, NULL, '2021-04-09 08:06:06', 'ss'), +(65, NULL, '2021-04-09 08:06:11', 'qzdqdaefef'), +(66, NULL, '2021-04-09 08:06:33', 'dflkdqkklds'), +(67, NULL, '2021-04-09 08:08:15', 'eeafe'), +(68, NULL, '2021-04-09 08:08:22', 'dsqlksqcklkqs'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `users` +-- + +CREATE TABLE `users` ( + `id` int(11) NOT NULL, + `username` varchar(255) NOT NULL, + `email` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `confirmation_token` varchar(60) DEFAULT NULL, + `confirmed_at` datetime DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Dumping data for table `users` +-- + +INSERT INTO `users` (`id`, `username`, `email`, `password`, `confirmation_token`, `confirmed_at`) VALUES +(33, 'lordofchicken', 'gael.layeux@poulet.org', '$2y$10$KW4M5Hs2r9DZj19LqaPU2OgSEHvXIsWsBJ4GIgn07SFx4qUC1JVSi', NULL, NULL); + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `comments` +-- +ALTER TABLE `comments` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `users` +-- +ALTER TABLE `users` + ADD PRIMARY KEY (`id`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `comments` +-- +ALTER TABLE `comments` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=69; + +-- +-- AUTO_INCREMENT for table `users` +-- +ALTER TABLE `users` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=34; +COMMIT; + +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/docker_env/docker-compose.yml b/docker_env/docker-compose.yml index 899dfe9..62be009 100644 --- a/docker_env/docker-compose.yml +++ b/docker_env/docker-compose.yml @@ -20,6 +20,8 @@ services: database: image: mariadb:10.4.2 container_name: becode-database + ports: + - 3306:3306 restart: always volumes: - ./database:/docker-entrypoint-initdb.d/ diff --git a/docker_env/info.html b/docker_env/info.html deleted file mode 100644 index 4b07946..0000000 --- a/docker_env/info.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - Video - - - - - - - - - - -
    - - -
    -
    - -
    -
    -
    Video window
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    Video description
    -
    -
    -

    Responsive

    -

    Uploaded on Jan 27, 2016

    -
    Science and Technology
    -

    - Lorem ipsum dolor sit amet, et singulis eleifend concludaturque - cum. Ne solet eleifend prodesset sed. Iusto deleniti -
    -
    - Lorem ipsum dolor sit amet, et singulis eleifend - concludaturque cum. Ne solet eleifend prodesset -
    -
    - Lorem ipsum dolor sit amet, et singulis eleifend concludaturque - cum. Ne solet eleifend prodesset sed. Iusto deleniti mandamus - has ut, vim ut omnium ponderum tractatos, oratio nostrud no mea. - Dolorum assentior sed cu -

    -
    -
    -
    28 Comments
    -
    -
    -
    -
    -
    -
    -
    - - - - \ No newline at end of file