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

Add changes to site #3

Merged
merged 79 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
bf17450
Ignore node_modules folder
chelmerrox Sep 20, 2022
5fef5ff
Setup webpack
chelmerrox Sep 20, 2022
e79c07f
Install all linters
chelmerrox Sep 20, 2022
a5c6ba2
Add images folder
chelmerrox Sep 20, 2022
1390d81
Add navbar for mobile, tablet & desktop screens
chelmerrox Sep 20, 2022
2f307c9
Add section-1 (home/homepage) for all screens
chelmerrox Sep 20, 2022
47778f7
Add section-2 in homepage for all screens
chelmerrox Sep 21, 2022
c1d7ab4
Add footer for all screens
chelmerrox Sep 21, 2022
8f9f2c2
Update files in dist folder
chelmerrox Sep 21, 2022
feccda9
Update README.md file
chelmerrox Sep 21, 2022
c5fb7a7
Change ministry logo in footer to circular shape
chelmerrox Sep 21, 2022
9cffb68
Remove Contact Us from footer in all screens
chelmerrox Sep 22, 2022
eed48b8
Remove border-radius from nav links in desktop screens
chelmerrox Sep 22, 2022
ab7364e
Add carousel/slideshow for Testimonies section for all screens
chelmerrox Sep 22, 2022
cecd267
Adjust the size of section-1 (homepage) background image for all screens
chelmerrox Sep 23, 2022
c0df8fb
Resize section-1 elements for max-width: 319px
chelmerrox Sep 24, 2022
f0df892
Resize all sections in homepage for all screens
chelmerrox Sep 25, 2022
f839217
Update files in dist folder
chelmerrox Sep 25, 2022
286db60
Refactor & add mobile-menu.js module
chelmerrox Sep 25, 2022
7bc8cd6
Add booking form for book a session button in homepage
chelmerrox Sep 25, 2022
129e9e7
Edit About Us button in navbar for desktop screens
chelmerrox Sep 26, 2022
92b1d51
Remove About Us link in footer
chelmerrox Sep 26, 2022
ea86696
Remove black border from About Us in mobile menu
chelmerrox Sep 26, 2022
fff8d22
Remove hover effect on booking button in desktop screens
chelmerrox Sep 26, 2022
f9e3f90
Center book a session button & remove About Us styles for footer
chelmerrox Sep 26, 2022
4b68885
Decrease size of section 1 in homepage for max-width: 319px
chelmerrox Sep 26, 2022
1e2f642
Center yellow line divider in section 2 for homepage
chelmerrox Sep 26, 2022
4003145
Decrease size of arrow image in homepage for all screens
chelmerrox Sep 26, 2022
8ce39d4
Add hover effect on book a session button
chelmerrox Sep 26, 2022
a09fc8d
Add Booking section & About Us section
chelmerrox Sep 26, 2022
b551531
Decrease size of arrow image in homepage
chelmerrox Sep 26, 2022
db45306
Link navbar mobile menu links & book a session button to show their s…
chelmerrox Sep 27, 2022
397639b
Link nav mobile menu links & book a session button to show/hide the c…
chelmerrox Sep 28, 2022
7d950ba
Highlight nav mobile menu links/nav desktop buttons to correct sections
chelmerrox Sep 28, 2022
6d193d4
Add round border on ministry logo in navbar for all screens
chelmerrox Sep 28, 2022
5ce2c02
Update README.md file
chelmerrox Sep 28, 2022
f609637
Update README.md file
chelmerrox Sep 28, 2022
b012d9d
Resize elements in max-width: 252px
chelmerrox Sep 28, 2022
933cc3d
Change book a session button to an anchor tag
chelmerrox Sep 28, 2022
887cb1a
Link ministry logo and name in navbar, footer 1 & footer 2 to the hom…
chelmerrox Sep 28, 2022
fbb6784
Remove black background color & round border on ministry logo
chelmerrox Sep 28, 2022
8404d97
Update files in dist folder
chelmerrox Sep 28, 2022
6bae7d8
Fix all linter errors
chelmerrox Sep 29, 2022
f569147
Add link to text in footer 1
chelmerrox Sep 29, 2022
f9d3db1
Change copyright information in footer 1 & footer 2
chelmerrox Oct 1, 2022
f65dc2c
Refactor code into functions & modules
chelmerrox Oct 1, 2022
2101ee0
Fix all linter errors
chelmerrox Oct 1, 2022
3480f37
Merge pull request #1 from chelmerrox/page-structure
chelmerrox Oct 1, 2022
70f0b42
Resize footer 1 & footer 2 elements
chelmerrox Oct 10, 2022
58cff04
Move About Section content closer to navbar
chelmerrox Oct 10, 2022
f598d82
Widen the images in About Us section
chelmerrox Oct 10, 2022
3dc12f4
Change the navbar mobile menu stylings
chelmerrox Oct 11, 2022
a6c511e
Change the stylings of footer 1 & footer 2
chelmerrox Oct 11, 2022
286fa58
Re-position navbar to be moved up
chelmerrox Oct 11, 2022
f093548
Increase font-size of navbar mobile menu links
chelmerrox Oct 12, 2022
258d23d
Re-position navbar mobile menu links
chelmerrox Oct 12, 2022
692f621
Move homepage paragraph to the top
chelmerrox Oct 12, 2022
b305662
Update README.md file
chelmerrox Oct 12, 2022
774591c
Highlight the correct navbar links for different sections in all screens
chelmerrox Oct 12, 2022
984647a
Update files in dist folder
chelmerrox Oct 12, 2022
7bc08d7
Update README.md file
chelmerrox Oct 12, 2022
bb088b0
Add hero title for site
chelmerrox Oct 28, 2022
1077e4b
Change testimonials images & remove comments
chelmerrox Oct 31, 2022
b7c765a
Update files in dist folder
chelmerrox Nov 1, 2022
db30706
Delete old images for testimonies section
chelmerrox Nov 1, 2022
778a063
Delete old images for testimonies section
chelmerrox Nov 1, 2022
1a9f2c1
Update images for testimonies section
chelmerrox Nov 1, 2022
502687b
Update files in dist folder
chelmerrox Nov 1, 2022
b7f0213
Delete image from testimonies section
chelmerrox Nov 1, 2022
a0611fa
Update image in testimonies section
chelmerrox Nov 1, 2022
6863602
Update files in dist folder
chelmerrox Nov 1, 2022
35fac8f
Update README.md file
chelmerrox Nov 1, 2022
7228302
Fix eslint linter errors
chelmerrox Nov 1, 2022
0847888
Fix stylelint linter errors
chelmerrox Nov 1, 2022
013d512
Update files in dist folder
chelmerrox Nov 1, 2022
e9c1957
Merge pull request #2 from chelmerrox/page-structure-2
chelmerrox Nov 1, 2022
df88533
Add favicon for the site
chelmerrox Mar 29, 2024
028c3cd
Change filepath to favicon
chelmerrox Mar 29, 2024
db809b2
Update README.md & .gitignore file
chelmerrox Apr 10, 2024
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
25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"extends": ["airbnb-base"],
"rules": {
"no-shadow": "off",
"no-param-reassign": "off",
"eol-last": "off",
"import/extensions": [ 1, {
"js": "always", "json": "always"
}]
},
"ignorePatterns": [
"dist/",
"build/"
]
}
70 changes: 70 additions & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Linters

