wbrawner/mealie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1030 commits 1 branch 0 tags 368 MiB
Commit graph

100 commits

Author SHA1 Message Date
Hayden
7ce02c31d5
chore: bump build deps (#1541) 
* bump build deps

* typescript nonsense

* bump prettier
 2022-08-08 18:38:18 -08:00
dependabot[bot]
95b1b8bbdc
fix(deps): bump @vueuse/core from 9.0.2 to 9.1.0 in /frontend (#1535) 
Bumps [@vueuse/core](https://github.com/vueuse/vueuse/tree/HEAD/packages/core) from 9.0.2 to 9.1.0.
- [Release notes](https://github.com/vueuse/vueuse/releases)
- [Commits](https://github.com/vueuse/vueuse/commits/v9.1.0/packages/core)

---
updated-dependencies:
- dependency-name: "@vueuse/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-08 18:11:17 -08:00
dependabot[bot]
f5040af8bb
chore(deps-dev): bump @babel/eslint-parser in /frontend (#1538) 
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.18.2 to 7.18.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.9/eslint/babel-eslint-parser)

---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-08 18:11:03 -08:00
dependabot[bot]
5fd79457dd
fix(deps): bump date-fns from 2.28.0 to 2.29.1 in /frontend (#1542) 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.28.0 to 2.29.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.28.0...v2.29.1)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-08 18:10:41 -08:00
dependabot[bot]
75d4d9658c
fix(deps): bump vuetify from 2.6.6 to 2.6.8 in /frontend (#1540) 
Bumps [vuetify](https://github.com/vuetifyjs/vuetify/tree/HEAD/packages/vuetify) from 2.6.6 to 2.6.8.
- [Release notes](https://github.com/vuetifyjs/vuetify/releases)
- [Commits](https://github.com/vuetifyjs/vuetify/commits/v2.6.8/packages/vuetify)

---
updated-dependencies:
- dependency-name: vuetify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-08 18:04:53 -08:00
dependabot[bot]
9907b9d625
fix(deps): bump @mdi/js from 6.7.96 to 7.0.96 in /frontend (#1539) 
Bumps [@mdi/js](https://github.com/Templarian/MaterialDesign-JS) from 6.7.96 to 7.0.96.
- [Release notes](https://github.com/Templarian/MaterialDesign-JS/releases)
- [Commits](https://github.com/Templarian/MaterialDesign-JS/compare/v6.7.96...v7.0.96)

---
updated-dependencies:
- dependency-name: "@mdi/js"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-08 18:04:44 -08:00
Hayden
60ecba2f92
chore: deps-dev-bump (#1533) 
* bump dev dependencies

* fix/generate font sheets

* bump python deps to nuke cache
 2022-08-08 17:58:10 -08:00
Michael Genson
1b83c82997
feat: implement local storage for sorting and dynamic sort icons on the new recipe sort card (#1506) 
* added new sort icons

* added dynamic sort icons

* implemented local storage for sorting
and mobile card view

* fixed bug with local storage booleans

* added type hints

* bum vue use to use merge defaults

* use reactive localstorage

* add $vuetify type

* sort returns

* fix type error

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
 2022-07-31 11:39:35 -08:00
Hayden
d4b92a8ade revert i18n version 2022-06-17 14:13:18 -08:00
dependabot[bot]
85d514eb1a
chore(deps-dev): bump @vue/runtime-dom in /frontend (#1423) 
Bumps [@vue/runtime-dom](https://github.com/vuejs/core/tree/HEAD/packages/runtime-dom) from 3.2.36 to 3.2.37.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.37/packages/runtime-dom)

---
updated-dependencies:
- dependency-name: "@vue/runtime-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:47:12 -08:00
dependabot[bot]
8878f78ab1
fix(deps): bump core-js from 3.17.2 to 3.23.1 in /frontend (#1383) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.17.2 to 3.23.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.17.2...v3.23.1)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:45:55 -08:00
dependabot[bot]
d315ad63d2
fix(deps): bump fuse.js from 6.5.3 to 6.6.2 in /frontend (#1325) 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 6.5.3 to 6.6.2.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v6.5.3...v6.6.2)

---
updated-dependencies:
- dependency-name: fuse.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:45:24 -08:00
dependabot[bot]
48053b55b9
fix(deps): bump date-fns from 2.23.0 to 2.28.0 in /frontend (#1293) 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.23.0 to 2.28.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.23.0...v2.28.0)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:36:33 -08:00
dependabot[bot]
78c7399ff7
fix(deps): bump @nuxtjs/i18n from 7.0.3 to 7.2.2 in /frontend (#1288) 
Bumps [@nuxtjs/i18n](https://github.com/nuxt-community/i18n-module) from 7.0.3 to 7.2.2.
- [Release notes](https://github.com/nuxt-community/i18n-module/releases)
- [Changelog](https://github.com/nuxt-community/i18n-module/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/i18n-module/compare/v7.0.3...v7.2.2)

---
updated-dependencies:
- dependency-name: "@nuxtjs/i18n"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:35:21 -08:00
dependabot[bot]
f70fc18222
fix(deps): bump @mdi/js from 5.9.55 to 6.7.96 in /frontend (#1279) 
Bumps [@mdi/js](https://github.com/Templarian/MaterialDesign-JS) from 5.9.55 to 6.7.96.
- [Release notes](https://github.com/Templarian/MaterialDesign-JS/releases)
- [Commits](https://github.com/Templarian/MaterialDesign-JS/compare/v5.9.55...v6.7.96)

---
updated-dependencies:
- dependency-name: "@mdi/js"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-17 13:35:08 -08:00
Hayden
6f83b0f522
chore: bump dev deps (#1418) 2022-06-17 13:34:22 -08:00
dependabot[bot]
592b1de39d
fix(deps): bump @vue/composition-api from 1.6.1 to 1.6.2 in /frontend (#1275) 
Bumps [@vue/composition-api](https://github.com/vuejs/composition-api) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/vuejs/composition-api/releases)
- [Changelog](https://github.com/vuejs/composition-api/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/composition-api/compare/v1.6.1...v1.6.2)

---
updated-dependencies:
- dependency-name: "@vue/composition-api"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-31 08:48:57 -08:00
dependabot[bot]
f29d5f1dff
chore(deps-dev): bump @babel/eslint-parser in /frontend (#1290) 
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.15.4 to 7.18.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.2/eslint/babel-eslint-parser)

---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-31 08:48:33 -08:00
dependabot[bot]
738ef0aaa7
chore(deps-dev): bump @types/sortablejs in /frontend (#1287) 
Bumps [@types/sortablejs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sortablejs) from 1.10.7 to 1.13.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sortablejs)

---
updated-dependencies:
- dependency-name: "@types/sortablejs"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-31 08:48:01 -08:00
Hayden
7609715d9e
remove explicity typescript version (#1285) 
* remove explicity typescript version

* i hate javascript
 2022-05-25 10:14:24 -08:00
Hayden
921fceddea
chore: update dev dependencies (#1282) 
* update dev dependencies

* upgrade eslint

* resolve several errors

* resolve eslint errors
 2022-05-25 09:38:21 -08:00
Hayden
30d19c6503
fix: bad dev dependency (#1281) 
* revert bad dev dependency

* fix concurrent builds
 2022-05-24 21:19:50 -08:00
dependabot[bot]
c05c123880
fix(deps): bump @nuxtjs/auth-next in /frontend (#1265) 
Bumps [@nuxtjs/auth-next](https://github.com/nuxt-community/auth-module) from 5.0.0-1624817847.21691f1 to 5.0.0-1648802546.c9880dc.
- [Release notes](https://github.com/nuxt-community/auth-module/releases)
- [Changelog](https://github.com/nuxt-community/auth-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/auth-module/commits)

---
updated-dependencies:
- dependency-name: "@nuxtjs/auth-next"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 20:02:43 -08:00
dependabot[bot]
6f45de6167
chore(deps-dev): bump vue2-script-setup-transform in /frontend (#1263) 
Bumps [vue2-script-setup-transform](https://github.com/antfu/vue2-script-setup-transform) from 0.2.6 to 0.3.5.
- [Release notes](https://github.com/antfu/vue2-script-setup-transform/releases)
- [Commits](https://github.com/antfu/vue2-script-setup-transform/compare/v0.2.6...v0.3.5)

---
updated-dependencies:
- dependency-name: vue2-script-setup-transform
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 20:02:00 -08:00
dependabot[bot]
d634e2fbe1
chore(deps-dev): bump nuxt-vite from 0.1.3 to 0.3.5 in /frontend (#1260) 
Bumps [nuxt-vite](https://github.com/nuxt/vite) from 0.1.3 to 0.3.5.
- [Release notes](https://github.com/nuxt/vite/releases)
- [Changelog](https://github.com/nuxt/vite/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nuxt/vite/compare/v0.1.3...v0.3.5)

---
updated-dependencies:
- dependency-name: nuxt-vite
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 20:00:50 -08:00
dependabot[bot]
43a566339a
chore(deps-dev): bump @vue/runtime-dom in /frontend (#1259) 
Bumps [@vue/runtime-dom](https://github.com/vuejs/core/tree/HEAD/packages/runtime-dom) from 3.2.35 to 3.2.36.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.36/packages/runtime-dom)

---
updated-dependencies:
- dependency-name: "@vue/runtime-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 20:00:16 -08:00
dependabot[bot]
cc284a0ceb
chore(deps-dev): bump eslint-plugin-nuxt in /frontend (#1258) 
Bumps [eslint-plugin-nuxt](https://github.com/nuxt/eslint-plugin-nuxt) from 2.0.0 to 3.2.0.
- [Release notes](https://github.com/nuxt/eslint-plugin-nuxt/releases)
- [Changelog](https://github.com/nuxt/eslint-plugin-nuxt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt/eslint-plugin-nuxt/compare/v2.0.0...v3.2.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-nuxt
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 19:59:49 -08:00
dependabot[bot]
3c19105d8b
fix(deps): bump isomorphic-dompurify from 0.18.0 to 0.19.0 in /frontend (#1257) 
Bumps [isomorphic-dompurify](https://github.com/kkomelin/isomorphic-dompurify) from 0.18.0 to 0.19.0.
- [Release notes](https://github.com/kkomelin/isomorphic-dompurify/releases)
- [Commits](https://github.com/kkomelin/isomorphic-dompurify/compare/v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: isomorphic-dompurify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-24 19:58:14 -08:00
Hayden
8235bd5104
chore: bump deps (#1252) 
* bump deps

* fix: add apt-get update
 2022-05-22 11:52:57 -08:00
Philipp Fischbeck
4d3346b727
Fix #1205 by using isomorphic-dompurify (#1228) 2022-05-15 15:30:33 -08:00
Hayden
2613420cd1
security: fix unsafe html inputs (#1173) 
* use DomPurify to sanatize ingredient html

* fix list-item render for markdown

* address volar linter issue
 2022-04-24 13:00:04 -08:00
Hayden
1ffd668033
update pwa support + web fonts performance (#1005) 
* update pwa support + web fonts performance

* update web manifest
 2022-02-24 15:49:58 -09:00
Hayden
92cf97e401
Feature/shopping lists second try (#927) 
* generate types

* use generated types

* ui updates

* init button link for common styles

* add links

* setup label views

* add delete confirmation

* reset when not saved

* link label to foods and auto set when adding to shopping list

* generate types

* use inheritence to manage exception handling

* fix schema generation and add test for open_api generation

* add header to api docs

* move list consilidation to service

* split list and list items controller

* shopping list/list item tests - PARTIAL

* enable recipe add/remove in shopping lists

* generate types

* linting

* init global utility components

* update types and add list item api

* fix import cycle and database error

* add container and border classes

* new recipe list component

* fix tests

* breakout item editor

* refactor item editor

* update bulk actions

* update input / color contrast

* type generation

* refactor controller dependencies

* include food/unit editor

* remove console.logs

* fix and update type generation

* fix incorrect type for column

* fix postgres error

* fix delete by variable

* auto remove refs

* fix typo
 2022-01-16 15:24:24 -09:00
Hayden
6db1357064
feat: ✨ (WIP) base-shoppinglist infra (#911) 
* feat: ✨ base-shoppinglist infra (WIP)

* add type checker

* implement controllers

* apply router fixes

* add checked section hide/animation

* add label support

* formatting

* fix overflow images

* add experimental banner

* fix #912 word break issue

* remove any type errors

* bump dependencies

* remove templates

* fix build errors

* bump node version

* fix template literal
 2022-01-08 22:24:34 -09:00
Hayden
5839992c19
add support for meta tags on share pages (#867) 2021-12-06 17:14:14 -09:00
Hayden
c1ba8dcd86
feature/improve-parser-ux (#789) 
* cleanup console.logs

* default to panels open

* feat(frontend): ✨ add ingredient on enter

* feat(frontend): ✨ automatically trigger parser on navigation

* feat(frontend): ✨ prompt user before leaving when in editor

* add deep copy utility

* improve flow of parser

* add tooltip and match disable with disableAmount

* force admin users to have advanced access

Co-authored-by: hay-kot <hay-kot@pm.me>
 2021-11-06 14:32:55 -08:00
Hayden
7e3a36f2dd
feat(frontend): ✨ add debugger to creation page (#750) 
* feat(frontend): ✨ add debugger to creation page

* styling

Co-authored-by: Hayden <hay-kot@pm.me>
 2021-10-19 18:45:03 -08:00
hay-kot
c0e3f04c23 fix(frontend): 🐛 add sortablejs types 2021-09-14 12:36:46 -08:00
Hayden
b542583303
feat(backend): ✨ rewrite mealplanner with simple api (#683) 
* feat(backend): ✨ new meal-planner feature

* feat(frontend): ✨ new meal plan feature

* refactor(backend): ♻️ refactor base services classes and add mixins for crud

* feat(frontend): ✨ add UI/API for mealplanner

* feat(backend): ✨ add get_today and get_slice options for mealplanner

* test(backend): ✅ add and update group mealplanner tests

* fix(backend): 🐛 Fix recipe_id column type for PG

Co-authored-by: hay-kot <hay-kot@pm.me>
 2021-09-12 11:05:09 -08:00
Hayden
bdaf758712
feat(backend): ✨ start multi-tenant support (WIP) (#680) 
* fix ts types

* feat(code-generation): ♻️ update code-generation formats

* new scope

* add step button

* fix linter error

* update code-generation tags

* feat(backend): ✨ start multi-tenant support

* feat(backend): ✨ group invitation token generation and signup

* refactor(backend): ♻️ move group admin actions to admin router

* set url base to include `/admin`

* feat(frontend): ✨ generate user sign-up links

* test(backend): ✅ refactor test-suite to further decouple tests (WIP)

* feat(backend): 🐛 assign owner on backup import for recipes

* fix(backend): 🐛 assign recipe owner on migration from other service

Co-authored-by: hay-kot <hay-kot@pm.me>
 2021-09-09 08:51:29 -08:00
Hayden
3c504e7048
feat(backend): ✨ migrate site-settings to groups (#673) 
* feat(frontend): ✨ add user registration page (WIP)

* feat(backend): ✨ add user registration (WIP)

* test(backend): ✅ add validator testing for registration schema

* feat(backend): ✨ continued work on user sign-up

* feat(backend): ✨ add signup flow and user/group settings

* test(backend): ✅ user-creation tests and small refactor of existing tests

* fix(backend): ✅ fix failing group tests

* style: 🎨 fix lint issues

Co-authored-by: hay-kot <hay-kot@pm.me>
 2021-09-05 22:05:29 -08:00
hay-kot
6d3a06e1b9 cleanup todos 2021-08-21 11:00:42 -08:00
hay-kot
bde885dc84 refactor(frontend): ♻️ rewrite search componenets to typescript 2021-08-08 20:52:44 -08:00
hay-kot
1981e191be Setup vite for development 2021-08-08 17:01:45 -08:00
hay-kot
fcee79a3e7 fix subpath config 2021-08-08 11:17:03 -08:00
hay-kot
ea68095cd3 remove husky 2021-08-07 17:05:46 -08:00
hay-kot
00a8fdda41 reorganize all frontend items 2021-08-01 19:24:47 -08:00
hay-kot
91f56b42de refactor(frontend): 🏗️ scafold pages and componenets folder 
Setup the file structure for components, pages, layouts, api, and all new frontend structure
 2021-07-31 14:45:28 -08:00
hay-kot
8d3db89327 nuxt init 2021-07-31 14:00:28 -08:00
hay-kot
8bfee7ae2a setup yarn 2021-07-25 13:37:18 -08:00