Skip to content

Commit

Permalink
Merge branch 'root' into 25-login-page
Browse files Browse the repository at this point in the history
  • Loading branch information
Zelzahn authored Jul 18, 2024
2 parents 94d26c5 + 828ce85 commit abddcee
Show file tree
Hide file tree
Showing 15 changed files with 472 additions and 221 deletions.
175 changes: 175 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# ESLint is a tool for identifying and reporting on patterns
# found in ECMAScript/JavaScript code.
# More details at https://github.com/eslint/eslint
# and https://eslint.org

name: AMA ESLint

on:
push:
branches: [ "root" ]
pull_request:
branches: [ "root" ]

jobs:
eslint:
name: 'ESLint'
runs-on: ubuntu-latest
defaults:
run:
working-directory: loama
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v4
- uses: pnpm/action-setup@v4
name: Install PNPM
with:
version: latest
run_install: false
- name: Get pnpm store directory
shell: bash
id: cache
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
name: Setup PNPM cache
env:
STORE_PATH: ${{ steps.cache.outputs.STORE_PATH }}
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Insall dependencies
run: pnpm install --frozen-lockfile
- name: Run Eslint
run: pnpm run lint:ci >> $GITHUB_STEP_SUMMARY
controller-tsc:
name: 'TSC (Controller)'
runs-on: ubuntu-latest
defaults:
run:
working-directory: controller
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v4
- uses: pnpm/action-setup@v4
name: Install PNPM
with:
version: latest
run_install: false
- name: Get pnpm store directory
shell: bash
id: cache
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
name: Setup PNPM cache
env:
STORE_PATH: ${{ steps.cache.outputs.STORE_PATH }}
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Insall dependencies
run: pnpm install --frozen-lockfile
- name: Run Typescript Check
run: pnpm run build >> $GITHUB_STEP_SUMMARY
- name: Save distribution files
uses: actions/upload-artifact@v4
with:
name: controller-dist
path: ${{github.workspace}}/controller/dist

vue-tsc:
name: 'TSC (Loama)'
runs-on: ubuntu-latest
needs: controller-tsc
defaults:
run:
working-directory: loama
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Download controller dist
uses: actions/download-artifact@v4
with:
name: controller-dist
path: ${{github.workspace}}/controller/dist
- name: Install Node.js
uses: actions/setup-node@v4
- uses: pnpm/action-setup@v4
name: Install PNPM
with:
version: latest
run_install: false
- name: Get pnpm store directory
shell: bash
id: cache
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
name: Setup PNPM cache
env:
STORE_PATH: ${{ steps.cache.outputs.STORE_PATH }}
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Insall dependencies
run: pnpm install --frozen-lockfile
- name: Run Typescript Check
run: pnpm run type-check >> $GITHUB_STEP_SUMMARY
build:
name: 'Build (Loama)'
runs-on: ubuntu-latest
needs: controller-tsc
defaults:
run:
working-directory: loama
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Download controller dist
uses: actions/download-artifact@v4
with:
name: controller-dist
path: ${{github.workspace}}/controller/dist
- name: Install Node.js
uses: actions/setup-node@v4
- uses: pnpm/action-setup@v4
name: Install PNPM
with:
version: latest
run_install: false
- name: Get pnpm store directory
shell: bash
id: cache
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
name: Setup PNPM cache
env:
STORE_PATH: ${{ steps.cache.outputs.STORE_PATH }}
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies of controller
working-directory: controller
run: pnpm install --frozen-lockfile
- name: Install dependencies of loama
run: pnpm install --frozen-lockfile
- name: Run Typescript Check
run: pnpm run build-only >> $GITHUB_STEP_SUMMARY
74 changes: 0 additions & 74 deletions .github/workflows/eslint.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .prototools
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[plugins]
act = "https://raw.githubusercontent.com/theomessin/proto-toml-plugins/master/act.toml"
6 changes: 4 additions & 2 deletions loama/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
"build-only": "vite build",
"type-check": "vue-tsc --build --force",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"format": "prettier --write src/"
"format": "prettier --write src/",
"lint:ci": "eslint . --config .eslintrc.cjs --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --format node_modules/eslint-formatter-markdown/markdown.js"
},
"engines": {
"node": ">= 22"
"node": ">=22.0.0"
},
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
"dependencies": {
Expand All @@ -33,6 +34,7 @@
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint": "^8.57.0",
"eslint-formatter-markdown": "^1.0.4",
"eslint-plugin-vue": "^9.23.0",
"npm-run-all2": "^6.2.0",
"prettier": "^3.2.5",
Expand Down
11 changes: 11 additions & 0 deletions loama/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion loama/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ p {
--solid-purple: #7C4DFF;
--off-white: #F7F7F7;
--off-black: #170D33;
--lama-gray: #F7F7F7;
--lama-gray: #DADADA;
--base-unit: 0.5rem;
--base-corner: 0.5rem;
}
Expand Down Expand Up @@ -124,5 +124,19 @@ html {
font-family: "Raleway", sans-serif;
font-optical-sizing: auto;
font-style: normal;
color: var(--off-black);
font-size: var(--base-unit)*2;
}
select {
padding: var(--base-unit);
border-radius: var(--base-corner);
background-color: var(--off-white);
border: 0.125rem solid var(--off-black);
}
select:active {
border-color: var(--solid-purple);
}
</style>
Loading

0 comments on commit abddcee

Please sign in to comment.