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

Feature/merges #30

Merged
merged 36 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
01a3f69
Add Header
hamidazim321 Jul 31, 2023
c02c492
Update with footer
mershark Jul 31, 2023
0ac0109
Create display list
mershark Jul 31, 2023
bc27793
Update with style
mershark Jul 31, 2023
9674491
Correct lint error
mershark Jul 31, 2023
929bc46
Fix Linter Errors
hamidazim321 Jul 31, 2023
16ecbcb
Fix Eslint errors
hamidazim321 Jul 31, 2023
b39fc43
Merge pull request #22 from mershark/feature/display-meal
mershark Jul 31, 2023
18d20e0
add function to post and get comments from the api
hamidazim321 Jul 31, 2023
bff2a9a
Add function to create and populate popups
hamidazim321 Jul 31, 2023
74d36b6
add function to post comments
hamidazim321 Jul 31, 2023
db83f68
add comments counter
hamidazim321 Jul 31, 2023
c2a4e59
Fix eslint errors
hamidazim321 Jul 31, 2023
3c2e165
Fix Stylelint errors
hamidazim321 Jul 31, 2023
62ce965
Relocate the footer to the bottom of the page
hamidazim321 Jul 31, 2023
1c747f4
Merge pull request #23 from mershark/feature/comments
hamidazim321 Jul 31, 2023
77b4b21
Update with add function to display likes
mershark Jul 31, 2023
acdcb12
Fix linter errors
hamidazim321 Jul 31, 2023
d8eeece
Merge pull request #24 from mershark/features/like
mershark Jul 31, 2023
8ae53f7
add jsdom
hamidazim321 Jul 31, 2023
0ec6303
Add tests for the comments Counter Function
hamidazim321 Aug 1, 2023
9767259
Fix Linter errors
hamidazim321 Aug 1, 2023
ea994af
Merge pull request #27 from mershark/feature/test1
hamidazim321 Aug 1, 2023
2acd8ba
Create test2
mershark Aug 1, 2023
a743e2d
Fix Linter Errors
hamidazim321 Aug 1, 2023
7405266
Merge pull request #28 from mershark/feature/test2
mershark Aug 1, 2023
326c21a
Add final styles
hamidazim321 Aug 1, 2023
562c369
Fix Linter errors
hamidazim321 Aug 1, 2023
222803c
Merge pull request #29 from mershark/feature/finalTouches
hamidazim321 Aug 1, 2023
ce04b2e
Update README.md
mershark Aug 1, 2023
7e53e9c
Create MIT.md
mershark Aug 1, 2023
949a11a
Update the dist folder
hamidazim321 Aug 1, 2023
91703f6
Merge branch 'feature/merges' of github.com:mershark/Microverse-capst…
hamidazim321 Aug 1, 2023
72afdc5
Relocate the Counter functions into separate modules aand update the …
hamidazim321 Aug 1, 2023
869a987
Update Imports
hamidazim321 Aug 1, 2023
001b421
Update dist folder and fix linter errors
hamidazim321 Aug 1, 2023
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
7 changes: 7 additions & 0 deletions MIT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Copyright 2023, Hamid & Mershark

Permission is hereby granted, free of charge, to any person obtaining a copy of this project and associated documentation files, to deal in the project without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the project, and to permit persons to whom the project is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the project.

THE PROJECT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE project OR THE USE OR OTHER DEALINGS IN THE PROJECT.
125 changes: 106 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

