diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d35c6688..01e92b54 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -136,11 +136,11 @@ For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations]. -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations +[homepage]: HTTPS://www.contributor-covenant.org +[v2.1]: HTTPS://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: HTTPS://github.com/mozilla/diversity +[FAQ]: HTTPS://www.contributor-covenant.org/faq +[translations]: HTTPS://www.contributor-covenant.org/translations Thank you for being part of our community and helping us create a safe and respectful environment for everyone! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dbbd16f8..c749fbe3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -124,19 +124,11 @@ For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations]. -<<<<<<< HEAD -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations -======= [homepage]: HTTPS://www.contributor-covenant.org [v2.1]: HTTPS://www.contributor-covenant.org/version/2/1/code_of_conduct.html [Mozilla CoC]: HTTPS://github.com/mozilla/diversity [FAQ]: HTTPS://www.contributor-covenant.org/faq [translations]: HTTPS://www.contributor-covenant.org/translations ->>>>>>> Fork/Current Thank you for being part of our community and helping us create a safe and respectful environment for everyone! diff --git a/Public/site.webmanifest b/Public/site.webmanifest index bfb5f8fa..579ff9b0 100644 --- a/Public/site.webmanifest +++ b/Public/site.webmanifest @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "background_color": "#fa5252", "categories": [], "display": "minimal-ui", @@ -64,14 +63,4 @@ "short_name": "crepes", "start_url": "/", "theme_color": "#fa5252" -======= - "background_color": "// TODO Set the background color of the app", - "categories": [], - "display": "minimal-ui", - "name": "// TODO Use the same title as in template.html", - "orientation": "landscape", - "short_name": "// TODO Title but lowercase", - "start_url": "/", - "theme_color": "// TODO Use the same theme color from template.html" ->>>>>>> Fork/Current } diff --git a/README.md b/README.md index e8b0b7f0..96ec8274 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,5 @@ -<<<<<<< HEAD # [crepes.dev] πŸ₯ž Crepes.dev main website. [crepes.dev]: https://crepes.dev -======= -# πŸ“„β€[Starter] — - -A simple skeleton with TailwindCSS, PostCSS. - - - - - - -
- - - - TailwindCSS Logo - - - - - PostCSS Logo - -
- -[Starter]: HTTPS://NPMJS.Org/@playform/starter ->>>>>>> Fork/Current diff --git a/Source/Layout/Base.astro b/Source/Layout/Base.astro index 31742b2e..8f8ef379 100644 --- a/Source/Layout/Base.astro +++ b/Source/Layout/Base.astro @@ -1,15 +1,10 @@ --- import "@Stylesheet/Base.css"; -<<<<<<< HEAD const { Title = "CrepesJS", Description = "A compiler for reactive views in HTML with JavaScript", } = Astro.props; -======= -// TODO Place your title and description here -const { Title = "", Description = "" } = Astro.props; ->>>>>>> Fork/Current interface Props { Title?: string; @@ -33,16 +28,11 @@ import { ViewTransitions } from "astro:transitions"; -<<<<<<< HEAD -======= - - ->>>>>>> Fork/Current @@ -58,20 +48,16 @@ import { ViewTransitions } from "astro:transitions"; href="/site.webmanifest" crossorigin="use-credentials" /> -<<<<<<< HEAD -======= ->>>>>>> Fork/Current -<<<<<<< HEAD -======= - - - ->>>>>>> Fork/Current
diff --git a/Source/Script/Firebase.ts b/Source/Script/Firebase.ts index 456eb9af..b6cb4fac 100644 --- a/Source/Script/Firebase.ts +++ b/Source/Script/Firebase.ts @@ -1,5 +1,4 @@ export default (await import("firebase/app")).initializeApp({ -<<<<<<< HEAD apiKey: "AIzaSyCCtwe3PjtMkftqCgc0GC2k3cbKb9vYdGk", authDomain: "crepesjs-com.firebaseapp.com", databaseURL: "https://crepesjs-com.firebaseio.com", @@ -8,14 +7,4 @@ export default (await import("firebase/app")).initializeApp({ messagingSenderId: "451350706276", appId: "1:451350706276:web:b8dcaa0d46ce2aca058771", measurementId: "G-9E2P7HPRNM", -======= - apiKey: "", // TODO Replace with your API key - appId: "", // TODO Replace with your app ID - authDomain: "", // TODO Replace with your auth domain - databaseURL: "", // TODO Replace with your database URL - measurementId: "", // TODO Replace with your measurement ID - messagingSenderId: "", // TODO Replace with your messaging sender ID - projectId: "", // TODO Replace with your project ID - storageBucket: "", // TODO Replace with your storage bucket ->>>>>>> Fork/Current }); diff --git a/Source/Stylesheet/Global.css b/Source/Stylesheet/Global.css index fd996684..233b25d9 100644 --- a/Source/Stylesheet/Global.css +++ b/Source/Stylesheet/Global.css @@ -4,42 +4,18 @@ html { html, body { -<<<<<<< HEAD - @apply h-full - w-full; -} - -body { - @apply dark:bg-black - flex - flex-grow - flex-col - bg-white - tabular-nums - text-black - antialiased - sm:subpixel-antialiased - dark:text-white; -======= @apply h-full w-full; } body { @apply flex flex-grow flex-col bg-white tabular-nums text-black antialiased sm:subpixel-antialiased dark:bg-black dark:text-white; ->>>>>>> Fork/Current font-variant-ligatures: no-common-ligatures; --swup-overlay-theme-color: white; -<<<<<<< HEAD - --swup-overlay-theme-duration: 0.2s; - --swup-overlay-theme-delay: 0s; - --swup-overlay-theme-scale: 1.2; -======= --swup-overlay-theme-duration: 0.21s; --swup-overlay-theme-delay: 0s; --swup-overlay-theme-scale: 0.21; ->>>>>>> Fork/Current --swup-overlay-theme-skew: 0deg; } @@ -53,33 +29,16 @@ body { ::selection { text-shadow: none; -<<<<<<< HEAD - @apply bg-amber-400 - text-black; -======= @apply bg-amber-400 text-black; ->>>>>>> Fork/Current } @media (prefers-color-scheme: dark) { *::selection, ::selection { -<<<<<<< HEAD - @apply bg-orange-400 - text-white; -======= @apply bg-orange-400 text-white; ->>>>>>> Fork/Current } } img { -<<<<<<< HEAD - @apply inline-block - select-none - align-top - outline-none; -======= @apply inline-block select-none align-top outline-none; ->>>>>>> Fork/Current } diff --git a/Source/env.d.ts b/Source/env.d.ts index 5719aecd..acef35f1 100644 --- a/Source/env.d.ts +++ b/Source/env.d.ts @@ -1,5 +1,2 @@ -<<<<<<< HEAD -======= /// ->>>>>>> Fork/Current /// diff --git a/Source/pages/index.astro b/Source/pages/index.astro index 85ebea59..611e3649 100644 --- a/Source/pages/index.astro +++ b/Source/pages/index.astro @@ -1,5 +1,4 @@ --- -<<<<<<< HEAD import Layout from "@Layout/Base.astro"; --- @@ -21,9 +20,3 @@ import Layout from "@Layout/Base.astro"; color: #fa5252; } -======= -import Base from "@Layout/Base.astro"; ---- - - ->>>>>>> Fork/Current diff --git a/astro.config.ts b/astro.config.ts index c8515405..e2d03480 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -2,12 +2,7 @@ export default (await import("astro/config")).defineConfig({ srcDir: "./Source", publicDir: "./Public", outDir: "./Target", -<<<<<<< HEAD site: "HTTPS://Crepes.Dev", -======= - // TODO Place your site URL here - // site: "", ->>>>>>> Fork/Current compressHTML: true, prefetch: true, integrations: [ diff --git a/package.json b/package.json index 24e94f92..15bf10eb 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "name": "@website/crepes_nikolahristov_tech", "version": "0.0.1", "private": false, @@ -12,45 +11,17 @@ "url": "git+https://github.com/CrepesJS/Website.git" }, "license": "SEE LICENSE IN LICENSE", - "author": { - "name": "Nikola Hristov", - "email": "Nikola@PlayForm.Cloud", - "url": "https://nikolahristov.tech" -======= - "name": "@playform/starter", - "version": "0.0.1", - "private": false, - "description": "πŸ“„β€Starter —", - "keywords": [ - "astro", - "starter", - "skeleton", - "playform" - ], - "homepage": "HTTPS://GitHub.Com/PlayForm/Starter#readme", - "bugs": { - "url": "HTTPS://GitHub.Com/PlayForm/Starter/issues" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/PlayForm/Starter.git" - }, - "license": "SEE LICENSE IN LICENSE", "author": { "name": "πŸ–‹οΈβ€Sourceβ€β€”β€πŸ‘πŸ»β€Open —", "email": "Source/Open@PlayForm.Cloud", "url": "HTTPS://PlayForm.Cloud" ->>>>>>> Fork/Current }, "scripts": { "Run": "astro dev", "prepublishOnly": "astro build" }, "dependencies": { -<<<<<<< HEAD "@astrojs/check": "0.8.2", -======= ->>>>>>> Fork/Current "@astrojs/sitemap": "3.1.6", "@playform/build": "0.1.1", "@playform/compress": "0.0.13", @@ -60,13 +31,7 @@ "@tailwindcss/forms": "0.5.7", "@tailwindcss/typography": "0.5.13", "astro": "*", -<<<<<<< HEAD - "astro-biome": "0.0.10", - "astro-capo": "0.0.1", - "astro-critters": "2.1.10", -======= "astro-capo": "0.0.1", ->>>>>>> Fork/Current "astrojs-service-worker": "2.0.0", "autoprefixer": "10.4.19", "cssnano": "7.0.4", @@ -79,21 +44,12 @@ "postcss-import": "16.1.0", "postcss-reporter": "7.1.0", "postcss-url": "10.1.3", -<<<<<<< HEAD -======= - "solid-js": "1.8.18", ->>>>>>> Fork/Current "tailwindcss": "*", "typescript": "*", "zod": "*" }, "publishConfig": { -<<<<<<< HEAD - "access": "public", - "provenance": true -======= "provenance": true, "access": "public" ->>>>>>> Fork/Current } } diff --git a/tailwind.config.js b/tailwind.config.js index 6fffefac..d1350e83 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,31 +1,21 @@ -<<<<<<< HEAD const defaultTheme = require("tailwindcss/defaultTheme"); -======= ->>>>>>> Fork/Current export default { content: [ "./Public/**/*.html", "./Source/**/*.{astro,js,jsx,ts,tsx,vue,svelte}", ], -<<<<<<< HEAD darkMode: "media", -======= - darkMode: "media", ->>>>>>> Fork/Current theme: { container: { center: true, }, extend: { -<<<<<<< HEAD fontFamily: { sans: ["Fira Sans", ...defaultTheme.fontFamily.sans], }, -======= ->>>>>>> Fork/Current typography: { DEFAULT: { css: { @@ -37,13 +27,9 @@ export default { }, }, }, -<<<<<<< HEAD variants: {}, -======= - variants: {}, ->>>>>>> Fork/Current plugins: [ require("@tailwindcss/forms"), require("@tailwindcss/typography"), diff --git a/tsconfig.json b/tsconfig.json index 79c7ee8e..fc5b0843 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,4 @@ { -<<<<<<< HEAD - "compilerOptions": { - "baseUrl": "./", - "types": ["astro/client", "astro/env"] - }, - "extends": "@playform/build/tsconfig" -======= "$schema": "https://json.schemastore.org/tsconfig", "compilerOptions": { "baseUrl": "./", @@ -17,5 +10,4 @@ }, "extends": "@playform/build/tsconfig", "include": ["Source"] ->>>>>>> Fork/Current }