on: pull_request

env:
FORCE_COLOR: 1

jobs:
lighthouse:
name: Lighthouse
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup Lighthouse
run: npm install -g @lhci/[email protected]
- name: Lighthouse Report
run: lhci autorun --upload.target=temporary-public-storage --collect.staticDistDir=.
webhint:
name: Webhint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup Webhint
run: |
npm install --save-dev [email protected]
[ -f .hintrc ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/html-css-js/.hintrc
- name: Webhint Report
run: npx hint .
stylelint:
name: Stylelint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup Stylelint
run: |
npm install --save-dev [email protected] [email protected] [email protected] [email protected]
[ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/html-css-js/.stylelintrc.json
- name: Stylelint Report
run: npx stylelint "**/*.{css,scss}"
eslint:
name: ESLint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup ESLint
run: |
npm install --save-dev [email protected] [email protected] [email protected] [email protected]
[ -f .eslintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/html-css-js/.eslintrc.json
- name: ESLint Report
run: npx eslint .
nodechecker:
name: node_modules checker
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Check node_modules existence
run: |
if [ -d "node_modules/" ]; then echo -e "\e[1;31mThe node_modules/ folder was pushed to the repo. Please remove it from the GitHub repository and try again."; echo -e "\e[1;32mYou can set up a .gitignore file with this folder included on it to prevent this from happening in the future." && exit 1; fi
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
favicon/
18 changes: 18 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"connector": {
"name": "local",
"options": {
"pattern": ["**", "!.git/**", "!node_modules/**"]
}
},
"extends": ["development"],
"formatters": ["stylish"],
"hints": [
"button-type",
"disown-opener",
"html-checker",
"meta-charset-utf-8",
"meta-viewport",
"no-inline-styles:error"
]
}
20 changes: 20 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
}
31 changes: 16 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![](https://img.shields.io/badge/HICM-Hope%20in%20Christ%20Ministry-yellow)
![](https://img.shields.io/badge/JQM-Joyful%20Quiver%20Ministries-yellow)

# Hope in Christ Ministry
# Joyful Quiver Ministries

> The Hope in Christ Ministry website. Built with HTML, CSS, Bootstrap, JavaScript and Webpack.
> The Joyful Quiver Ministries website is a Single Page Application (SPA) where users can find information about the ministry & book a deliverance session with the deliverance team. Built with HTML, CSS, Bootstrap, JavaScript and Webpack.

## Built With

Expand All @@ -11,26 +11,30 @@
- JavaScript
- Bootstrap
- Webpack
- TypeForm
- Canva
- Git

## Live Demo

[Live Demo Link]()
[Joyful Quiver Ministries](https://joyfulquiverministries.netlify.app/)

## Preview

![Website preview](images/preview.png)
![Website preview](./preview.png)

## Getting Started

To get a local copy up and running follow these simple example steps.

### Prerequisites

- HTML5 & CSS3
- HTML5 & CSS3
- JavaScript
- Bootstrap
- Webpack
- TypeForm
- Canva
- VSCode (or any other text editor)
- Git
- GitHub
Expand All @@ -44,29 +48,26 @@ From the command line, do the following steps below:

```bash
# Clone this repository
$ git clone [email protected]:chelmerrox/hope-in-christ-ministry.git
$ git clone [email protected]:chelmerrox/joyful-quiver-ministries.git

```

2. Change directory/Go into the repository with the command below.

```bash
$ cd hope-in-christ-ministry
$ cd joyful-quiver-ministries

```

## Author

👤 **Losalini Rokocakau**

- GitHub: [@chelmerrox](https://github.com/chelmerrox)
- Twitter: [@chelmerrox](https://twitter.com/chelmerrox)
- LinkedIn: [Losalini Rokocakau](https://linkedin.com/in/losalini-rokocakau)
👤 **Losalini Rokocakau** [GitHub](https://github.com/chelmerrox) • [X](https://twitter.com/chelmerrox) • [LinkedIn](https://linkedin.com/in/losalini-rokocakau)

## 🤝 Contributing

Contributions, issues, and feature requests are welcome!

Feel free to check the [issues page](https://github.com/chelmerrox/hope-in-christ-ministry/issues).
Feel free to check the [issues page](https://github.com/chelmerrox/joyful-quiver-ministries/issues).

## Show your support

Expand All @@ -75,4 +76,4 @@ Give a ⭐️ if you like this project!
## Acknowledgments

- My God & family
- Microverse
- Colleagues & mentors
Binary file added dist/1443944075db96389550.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dist/5a0fcd176bb55a49559e.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/734ed9f3651ac4860c13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/7efe41bbe5a6a745963c.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/8e89b0770f4a85942beb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/9b949f73d679c1ebf7d9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading