Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修改了json解析逻辑，直接解析谷歌浏览器的书签文件 #34

Open
wants to merge 5 commits into
base: gh-pages
Choose a base branch
from
Open

修改了json解析逻辑，直接解析谷歌浏览器的书签文件 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8b8cda
修改json的解析逻辑，直接解析谷歌浏览器的书签
wynnforthework Aug 29, 2024
8dbc8d1
Update 同步书签.bat
wynnforthework Aug 29, 2024
85232a7
Update 同步书签.bat
wynnforthework Aug 29, 2024
00dd957
更新js
wynnforthework Aug 29, 2024
d0a80eb
新增网页快照
wynnforthework Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 68 additions & 25 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<meta name="author" content="Pintree">
<meta name="robots" content="index, follow">
<link rel="canonical" href="https://www.pintree.io">
<script defer src="https://cloud.umami.is/script.js" data-website-id="60283522-e543-4dcb-bd47-e855f1e0a635"></script>
<script defer data-domain="pintree.io" src="https://plausible.io/js/script.js"></script>
<script defer src="js/umami.js" data-website-id="60283522-e543-4dcb-bd47-e855f1e0a635"></script>
<script defer data-domain="pintree.io" src="js/plausible.js"></script>
<script type="text/javascript">
(function (c, l, a, r, i, t, y) {
c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };
Expand Down Expand Up @@ -80,6 +80,17 @@
<div class="fixed inset-0 flex">
<div id="off-canvas-content"
class="relative mr-16 flex w-full max-w-xs flex-1 -translate-x-full transition ease-in-out duration-300 transform">
<!-- Close button for the off-canvas menu -->
<div class="absolute left-full top-0 flex w-16 justify-center pt-5">
<button id="open-sidebar-button" type="button" class="-m-2.5 p-2.5">
<span class="sr-only">Close sidebar</span>
<svg class="h-6 w-6 text-white" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>
</button>
</div>

<!-- Close button for the off-canvas menu -->
<div class="absolute left-full top-0 flex w-16 justify-center pt-5">
<button id="close-sidebar-button" type="button" class="-m-2.5 p-2.5">
Expand Down Expand Up @@ -166,6 +177,7 @@
stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
</svg>
</button>
<button id="updateScreenShot" type="button" onclick="window.open('screenshot.html', '_blank')">更新网页快照</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -303,9 +315,10 @@
fetch('json/pintree.json')
.then(response => response.json())
.then(data => {
const secondLayer = data[0].children;
renderNavigation(secondLayer, document.getElementById('navigation'));
renderBookmarks(secondLayer, [{ title: 'Bookmark', children: secondLayer }]);
const firstLayer = data.roots;
const secondLayer = data.roots.bookmark_bar;
renderNavigation(firstLayer, document.getElementById('navigation'));
renderBookmarks(secondLayer, [{ title: 'Bookmark', children: secondLayer.children }]);
document.getElementById('searchInput').value = '';
document.getElementById('clearSearchButton').classList.add('hidden');
})
Expand Down Expand Up @@ -397,7 +410,15 @@
}

