Skip to content

Commit 37dec8b

Browse files
TwinceTwince
authored
Merge pull request #314 from EATSTEAK/dev
0.11.1
2 parents 0b36ab7 + d112066 commit 37dec8b

File tree

184 files changed

+9126
-9151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+9126
-9151
lines changed

‎.githooks/pre-push‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
pnpm install --frozen-lockfile
6+
pnpm -r prettier
7+
pnpm -r lint
8+
pnpm -r check

‎.github/workflows/lint-check.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Check code
2+
3+
on:
4+
pull_request:
5+
types: [ opened, edited, reopened, synchronize ]
6+
jobs:
7+
check:
8+
runs-on: ubuntu-22.04
9+
steps:
10+
- uses: actions/checkout@v3
11+
- uses: actions/setup-node@v3
12+
with:
13+
node-version: 18
14+
- name: Install pnpm
15+
uses: pnpm/action-setup@v2
16+
with:
17+
version: 7
18+
run_install: false
19+
- name: Get pnpm store directory
20+
id: pnpm-cache
21+
run: |
22+
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
23+
- name: Setup pnpm cache
24+
uses: actions/cache@v2
25+
with:
26+
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
27+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
28+
restore-keys: |
29+
${{ runner.os }}-pnpm-store-
30+
- name: Install Dependencies
31+
run: pnpm install --frozen-lockfile
32+
- name: Run prettier check
33+
run: pnpm -r prettier
34+
- name: Run eslint in server and types
35+
run: pnpm -r --filter=!client lint
36+
- name: Run eslint on changed files in client
37+
uses: tj-actions/eslint-changed-files@v13.3
38+
with:
39+
path: "./packages/client"
40+
file_extensions: |
41+
**/*.ts
42+
**/*.svelte
43+
**/*.js
44+
**/*.json
45+
- name: Build client
46+
run: pnpm -r --filter=client build
47+
- name: Run svelte-check
48+
run: pnpm -r check

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lockerweb",
3-
"version": "0.11.0",
3+
"version": "0.11.1",
44
"description": "SSU IT Collage Locker system.",
55
"private": true,
66
"scripts": {

‎packages/client/.eslintrc.cjs‎

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,49 @@
11
module.exports = {
2-
root: true,
3-
parser: '@typescript-eslint/parser',
4-
extends: [
5-
'plugin:import/recommended',
6-
'plugin:import/typescript',
7-
'plugin:tailwindcss/recommended',
8-
'eslint:recommended',
9-
'airbnb-typescript/base',
10-
'plugin:@typescript-eslint/recommended',
11-
'prettier'
12-
],
13-
plugins: ['svelte3', '@typescript-eslint', 'tailwindcss'],
14-
ignorePatterns: ['*.cjs'],
15-
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
16-
settings: {
17-
'svelte3/typescript': () => require('typescript')
18-
},
19-
parserOptions: {
20-
project: 'tsconfig.json',
21-
sourceType: 'module',
22-
ecmaVersion: 2020
23-
},
24-
env: {
25-
browser: true,
26-
es2017: true,
27-
node: true
28-
}
2+
root: true,
3+
extends: ['plugin:import/recommended', 'eslint:recommended'],
4+
plugins: ['svelte3', '@typescript-eslint', 'tailwindcss'],
5+
ignorePatterns: ['*.cjs'],
6+
overrides: [
7+
{
8+
files: ['*.svelte'],
9+
processor: 'svelte3/svelte3',
10+
parser: '@typescript-eslint/parser',
11+
extends: [
12+
'plugin:import/typescript',
13+
'airbnb-typescript/base',
14+
'plugin:tailwindcss/recommended',
15+
'plugin:@typescript-eslint/recommended',
16+
'prettier',
17+
],
18+
rules: {
19+
'@typescript-eslint/indent': 'off',
20+
},
21+
},
22+
{
23+
files: ['*.ts'],
24+
parser: '@typescript-eslint/parser',
25+
extends: [
26+
'plugin:import/typescript',
27+
'airbnb-typescript/base',
28+
'plugin:@typescript-eslint/recommended',
29+
'prettier',
30+
],
31+
rules: {
32+
'@typescript-eslint/indent': 'off',
33+
},
34+
},
35+
],
36+
settings: {
37+
'svelte3/typescript': () => require('typescript'),
38+
},
39+
parserOptions: {
40+
project: 'tsconfig.json',
41+
sourceType: 'module',
42+
ecmaVersion: 2020,
43+
},
44+
env: {
45+
browser: true,
46+
es2017: true,
47+
node: true,
48+
},
2949
};

‎packages/client/.prettierrc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"useTabs": true,
3-
"singleQuote": true,
4-
"trailingComma": "none",
5-
"printWidth": 100
2+
"singleQuote": true,
3+
"trailingComma": "all",
4+
"printWidth": 100,
5+
"bracketSameLine": true
66
}

