Skip to content

Commit

Permalink
Merge pull request #20 from prajjwalyd/council
Browse files Browse the repository at this point in the history 
frontend-backend integration and some changes
  • Loading branch information
@ravikumawat7716
ravikumawat7716 authored Dec 30, 2023
2 parents ddc31ec + 4e742e9 commit 5b44853
Show file tree
Hide file tree
Showing 14 changed files with 1,488 additions and 1,644 deletions.
21 changes: 20 additions & 1 deletion package-lock.json
View file

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

4 changes: 3 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
"postcss": "^8.4.32",
"tailwindcss": "^3.3.6",
"vue": "^3.2.13",
"vue-analytics": "^5.22.1",
"vue-google-oauth2": "^1.5.10",
"vue-google-signin-button": "^1.0.4",
"vue-router": "^4.2.5",
"vue3-google-login": "^2.0.25"
"vue3-google-login": "^2.0.25",
"vuex": "^4.1.0"
},
"devDependencies": {
"@babel/core": "^7.12.16",
Expand Down
10 changes: 9 additions & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@
<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp">
</script>
<script defer src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cdn.min.js"></script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-JRLY53RMRP"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-JRLY53RMRP');
</script>
</head>
<body>
<noscript>
Expand All @@ -24,7 +32,7 @@
<div
class="container flex flex-col items-center justify-between p-6 mx-auto space-y-4 sm:space-y-0 sm:flex-row">
<a href="#" class="flex text-xl font-bold text-white my-auto py-auto gap-2">
<img class="w-auto h-8 sm:h-10 my-auto " src="/sundarbans2.png" alt="">
<img class="w-auto h-8 sm:h-10 my-auto " src="../src/assets/sundarbans2.png" alt="">
Sundarbans
</a>

Expand Down
12 changes: 12 additions & 0 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,19 @@
export default {
name: 'App',
components: {
},
data(){
return{
userDetails: null,
}
},
mounted() {
const storedUserDetails = localStorage.getItem('userDetails');
if (storedUserDetails) {
const userDetails = JSON.parse(storedUserDetails);
this.userDetails = userDetails;
// console.log("App.vue : ", userDetails)
}},
}
</script>

Expand Down
125 changes: 26 additions & 99 deletions src/components/AboutPage.vue
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,30 @@
<template>
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>

</head>

<body class=" dark:bg-black">




<!-- navbar section -->
<section class="bg-white dark:bg-black">
<nav x-data="{ isOpen: false }" class="container px-6 py-4 mx-auto lg:flex lg:justify-between lg:items-center">
<div class="flex items-center text-2xl font-bold dark:text-white flex justify-between">
<a href="#" class="flex my-auto gap-2">
<img class="w-auto h-8 sm:h-10 my-auto " src="/sundarbans2.png" alt="">
Sundarbans
</a>

<!-- Mobile menu button -->
<div class="flex lg:hidden">
<button x-cloak @click="isOpen = !isOpen" type="button"
class="text-gray-500 dark:text-gray-200 hover:text-gray-600 dark:hover:text-gray-400 focus:outline-none focus:text-gray-600 dark:focus:text-gray-400"
aria-label="toggle menu">
<svg x-show="!isOpen" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
<path stroke-linecap="round" stroke-linejoin="round" d="M4 8h16M4 16h16" />
</svg>

<svg x-show="isOpen" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>

</button>
</div>
</div>

<!-- Mobile Menu open: "block", Menu closed: "hidden" -->
<div x-cloak :class="[isOpen ? 'translate-x-0 opacity-100 ' : 'opacity-0 -translate-x-full']"
class="absolute inset-x-0 z-20 w-full px-6 py-4 transition-all duration-300 ease-in-out bg-white shadow-md lg:bg-transparent lg:dark:bg-transparent lg:shadow-none dark:bg-black lg:mt-0 lg:p-0 lg:top-0 lg:relative lg:w-auto lg:opacity-100 lg:translate-x-0 lg:flex lg:items-center">
<div class="flex flex-col space-y-4 lg:mt-0 lg:flex-row lg:-px-8 lg:space-y-0">
<a class="text-gray-700 transition-colors duration-300 transform lg:mx-8 dark:text-gray-200 dark:hover:text-blue-400 hover:text-blue-500"
href="/index.html">Home</a>
<a class="text-gray-700 transition-colors duration-300 transform lg:mx-8 dark:text-gray-200 dark:hover:text-blue-400 hover:text-blue-500"
href="/events.html">Events</a>
<a class="text-gray-700 transition-colors duration-300 transform lg:mx-8 dark:text-gray-200 dark:hover:text-blue-400 hover:text-blue-500"
href="/gallery.html">Gallery</a>
<a class="text-gray-700 transition-colors duration-300 transform lg:mx-8 dark:text-gray-200 dark:hover:text-blue-400 hover:text-blue-500"
href="/council.html">Council</a>
</div>

<!-- <a class="block px-5 py-2 mt-4 text-sm text-center text-white capitalize bg-blue-600 rounded-lg lg:mt-0 hover:bg-blue-500 lg:w-auto"
href="#">
Login
</a> -->
<a href="#"
class="flex items-center justify-center px-2 text-gray-600 transition-colors duration-300 transform border rounded-lg dark:border-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-600">
<div class="px-1 py-1">
<svg class="w-6 h-6" viewBox="0 0 40 40">
<path
d="M36.3425 16.7358H35V16.6667H20V23.3333H29.4192C28.045 27.2142 24.3525 30 20 30C14.4775 30 10 25.5225 10 20C10 14.4775 14.4775 9.99999 20 9.99999C22.5492 9.99999 24.8683 10.9617 26.6342 12.5325L31.3483 7.81833C28.3717 5.04416 24.39 3.33333 20 3.33333C10.7958 3.33333 3.33335 10.7958 3.33335 20C3.33335 29.2042 10.7958 36.6667 20 36.6667C29.2042 36.6667 36.6667 29.2042 36.6667 20C36.6667 18.8825 36.5517 17.7917 36.3425 16.7358Z"
fill="#FFC107" />
<path
d="M5.25497 12.2425L10.7308 16.2583C12.2125 12.59 15.8008 9.99999 20 9.99999C22.5491 9.99999 24.8683 10.9617 26.6341 12.5325L31.3483 7.81833C28.3716 5.04416 24.39 3.33333 20 3.33333C13.5983 3.33333 8.04663 6.94749 5.25497 12.2425Z"
fill="#FF3D00" />
<path
d="M20 36.6667C24.305 36.6667 28.2167 35.0192 31.1742 32.34L26.0159 27.975C24.3425 29.2425 22.2625 30 20 30C15.665 30 11.9842 27.2359 10.5975 23.3784L5.16254 27.5659C7.92087 32.9634 13.5225 36.6667 20 36.6667Z"
fill="#4CAF50" />
<path
d="M36.3425 16.7358H35V16.6667H20V23.3333H29.4192C28.7592 25.1975 27.56 26.805 26.0133 27.9758C26.0142 27.975 26.015 27.975 26.0158 27.9742L31.1742 32.3392C30.8092 32.6708 36.6667 28.3333 36.6667 20C36.6667 18.8825 36.5517 17.7917 36.3425 16.7358Z"
fill="#1976D2" />
</svg>
</div>
<!-- AboutPage.vue -->

<span class="w-5/6 px-1 py-2 font-bold text-center">Sign In</span>
</a>
</div>
</nav>


</section>






</body>

</html>
<template>
<div>
<h1 class="text-3xl font-semibold mb-4">About Us</h1>
<p>
Welcome to our website! Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Curabitur vel turpis at magna elementum blandit. Nullam nec diam sit amet ex posuere
dictum vel nec mauris.
</p>
<p>
Sed euismod lacinia sem, eget scelerisque libero lacinia et. Integer non commodo
justo. Phasellus suscipit dolor nec odio suscipit, in ullamcorper metus vulputate.
</p>
<p>
Thank you for visiting our website. If you have any questions or feedback, feel
free to reach out to us!
</p>
</div>
</template>

<script>
export default {
name: 'AboutPage'
}
</script>
name: "AboutPage",
};
</script>

<style scoped>
/* Add any specific styles for the AboutPage component here */
</style>
Loading

0 comments on commit 5b44853

Please sign in to comment.