No commit message

CrepesJS · Jul 22, 2024 · b6e703a · b6e703a
1 parent 52fefaf
commit b6e703a
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 202 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,31 +1,5 @@
-<<<<<<< HEAD
 # [crepes.dev] 🥞
 
 Crepes.dev main website.
 
 [crepes.dev]: https://crepes.dev
-=======
-# 📄 [Starter] —
-
-A simple skeleton with TailwindCSS, PostCSS.
-
-<table>
-	<tr>
-		<td>
-			<picture>
-				<source media="(prefers-color-scheme: dark)" srcset="https://nikolahristov.tech/Dark/Image/GitHub/tailwindcss.svg">
-				<source media="(prefers-color-scheme: light)" srcset="https://nikolahristov.tech/Image/GitHub/tailwindcss.svg">
-				<img alt="TailwindCSS Logo" src="https://nikolahristov.tech/Dark/Image/GitHub/tailwindcss.svg" width="300" />
-			</picture>
-		</td>
-    	<td>
-    		<picture>
-    			<source media="(prefers-color-scheme: dark)" srcset="https://nikolahristov.tech/Image/GitHub/postcss.svg">
-    			<img alt="PostCSS Logo" src="https://nikolahristov.tech/Image/GitHub/postcss.svg" width="150" />
-    		</picture>
-    	</td>
-    </tr>
-</table>
-
-[Starter]: HTTPS://NPMJS.Org/@playform/starter
->>>>>>> Fork/Current
diff --git 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";
 		<meta charset="utf-8" />
 		<meta name="description" content={Description} />
 		<meta name="viewport" content="width=device-width,initial-scale=1.0" />
-<<<<<<< HEAD
 		<meta name="theme-color" content="#fa5252" />
 		<meta name="apple-mobile-web-app-capable" content="no" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="default" />
 		<meta name="msapplication-TileColor" content="#fa5252" />
 		<meta name="msapplication-config" content="/browserconfig.xml" />
-=======
-		<!-- TODO Define your color theme in hex here -->
-		<meta name="theme-color" content="" />
->>>>>>> Fork/Current
 		<meta name="format-detection" content="telephone=no" />
 		<meta name="twitter:dnt" content="on" />
 
@@ -58,20 +48,16 @@ import { ViewTransitions } from "astro:transitions";
 			href="/site.webmanifest"
 			crossorigin="use-credentials"
 		/>
-<<<<<<< HEAD
 		<link
 			rel="stylesheet"
 			href="https://fonts.googleapis.com/css2?family=Fira+Sans&display=swap"
 		/>
-=======
->>>>>>> Fork/Current
 
 		<style is:global>
 			@import "@Stylesheet/Global.css";
 		</style>
 
 		<!-- Favicon -->
-<<<<<<< HEAD
 		<link
 			rel="apple-touch-icon"
 			sizes="114x114"
@@ -154,11 +140,6 @@ import { ViewTransitions } from "astro:transitions";
 		<ViewTransitions />
 	</Head>
 	<body class="flex flex-grow">
-=======
-		<ViewTransitions />
-	</Head>
-	<body>
->>>>>>> Fork/Current
 		<div class="grow">
 			<slot />
 		</div>

diff --git 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
@@ -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
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 /// <reference path="../.astro/types.d.ts" />
->>>>>>> Fork/Current
 /// <reference types="astro/client" />
diff --git 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;
 	}
 </style>
-=======
-import Base from "@Layout/Base.astro";
----
-
-<Base />
->>>>>>> Fork/Current
diff --git 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
@@ -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": "[email protected]",
-		"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/[email protected]",
 		"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
 	}
 }