Skip to content

Commit

Permalink
Merge branch 'main' into fix-issue-#1102
Browse files Browse the repository at this point in the history
  • Loading branch information
@Developer-Swati
Developer-Swati authored Jul 17, 2023
2 parents 3ff4da6 + 24258a9 commit f5a8674
Show file tree
Hide file tree
Showing 58 changed files with 5,056 additions and 2,732 deletions.
5 changes: 3 additions & 2 deletions AR_Meditate/meditation.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body {
padding: 0;
font-family: sans-serif;
}

iframe {
min-height: 100% !important;
}
Expand Down Expand Up @@ -89,7 +89,8 @@ iframe {
.navbar-logo img {
width: 60px;
background-color: antiquewhite;
border-radius: 10%;
border-radius: 50%;
object-fit: cover;
}

.navbar-logo span {
Expand Down
149 changes: 141 additions & 8 deletions AR_Meditate/meditation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
<title>AR Meditate</title>

<link
Expand All @@ -20,6 +21,8 @@
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" />
<link rel="stylesheet" href="../commonStyles.css" type="text/css" />
<link href="./meditation.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="commonStyles.css" />
<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
</head>

<body>
Expand All @@ -29,7 +32,7 @@
<!-- Nav Logo & Name -->
<div class="navbar-logo">
<img src="../Images/New_Logo.svg" alt="Moksh Logo" />
<a href="../index.html"><span>Moksh</span></a>
<a href="../index.html"><span>Moksh</span></a>
</div>

<!-- Nav menu -->
Expand All @@ -40,12 +43,12 @@
<li>
<a href="../Blogs/Blog.html">Blog</a>
</li>
<li class="dropdown">
<li class="dropdown ">
<a href="#">Features
<i class="fas fa-caret-down"></i>
</a>
<!-- Dropdown -->
<ul>
<ul class="right-0">
<li><a href="../AR_Meditate/meditation.html">Augmented Reality Meditation</a></li>
<li><a href="../Iskcon/event.html">Iskcon Events</a></li>
<li>
Expand Down Expand Up @@ -111,17 +114,145 @@ <h4 class="text-center my-5">
execution-while-not-rendered
web-share
width="100%"
height="530"
height="550"
style="padding: 0; margin: 0"
src="https://sketchfab.com/models/506d0a8f43884c458e5a78156151ff09/embed">
</iframe>
</div>
</div>

<!-- Footer -->
<footer
class="customFooter container-fluid py-3 py-sm-5 h-25 d-flex px-3 flex-column justify-content-between"
style="background-color: #2980b9"></footer>
<footer class="bg-slate-900 py-4 px-8 lg:px-24 flex flex-col">

<!-- NewsLetter -->
<div
class="mt-8 newsLetter text-slate-300 flex text-xs flex-col justify-center lg:flex-row lg:justify-between items-center">

<div class="mb-1 text-center lg:text-left">
<p class="capitalize text-[11px] font-semibold tracking-wider">Sign Up for our newsletter:</p>
<p>Get weekly updates regarding Moksh.</p>
</div>

<div class="newsLetter flex group ease-in-out duration-300">
<input type="email" name="email" id="" placeholder="your email"
class="bg-transparent border border-emerald-600 py-2 rounded-l-md placeholder:text-slate-300 placeholder:text-xs w-full group-hover:border-indigo-600 ease-in-out duration-300 text-sm outline-0">
<button
class="bg-emerald-600 text-slate-300 rounded-r-md px-4 py-2 text-white uppercase subscribeBtn tracking-wider ease-in-out duration-300 group-hover:bg-indigo-600">Subscribe</button>
</div>

</div>

<!-- Site Nav -->
<div class="mt-8 siteNav flex flex-col lg:flex-row ">

<div class="flex flex-col lg:flex-row items-center text-center lg:text-left lg:w-1/2">
<img src="../Images/New_Logo.svg" alt="Moksh Logo" class="h-24 w-24 lg:mr-4 rounded-full" />
<div class="py-3 font-medium text-white w-2/3 flex flex-col text-xs">
<h1 class="text-3xl projectName">Moksh</h1>
<span>
It is a spiritual productivity tool designed for
individuals who want to unlock their potential and
achieve true balance in life. Join us on our journey to empower the world with spiritual knowledge.
</span>

<div class="social flex justify-center lg:justify-start items-center gap-x-4 mt-4">
<a href="https://github.com/akshitagupta15june/Moksh">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor"
class="bi bi-github text-slate-300 ease-in-out duration-300 hover:text-indigo-600"
viewBox="0 0 16 16">
<path
d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
</svg>
</a>
<a href="https://twitter.com/ExperienceMoksh">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor"
class="bi bi-twitter text-slate-300 ease-in-out duration-300 hover:text-indigo-600"
viewBox="0 0 16 16">
<path
d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" />
</svg>
</a>
</div>

</div>


</div>

<div
class="site--links capitalize text-xs text-slate-300 grid sm:grid-cols-1 lg:grid-cols-2 mt-4 gap-y-4 lg:w-1/2">

<a href="./index.html"
class="w-full text-center lg:text-left">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Home</span>
</a>

<a href="./Blogs/Blog.html"
class="w-full text-center lg:text-right">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Power
of Knowledge blogs</span>
</a>

<a href=" ./AR_Meditate/meditation.html"
class="w-full text-center lg:text-left">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Augmented
Reality
Meditation</span>
</a>

<a href=" ./Iskcon/event.html"
class="w-full text-center lg:text-right">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Iskon
Events</span>
</a>

<a href=" ./Divine_page/story.html"
class="w-full text-center lg:text-left">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Divine
Activities for all
Generation
</span>
</a>

<a href=" ./Pomodro_page/reward.html"
class="w-full text-center lg:text-right">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Pomodoro
Spiritual
Break</span>
</a>

<a href=" ./shlok_page/motivation.html"
class="w-full text-center lg:text-left">
<span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Read
a Shlok</span> </a>

<a href=" ./Rejuvenate_page/rejuvenate.html"
class="w-full text-center lg:text-right"><span
class="relative font-semibold ease-in-out duration-300 pb-1 relative after:content-[''] after:bottom-0 after:h-[2px] after:w-0 after:left-0 after:absolute after:bg-slate-300 hover:after:w-full after:ease-in-out after:duration-300">Rejuvenate</span></a>

</div>

</div>

<!-- Copyright -->
<div class="mt-8 copyRight flex items-center justify-center text-xs text-slate-300 flex-col">
<p class='text-center'>Made with ❤️ by Akshita during XPRESSION'23</p>
<p class="text-indigo-900 font-bold">
&copy; <span id="copyright-year"></span> Moksh. All rights reserved.
</p>
</div>

</footer>
<!-- Footer -->
</div>
</div>

</div>

<script
Expand All @@ -134,6 +265,8 @@ <h4 class="text-center my-5">
<script src="../commonScript.js"></script>
<script src="./meditation.js"></script>
<script src="../script.js"></script>
<!-- Copyright Year js file -->
<script src="../copyrightYear.js"></script>
</body>

</html>
14 changes: 7 additions & 7 deletions AR_Meditate/meditation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ const audios=[
{
title: "Deep meditation Music",
path:"../Images/deep-music.mp3",
thumbnail:"../Images/Deep_meditation.jpg"
thumbnail:"./Images/Deep_meditation.jpg"
},
{
title: "Krishna Flute meditation music",
path:"../Images/krishna.mp3",
thumbnail:"../Images/Krishna.jpg"
thumbnail:"./Images/Krishna.jpg"
},
{
title: "River meditation music",
path:"../Images/river-music.mp3",
thumbnail:"../Images/River.jpg"
thumbnail:"./Images/River.jpg"
},
{
title: "Piano meditation music",
path:"../Images/piano-music.mp3",
thumbnail:"../Images/Piano.jpg"
thumbnail:"./Images/Piano.jpg"
},
{
title: "Himalayas meditation music",
path:"../Images/himalaya-music.mp3",
thumbnail:"../Images/Himalayas.jpg"
thumbnail:"./Images/Himalayas.jpg"
}
]

Expand All @@ -38,7 +38,7 @@ const audioToInsert = audios.map((item,index)=>{
src="${item.thumbnail}"
alt=""
height="80px"
style="border-radius: 16px" />
style="border-radius: 16px; height:80px;" />
<p id="music" class="m-0">${item.title}</p>
<button class="icons bg-transparent border-0 text-danger-emphasis fs-2 play-pause-btn" data-id="${index}">
<i class="bi bi-play-circle-fill" data-id="${index}"></i>
Expand Down Expand Up @@ -89,4 +89,4 @@ playPauseBtns.forEach(playPauseBtn=>{


});
})
})
Loading

0 comments on commit f5a8674

Please sign in to comment.