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.

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

Feat/highlight code #15

Merged
merged 10 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"test": "vitest"
},
"dependencies": {
"@highlightjs/vue-plugin": "^2.1.0",
"highlight.js": "^11.10.0",
"idb": "^8.0.0",
"nanoid": "^5.0.6",
"vee-validate": "^4.6.2",
Expand Down
62 changes: 46 additions & 16 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ onMounted(async () => await getCollections());
</script>

<template>
<div class="px-5 mx-auto max-w-4xl">
<div class="px-5 mx-auto py-9 max-w-4xl">
<TitleApp title="Tomodo" />
<router-view></router-view>
</div>
Expand Down
51 changes: 39 additions & 12 deletions src/components/ExampleJson.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,50 @@
<script setup>
import { ref } from "vue";
import Switch from "./Switch.vue";

/** @type {import('@/types').ExampleJsonProp} */
const { json } = defineProps({
json: Object,
});
</script>
<template>
<pre
class="border border-gray-500 border-dashed p-3 rounded-md whitespace-pre-wrap"
v-if="json"
>{{ json }}
</pre
>
<pre class="border border-gray-500 border-dashed p-3 rounded-md" v-else>

const showJson = ref(true);
const example = `
{
"id": "",
"name": "",
"description": "",
"todos": []
}
</pre
>
}`;
</script>
<template>
<div>
<template v-if="json">
<div class="flex gap-3 items-center py-3">
<Switch v-model:modelValue="showJson" id="show_json" />
<label for="show_json"> Show json format </label>
</div>
<highlightjs
:code="JSON.stringify(json, null, 2)"
v-if="showJson"
class="border border-gray-500 border-dashed p-3 rounded-md whitespace-pre-wrap"
>
</highlightjs>
<div v-else>
<TodoItem
v-for="(todo, index) in json.todos"
:key="index"
:todo="todo"
:preview="true"
/>
</div>
</template>
<template v-else>
<highlightjs
:code="example"
lang="json"
class="border border-gray-500 border-dashed p-3 rounded-md whitespace-pre-wrap"
>
</highlightjs>
</template>
</div>
</template>
54 changes: 54 additions & 0 deletions src/components/Switch.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<script setup>
import { ref, watch, defineProps, defineEmits } from "vue";

const props = defineProps({
modelValue: {
type: Boolean,
required: true,
},
id: {
type: String,
},
});
const emit = defineEmits(["update:modelValue"]);

const checked = ref(props.modelValue);

watch(
() => props.modelValue,
(newValue) => {
checked.value = newValue;
}
);

const toggle = () => {
checked.value = !checked.value;
emit("update:modelValue", checked.value);
};
</script>
<template>
<label class="relative inline-flex items-center cursor-pointer">
<input
type="checkbox"
class="sr-only"
:checked="checked"
@change="toggle"
:id="props.id"
/>
<div
:class="{
'bg-[#032836]': checked,
'bg-gray-300': !checked,
}"
class="w-12 h-7 py-1 rounded-full transition-colors duration-300 ease-in-out"
>
<span
:class="{
'translate-x-6': checked,
'translate-x-1': !checked,
}"
class="inline-block w-5 h-5 py-1 transform bg-white rounded-full transition-transform"
></span>
</div>
</label>
</template>
9 changes: 5 additions & 4 deletions src/components/TodoItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
*/

/** @type {TodoItemProp} */
const { todo, isSelected } = defineProps({
const { todo, isSelected, preview } = defineProps({
todo: Object,
isSelected: Boolean,
preview: Boolean,
});
</script>
<template>
<div
class="border rounded-md py-3 my-2 px-2 cursor-pointer"
class="border rounded-md py-3 my-2 px-2 cursor-pointer hover:bg-gray-100 transition-colors ease-in duration-150"
:class="{
'line-through': todo.isDone,
'line-through': todo.is_done,
'bg-gray-100': isSelected,
}"
>
Expand All @@ -28,7 +29,7 @@ const { todo, isSelected } = defineProps({
>
<p class="text-xl">{{ todo.name }}</p>
</div>
<div>
<div v-if="!preview">
<button @click="$emit('selectTodo')" class="mr-2">edit</button>
<button @click="$emit('deleteTodo')">delete</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/composables/useFormTodo.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const formTodo = ref({
id: `todo-${nanoid(7)}`,
name: "",
priority: "high",
isDone: false,
is_done: false,
created_at: new Date(),
});

Expand All @@ -23,7 +23,7 @@ const useFormTodo = () => {
id: `todo-${nanoid(7)}`,
name: "",
priority: "high",
isDone: false,
is_done: false,
created_at: new Date(),
};
isEditing.value = false;
Expand Down
4 changes: 2 additions & 2 deletions src/composables/useTodo.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { collection, getDetailCollection } = useCollection();
const useTodo = () => {
const todos = computed(() => collection.value.todos);
const doneTodos = computed(() =>
collection.value.todos?.filter((todo) => todo.isDone === true)
collection.value.todos?.filter((todo) => todo.is_done === true)
);

/** @param {Todo} todo */
Expand All @@ -28,7 +28,7 @@ const useTodo = () => {
const markTodo = (index) => {
const todo = collection.value.todos.at(index);

todo.isDone = !todo.isDone;
todo.is_done = !todo.is_done;
collection.value.todos.splice(index, 1, todo);

const rawCollection = toRaw(collection.value);
Expand Down
Loading