‎packages/client/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "client",
3-
"version": "0.11.0",
3+
"version": "0.11.1",
44
"scripts": {
55
"dev": "cross-env VITE_BASE_URL=http://localhost:3000 vite dev --port 5002 --host 0.0.0.0",
66
"build": "vite build",
77
"package": "svelte-kit package",
88
"preview": "vite preview",
99
"check": "svelte-check --tsconfig ./tsconfig.json",
1010
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
11-
"lint": "prettier --check --plugin-search-dir=. . && eslint .",
12-
"format": "prettier --write --plugin-search-dir=. .",
11+
"prettier": "prettier --check --plugin-search-dir=. . ",
12+
"lint": "eslint .",
13+
"format": "eslint . --fix && prettier --write --plugin-search-dir=. .",
1314
"delete": "node ./scripts/delete.js",
1415
"deploy": "node ./scripts/deploy.js"
1516
},
@@ -32,7 +33,7 @@
3233
"postcss": "^8.4.14",
3334
"postcss-load-config": "^4.0.1",
3435
"prettier": "^2.6.2",
35-
"prettier-plugin-svelte": "^2.7.0",
36+
"prettier-plugin-tailwindcss": "^0.1.13",
3637
"svelte": "^3.44.0",
3738
"svelte-check": "^2.7.1",
3839
"svelte-preprocess": "^4.10.7",

‎packages/client/postcss.config.cjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ const tailwindcss = require('tailwindcss');
22
const autoprefixer = require('autoprefixer');
33

44
const config = {
5-
plugins: [
6-
//Some plugins, like tailwindcss/nesting, need to run before Tailwind,
7-
tailwindcss(),
8-
//But others, like autoprefixer, need to run after,
9-
autoprefixer
10-
]
5+
plugins: [
6+
//Some plugins, like tailwindcss/nesting, need to run before Tailwind,
7+
tailwindcss(),
8+
//But others, like autoprefixer, need to run after,
9+
autoprefixer,
10+
],
1111
};
1212

1313
module.exports = config;

‎packages/client/prettier.config.cjs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
plugins: [require('prettier-plugin-tailwindcss')],
3+
};

‎packages/client/scripts/delete.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
import { exec } from 'child_process';
22

