Compare commits

..

1 Commits

Author SHA1 Message Date
4ea6bc3e39
Merge e15d9eb537 into b60a079bbe 2024-08-26 22:42:26 +00:00
10 changed files with 18 additions and 32 deletions

View File

@ -5,8 +5,8 @@
"dev": "run-p dev:*", "dev": "run-p dev:*",
"docker:up": "docker compose -f docker-compose.dev.yaml up", "docker:up": "docker compose -f docker-compose.dev.yaml up",
"docker:build": "docker compose -f docker-compose.dev.yaml build", "docker:build": "docker compose -f docker-compose.dev.yaml build",
"test": "playwright test --project=chrome --project=firefox --project=safari", "test": "playwright test --project chrome firefox safari",
"test:local": "playwright test --project=chrome", "test:local": "playwright test --project chrome",
"test:server": "run-s docker:up", "test:server": "run-s docker:up",
"test:prepare": "run-p build docker:build", "test:prepare": "run-p build docker:build",
"build": "pnpm run --recursive --filter=!@cryptgeon/backend build" "build": "pnpm run --recursive --filter=!@cryptgeon/backend build"

View File

@ -261,7 +261,7 @@ dependencies = [
[[package]] [[package]]
name = "cryptgeon" name = "cryptgeon"
version = "2.8.0" version = "2.7.0"
dependencies = [ dependencies = [
"axum", "axum",
"bs62", "bs62",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cryptgeon" name = "cryptgeon"
version = "2.8.0" version = "2.7.0"
authors = ["cupcakearmy <hi@nicco.io>"] authors = ["cupcakearmy <hi@nicco.io>"]
edition = "2021" edition = "2021"
rust-version = "1.80" rust-version = "1.80"

View File

@ -1,9 +1,7 @@
use axum::{ use axum::extract::Path;
extract::Path, use axum::http::StatusCode;
http::StatusCode, use axum::response::{IntoResponse, Response};
response::{IntoResponse, Response}, use axum::Json;
Json,
};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::time::SystemTime; use std::time::SystemTime;

View File

@ -1,5 +1,6 @@
use crate::config; use crate::config;
use axum::{http::StatusCode, Json}; use axum::http::StatusCode;
use axum::Json;
use serde::Serialize; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]

View File

@ -1,6 +1,6 @@
{ {
"name": "cryptgeon", "name": "cryptgeon",
"version": "2.8.0", "version": "2.7.0",
"homepage": "https://github.com/cupcakearmy/cryptgeon", "homepage": "https://github.com/cupcakearmy/cryptgeon",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -39,23 +39,13 @@
<input bind:value {...$$restProps} class:valid={valid === true} /> <input bind:value {...$$restProps} class:valid={valid === true} />
<div class="icons"> <div class="icons">
{#if isPassword} {#if isPassword}
<Icon <Icon class="icon" icon={hidden ? 'eye' : 'eye-off'} on:click={toggle} />
disabled={$$restProps.disabled}
class="icon"
icon={hidden ? 'eye' : 'eye-off'}
on:click={toggle}
/>
{/if} {/if}
{#if random} {#if random}
<Icon disabled={$$restProps.disabled} class="icon" icon="dice" on:click={randomFN} /> <Icon class="icon" icon="dice" on:click={randomFN} />
{/if} {/if}
{#if copy} {#if copy}
<Icon <Icon class="icon" icon="copy" on:click={() => copyFN(value.toString())} />
disabled={$$restProps.disabled}
class="icon"
icon="copy"
on:click={() => copyFN(value.toString())}
/>
{/if} {/if}
</div> </div>
</label> </label>

View File

@ -10,11 +10,9 @@ const config: PlaywrightTestConfig = {
outputDir: './test-results', outputDir: './test-results',
testDir: './test', testDir: './test',
timeout: 30_000, timeout: 30_000,
fullyParallel: true,
retries: 2,
webServer: { webServer: {
command: 'pnpm run docker:up', command: 'docker compose -f docker-compose.dev.yaml up',
port: 3000, port: 3000,
reuseExistingServer: true, reuseExistingServer: true,
}, },

View File

@ -3,8 +3,8 @@ import { Files } from '../../files'
import { createNoteError } from '../../utils' import { createNoteError } from '../../utils'
test.describe('@web', () => { test.describe('@web', () => {
test.skip('to big zip', async ({ page }) => { test('to big zip', async ({ page }) => {
const files = [Files.Zip] const files = [Files.Zip]
await createNoteError(page, { files }, 'could not create note. note is too big') await createNoteError(page, { files }, 'note is to big')
}) })
}) })

View File

@ -2,8 +2,7 @@ import { test } from '@playwright/test'
import { checkLinkDoesNotExist, checkLinkForText, createNoteSuccessfully } from '../../utils' import { checkLinkDoesNotExist, checkLinkForText, createNoteSuccessfully } from '../../utils'
test.describe('@web', () => { test.describe('@web', () => {
test('1 minute', async ({ page, browserName }) => { test('1 minute', async ({ page }) => {
test.skip(browserName === 'webkit')
const text = `Virtues value ascetic revaluation sea dead strong burying.` const text = `Virtues value ascetic revaluation sea dead strong burying.`
const minutes = 1 const minutes = 1
const timeout = minutes * 60_000 const timeout = minutes * 60_000