Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modal about #5

Merged
merged 10 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
pull_request:
branches: ['master']

jobs:
create-release-on-push:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: read
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: rymndhng/release-on-push-action@master
with:
bump_version_scheme: minor
tag_prefix: 'v'
release_name: 'Release <RELEASE_VERSION>'
max_commits: 20
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Determine Paper Cost


## Tech Stack

```bash
Expand All @@ -13,6 +12,7 @@
Tools

```bash

```

## After Cloning this project
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paper-cost",
"version": "0.0.1",
"version": "1.2.0",
"private": true,
"scripts": {
"dev": "vite dev",
Expand Down
8 changes: 4 additions & 4 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
plugins: {
tailwindcss: {},
autoprefixer: {}
}
}
2 changes: 1 addition & 1 deletion src/app.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ declare global {
}
}

export {};
export {}
8 changes: 4 additions & 4 deletions src/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest';
import { describe, it, expect } from 'vitest'

describe('sum test', () => {
it('adds 1 + 2 to equal 3', () => {
expect(1 + 2).toBe(3);
});
});
expect(1 + 2).toBe(3)
})
})
7 changes: 7 additions & 0 deletions src/lib/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

.brand-name {
background-image: url('./giphy.gif');
background-position: top;
background-clip: text;
-webkit-background-clip: text;
}
16 changes: 16 additions & 0 deletions src/lib/elements/About.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script lang="ts">
import { version } from '$app/environment'
</script>

<div class="flex flex-col text-center items-center">
<img class="h-10 w-10 rounded-full" src="/logo.jpeg" alt="logo" />
<p class="text-lg font-bold">Paper Cost</p>

<p class="mt-5">Developed by</p>
<div class="text-sm flex flex-col">
<p>Sheba Queue</p>
<p>Kawsar Ahmed</p>
<p class="text-[13px]">+880 1915983757</p>
</div>
<p class="mt-10 text-slate-500 text-xs">Version: {version}</p>
</div>
3 changes: 3 additions & 0 deletions src/lib/elements/BrandTitle.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<p class="brand-name text-center text-[26px] text-transparent font-bold tracking-wide">
Molla Printing & Packaging
</p>
23 changes: 23 additions & 0 deletions src/lib/elements/Modal.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<script lang="ts">
import { makeid, receive, send } from '$lib/utils/tools'
import Icon from '@iconify/svelte'

export let show = false
const id = makeid(6)
</script>

<div class="absolute bg-black bg-opacity-20 flex h-full w-full items-center justify-center z-10">
<div
in:receive={{ key: id, duration: 200 }}
out:send={{ key: id, duration: 200 }}
class="bg-white p-2 rounded relative flex flex-col w-3/4"
>
<button
class="absolute top-0 right-0 p-[3px] rounded-full w-fit"
on:click|stopPropagation|preventDefault={() => (show = false)}
>
<Icon icon="majesticons:multiply" width="20px" />
</button>
<slot />
</div>
</div>
2 changes: 1 addition & 1 deletion src/lib/utils/tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const [send, receive] = crossfade({
const transform = style.transform === 'none' ? '' : style.transform

return {
duration: 300,
duration: params.duration,
easing: params.easing,
css: (t) => `
transform: ${transform} scale(${t});
Expand Down
8 changes: 4 additions & 4 deletions src/lib/utils/tooltip.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import tippy from 'tippy.js';
import 'tippy.js/dist/tippy.css';
import 'tippy.js/animations/scale.css';
import tippy from 'tippy.js'
import 'tippy.js/dist/tippy.css'
import 'tippy.js/animations/scale.css'

tippy('[data-tippy]', {
content: (reference) => reference.getAttribute('data-tippy') || '',
Expand All @@ -9,4 +9,4 @@ tippy('[data-tippy]', {
arrow: true,
delay: 100,
animation: 'scale'
});
})
17 changes: 15 additions & 2 deletions src/routes/(app)/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import { supabase } from '$lib/db/supabaseClient'
import { Toaster } from 'svelte-sonner'
import Icon from '@iconify/svelte'
import Modal from '$lib/elements/Modal.svelte'
import BrandTitle from '$lib/elements/BrandTitle.svelte'
import About from '$lib/elements/About.svelte'

//Import Mixpanel SDK
mixpanel.init(PUBLIC_MIX_TOKEN, {
Expand All @@ -19,6 +22,7 @@
})

