Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Commit 727f9a9

Browse files
committed
Change license to GPL-3.0, copyright to Vedegis Evgenii
1 parent 6fca7da commit 727f9a9

File tree

10 files changed

+1451
-298
lines changed

10 files changed

+1451
-298
lines changed

COPYING

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 674 additions & 201 deletions
Large diffs are not rendered by default.

NOTICE

Lines changed: 0 additions & 2 deletions
This file was deleted.

assets/stylus/main.styl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*!
2+
* TimeLibrary v1.0.4 - web application
3+
* https://github.com/vedees/timelibrary
4+
* Copyright (C) 2018 Vedegis Evgenii <vedegis@gmail.com>
5+
* @license GPL-3.0
6+
* https://github.com/vedees/timelibrary/master/LICENSE
7+
*/
8+
19
// utils
210
@import 'utils/mixin.styl'
311
@import 'utils/vars.styl'

layouts/default.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<template lang="pug">
2-
//- Copyright © 2018 Vedegis Evgenii. Contacts: https://github.com/vedees
3-
//- License: https://opensource.org/licenses/Apache-2.0
4-
52
.wrapper(:class="{blur: loading}")
63
// Header + Navbar
74
Header
@@ -17,7 +14,8 @@
1714
.preloader3
1815

1916
// Error & Success Messages
20-
Message
17+
no-ssr
18+
Message
2119

2220
</template>
2321

nuxt.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Copyright © 2018 Vedegis Evgenii. Contacts: https://github.com/vedees
2-
// License: https://opensource.org/licenses/Apache-2.0
3-
41
const pkg = require('./package')
52