![Capstone2](https://github.com/mershark/Microverse-capstone-2/assets/113654948/4509b1ae-3485-43cc-8ebb-b8898ff65b7a)

<a name="readme-top"></a>

<div align="center">
Expand Down Expand Up @@ -29,25 +32,67 @@
- [📝 License](#license)


# 📖 Set Up Project With Webpack <a name="about-project"></a>
# 📖 Microverse Capstone Project 2 <a name="about-project"></a>

> In our JavaScript capstone project, we built a dynamic web application using an external [API](https://www.themealdb.com/api.php). The webapp featured a home page with a list of "likeable" items, a comments popup for more information. We followed best JavaScript practices, used ES6 syntax, modules, and webpack. Our project included unit tests, code reviews, and integrated the Involvement API for user interactions.

In this project I build a simple yet powerful webpack boilerplate, which can be used as a starting point in a project.
## Built With

## 🛠 Built With <a name="built-with"></a>
- HTML
- CSS
- JAVASCRIPT

### Tech Stack <a name="tech-stack"></a>

>

<details>
<summary>Markup Language</summary>
<ul>
<li><a href="https://developer.mozilla.org/en-US/docs/Web/HTML">HTML</a></li>
</ul>
</details>

<details>
<summary>Style</summary>
<ul>
<li><a href="https://developer.mozilla.org/en-US/docs/Web/CSS">CSS</a></li>
</ul>
</details>

<details>
<summary>Layout</summary>
<ul>
<li><a href="https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Flexbox">Flexbox</a></li>
</ul>
</details>

<details>
<summary>Interaction and Dynamic HTML</summary>
<ul>
<li><a href="https://developer.mozilla.org/en-US/docs/Learn/JavaScript">Javascript</a></li>
</ul>
</details>

<details>
<summary>Module Bundler</summary>
<ul>
<li><a href="https://webpack.js.org/">Webpack</a></li>
</ul>
</details>

<details>
<summary>Client</summary>
<summary>Testing</summary>
<ul>
<li><a href="">HTML, CSS and JavaScript</a></li>
<li><a href="https://jestjs.io/docs/getting-started">Jest</a></li>
</ul>
</details>


### Key Features <a name="key-features"></a>

- Has HTML template to use.
- You can view live edit in your localhost while editing.
- **Like A Meal**
- **Comment On A Meal**

<p align="right">(<a href="#readme-top">back to top</a>)</p>

Expand All @@ -57,31 +102,51 @@ To get a local copy up and running, follow these steps.

### Prerequisites

In order to run this project you need:
NPM installed
Any code editors
In order to run this project you need the following tools:
- Node.js on your computer
- Code editor e.g.: VScode

### Setup

Clone this repository to your desired folder by.
- cd my-folder
- git clone [https://github.com/mershark/webpack-to-bundle-JavaScript]
- cd my-project
Clone this repository to your desired folder by running the following commands in your terminal:

```sh
cd your-prefered-folder-name

git clone https://github.com/mershark/Microverse-capstone-2.git
```

### Install

Installation is completed once the repository and cloned into your local machine.
- Install this project with:

```sh
cd Microverse-capstone-2

npm install or npm i
```

- Run an optimized build for prodction:
```
npm run build
```

### Usage

To run the project launch index.html in your browser
To run the project, execute the following command:

```sh
npm start

```

### Run tests

To run tests, run the following command:
npx stylelint "**/*.{css,scss}

```sh
npm run test
```

### Deployment

Expand All @@ -90,19 +155,40 @@ You can deploy this project by transferring the files in your local repository o

<p align="right">(<a href="#readme-top">back to top</a>)</p>

<!-- VIDEO WALKTHROUGH -->

## 🚀 Video Walkthrough <a name="live-demo"></a>

([Click here](https://drive.google.com/file/d/1_pBcQuip5oGkJKRvn-AYbmCB6UbvPWf_/view?usp=sharing))


<!-- LIVE DEMO -->

## 🚀 Live Demo Website <a name="live-demo"></a>

([Click here](https://mershark.github.io/Microverse-capstone-2/dist/))

<p align="right">(<a href="#readme-top">back to top</a>)</p>

## 👥 Authors <a name="authors"></a>

👤 **Mershark Takyi**

- GitHub: [@githubhandle](https://github.com/mershark)
- LinkedIn: [LinkedIn](https://www.linkedin.com/in/mershark/)
- LinkedIn: [Profile link](https://www.linkedin.com/in/mershark/)


👤 **Hamid Azim**

- GitHub: [@hamidazim321](https://github.com/hamidazim321)
- Twitter: [@hamidazim321](https://twitter.com/hamidazim321)


<p align="right">(<a href="#readme-top">back to top</a>)</p>

## 🔭 Future Features <a name="future-features"></a>
- [ ] **More templates**
- [ ] **Contacts Papge**
- [ ] **About Page**

<p align="right">(<a href="#readme-top">back to top</a>)</p>

Expand All @@ -124,6 +210,7 @@ Give a ⭐️ if you like this project!

- Thanks to the Microverse team for the great curriculum.
- Thanks to the Code Reviewer(s) for the insightful feedback.
- Thanks to our coding partners, the morning session team and standup team for their coperation.

<p align="right">(<a href="#readme-top">back to top</a>)</p>

Expand Down
12 changes: 12 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
node: 'current',
},
},
],
],
};
Binary file added dist/e1a3d136c3dcec637691.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions dist/index.bundle.js

This file was deleted.

8 changes: 0 additions & 8 deletions dist/index.bundle.js.LICENSE.txt

This file was deleted.

30 changes: 29 additions & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Wbpack Exercise</title><script defer="defer" src="index.bundle.js"></script></head><body><h1>Hello webpack!</h1></body></html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
<title>My Meals</title>
<script defer src="runtime.bundle.js"></script><script defer src="main.bundle.js"></script></head>
<body>
<nav id="Navbar">
<div id="brand">
<img src="" alt="logo" id="logo">
</div>
<ul id="nav-list">
<li class="nav"><a href="#" id="nav-dishes">Dishes</a></li>
<li class="nav"><a href="#">Contacts</a></li>
<li class="nav"><a href="#">About</a></li>
</ul>
</nav>
<main id="meals"></main>
<footer>
<div>
<p>
Created by Hamid and Mershark under CC License
</p>
</div>
</footer>
</body>
</html>
Loading