Skip to content

Commit

Permalink
Merge pull request #4 from start-again/dev
Browse files Browse the repository at this point in the history
Version 2.0.0
  • Loading branch information
LucasCtrl authored Mar 22, 2020
2 parents ab7d5c4 + cb9e0a9 commit 2de12bb
Show file tree
Hide file tree
Showing 33 changed files with 1,160 additions and 1,330 deletions.
6 changes: 5 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"useTabs": false,
"semi": false,
"singleQuote": true,
"trailingComma": "es5",
"bracketSpacing": true,
"arrowParens": "always",
"singleQuote": true
"endOfLine": "lf"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h3 align="center">An other minimalist pomodoro application</h3>

<p align="center">
<img alt="Version" src="https://img.shields.io/badge/version-1.0.0-blue.svg?style=flat-square" />
<img alt="Version" src="https://img.shields.io/badge/version-2.0.0-blue.svg?style=flat-square" />
<a href="https://github.com/start-again/pmdr/stargazers"><img alt="Version" src="https://img.shields.io/github/stars/start-again/pmdr?style=flat-square" /></a>
<a href="https://github.com/start-again/pmdr/issues"><img alt="Version" src="https://img.shields.io/github/issues/start-again/pmdr?style=flat-square" /></a>
<a href="http://firsttimersonly.com"><img src="https://img.shields.io/badge/first--timers-friendly-blue.svg?style=flat-square" alt="First-timers Friendly"></a>
Expand Down
23 changes: 0 additions & 23 deletions assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,23 +0,0 @@
:root {
--ggs: 1.2;
}

.gg {
display: flex;
justify-content: center;
align-items: center;

height: 26px;
width: 26px;
}

a {
color: inherit;
text-decoration: none;
}

button {
padding: 0;
background-color: transparent;
border: none
}
50 changes: 0 additions & 50 deletions components/Controllers.vue

This file was deleted.

61 changes: 61 additions & 0 deletions components/InfoCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<template>
<div class="infoCard">
<div class="icon">
<slot name="icon"></slot>
</div>
<p class="title">
<slot name="title"></slot>
</p>
<p class="description">
<slot name="description"></slot>
</p>
</div>
</template>

<style scoped>
.infoCard {
display: flex;
flex-direction: column;
align-items: center;
padding: 1rem;
background-color: #ffffff;
text-align: center;
border-radius: 10px;
}
.infoCard:first-child {
margin-left: 1rem;
}
.infoCard:last-child {
margin-right: 1rem;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 0.4rem;
height: 2.6rem;
width: 2.6rem;
color: #293c9b;
background-color: #22cfee44;
border-radius: 1.3rem;
}
.title {
font-size: 12px;
font-weight: 500;
opacity: 0.6;
}
.description {
font-size: 18px;
font-weight: 600;
}
</style>
45 changes: 45 additions & 0 deletions components/InfoCards.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<template>
<div class="infoCards">
<InfoCard>
<template v-slot:icon>
<TrendingUpIcon />
</template>
<template v-slot:title>Cycle Stage</template>
<template v-slot:description>
{{ $store.state.round }} of {{ $store.state.roundSeries }}
</template>
</InfoCard>
<InfoCard>
<template v-slot:icon>
<ClockIcon />
</template>
<template v-slot:title>Next Cycle</template>
<template v-slot:description>
{{ $store.state.currentSession.id === 'work' ? 'Break' : 'Work' }}
</template>
</InfoCard>
</div>
</template>

<script>
import { TrendingUpIcon, ClockIcon } from 'vue-feather-icons'
import InfoCard from '@/components/InfoCard'
export default {
components: { TrendingUpIcon, ClockIcon, InfoCard },
}
</script>

<style scoped>
.infoCards {
position: fixed;
right: 0;
bottom: 1rem;
left: 0;
display: grid;
gap: 1rem;
grid-template-columns: repeat(2, auto);
}
</style>
Empty file added components/NavBar/Bottom.vue
Empty file.
51 changes: 51 additions & 0 deletions components/NavBar/Top.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<template>
<div class="top-navbar">
<button @click="reset">
<RotateCwIcon />
</button>
<button @click="skip">
Skip
</button>
</div>
</template>

<script>
import { RotateCwIcon } from 'vue-feather-icons'
export default {
components: {
RotateCwIcon,
},
methods: {
reset() {
this.$store.commit('timer/reset')
},
skip() {
this.$store.commit('timer/skip')
},
},
}
</script>

<style scoped>
.top-navbar {
display: flex;
justify-content: space-between;
align-items: flex-start;
padding: 1rem 1.5rem 0rem;
}
button {
padding: 0;
background-color: transparent;
font-size: 1.3rem;
border: none;
}
button:focus {
outline: none;
}
</style>
44 changes: 0 additions & 44 deletions components/Navbar/Bottom.vue

This file was deleted.

43 changes: 0 additions & 43 deletions components/Navbar/Top.vue

This file was deleted.

Loading

0 comments on commit 2de12bb

Please sign in to comment.