mirror of https://github.com/Lissy93/dashy.git
Slight refactor
This commit is contained in:
parent
6f608b570c
commit
67638b1d4c
|
@ -50,9 +50,7 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
itemOpened() {
|
/* Returns true if a string is in URL format. Used to identify tile icon source */
|
||||||
this.$emit('itemClicked');
|
|
||||||
},
|
|
||||||
isUrl(str) {
|
isUrl(str) {
|
||||||
const pattern = new RegExp(/(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-/]))?/);
|
const pattern = new RegExp(/(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-/]))?/);
|
||||||
return pattern.test(str);
|
return pattern.test(str);
|
||||||
|
@ -91,18 +89,25 @@ export default {
|
||||||
}
|
}
|
||||||
return imgType;
|
return imgType;
|
||||||
},
|
},
|
||||||
|
/* Called when an item is opened, so that search field can be reset */
|
||||||
|
itemOpened() {
|
||||||
|
this.$emit('itemClicked');
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Detects overflowing text, shows ellipse, and allows is to marguee on hover
|
||||||
|
* The below code is horifically bad, it is embarassing that I wrote it...
|
||||||
|
*/
|
||||||
|
manageTitleEllipse() {
|
||||||
|
const tileElem = document.getElementById(`tile-${this.getId}`);
|
||||||
|
if (tileElem) {
|
||||||
|
const isOverflowing = tileElem.scrollHeight > tileElem.clientHeight
|
||||||
|
|| tileElem.scrollWidth > tileElem.clientWidth;
|
||||||
|
if (isOverflowing) tileElem.className += ' is-overflowing';
|
||||||
|
} // Note from present me to past me: WTF?!
|
||||||
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
// Detects overflowing text, and allows is to marguee on hover
|
this.manageTitleEllipse();
|
||||||
// The below code is horifically bad, it is embarassing that I wrote it...
|
|
||||||
const tileElem = document.getElementById(`tile-${this.getId}`);
|
|
||||||
if (tileElem) {
|
|
||||||
const isOverflowing = tileElem.scrollHeight > tileElem.clientHeight
|
|
||||||
|| tileElem.scrollWidth > tileElem.clientWidth;
|
|
||||||
if (isOverflowing) {
|
|
||||||
tileElem.className += ' is-overflowing';
|
|
||||||
}
|
|
||||||
} // Note from present me to past me: WTF?!
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="home">
|
<div class="home">
|
||||||
|
<!-- Page title and navigation buttons -->
|
||||||
<Header :pageInfo="getPageInfo(pageInfo)" />
|
<Header :pageInfo="getPageInfo(pageInfo)" />
|
||||||
|
<!-- Search bar, layout options and settings -->
|
||||||
<FilterTile ref="filterComp"
|
<FilterTile ref="filterComp"
|
||||||
@user-is-searchin="searching"
|
@user-is-searchin="searching"
|
||||||
@change-display-layout="changeDisplayLayout"
|
@change-display-layout="changeDisplayLayout"
|
||||||
class="filter-container"
|
class="filter-container"
|
||||||
/>
|
/>
|
||||||
|
<!-- Main content, section for each group of items -->
|
||||||
<div class="item-group-container">
|
<div class="item-group-container">
|
||||||
<ItemGroup
|
<ItemGroup
|
||||||
v-for="(section, index) in sections"
|
v-for="(section, index) in sections"
|
||||||
|
@ -25,7 +28,7 @@
|
||||||
import Header from '@/components/Header.vue';
|
import Header from '@/components/Header.vue';
|
||||||
import FilterTile from '@/components/FilterTile.vue';
|
import FilterTile from '@/components/FilterTile.vue';
|
||||||
import ItemGroup from '@/components/ItemGroup.vue';
|
import ItemGroup from '@/components/ItemGroup.vue';
|
||||||
import conf from '../data/conf.yml';
|
import conf from '../data/conf.yml'; // Main site configuration
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'home',
|
name: 'home',
|
||||||
|
@ -35,23 +38,23 @@ export default {
|
||||||
ItemGroup,
|
ItemGroup,
|
||||||
},
|
},
|
||||||
data: () => ({
|
data: () => ({
|
||||||
pageInfo: conf.pageInfo,
|
pageInfo: conf.pageInfo, // Site meta data (title, description, etc)
|
||||||
sections: conf.sections,
|
sections: conf.sections, // List of sections, containing items
|
||||||
searchTile: '',
|
searchValue: '',
|
||||||
}),
|
}),
|
||||||
methods: {
|
methods: {
|
||||||
changeDisplayLayout(layout) {
|
changeDisplayLayout(layout) {
|
||||||
console.log('Display layout will update', layout);
|
console.log('Display layout will update', layout);
|
||||||
},
|
},
|
||||||
/* Returns true if the user is currently searching */
|
/* Updates local data with search value, triggered from filter comp */
|
||||||
searching(searchTile) {
|
searching(searchValue) {
|
||||||
this.searchTile = searchTile;
|
this.searchValue = searchValue;
|
||||||
},
|
},
|
||||||
/* Clears input field, once a searched item is opened */
|
/* Clears input field, once a searched item is opened */
|
||||||
finishedSearching() {
|
finishedSearching() {
|
||||||
this.$refs.filterComp.clearFilterInput();
|
this.$refs.filterComp.clearFilterInput();
|
||||||
},
|
},
|
||||||
/* Extracts the website name from domain, used for the searching functionality */
|
/* Extracts the site name from domain, used for the searching functionality */
|
||||||
getDomainFromUrl(url) {
|
getDomainFromUrl(url) {
|
||||||
const urlPattern = /^(?:https?:\/\/)?(?:w{3}\.)?([a-z\d.-]+)\.(?:[a-z.]{2,10})(?:[/\w.-]*)*/;
|
const urlPattern = /^(?:https?:\/\/)?(?:w{3}\.)?([a-z\d.-]+)\.(?:[a-z.]{2,10})(?:[/\w.-]*)*/;
|
||||||
const domainPattern = url.match(urlPattern);
|
const domainPattern = url.match(urlPattern);
|
||||||
|
@ -63,7 +66,7 @@ export default {
|
||||||
const {
|
const {
|
||||||
title, description, provider, url,
|
title, description, provider, url,
|
||||||
} = tile;
|
} = tile;
|
||||||
const searchTerm = this.searchTile.toLowerCase();
|
const searchTerm = this.searchValue.toLowerCase();
|
||||||
return (title && title.toLowerCase().includes(searchTerm))
|
return (title && title.toLowerCase().includes(searchTerm))
|
||||||
|| (provider && provider.toLowerCase().includes(searchTerm))
|
|| (provider && provider.toLowerCase().includes(searchTerm))
|
||||||
|| (description && description.toLowerCase().includes(searchTerm))
|
|| (description && description.toLowerCase().includes(searchTerm))
|
||||||
|
|
Loading…
Reference in New Issue