Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'production'

Browse Source 
Master

See merge request Romulus21/portal!40
This commit is contained in:
Romain Delanoë
2020-05-03 09:19:03 +00:00
parent 4f582b06c3 ee3eca7d8f
commit 3a38ddc482
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
resources/js/views/Meteo/OpenWeatherCard.vue
View File

@@ -2,21 +2,27 @@
<div class="my-2">
<h2>Météo</h2>
<p v-if="loading"></p>
<div v-else class="meteo card my-1">
<h3>{{ meteo.city.name }}</h3>
<div class="flex flex-end">
<div class="flex-1 flex-col flex-end">
<div class="meteo-date">{{ dateFormat(meteo.list[0].dt_txt) }}</div>
<div><strong>{{ meteo.list[0].main.temp }}</strong> °C</div>
<div><strong>{{ meteo.list[0].main.humidity }}</strong> %</div>
<div><strong>{{ meteo.list[0].main.pressure }}</strong> hPa</div>
</div>
<div class="flex-1 text-right">
<i v-bind:class="'owf owf-5x owf-' + meteo.list[0].weather[0].id"></i>
<div><strong>{{ meteo.list[0].weather[0].description }}</strong></div>
<div v-else class="my-1">
<div class="flex flex-wrap -m-2 mt-2">
<div class="w-full sm:w-1/2 md:w-1/3 lg:w-1/4">
<div class="bg-orange-300 rounded text-black m-2 p-2 flex flex-col">
<h3 class="text-2xl font-bold text-center">{{ meteo.city.name }}</h3>
<div class="flex">
<div class="flex flex-col justify-end">
<div>{{ dateFormat(meteo.list[0].dt_txt) }}</div>
<div><strong>{{ meteo.list[0].main.temp }}</strong> °C</div>
<div><strong>{{ meteo.list[0].main.humidity }}</strong> %</div>
<div><strong>{{ meteo.list[0].main.pressure }}</strong> hPa</div>
</div>
<div class="flex flex-col flex-1 justify-end items-end">
<i v-bind:class="'owf owf-5x owf-' + meteo.list[0].weather[0].id"></i>
<div><strong>{{ meteo.list[0].weather[0].description }}</strong></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>

6
resources/js/views/ToDoLists/ToDoListIndex.vue
View File

@@ -10,7 +10,7 @@
</div>
</div>
<div class="flex justify-between mb-1">
<a href="#" class="btn" @click="$router.back()">Back</a>
<router-link to="/" class="btn">Back</router-link>
<a href="#" class="btn-primary" @click="modal = ! modal">Add New List</a>
</div>
@@ -20,12 +20,12 @@
<router-link v-else
v-for="(toDoList, index) in toDoLists"
:key="index"
:to="'/to-do-lists/' + toDoList.data.to_do_list_id"
:to="'/to-do-lists/' + toDoList.data.to_do_list_id"
:to-do-list="toDoList"
class="w-full sm:w-1/2 md:w-1/3 lg:w-1/4" >
<div class="bg-orange-300 rounded text-black m-2 p-2">
<div class="flex justify-between">
{{ toDoList.data.attributes.data.name }}
<span class="font-bold">{{ toDoList.data.attributes.data.name }}</span>
<span class="text-orange-900">
{{ toDoList.data.attributes.data.to_dos.to_dos_count_check }} / {{ toDoList.data.attributes.data.to_dos.to_dos_count }}
</span>

8
resources/js/views/ToDoLists/ToDoListShow.vue
View File

@@ -9,10 +9,8 @@
</div>
</div>
<div class="flex items-center justify-between pb-2">
<router-link to="/memos/" class="btn-secondary">Back</router-link>
<div>
<a href="#" class="btn-alert" @click="modal = ! modal">Delete</a>
</div>
<router-link to="/to-do-lists/" class="btn-secondary">Back</router-link>
<a href="#" class="btn-alert" @click="modal = ! modal">Delete</a>
</div>
<div v-if="!loading" class="bg-orange-400 rounded p-1">
<h1 class="mb-2 ml-2 todo" >
@@ -43,7 +41,7 @@
<ToDo :to-do="toDo"
:id-list="toDoList.data.to_do_list_id"
class="flex-1 bg-blue" />
<span @click="deleteToDo(toDo, index)" class="cursor-pointer ml-2 font-bold edit-icon">
<span @click="deleteToDo(toDo, index)" class="cursor-pointer ml-2 font-bold edit-icon flex items-center">
<svg-vue icon="close" class="w-4" />
</span>
</div>

1
resources/sass/app.scss vendored
View File

@@ -7,6 +7,7 @@
@import "components/btn";
@import "components/nav";
@import "components/transitions";
@import "components/owfont-regular";
@import "pages/memos";