Merge branch 'main' into contact-page

PatilHarshh · May 25, 2024 · 41a4a2e · 41a4a2e
2 parents a5b2667 + 5d9eddd
commit 41a4a2e
Show file tree

Hide file tree

Showing 14 changed files with 656 additions and 1,293 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,26 @@
+## Related Issue
+[Cite any related issue(s) this pull request addresses. If none, simply state "None”]
+
+## Description
+[Please include a brief description of the changes or features added]
+
+## Type of PR
+
+- [ ] Bug fix
+- [ ] Feature enhancement
+- [ ] Documentation update
+- [ ] Other (specify): _______________
+
+## Screenshots / videos (if applicable)
+[Attach any relevant screenshots or videos demonstrating the changes]
+
+## Checklist:
+- [ ] I have performed a self-review of my code
+- [ ] I have read and followed the Contribution Guidelines.
+- [ ] I have tested the changes thoroughly before submitting this pull request.
+- [ ] I have provided relevant issue numbers, screenshots, and videos after making the changes.
+- [ ] I have commented my code, particularly in hard-to-understand areas.
+<!-- [X] - put a cross/X inside [] to check the box -->
+
+## Additional context:
+[Include any additional information or context that might be helpful for reviewers.]
diff --git a/.github/workflows/autocomment-issue.yml b/.github/workflows/autocomment-issue.yml
@@ -0,0 +1,35 @@
+name: Auto Comment on Issue
+
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  issues: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Add Comment to Issue
+        run: |
+          COMMENT=$(cat <<EOF
+          {
+            "body": "Thank you for creating this issue! 🎉 We'll look into it as soon as possible. In the meantime, please make sure to provide all the necessary details and context. If you have any questions or additional information, feel free to add them here. Your contributions are highly appreciated! 😊\n\nYou can also check our [CONTRIBUTING.md](https://github.com/PatilHarshh/Kaam-Do/blob/main/CONTRIBUTING.md) for guidelines on contributing to this project."
+          }
+          EOF
+          )
+          RESPONSE=$(curl -s -o response.json -w "%{http_code}" \
+            -X POST \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments \
+            -d "$COMMENT")
+          cat response.json
+          if [ "$RESPONSE" -ne 201 ]; then
+            echo "Failed to add comment"
+            exit 1
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/autocomment-pr-merge.yml b/.github/workflows/autocomment-pr-merge.yml
@@ -0,0 +1,20 @@
+name: Auto Comment on PR Merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  notify:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Post merge comment
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        curl -H "Authorization: token $GITHUB_TOKEN" \
+        -X POST \
+        -d '{"body":"🎉 Your pull request has been successfully merged! 🎉 Thank you for your valuable contribution to our project. Your efforts are greatly appreciated. Feel free to reach out if you have any more contributions or if there's anything else we can assist you with. Keep up the fantastic work! 🚀"}' \
+        "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
diff --git a/.github/workflows/autocomment-pr-raise.yml b/.github/workflows/autocomment-pr-raise.yml
@@ -0,0 +1,36 @@
+name: Auto Comment on PR
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Add Comment to Pull Request
+      run: |
+        COMMENT=$(cat <<EOF
+        {
+          "body": "Thank you for submitting your pull request! 🙌 We'll review it as soon as possible. In the meantime, please ensure that your changes align with our [CONTRIBUTING.md](https://github.com/PatilHarshh/Kaam-Do/blob/main/CONTRIBUTING.md). If there are any specific instructions or feedback regarding your PR, we'll provide them here. Thanks again for your contribution! 😊"
+        }
+        EOF
+        )
+        RESPONSE=$(curl -s -o response.json -w "%{http_code}" \
+          -X POST \
+          -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments \
+          -d "$COMMENT")
+        cat response.json
+        if [ "$RESPONSE" -ne 201 ]; then
+          echo "Failed to add comment"
+          exit 1
+        fi
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/client/index.html b/client/index.html
@@ -8,6 +8,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script type="module" src="/src/main.jsx"></script>
+  <script type="module" src="./src/main.jsx"></script>
 </body>
 </html>
diff --git a/client/package.json b/client/package.json
@@ -15,6 +15,7 @@
     "@headlessui/react": "^1.7.15",
     "@mui/icons-material": "^5.15.18",
     "@mui/material": "^5.15.18",
+    "@mui/styled-engine-sc": "^6.0.0-alpha.18",
     "@reduxjs/toolkit": "^1.9.5",
     "axios": "^1.4.0",
     "lottie-react": "^2.4.0",
@@ -24,7 +25,8 @@
     "react-hook-form": "^7.45.1",
     "react-icons": "^4.10.1",
     "react-redux": "^8.1.1",
-    "react-router-dom": "^6.14.1"
+    "react-router-dom": "^6.14.1",
+    "styled-components": "^6.1.11"
   },
   "devDependencies": {
     "@types/react": "^18.2.14",

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -58,6 +58,7 @@ function App() {
         <Route element={<Layout />}>
           <Route element={<About />} path="/about" />
           <Route element={<Contact />} path="/contact-us" />
+
           <Route
             path='/'
             element={

diff --git a/client/src/components/About/Home/SectionFifth.jsx b/client/src/components/About/Home/SectionFifth.jsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { Box, Typography, Grid, TextField, Button, Container, InputAdornment } from '@mui/material';
+
+const SectionSixth = () => {
+  const handleSubmit = (event) => {
+    event.preventDefault();
+    // Handle subscription logic here
+    console.log('Subscribe button clicked!');
+  };
+
+  return (
+    <Container>
+      <Box sx={{ py: 8 }}>
+        <Typography variant="h4" align="center" gutterBottom>
+          Stay Up to Date
+        </Typography>
+        <Typography variant="body2" align="center" color="textSecondary" sx={{ mb: 4 }}>
+          Subscribe to our newsletter to receive our weekly feed
+        </Typography>
+        <Grid container spacing={3} alignItems="center" justifyContent="center">
+          <Grid item xs={12} md={6} sx={{ display: 'flex', justifyContent: 'center' }}>
+            <img
+              src="https://www.shutterstock.com/image-vector/young-good-looking-man-using-600nw-1959667441.jpg"
+              alt="Newsletter"
+              style={{ maxWidth: '100%', borderRadius: 10 }}
+            />
+          </Grid>
+          <Grid item xs={12} md={6} sx={{ display: 'flex', justifyContent: 'center' }}>
+            <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+              <TextField
+                variant="outlined"
+                placeholder="Enter your email"
+                fullWidth
+                sx={{ mb: 2, borderRadius: 20 }}
+                InputProps={{
+                  endAdornment: (
+                    <InputAdornment position="end">
+                      <Button
+                        variant="contained"
+                        color="primary"
+                        onClick={handleSubmit}
+                        sx={{ borderRadius: 10, textTransform: 'none', color: 'white' }}
+                      >
+                        Subscribe
+                      </Button>
+                    </InputAdornment>
+                  ),
+                }}
+              />
+            </Box>
+          </Grid>
+        </Grid>
+      </Box>
+    </Container>
+  );
+};
+
+export default SectionSixth;
diff --git a/client/src/components/About/Home/SectionFirst.jsx b/client/src/components/About/Home/SectionFirst.jsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Box, Grid, Typography, TextField, InputAdornment, IconButton, List, ListItem, ListItemIcon, ListItemText } from '@mui/material';
+import SearchIcon from '@mui/icons-material/Search';
+import CheckIcon from '@mui/icons-material/Check';
+
+const SectionFirst = () => {
+    return (
+        <Box sx={{ backgroundColor: '#eee6db', minHeight: '100vh', display: 'flex', paddingTop: '2%' }}>
+            <Grid container sx={{ height: '100%' }}>
+                <Grid
+                    item
+                    xs={12}
+                    md={6}
+                    sx={{
+                        backgroundImage: `url('https://static.vecteezy.com/system/resources/previews/007/138/783/large_2x/recruitment-concept-girl-browsing-work-opportunities-online-using-job-search-app-or-website-on-laptop-free-photo.jpg')`,
+                        backgroundSize: 'cover',
+                        backgroundPosition: 'center',
+                        height: '100vh'
+                    }}
+                ></Grid>
+                <Grid item xs={12} md={6} sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', padding: 4 }}>
+                    <Typography variant="h2" sx={{ fontWeight: 'bold' }}>
+                        Find The Perfect<br />Job For You
+                    </Typography>
+                    <Typography variant="h6" sx={{ color: 'gray', marginTop: 2 }}>
+                        Search your career opportunity through 12,000 yours
+                    </Typography>
+                    <Box sx={{ display: 'flex', alignItems: 'center', marginTop: 4 }}>
+                        <TextField
+                            variant="outlined"
+                            placeholder="Search job title"
+                            sx={{ flex: 1, marginRight: 2, '& .MuiOutlinedInput-root': { borderRadius: '20px', background: 'white', color: 'black' } }}
+                        />
+                        <TextField
+                            variant="outlined"
+                            placeholder="Location"
+                            sx={{ flex: 1, '& .MuiOutlinedInput-root': { borderRadius: '20px', background: 'white', color: 'black' }}}
+                            InputProps={{
+                                endAdornment: (
+                                    <InputAdornment position="end">
+                                        <IconButton sx={{ bgcolor: 'orange', borderRadius: '20px', color: 'white' }}>
+                                            <SearchIcon />
+                                        </IconButton>
+                                    </InputAdornment>
+                                ),
+                            }}
+                        />
+                    </Box>
+                    <List sx={{ marginTop: 4 }}>
+                        <ListItem>
+                            <ListItemIcon>
+                                <CheckIcon />
+                            </ListItemIcon>
+                            <ListItemText primary="Wide range of job categories" />
+                        </ListItem>
+                        <ListItem>
+                            <ListItemIcon>
+                                <CheckIcon />
+                            </ListItemIcon>
+                            <ListItemText primary="Flexible working hours" />
+                        </ListItem>
+                        <ListItem>
+                            <ListItemIcon>
+                                <CheckIcon />
+                            </ListItemIcon>
+                            <ListItemText primary="Remote work options" />
+                        </ListItem>
+                    </List>
+                </Grid>
+            </Grid>
+        </Box>
+    );
+};
+
+export default SectionFirst;
diff --git a/client/src/components/About/Home/SectionFourth.jsx b/client/src/components/About/Home/SectionFourth.jsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import { Box, Grid, Typography, Card, CardContent, CardMedia, Container } from '@mui/material';
+
+const SectionFourth = () => {
+  // Example data for three companies
+  const companies = [
+    {
+      id: '1',
+      name: 'Google',
+      description: 'Explore opportunities at Google.',
+      jobs: 5000, // Total number of jobs
+      image: 'https://via.placeholder.com/150', // Example image URL
+    },
+    {
+      id: '2',
+      name: 'Amazon',
+      description: 'Join Amazon and build the future.',
+      jobs: 8000,
+      image: 'https://via.placeholder.com/150', // Example image URL
+    },
+    {
+      id: '3',
+      name: 'Microsoft',
+      description: 'Innovate with Microsoft.',
+      jobs: 10000,
+      image: 'https://via.placeholder.com/150', // Example image URL
+    },
+  ];
+
+  return (
+    <Container>
+
+      <Box sx={{ py: 8 }}>
+
+        <Typography variant="h4" align="left" gutterBottom color="black">
+          Find Best Companies
+        </Typography>
+        <Typography variant="body2" align="left" color="textSecondary" sx={{ mb: 4 }}>
+          Work for the best companies in the world
+        </Typography>
+        <Grid container spacing={3} justifyContent="center">
+          {companies.map(company => (
+            <Grid item key={company.id} xs={12} sm={6} md={4}>
+              <Card sx={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+                <CardMedia
+                  component="img"
+                  height="150"
+                  image={company.image}
+                  alt={company.name}
+                  sx={{ objectFit: 'cover' }}
+                />
+                <CardContent sx={{ flexGrow: 1 }}>
+                  <Typography variant="h6" color="primary" gutterBottom>
+                    {company.name}
+                  </Typography>
+                  <Typography variant="body2" color="textSecondary">
+                    {company.description}
+                  </Typography>
+                  <Typography variant="body2" color="black" sx={{ mt: 1 }}>
+                    {company.jobs} jobs available
+                  </Typography>
+                </CardContent>
+              </Card>
+            </Grid>
+          ))}
+        </Grid>
+      </Box>
+    </Container>
+
+  );
+};
+
+export default SectionFourth;