33
exec('aws cloudformation describe-stacks --stack-name ssu-it-locker', (err, stdout, stderr) => {
4-
if (err) {
5-
console.error(`Exception thrown: ${err.message}`);
6-
return;
7-
}
8-
if (stderr) {
9-
console.error(`Error occurred: ${stderr}`);
10-
return;
11-
}
12-
const stackObj = JSON.parse(stdout);
13-
const s3Name = stackObj?.['Stacks']?.[0]?.['Outputs']?.find(
14-
(elem) => elem['OutputKey'] === 'FrontS3BucketName'
15-
)?.['OutputValue'];
16-
if (!s3Name) {
17-
console.error('Cannot find s3 bucket. Please deploy lambda first.');
18-
return;
19-
}
20-
console.log(`Found s3 bucket: ${s3Name}`);
21-
exec(`aws s3 rm "s3://${s3Name}/" --recursive`, (err, stdout, stderr) => {
22-
if (err) {
23-
console.error(`Exception thrown: ${err.message}`);
24-
return;
25-
}
26-
if (stderr) {
27-
console.error(`Error occurred: ${stderr}`);
28-
return;
29-
}
30-
console.log(`${stdout}`);
31-
});
4+
if (err) {
5+
console.error(`Exception thrown: ${err.message}`);
6+
return;
7+
}
8+
if (stderr) {
9+
console.error(`Error occurred: ${stderr}`);
10+
return;
11+
}
12+
const stackObj = JSON.parse(stdout);
13+
const s3Name = stackObj?.['Stacks']?.[0]?.['Outputs']?.find(
14+
(elem) => elem['OutputKey'] === 'FrontS3BucketName',
15+
)?.['OutputValue'];
16+
if (!s3Name) {
17+
console.error('Cannot find s3 bucket. Please deploy lambda first.');
18+
return;
19+
}
20+
console.log(`Found s3 bucket: ${s3Name}`);
21+
exec(`aws s3 rm "s3://${s3Name}/" --recursive`, (err, stdout, stderr) => {
22+
if (err) {
23+
console.error(`Exception thrown: ${err.message}`);
24+
return;
25+
}
26+
if (stderr) {
27+
console.error(`Error occurred: ${stderr}`);
28+
return;
29+
}
30+
console.log(`${stdout}`);
31+
});
3232
});

‎packages/client/scripts/deploy.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
import { exec } from 'child_process';
22

33
exec('aws cloudformation describe-stacks --stack-name lockerweb', (err, stdout, stderr) => {
4-
if (err) {
5-
console.error(`Exception thrown: ${err.message}`);
6-
return;
7-
}
8-
if (stderr) {
9-
console.error(`Error occurred: ${stderr}`);
10-
return;
11-
}
12-
const stackObj = JSON.parse(stdout);
13-
const s3Name = stackObj?.['Stacks']?.[0]?.['Outputs']?.find(
14-
(elem) => elem['OutputKey'] === 'FrontS3BucketName'
15-
)?.['OutputValue'];
16-
if (!s3Name) {
17-
console.error('Cannot find s3 bucket. Please deploy lambda first.');
18-
return;
19-
}
20-
console.log(`Found s3 bucket: ${s3Name}`);
21-
exec(`aws s3 sync ./build "s3://${s3Name}/" --delete`, (err, stdout, stderr) => {
22-
if (err) {
23-
console.error(`Exception thrown: ${err.message}`);
24-
return;
25-
}
26-
if (stderr) {
27-
console.error(`Error occurred: ${stderr}`);
28-
return;
29-
}
30-
console.log(`${stdout}`);
31-
});
4+
if (err) {
5+
console.error(`Exception thrown: ${err.message}`);
6+
return;
7+
}
8+
if (stderr) {
9+
console.error(`Error occurred: ${stderr}`);
10+
return;
11+
}
12+
const stackObj = JSON.parse(stdout);
13+
const s3Name = stackObj?.['Stacks']?.[0]?.['Outputs']?.find(
14+
(elem) => elem['OutputKey'] === 'FrontS3BucketName',
15+
)?.['OutputValue'];
16+
if (!s3Name) {
17+
console.error('Cannot find s3 bucket. Please deploy lambda first.');
18+
return;
19+
}
20+
console.log(`Found s3 bucket: ${s3Name}`);
21+
exec(`aws s3 sync ./build "s3://${s3Name}/" --delete`, (err, stdout, stderr) => {
22+
if (err) {
23+
console.error(`Exception thrown: ${err.message}`);
24+
return;
25+
}
26+
if (stderr) {
27+
console.error(`Error occurred: ${stderr}`);
28+
return;
29+
}
30+
console.log(`${stdout}`);
31+
});
3232
});

0 commit comments

Comments
 (0)