Skip to content

Commit

Permalink
Add WIP updated list to locations page
Browse files Browse the repository at this point in the history
  • Loading branch information
@Correct-Syntax
Correct-Syntax committed Apr 3, 2024
1 parent 3e325d0 commit d803481
Show file tree
Hide file tree
Showing 2 changed files with 326 additions and 9 deletions.
249 changes: 249 additions & 0 deletions src/psalms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,255 @@
]
}
],
"psalms_locations": [
{
"psalm": 1,
"completed": false,
"time_of_day": "Morning",
"location": "River",
"weather": "sunny",
"categories": [
"Wisdom"
],
"tags": [
"A Psalm of a righteous man", "Tree planted by the rivers of water", "Summer", "Fruit tree", "Wind", "Encouragement", "Instruction", "Judgement on evil"
]
},
{
"psalm": 2,
"completed": false,
"time_of_day": "Morning/Evening",
"location": "Mountain/Mountain Top",
"weather": "sunny",
"categories": [
"Thanksgiving/Kingship-Covenant"
],
"tags": [
"A Psalm about Yahweh the Father and Yahushua the Son", "Holy hill", "Judgement on evil", "Yahweh's power", "All will bow to Yahushua", "Ends of the earth"
]
},
{
"psalm": 3,
"completed": false,
"time_of_day": "Evening/Afternoon",
"location": "Meadow/Hill/Mountain",
"weather": "rainy",
"categories": [
"Lament/Individual"
],
"tags": [
"Crying out for deliverance", "Yahweh's protection", "Holy hill", "Laying down to sleep", "Trust in Yahweh", "Protection"
]
},
{
"psalm": 4,
"completed": false,
"time_of_day": "Evening",
"location": "Meadow/Hill/Mountain",
"weather": "rainy",
"categories": [
"Lament/Individual"
],
"tags": [
"The evening Psalm", "Crying out for deliverance", "Light", "Lie down and sleep", "Trust in Yahweh", "Protection"
]
},
{
"psalm": 5,
"completed": false,
"time_of_day": "Morning sunrise",
"location": "River",
"weather": "sunny",
"categories": [
"Lament/Individual"
],
"tags": [
"The morning Psalm", "River", "Calling out to Yahweh", "Morning prayer", "Judgement on evil", "Mercy", "Worship", "Shout for joy", "Prayer for guidance"
]
},
{
"psalm": 6,
"completed": false,
"time_of_day": "Afternoon",
"location": "Lake",
"weather": "cloudy",
"categories": [
"Lament/Individual"
],
"tags": [
"A penitental Psalm", "Crying out for mercy", "Forgiveness", "How long? Psalm", "Night", "tears"
]
},
{
"psalm": 7,
"completed": false,
"time_of_day": "Morning",
"location": "Woods/Forest",
"weather": "sunny",
"categories": [
"Lament/Individual"
],
"tags": [
"Crying out for deliverance", "Judgement on evil", "Praise", "Judgement of the righteous", "Defense in Yahweh"
]
},
{
"psalm": 8,
"completed": false,
"time_of_day": "Evening night with stars and moon",
"location": "Hill",
"weather": "sunny",
"categories": [
"Praise/Creator"
],
"tags": [
"A Creation Psalm", "Hill", "Yahweh's power and glory", "Smallness of man", "Nature"
]
},
{
"psalm": 9,
"completed": false,
"time_of_day": "Afternoon",
"location": "Meadow",
"weather": "sunny",
"categories": [
"Lament/Individual"
],
"tags": [
"An arostic Psalm", "Praise for Yahweh's works", "Destruction and judgement of the wicked", "Yahweh is a refuge for the oppressed", "Yahweh's mercy", "Unbelievers sunk in a pit", "Yahweh's care for the humble and needy"
]
},
{
"psalm": 10,
"completed": false,
"time_of_day": "Morning",
"location": "Hill",
"weather": "cloudy",
"categories": [
"Lament/Individual"
],
"tags": [
"An arostic Psalm", "A Psalm of the wicked", "Persecution", "Evil men", "Crying to Yahweh to see the evil and judge it", "Yahweh is a helper to the fatherless and humble"
]
},
{
"psalm": 11,
"completed": false,
"time_of_day": "Morning",
"location": "Desert",
"weather": "cloudy",
"categories": [
"Song of Trust"
],
"tags": [
"Trust in Yahweh", "Yahweh's Holy temple and throne", "Judgement of the wicked", "Yahweh's care for the righteous"
]
},
{
"psalm": 12,
"completed": false,
"time_of_day": "Midday",
"location": "Meadow",
"weather": "cloudy",
"categories": [
"Lament/National/Individual"
],
"tags": [
"Judgement on evil", "Help for the poor and oppressed", "Yahweh's pure words, tried and purified in the furnace of earth"
]
},
{
"psalm": 13,
"completed": true,
"time_of_day": "Morning",
"location": "Meadow",
"weather": "foggy",
"categories": [
"Lament/Individual"
],
"tags": [
"The How long? Psalm", "Sorrow", "Sing unto Yahweh", "Crying out for deliverance"
]
},
{
"psalm": 14,
"completed": false,
"time_of_day": "Afternoon",
"location": "Mountain/Mountain Top",
"weather": "sunny",
"categories": [
"Lament/Individual"
],
"tags": [
"A Psalm of the wicked", "All have sinned", "No-one does good"
]
},
{
"psalm": 15,
"completed": false,
"time_of_day": "Midday",
"location": "Hill",
"weather": "sunny",
"categories": [
"Wisdom"
],
"tags": [
"Instruction", "Truth", "Righteousness"
]
},
{
"psalm": 16,
"completed": false,
"time_of_day": "Morning",
"location": "Waterfall",
"weather": "foggy",
"categories": [
"Song of Trust"
],
"tags": [
"A Messianic Psalm (prophecy of Yahushua)", "Yahweh is my portion and cup", "We will not be moved", "Joy"
]
},
{
"psalm": 17,
"completed": false,
"time_of_day": "Evening",
"location": "Mountain/Mountain Top",
"weather": "sunny",
"categories": [
"Lament/Individual"
],
"tags": [
"Crying to Yahweh to prove him", "Prayer for deliverance from the wicked"
]
},
{
"psalm": 18,
"completed": false,
"time_of_day": "Afternoon",
"location": "Woods/Forest",
"weather": "cloudy",
"categories": [
"Thanksgiving/Individual", "Thanksgiving/Kingship-Covenant"
],
"tags": [
"A Messianic Psalm (prophecy of Yahushua)", "Yahweh is our rock and our high tower", "Crying out for deliverance", "Yahweh's power over creation", "Yahweh's salvation", "Yahweh's protection", "Praise"
]
},
{
"psalm": 19,
"completed": false,
"time_of_day": "Evening night with stars and moon",
"location": "Hilltop",
"weather": "sunny",
"categories": [
"Praise hymn/Creator", "Wisdom"
],
"tags": [
"A word of Yahweh Psalm", "Yahweh's creation", "Yahweh's law", "Plea for help to avoid sin", "In awe of Yahweh"
]
}
],
"progress_log": [
{
"title": "Psalm 49",
Expand Down
86 changes: 77 additions & 9 deletions src/routes/locations/+page.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
<script>
import json from '../../psalms.json';
/**
* @param {string} icon
*/
function getIconStr(icon) {
let basePath = "/icons/";
let iconExt = ".svg";
return basePath + icon + iconExt;
}
let searchTerms = '';
let allPsalms = json.psalms_locations;
let filteredPsalms = allPsalms;
const searchPsalms = () => {
filteredPsalms = allPsalms.filter(psalm => {
return psalm.tags.includes(searchTerms.toLowerCase());
});
}
/**
* @param {string} icon
*/
function getIconStr(icon) {
let basePath = "/icons/";
let iconExt = ".svg";
return basePath + icon + iconExt;
}
</script>

<svelte:head>
Expand All @@ -22,7 +32,65 @@ function getIconStr(icon) {
<h3 class="text-4xl sm:text-5xl text-navyblue font-serif mt-4">Planned Locations</h3>
<p class="text-lg mt-5">This page shows how we are planning to align the location, weather, and time of day of each reading with the overal theme and mood of each Psalm. This is subject to change as Yahweh leads. We plan to divide the sections of Psalm 119 into different locations.</p>
</div>
<div class="flex flex-col border border-violet-200 px-6 py-4 mt-6 rounded-md">

<!-- <div class="flex flex-row mt-5">
<div class="relative">
<input class="relative inline-flex flex-auto w-full py-2 pl-12 pr-6 rounded-full border border-violet-200 focus:ring-0 focus:outline-none placeholder:text-navyblue/50 placeholder:dark:text-dark-40 placeholder:font-medium" placeholder="Type to search" bind:value={searchTerms} on:input={searchPsalms}>
<svg xmlns="http://www.w3.org/2000/svg" class="absolute -top-0.5 left-0 h-12 w-12 fill-navyblue px-3.5 ml-2" viewBox="0 0 24 24">
<g data-name="Layer 2"><g data-name="search"><rect width="24" height="24" opacity="0"/><path d="M20.71 19.29l-3.4-3.39A7.92 7.92 0 0 0 19 11a8 8 0 1 0-8 8 7.92 7.92 0 0 0 4.9-1.69l3.39 3.4a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 11a6 6 0 1 1 6 6 6 6 0 0 1-6-6z"/></g></g>
</svg>
</div>
</div> -->

<div class="grid grid-cols-1 md:grid-cols-2 gap-3 mt-5">
{#each Object.values(json.psalms_locations) as psalm}
<div class="relative px-5 py-6 rounded-lg border border-violet-200" class:opacity-60={psalm.completed == true}>
{#if psalm.completed == true}
<span class="absolute top-6 right-5 font-semibold uppercase">Completed</span>
{/if}
<p class="uppercase text-sm text-navyblue">{psalm.location}</p>
<h4 class="text-4xl font-serif mb-3">Psalm {psalm.psalm}</h4>
<div class="flex flex-row items-center justify-between py-1 px-2">
<p class="text-navyblue/80 text-sm">
TIME OF DAY
</p>
<p class="inline-flex items-center">
{psalm.time_of_day}
</p>
</div>
<hr class="border border-violet-200"/>
<div class="flex flex-row items-center justify-between py-1 px-2">
<p class="text-navyblue/80 text-sm">
WEATHER
</p>
<p class="inline-flex items-center capitalize">
<img class="w-4 h-4 mr-1" src="{getIconStr(psalm.weather)}" alt="weather" title="{psalm.weather}"/>
{psalm.weather}
</p>
</div>
<hr class="border border-violet-200"/>
<div class="flex flex-row items-center justify-between py-1 px-2">
<p class="text-navyblue/80 text-sm">
CATEGORIES
</p>
<p class="inline-flex items-center">
{#each Object.values(psalm.categories) as category}
<span class="mx-1">{category}</span>
{/each}
</p>
</div>
<p class="flex flex-row flex-wrap mt-3">
{#each Object.values(psalm.tags) as tag}
<span class="bg-violet-100 rounded-full py-1 px-3 m-1">{tag}</span>
{/each}
</p>
</div>
{/each}
</div>

<p class="text-lg text-navyblue my-28">The rest of this list is still being worked on. In the meantime, refer to the following table:</p>

<div class="flex flex-col border border-violet-200 px-6 py-4 rounded-md">
<div class="flex flex-row flex-wrap">
{#each Object.values(json.psalms_location_table) as location}
<div class="w-full md:w-1/3 flex flex-col mt-3">
Expand Down

0 comments on commit d803481

Please sign in to comment.