// Render sidebar navigation
function renderNavigation(folders, container, isFirstRender = false, path = []) {
function renderNavigation(firstLayer, container, isFirstRender = false, path = []) {
var folders = []
if (firstLayer.hasOwnProperty("bookmark_bar"))
{
folders = [firstLayer.bookmark_bar,firstLayer.other,firstLayer.synced]
}
else{
folders = firstLayer
}
container.innerHTML = ''; // Clear previous content
folders.forEach((folder, index) => {
if (folder.type === 'folder') {
Expand All @@ -412,7 +433,14 @@

const navLink = document.createElement('a');
navLink.className = 'flex text-sm leading-6 font-semibold dark:text-gray-400';
navLink.innerText = folder.title;
if (firstLayer.hasOwnProperty("bookmark_bar"))
{
folders = [firstLayer.bookmark_bar,firstLayer.other,firstLayer.synced]
}
else{
folders = firstLayer
}
navLink.innerText = getBookmarkName(folder);

navLinkContainer.appendChild(folderIcon);
navLinkContainer.appendChild(navLink);
Expand All @@ -430,7 +458,7 @@
if (folder.children && folder.children.length > 0) {
const subList = document.createElement('ul');
subList.className = 'ml-4 space-y-2 hidden';
renderNavigation(folder.children, subList, false, path.concat({ title: folder.title, children: folder.children }));
renderNavigation(folder.children, subList, false, path.concat({ title: getBookmarkName(folder), children: folder.children }));
container.appendChild(subList);

if (isFirstRender && index === 0) {
Expand All @@ -447,14 +475,14 @@
if (subList.children.length > 0) {
toggleIcon.classList.toggle('rotate-90');
}
renderBookmarks(folder.children, path.concat({ title: folder.title, children: folder.children }));
renderBookmarks(folder.children, path.concat({ title: getBookmarkName(folder), children: folder.children }));
};
} else {
navItem.onclick = (e) => {
e.stopPropagation();
document.querySelectorAll('#navigation .sidebar-active').forEach(el => el.classList.remove('sidebar-active'));
navItem.classList.add('sidebar-active');
renderBookmarks(folder.children, path.concat({ title: folder.title, children: folder.children }));
renderBookmarks(folder.children, path.concat({ title: getBookmarkName(folder), children: folder.children }));
};
}
}
Expand All @@ -469,7 +497,7 @@
path.forEach((item, index) => {
const breadcrumb = document.createElement('span');
breadcrumb.className = 'cursor-pointer hover:underline';
breadcrumb.innerText = item.title;
breadcrumb.innerText = getBookmarkName(item);
breadcrumb.onclick = () => {
// Render bookmarks for the selected breadcrumb
const newPath = path.slice(0, index + 1);
Expand Down Expand Up @@ -498,7 +526,7 @@
const items = currentNav.querySelectorAll('li');
items.forEach(navItem => {
const navLink = navItem.querySelector('a');
if (navLink && navLink.innerText === item.title) {
if (navLink && navLink.innerText === getBookmarkName(item)) {
if (index === path.length - 1) {
navItem.classList.add('sidebar-active');
}
Expand Down Expand Up @@ -557,7 +585,7 @@
// Separate folders and links
const folders = data.filter(item => item.type === 'folder');
// const links = data.filter(item => item.type === 'link').sort((a, b) => b.addDate - a.addDate);
const links = data.filter(item => item.type === 'link');
const links = data.filter(item => item.type === 'url');

if (folders.length === 0 && links.length === 0) {
showNoResultsMessage();
Expand All @@ -569,7 +597,7 @@
const folderSection = document.createElement('div');
folderSection.className = 'grid grid-cols-3 sm:grid-cols-6 lg:grid-cols-8 2xl:grid-cols-12 gap-6';
folders.forEach(folder => {
const card = createFolderCard(folder.title, folder.children, path);
const card = createFolderCard(getBookmarkName(folder), folder.children, path);
folderSection.appendChild(card);
});
container.appendChild(folderSection);
Expand All @@ -587,7 +615,7 @@
const linkSection = document.createElement('div');
linkSection.className = 'grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 2xl:grid-cols-6 gap-6';
links.forEach(link => {
const card = createCard(link.title, link.url, link.icon);
const card = createCard(getBookmarkName(link), link.url, link.icon);
linkSection.appendChild(card);
});
container.appendChild(linkSection);
Expand All @@ -602,17 +630,19 @@
.then(response => response.json())
.then(data => {
// Use the first layer of the data directly
const firstLayer = data;
const firstLayer = data.roots;
const secondLayer = data.roots.bookmark_bar;
// var folders = [firstLayer.bookmark_bar,firstLayer.other,firstLayer.synced]
// Render navigation using the first layer of data
renderNavigation(firstLayer, document.getElementById('navigation'), true);
// Render bookmarks using the first layer of data, starting from the Bookmark
renderBookmarks(firstLayer, [{ title: 'Bookmark', children: firstLayer }]);
renderBookmarks(secondLayer.children, [{ title: secondLayer.name, children: secondLayer.children }]);

// Automatically select and show the first item
if (firstLayer.length > 0) {
const firstItem = firstLayer[0];
updateSidebarActiveState([{ title: firstItem.title, children: firstItem.children }]);
renderBookmarks(firstItem.children, [{ title: 'Bookmark', children: firstLayer }, { title: firstItem.title, children: firstItem.children }]);
if (secondLayer.length > 0) {
const firstItem = secondLayer.children[0];
updateSidebarActiveState([{ title: getBookmarkName(firstItem), children: firstItem.children }]);
renderBookmarks(firstItem.children, [{ title: 'Bookmark', children: secondLayer }, { title: getBookmarkName(firstItem), children: firstItem.children }]);
}
})
.catch(error => console.error('Error loading bookmarks:', error));
Expand Down Expand Up @@ -668,17 +698,20 @@
document.getElementById('loading-spinner').style.display = 'none';

// Use the first layer of the data directly
const firstLayer = data;
const firstLayer = data.roots;
const secondLayer = data.roots.bookmark_bar;
// var folders = [firstLayer.bookmark_bar,firstLayer.other,firstLayer.synced]
// Render navigation using the first layer of data
renderNavigation(firstLayer, document.getElementById('navigation'), true);
// Render bookmarks using the first layer of data, starting from the Bookmark
renderBookmarks(firstLayer, [{ title: 'Bookmark', children: firstLayer }]);
renderBookmarks(secondLayer.children, [{ title: getBookmarkName(secondLayer), children: secondLayer.children }]);


// Automatically select and show the first item
if (firstLayer.length > 0) {
const firstItem = firstLayer[0];
updateSidebarActiveState([{ title: firstItem.title, children: firstItem.children }]);
renderBookmarks(firstItem.children, [{ title: 'Bookmark', children: firstLayer }, { title: firstItem.title, children: firstItem.children }]);
updateSidebarActiveState([{ title: getBookmarkName(firstItem), children: firstItem.children }]);
renderBookmarks(firstItem.children, [{ title: 'Bookmark', children: firstLayer }, { title: getBookmarkName(firstItem), children: firstItem.children }]);
}
})
.catch(error => {
Expand Down Expand Up @@ -715,6 +748,16 @@
document.getElementById('sidebar-2').appendChild(navigation);
});

function getBookmarkName(book)
{
if (book.hasOwnProperty("name"))
{
return book.name
}
else{
return book.title
}
}
</script>

<script>
Expand Down
20 changes: 20 additions & 0 deletions js/html2canvas.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/plausible.js
View file
Open in desktop

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

1 change: 1 addition & 0 deletions js/umami.js
View file
Open in desktop

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

Loading