63
module.exports = {

package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
{
2-
"name": "filmlibrary",
3-
"version": "1.0.0",
4-
"description": "A Vue.js project",
5-
"author": "Jack",
2+
"name": "timelibrary",
3+
"version": "1.0.4",
4+
"description": "Time Library Web App",
5+
"author": "https://github.com/vedees",
6+
"repository": {
7+
"type": "git",
8+
"url": "git://github.com/vedees/timelibrary"
9+
},
10+
"bugs": {
11+
"url": "https://github.com/vedees/timelibrary/issues"
12+
},
13+
"homepage": "http://timelibrary.in",
14+
"license": "GPL-3.0",
615
"private": true,
716
"scripts": {
817
"dev": "nuxt",

pages/_id/index.vue

Lines changed: 73 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,34 @@
11
<template lang="pug">
2-
//- Copyright © 2018 Vedegis Evgenii. Contacts: https://github.com/vedees
3-
//- License: https://opensource.org/licenses/Apache-2.0
4-
52
.content-wrapper
63
section
74
.container
8-
h1.ui-title-1 Home
5+
h1.ui-title-1 Add new {{ whatWatch }}
96
form(@submit.prevent="onSubmit")
10-
// Task title
11-
.form-item
7+
//! Task header
8+
.header
129
input(
1310
type="text"
1411
id="title"
1512
placeholder="What we will watch?"
1613
v-model="taskTitle"
14+
style="margin-right: 12px;"
1715
)
18-
select(v-model="what")
19-
option(value="Watch") Watch
20-
option(value="Read") Read
21-
// Task desr
22-
.form-item
23-
textarea(
24-
type="text"
25-
v-model="taskDescription"
26-
@keyup.enter="newTask"
27-
)
28-
29-
// WHAT WE WATCH
30-
.option-list
31-
input.what-watch--radio(
32-
type="radio"
33-
id="radioFilm"
34-
value="Film"
35-
v-model="whatWatch"
36-
)
37-
label(for="radioFilm") Film
38-
input.what-watch--radio(
39-
type="radio"
40-
id="radioSerial"
41-
value="Serial"
42-
v-model="whatWatch"
43-
)
44-
label(for="radioSerial") Serial
45-
input.what-watch--radio(
46-
type="radio"
47-
id="radioCourse"
48-
value="Course"
49-
v-model="whatWatch"
50-
)
51-
label(for="radioCourse") Course
52-
53-
// TOTAL what TIME Watch
54-
.total-time( v-if="what === 'Watch'" )
55-
// Film Time
56-
.total-time__film(
57-
v-if="whatWatch === 'Film'"
58-
)
16+
select(v-model="whatWatch" style="max-width: 230px;")
17+
option(
18+
v-for="option in options"
19+
:key="option.title"
20+
:value="option.title"
21+
) {{ option.title }}
22+
textarea(
23+
type="text"
24+
v-model="taskDescription"
25+
@keyup.enter="newTask"
26+
)
27+
28+
//* TOTAL TIME FOR WHAT WATCH
29+
.total-time
30+
//* Film Time
31+
.time-film(v-if="whatWatch === 'Film'")
5932
span.time-title Hours
6033
input.time-input(
6134
type="number"
@@ -66,13 +39,10 @@
6639
type="number"
6740
v-model="filmMinutes"
6841
)
69-
// Show time
7042
p {{ filmTime }}
7143

72-
// Serial Time
73-
.total-time__serial(
74-
v-if="whatWatch === 'Serial'"
75-
)
44+
//* Serial Time
45+
.time-serial(v-if="whatWatch === 'Serial'")
7646
span.time-title How many season?
7747
input.time-input(
7848
type="number"
@@ -88,11 +58,30 @@
8858
type="number"
8959
v-model="serialSeriesMinutes"
9060
)
91-
// Show time
9261
p {{ serialTime }}
9362

94-
.total-time( v-else )
95-
p book
63+
//* Course Time
64+
.time-course(v-if="whatWatch === 'Course'")
65+
span.time-title Average Hours
66+
input.time-input(
67+
type="number"
68+
v-model="courseHours"
69+
)
70+
span.time-title Average Minutes
71+
input.time-input(
72+
type="number"
73+
v-model="courseMinutes"
74+
)
75+
p {{ courseTime }}
76+
77+
//* Read
78+
.time-book(v-if="whatWatch === 'Book'")
79+
span.time-title How many pages?
80+
input.time-input(
81+
type="number"
82+
v-model="pages"
83+
)
84+
p {{ readTime }}
9685

9786
// TAG LIST
9887
@@ -157,7 +146,12 @@ export default {
157146
submitStatus: null,
158147
taskTitle: '',
159148
taskDescription: '',
160-
what: 'Watch',
149+
options: [
150+
{title: 'Film', count: 0},
151+
{title: 'Serial', count: 0},
152+
{title: 'Course', count: 0},
153+
{title: 'Book', count: 0}
154+
],
161155
whatWatch: 'Film',
162156
163157
// Total Time
@@ -169,6 +163,11 @@ export default {
169163
serialSeason: 1,
170164
serialSeries: 11,
171165
serialSeriesMinutes: 40,
166+
// Course
167+
courseHours: 8,
168+
courseMinutes: 30,
169+
// Book
170+
pages: 320,
172171
173172
// Tags
174173
tagTitle: '',
@@ -182,15 +181,22 @@ export default {
182181
return this.$store.getters.tags
183182
},
184183
185-
// FILM Total Time
184+
//! Total Time
186185
filmTime () {
187186
let min = (this.filmHours * 60) + (this.filmMinutes * 1)
188187
return this.getHoursAndMinutes(min)
189188
},
190-
// SERIAL Total Time
191189
serialTime () {
192190
let min = this.serialSeason * this.serialSeries * this.serialSeriesMinutes
193191
return this.getHoursAndMinutes(min)
192+
},
193+
courseTime () {
194+
let min = (this.courseHours * 60) + (this.courseMinutes * 1)
195+
return this.getHoursAndMinutes(min)
196+
},
197+
readTime () {
198+
let min = (this.pages * 250 / 130)
199+
return this.getHoursAndMinutes(min)
194200
}
195201
},
196202
methods: {
@@ -238,15 +244,17 @@ export default {
238244
console.log('ERROR')
239245
// Valid
240246
} else {
241-
// Time (What Watch)
247+
//* Time (What Watch) STRING
242248
let time
243249
if (this.whatWatch === 'Film') {
244250
time = this.filmTime
245-
} else {
251+
} else if (this.whatWatch === 'Serial') {
246252
time = this.serialTime
253+
} else {
254+
time = this.courseTime
247255
}
248256
249-
// Task
257+
//* Task
250258
const task = {
251259
title: this.taskTitle,
252260
description: this.taskDescription,
@@ -281,18 +289,20 @@ export default {
281289
}
282290
},
283291
284-
// COMMON Total Time
292+
//! COMMON Total Time
285293
getHoursAndMinutes (minutes) {
286294
this.totalTime = minutes
287295
let hours = Math.trunc(minutes / 60)
288-
let min = minutes % 60
296+
let min = (minutes % 60).toFixed(0)
289297
return hours + ' Hours ' + min + ' Minutes'
290298
}
291299
}
292300
}
293301
</script>
294302

295303
<style lang="stylus" scoped>
304+
.header
305+
display: flex
296306
//
297307
// Options
298308
//
@@ -377,19 +387,10 @@ export default {
377387
display flex
378388
justify-content flex-end
379389
380-
// TODO fix select + btnlist
381390
//
382391
// Validate
383392
//
384393
.form-item
385-
// select
386-
&:first-child
387-
display flex
388-
input
389-
margin-right 12px
390-
select
391-
max-width 230px
392-
393394
.error
394395
display none
395396
margin-bottom 8px

static/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

store/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
// Copyright © 2018 Vedegis Evgenii. Contacts: https://github.com/vedees
2-
// License: https://opensource.org/licenses/Apache-2.0
1+
/*!
2+
* TimeLibrary v1.0.4 - web application
3+
* https://github.com/vedees/timelibrary
4+
* Copyright (C) 2018 Vedegis Evgenii <vedegis@gmail.com>
5+
* @license GPL-3.0
6+
* https://github.com/vedees/timelibrary/master/LICENSE
7+
*/
38

49
import Vue from 'vue'
510
import Vuex from 'vuex'

0 commit comments

Comments
 (0)