Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MovieApp-JS-Capstone-Project-Review #29

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5637df6
FILE SETUP
Apatakiti Sep 6, 2022
0cef7ad
fix config file errors
Marlyn-Mayienga Sep 6, 2022
c0a8a62
add confi files
Marlyn-Mayienga Sep 6, 2022
63ec88b
added asset folder
Marlyn-Mayienga Sep 6, 2022
619b433
PROJECT SETUP
Apatakiti Sep 7, 2022
82fea92
display list of items
Marlyn-Mayienga Sep 7, 2022
a127831
fix workflows
Marlyn-Mayienga Sep 7, 2022
cfb934d
fix linters
Marlyn-Mayienga Sep 7, 2022
df466d2
Merge pull request #22 from Marlyn-Mayienga/item-list
Marlyn-Mayienga Sep 7, 2022
ba61632
fix conflicts
Marlyn-Mayienga Sep 7, 2022
c22c5cd
fix merge confllicts
Marlyn-Mayienga Sep 7, 2022
3189f64
display number of likes for each item
Marlyn-Mayienga Sep 8, 2022
6bf9480
add new like
Marlyn-Mayienga Sep 8, 2022
17c49b8
ADDED COMMENT POPUP
Apatakiti Sep 8, 2022
45933ea
fix webpack error
Marlyn-Mayienga Sep 8, 2022
78def2b
Add tests for items counter and the counter
Marlyn-Mayienga Sep 8, 2022
7ca6315
ADDED COMMENT API INTERACTION and TESTING
Apatakiti Sep 8, 2022
4cba23e
added test
Apatakiti Sep 8, 2022
213dcc3
Merge pull request #26 from Marlyn-Mayienga/COMMENT-POPUP
Apatakiti Sep 8, 2022
072b617
Merge pull request #24 from Marlyn-Mayienga/add-new-like
Apatakiti Sep 8, 2022
cd66b58
Merge pull request #28 from Marlyn-Mayienga/COMMENT-API-INTERACTION
Apatakiti Sep 8, 2022
4ebe552
Merge branch 'DEV' into add-like
Apatakiti Sep 8, 2022
82a18eb
Fixed linters
Apatakiti Sep 8, 2022
3099157
Merge pull request #23 from Marlyn-Mayienga/add-like
Apatakiti Sep 8, 2022
81517d6
updated add-like
Marlyn-Mayienga Sep 9, 2022
5fcd155
Update README.md
Marlyn-Mayienga Sep 9, 2022
d68021c
Update README.md
Marlyn-Mayienga Sep 9, 2022
3cab3d4
Update README.md
Marlyn-Mayienga Sep 9, 2022
3098ea0
Update README.md
Marlyn-Mayienga Sep 9, 2022
d1a4417
updated movie-logo
Marlyn-Mayienga Sep 9, 2022
f7e3e9a
delete file
Marlyn-Mayienga Sep 9, 2022
c612cb9
create dist folder
Marlyn-Mayienga Sep 9, 2022
8522979
UPDATED ALL FILES
Apatakiti Sep 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix webpack error
  • Loading branch information
Marlyn-Mayienga committed Sep 8, 2022
commit 45933ea45016001ce8a7325662692c8f56621433
Binary file removed dist/a18a760877d7a4dac494.jpg
Binary file not shown.
212 changes: 17 additions & 195 deletions dist/bundle.js

Large diffs are not rendered by default.

31 changes: 25 additions & 6 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -4,29 +4,48 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay"
crossorigin="anonymous"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link rel="stylesheet" href="style.css">
<title>Movie App</title>
<script defer src="bundle.js"></script></head>
<body>
<header>
<div class="header-container">
<div class="logo"><img src="../assets/M-watch.png" alt="M-watch icon"></div>
<div class="Films">Films</div>
<div class="Recent">Recent</div>
<div class="old-times">Old times</div>
<div class="old-times">Old Times</div>
</div>
</header>

<section class="shows">
<h2>Films Available</h2>
<div class="movies"></div>
<div class="movie-container">
<div class="movies"></div>
</div>
</section>

<!-- comment Popup -->
<div class="comments"> </div>

<footer>
Created by <a href="https://github.com/Ademola-coding">Ademola Owoeye</a> & <a href="https://github.com/Marlyn-Mayienga">Marlyn Mayienga</a> under CC license.
</footer>

<footer class="text-center text-lg-start">
<div class="text-center p-3">
Created by <a href="https://github.com/Ademola-coding">Ademola Owoeye</a> & <a href="https://github.com/Marlyn-Mayienga">Marlyn Mayienga</a> under CC license.
</div>
</footer>
<script type="module" src="./index.js"></script>
</body>
</html>
10 changes: 7 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -260,7 +260,6 @@
"html-entities": "^2.3.3",
"html-minifier-terser": "^6.1.0",
"html-tags": "^3.2.0",
"html-webpack-plugin": "^5.5.0",
"htmlparser2": "^6.1.0",
"http-cache-semantics": "^4.1.0",
"http-deceiver": "^1.2.7",
@@ -701,6 +700,7 @@
"@babel/core": "^7.19.0",
"@babel/preset-env": "^7.19.0",
"babel-jest": "^29.0.2",
"html-webpack-plugin": "^5.5.0",
"jest": "^29.0.2",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// import './style.css';
import './style.css';
import display from './modules/display.js';
import likes from './modules/likes.js';