Внесение правок и перенос выгрузки
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -74,7 +74,7 @@
|
|||||||
|
|
||||||
<!-- Список источников -->
|
<!-- Список источников -->
|
||||||
<div class="p-4 grid gap-2 grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3">
|
<div class="p-4 grid gap-2 grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3">
|
||||||
<div v-for="source in filteredSources" :key="source.url" class="mb-4">
|
<div v-for="source in filteredSources" :key="source.url" class="mb-4 hover:-translate-y-2 hover:shadow-2xl transition">
|
||||||
<Istochnik_one_kard
|
<Istochnik_one_kard
|
||||||
:source="source"
|
:source="source"
|
||||||
@sourceStarted="handleSourceStarted"
|
@sourceStarted="handleSourceStarted"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
class="flex flex-col sm:flex-row justify-between w-full lg:w-auto gap-2 p-2 bg-gray-100 shadow dark:bg-gray-800 rounded-xl border border-gray-200 dark:border-gray-600"
|
class="flex flex-col sm:flex-row justify-between w-full lg:w-auto gap-2 p-2 bg-white shadow dark:bg-gray-800 rounded-xl border border-gray-200 dark:border-gray-600"
|
||||||
>
|
>
|
||||||
<dev class="">
|
<dev class="">
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -1,45 +1,52 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="w-full sm:w-4/5 dark:text-neutral-300">
|
<div class="w-full sm:w-4/5 dark:text-neutral-300">
|
||||||
<div class="bg-white flex justify-between p-3 lg:p-5 dark:bg-gray-800">
|
<div class="bg-white p-3 lg:p-5 dark:bg-gray-800">
|
||||||
<div class="flex flex-col md:flex-row">
|
<div class="flex justify-between">
|
||||||
<div class="relative">
|
<div class="flex flex-col md:flex-row">
|
||||||
<img
|
<div class="relative">
|
||||||
v-if="isDarkMode"
|
<img
|
||||||
src="https://img.icons8.com/?size=100&id=WwWusvLMTFd7&format=png&color=000000"
|
v-if="isDarkMode"
|
||||||
class="absolute top-4 left-3 h-5"
|
src="https://img.icons8.com/?size=100&id=WwWusvLMTFd7&format=png&color=000000"
|
||||||
/>
|
class="absolute top-4 left-3 h-5"
|
||||||
<img
|
/>
|
||||||
v-else
|
<img
|
||||||
src="https://img.icons8.com/?size=100&id=zR5EBMqZTIBz&format=png&color=000000"
|
v-else
|
||||||
class="absolute top-4 left-3 h-5"
|
src="https://img.icons8.com/?size=100&id=zR5EBMqZTIBz&format=png&color=000000"
|
||||||
/>
|
class="absolute top-4 left-3 h-5"
|
||||||
<input
|
/>
|
||||||
v-model="poisk"
|
<input
|
||||||
type="text"
|
v-model="poisk"
|
||||||
placeholder="Поиск..."
|
type="text"
|
||||||
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl p-3 pl-11"
|
placeholder="Поиск..."
|
||||||
/>
|
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl p-3 pl-11"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<select
|
||||||
|
@change="onfilterItems($event.target.value)"
|
||||||
|
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl h-12 p-3 mt-3 md:mt-0 md:ml-4"
|
||||||
|
>
|
||||||
|
<option value="all">Все</option>
|
||||||
|
<option value="time">По времени</option>
|
||||||
|
<option value="Китай">Китай</option>
|
||||||
|
<option value="Корея">Корея</option>
|
||||||
|
<option value="Япония">Япония</option>
|
||||||
|
<option value="viewed">Просмотренные</option>
|
||||||
|
<option value="status">Избранные</option>
|
||||||
|
<option value="tematik">Тематическая</option>
|
||||||
|
<option value="svodka">Сводка</option>
|
||||||
|
<option value="donesenie">Донесение</option>
|
||||||
|
<option value="bilutene">Билутень</option>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<select
|
|
||||||
@change="onfilterItems($event.target.value)"
|
|
||||||
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl h-12 p-3 mt-3 md:mt-0 md:ml-4"
|
|
||||||
>
|
|
||||||
<option value="all">Все</option>
|
|
||||||
<option value="time">По времени</option>
|
|
||||||
<option value="Китай">Китай</option>
|
|
||||||
<option value="Корея">Корея</option>
|
|
||||||
<option value="Япония">Япония</option>
|
|
||||||
<option value="viewed">Просмотренные</option>
|
|
||||||
<option value="status">Избранные</option>
|
|
||||||
<option value="tematik">Тематическая</option>
|
|
||||||
<option value="svodka">Сводка</option>
|
|
||||||
<option value="donesenie">Донесение</option>
|
|
||||||
<option value="bilutene">Билутень</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<Time />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<Time />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dark:bg-gray-800 bg-white p-3 hidden lg:block">
|
||||||
|
<div class="mx-2 p-3 bg-gray-100 dark:bg-gray-700 rounded-xl border border-gray-200 dark:border-gray-600">
|
||||||
|
<Setings_downloads />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div ref="scrollContainer" class="p-4">
|
<div ref="scrollContainer" class="p-4">
|
||||||
<Stat
|
<Stat
|
||||||
v-for="item in items"
|
v-for="item in items"
|
||||||
@@ -81,7 +88,7 @@ import { ref, onMounted, onUnmounted, watch, nextTick } from "vue";
|
|||||||
import Stat from "./One_kard.vue";
|
import Stat from "./One_kard.vue";
|
||||||
import Time from "./Time.vue";
|
import Time from "./Time.vue";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
import Setings_downloads from "../Settings_section/Setings_downloads.vue";
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
filter: { type: String, default: "all" },
|
filter: { type: String, default: "all" },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -137,8 +137,11 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
class="dark:bg-gray-800 mt-5 sm:m-5 bg-white p-4 hover:-translate-y-2 hover:shadow-2xl border-slate-100 rounded-xl transition"
|
||||||
|
>
|
||||||
<Setings_downloads />
|
<Setings_downloads />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -1,37 +1,33 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div class="flex flex-wrap items-center gap-2 w-full justify-between">
|
||||||
class="dark:bg-gray-800 mt-5 sm:m-5 bg-white p-4 hover:-translate-y-2 hover:shadow-2xl border-slate-100 rounded-xl transition"
|
<!-- Поля ввода дат в одной строке -->
|
||||||
>
|
<div class="flex flex-col lg:flex-row items-center gap-2 flex-grow">
|
||||||
<div class="flex flex-wrap items-center gap-2 w-full justify-between">
|
<div class="flex items-center gap-2 w-full lg:w-auto">
|
||||||
<!-- Поля ввода дат в одной строке -->
|
<span class="dark:text-neutral-300 whitespace-nowrap">с</span>
|
||||||
<div class="flex flex-col lg:flex-row items-center gap-2 flex-grow">
|
<DatePicker v-model="data_start" />
|
||||||
<div class="flex items-center gap-2 w-full lg:w-auto">
|
<span class="dark:text-neutral-300 whitespace-nowrap">по</span>
|
||||||
<span class="dark:text-neutral-300 whitespace-nowrap">с</span>
|
<DatePicker v-model="data_finish" />
|
||||||
<DatePicker v-model="data_start" />
|
|
||||||
<span class="dark:text-neutral-300 whitespace-nowrap">по</span>
|
|
||||||
<DatePicker v-model="data_finish" />
|
|
||||||
</div>
|
|
||||||
<select
|
|
||||||
v-model="selectedFilter"
|
|
||||||
@change="onfilterItems($event.target.value)"
|
|
||||||
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl h-12 p-3 mt-3 lg:mt-0 lg:ml-4 w-full lg:w-auto flex-shrink-0 "
|
|
||||||
>
|
|
||||||
<option value="status">Избранные</option>
|
|
||||||
<option value="tematik">Тематическая</option>
|
|
||||||
<option value="svodka">Сводка</option>
|
|
||||||
<option value="donesenie">Донесение</option>
|
|
||||||
<option value="bilutene">Билутень</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
|
<select
|
||||||
<!-- Кнопка выгрузки -->
|
v-model="selectedFilter"
|
||||||
<button
|
@change="onfilterItems($event.target.value)"
|
||||||
class="dark:bg-orange-500 hover:dark:bg-orange-600 shadow text-white bg-sky-700 hover:bg-sky-900 rounded-xl px-2 min-h-11 cursor-pointer w-full lg:w-auto md:min-w-40 flex-shrink-0"
|
class="dark:bg-gray-900 border-slate-100 shadow rounded-xl h-12 p-3 mt-3 lg:mt-0 lg:ml-4 w-full lg:w-auto flex-shrink-0 cursor-pointer"
|
||||||
@click="downloadAll"
|
|
||||||
>
|
>
|
||||||
Выгрузить
|
<option value="status">Избранные</option>
|
||||||
</button>
|
<option value="tematik">Тематическая</option>
|
||||||
|
<option value="svodka">Сводка</option>
|
||||||
|
<option value="donesenie">Донесение</option>
|
||||||
|
<option value="bilutene">Билутень</option>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Кнопка выгрузки -->
|
||||||
|
<button
|
||||||
|
class="dark:bg-orange-500 hover:dark:bg-orange-600 shadow text-white bg-sky-700 hover:bg-sky-900 rounded-xl px-2 min-h-11 cursor-pointer w-full lg:w-auto md:min-w-40 flex-shrink-0"
|
||||||
|
@click="downloadAll"
|
||||||
|
>
|
||||||
|
Выгрузить
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user