Skip to content

Commit

Permalink
Merge pull request #31 from web3privacy/v3
Browse files Browse the repository at this point in the history
V2 to main
  • Loading branch information
danielklein-arch authored Sep 23, 2024
2 parents 8b9a1e0 + 28c3293 commit 116f91f
Show file tree
Hide file tree
Showing 73 changed files with 24,243 additions and 1,238 deletions.
91 changes: 26 additions & 65 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,77 +1,38 @@
name: CI

on:
push:
branches:
- main

branches: [main, v3]
pull_request:
branches:
- main
- dev

branches: [main, v3]
jobs:
codechecks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/cache@v2
- name: Checkout the repository
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
run_install: false
- name: Install Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: pnpm
- name: Enable Corepack
run: corepack enable
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Cache the pnpm lock file
uses: actions/cache@v4
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: Install Dependencies
${{ runner.os }}-pnpm-store-
- name: Install package dependencies
run: pnpm install
- name: Typecheck
run: pnpm run typecheck
- name: Lint
- name: Lint the code
run: pnpm run lint

# build:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: pnpm/action-setup@v2
# - uses: actions/setup-node@v3
# with:
# node-version: 16.x
# cache: pnpm

# - name: Install
# run: pnpm install

# - name: Build
# run: pnpm run build

# test-e2e:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/cache@v3
# with:
# path: |
# ~/.cache
# key: cypress-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}

# - uses: pnpm/action-setup@v2

# - uses: pnpm/action-setup@v2
# - uses: actions/setup-node@v3
# with:
# node-version: 16.x
# cache: pnpm

# - name: Install
# run: pnpm install

# - name: Cypress PNPM Patch
# run: cp pnpm-lock.yaml package-lock.json

# - name: Cypress [Hub]
# uses: cypress-io/github-action@v4
# with:
# install-command: echo
# build: pnpm hub:generate
# start: pnpm hub:preview
9 changes: 5 additions & 4 deletions components/Button.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<script setup lang="ts">
defineProps<{
border?: boolean
invertedColor?: boolean
}>()
</script>

<template>
<div
flex
items-center
justify-center
gap-12px
px-12px
py-6px
cursor-pointer
text-app-white
:class="[border ? 'border-2px border-app-white' : 'border-0']"
hover:text-app-black
hover:bg-app-white
:class="[border ? 'border-2px border-app-white' : 'border-0',
invertedColor ? 'bg-app-white text-app-black hover:text-app-white hover:bg-app-black' : 'text-app-white bg-app-black hover:text-app-black hover:bg-app-white',
]"
>
<template v-if="!!$slots.prefix">
<div text-24px>
Expand Down
Loading

0 comments on commit 116f91f

Please sign in to comment.