From 9bd49ee04dc5702f996bab675ff2826ec5ae1918 Mon Sep 17 00:00:00 2001 From: FireMasterK <20838718+FireMasterK@users.noreply.github.com> Date: Fri, 8 Oct 2021 21:41:03 +0100 Subject: [PATCH 1/7] Include prettier config files. --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 50f071e0..ab2a8d67 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ dist/ .git/ .* *.md +!.prettier* From 8143919374904fc0730bb7b645ffcc53c229a1b2 Mon Sep 17 00:00:00 2001 From: FireMasterK <20838718+FireMasterK@users.noreply.github.com> Date: Fri, 8 Oct 2021 22:08:41 +0100 Subject: [PATCH 2/7] Fix old regression for Views and Upload date on channels. Closes #424 --- src/components/VideoItem.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue index 9ffeba4c..fe9bf4dc 100644 --- a/src/components/VideoItem.vue +++ b/src/components/VideoItem.vue @@ -37,10 +37,7 @@ -
+
Date: Fri, 8 Oct 2021 22:50:49 +0100 Subject: [PATCH 3/7] actions: Add build and lint Closes #512 --- .github/workflows/ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..6c9c0f4f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,18 @@ +name: Build and Lint + +on: + pull_request: + push: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.4 + - name: Setup Node.js + uses: actions/setup-node@v2.4.1 + with: + cache: "yarn" + - run: yarn install --prefer-offline + - run: yarn build + - run: yarn lint --no-fix From 14976bad8812273ac64e2920c946e05915b9171a Mon Sep 17 00:00:00 2001 From: Filipe Medeiros Date: Sun, 10 Oct 2021 04:35:10 +0100 Subject: [PATCH 4/7] feat: sidebar not perfect, but good enough for me, maybe you can tweak it to make it better! only on desktop for now --- public/img/icons/logo.svg | 1 - public/img/logo.svg | 20 +++++ public/img/piped.svg | 7 ++ public/img/pipedPlay.svg | 15 ++++ src/App.vue | 55 +++++++----- src/components/Sidebar.vue | 176 +++++++++++++++++++++++++++++++++++++ src/main.js | 12 ++- 7 files changed, 259 insertions(+), 27 deletions(-) delete mode 100644 public/img/icons/logo.svg create mode 100644 public/img/logo.svg create mode 100644 public/img/piped.svg create mode 100644 public/img/pipedPlay.svg create mode 100644 src/components/Sidebar.vue diff --git a/public/img/icons/logo.svg b/public/img/icons/logo.svg deleted file mode 100644 index f0356a6e..00000000 --- a/public/img/icons/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/logo.svg b/public/img/logo.svg new file mode 100644 index 00000000..3659243c --- /dev/null +++ b/public/img/logo.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/piped.svg b/public/img/piped.svg new file mode 100644 index 00000000..3e78adcd --- /dev/null +++ b/public/img/piped.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/img/pipedPlay.svg b/public/img/pipedPlay.svg new file mode 100644 index 00000000..d5a67c8e --- /dev/null +++ b/public/img/pipedPlay.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index 28803eaa..921cc238 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,34 +1,37 @@ - diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue new file mode 100644 index 00000000..c3505fe5 --- /dev/null +++ b/src/components/Sidebar.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/main.js b/src/main.js index d6da6802..031806e1 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,10 @@ import { faHeadphones, faRss, faChevronLeft, + faBars, + faFire, + faCog, + faSignOutAlt, } from "@fortawesome/free-solid-svg-icons"; import { faGithub, faBitcoin, faYoutube } from "@fortawesome/free-brands-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; @@ -26,6 +30,10 @@ library.add( faYoutube, faRss, faChevronLeft, + faBars, + faFire, + faCog, + faSignOutAlt, ); import("uikit/dist/css/uikit-core.css"); @@ -185,10 +193,10 @@ const mixin = { }, computed: { backgroundColor() { - return this.getEffectiveTheme() === "light" ? "#fff" : "#0b0e0f"; + return this.getEffectiveTheme() === "light" ? "#fff" : "#1d2438"; }, secondaryBackgroundColor() { - return this.getEffectiveTheme() === "light" ? "#e5e5e5" : "#242727"; + return this.getEffectiveTheme() === "light" ? "#e5e5e5" : "#30354b"; }, foregroundColor() { return this.getEffectiveTheme() === "light" ? "#15191a" : "#0b0e0f"; From 328ecd43b64f9a9c413beeb7cd3bf7fc200cedac Mon Sep 17 00:00:00 2001 From: Filipe Medeiros Date: Sun, 10 Oct 2021 13:37:01 +0100 Subject: [PATCH 5/7] feat: menu for mobile and improvements --- src/App.vue | 15 +- src/components/Menu.vue | 28 +++ .../{Sidebar.vue => MenuDesktop.vue} | 84 +++++---- src/components/MenuMobile.vue | 163 ++++++++++++++++++ src/components/TrendingPage.vue | 31 +++- src/locales/en.json | 13 +- src/main.js | 2 + 7 files changed, 292 insertions(+), 44 deletions(-) create mode 100644 src/components/Menu.vue rename src/components/{Sidebar.vue => MenuDesktop.vue} (56%) create mode 100644 src/components/MenuMobile.vue diff --git a/src/App.vue b/src/App.vue index 921cc238..42bc7d21 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,10 @@ diff --git a/src/components/Sidebar.vue b/src/components/MenuDesktop.vue similarity index 56% rename from src/components/Sidebar.vue rename to src/components/MenuDesktop.vue index c3505fe5..09c8ead4 100644 --- a/src/components/Sidebar.vue +++ b/src/components/MenuDesktop.vue @@ -1,62 +1,74 @@