let showSettings = false
let showAbout = false

const handleLogout = async () => {
await supabase.auth.signOut()
Expand All @@ -40,10 +44,15 @@
<Loader />
</div>
{/if}
{#if showAbout}
<Modal bind:show={showAbout}>
<About />
</Modal>
{/if}
<div class="flex flex-col h-[92%]">
<nav class="max-w-6xl mx-auto w-full">
<div class="flex justify-center py-2">
<p class="text-center text-2xl text-red-600 font-semibold">Molla Printing & Packaging</p>
<BrandTitle />
</div>
<div class="bg-gradient-to-r from-transparent via-orange-800/40 to-transparent p-[1px]" />
</nav>
Expand Down Expand Up @@ -85,7 +94,11 @@
class="absolute w-20 right-3 bottom-11 flex flex-col items-start divide-y divide-orange-400 gap-1 bg-slate-50 p-2 rounded"
>
<!-- <button on:click={() => handleLogout()}>Logout</button> -->
<button>About</button>
<button
on:click={() => {
;(showAbout = true), (showSettings = false)
}}>About</button
>
</div>
{/if}
</main>
4 changes: 2 additions & 2 deletions src/routes/(app)/history/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<title>History</title>
</svelte:head>

<section class="max-w-6xl mx-auto flex w-full max-h-[90%] flex-col gap-4 px-4 pt-5">
<section class="max-w-6xl mx-auto flex w-full max-h-[90%] flex-col gap-3 px-4 pt-3">
<h1 class="text-xl text-center">Cost Details</h1>
<div class="w-full bg-gradient-to-r from-transparent via-slate-600/10 to-transparent p-[1px]" />
{#if history}
Expand All @@ -30,7 +30,7 @@
</h1>
</div>

<div class="flex flex-col w-full justify-between gap-3 h-[80%] items-center">
<div class="flex flex-col w-full justify-between gap-3 h-[85%] items-center">
<div class="flex flex-col overflow-y-auto w-full max-w-3xl py-2">
{#if history.papers.length}
{#each history.papers as { length, width, thickness, rate, id }}
Expand Down
3 changes: 2 additions & 1 deletion src/routes/auth/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { page } from '$app/stores'
import { PUBLIC_MIX_TOKEN } from '$env/static/public'
import '$lib/app.css'
import BrandTitle from '$lib/elements/BrandTitle.svelte'
import '@fontsource/jost'

//Import Mixpanel SDK
Expand All @@ -16,7 +17,7 @@
<main class="h-[100svh] flex flex-col">
<nav>
<div class="flex justify-center py-2">
<p class="text-center text-2xl text-red-600 font-semibold">Molla Printing & Packaging</p>
<BrandTitle />
</div>
<div
class="w-full max-w-6xl mx-auto bg-gradient-to-r from-transparent via-orange-800/40 to-transparent p-[1px]"
Expand Down
Binary file added static/giphy.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 14 additions & 5 deletions svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
// import adapter from '@sveltejs/adapter-auto';
import adapter from '@sveltejs/adapter-vercel';
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
import adapter from '@sveltejs/adapter-vercel'
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
import { readFileSync } from 'fs'
import { fileURLToPath } from 'url'

const file = fileURLToPath(new URL('package.json', import.meta.url))
const json = readFileSync(file, 'utf8')
const pkg = JSON.parse(json)

/** @type {import('@sveltejs/kit').Config} */
const config = {
Expand All @@ -12,8 +18,11 @@ const config = {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter()
adapter: adapter(),
version: {
name: pkg.version
}
}
};
}

export default config;
export default config
8 changes: 4 additions & 4 deletions tests/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from '@playwright/test';
import { expect, test } from '@playwright/test'

test('index page has expected h1', async ({ page }) => {
await page.goto('/');
await expect(page.getByRole('heading', { name: 'Welcome to SvelteKit' })).toBeVisible();
});
await page.goto('/')
await expect(page.getByRole('heading', { name: 'Welcome to SvelteKit' })).toBeVisible()
})
9 changes: 6 additions & 3 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vitest/config';
import { sveltekit } from '@sveltejs/kit/vite'
import { defineConfig } from 'vitest/config'

export default defineConfig({
plugins: [sveltekit()],
test: {
include: ['src/**/*.{test,spec}.{js,ts}']
},
server: {
port: 2000
}
});
})