Skip to content

Commit

Permalink
Merge branch 'master' into Issue_template
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavan-Sai-padavala authored Oct 18, 2023
2 parents 7568fbb + fc1e904 commit c27fc6a
Show file tree
Hide file tree
Showing 13 changed files with 8,199 additions and 8,971 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"

open-pull-requests-limit: 5


33 changes: 33 additions & 0 deletions .github/workflows/Build_Test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and Test


on:

push:
branches: [ master ]
pull_request:
branches: [ master ]


jobs:
build_test:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 15.x, 16.x]


steps:

- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: npm ci, build and test
run: |
npm ci
npm run build --if-present
npm test
17,010 changes: 8,085 additions & 8,925 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"framer-motion": "^10.16.2",
Expand All @@ -17,7 +17,7 @@
"react-icons": "^4.10.1",
"react-router-dom": "^6.15.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
"web-vitals": "^3.5.0"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Submodule A-Simple-Web-Contact-Form updated from d54487 to 404b5a
Submodule ToDo-Web-App added at 7f77ea
1 change: 0 additions & 1 deletion src/components/Accordion.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
cursor: pointer;
background-color: #f5f5f5;
border-bottom: 1px solid #ddd;

}

.accordion-title:hover {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Bottom Nav bar/BottomNavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ const BottomNav = (props) => {
function Func2(){
navigate(nextUrl)
}
if(backUrl ==' ' )
if(backUrl ===' ' )
return(
<div className='bottomNav'>
<div style={{width:'34px',height:'40px',padding:'6px 16px'}}></div>
<button className='bottomNavItem2' onClick={Func2}>{nextname}</button>
</div>
)
if(nextUrl ==' ')
if(nextUrl ===' ')
return(
<div className='bottomNav'>
<button className='bottomNavItem1' onClick={Func1}>{backname}</button>
Expand Down
91 changes: 58 additions & 33 deletions src/components/Footer.css
Original file line number Diff line number Diff line change
@@ -1,41 +1,66 @@

.footer_main{
background-color: #FFFFFF ;
border: clamp(0px, var(--flow-condition), 0.125rem) solid var(--accent-cyan);
border-radius: 0.5em;
.footer_main {
background-color: #ffffff;
border: clamp(0px, var(--flow-condition), 0.125rem) solid var(--accent-cyan);
border-radius: 0.5em;
}

.footer_container {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
color: black;
padding: 2%;
border: clamp(0px, var(--flow-condition), 0.125rem) solid var(--accent-cyan);
border-radius: 0.5em;
width: 80vw;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
color: black;
padding: 2%;
border: clamp(0px, var(--flow-condition), 0.125rem) solid var(--accent-cyan);
border-radius: 0.5em;
}
.footer_brand {
display: flex;
max-width: 300px;
text-align: center;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 8px;
}
.h4 {
color: var(--text-primary);
font-weight: 500;
}
.body3 {
color: var(--text-primary);
font-weight: 300;
}
.pages {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
gap: 8px;
}

.mt {
margin-top: 0px;
}

@media only screen and (max-width: 800px) and (min-width: 450px) {
.footer_container {
width: 70vw;
}
.footer_brand{
display: flex;
max-width: 300px;
text-align: center;
.footer_brand {
max-width: 180px;
}
}

@media only screen and (max-width: 449px) and (min-width: 300px) {
.footer_container {
flex-direction: column;
justify-content: center;
align-items: center;
gap: 8px;
}
.h4{
color: var(--text-primary);
font-weight: 500;
.footer_brand {
max-width: 180px;
}
.body3{
color: var(--text-primary);
font-weight: 300;
.mt {
margin-top: 30px;
}
.pages{
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
gap: 8px;
}
}
8 changes: 4 additions & 4 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ const Footer = () => {
return (
<div className="footer_main">
<div className="footer_container">
<div className="footer_brand">
<div className="footer_brand mt">
<p className="h4">YourBrand</p>
<p className="body3">
The majority of our global workforce of 600,000+ is made up of our
guards. It is a high profile service and is the made
</p>
</div>

<div className="pages">
<div className="pages mt">
<p className="h3">Pages</p>
<p className="body3">
<a href="/">Home</a>
Expand All @@ -28,7 +28,7 @@ const Footer = () => {
<p className="body3">Cakes </p>
</a>
</div>
<div className="pages">
<div className="pages mt">
<p className="h3">Quick Links</p>
<p className="body3">
<a href="/">DashBoard</a>
Expand All @@ -44,7 +44,7 @@ const Footer = () => {
<p className="body3">FAQ </p>
</a>
</div>
<div className="pages">
<div className="pages mt">
<p className="h3">Social Media</p>
<div
style={{
Expand Down
2 changes: 1 addition & 1 deletion src/components/Login.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
width: 100%;
}

submit_button:hover {
.submit_button:hover {
background-color: #0056b3;
}
2 changes: 1 addition & 1 deletion src/components/Modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default function Modal() {
return (
<>
<button
className="bg-gray-800 text-white active:bg-pink-600 uppercase text-sm px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
className="bg-gray-800 text-white active:bg-pink-600 uppercase text-sm px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
type="button"
onClick={() => setShowModal(true)}
>
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
justify-content: flex-start;
gap: 2rem;
height: 80.7vh;
width: 100vw;
width: 100%;
margin-top: 2rem;
background-color: white;
}
Expand Down

0 comments on commit c27fc6a

Please sign in to comment.