Skip to content

Commit

Permalink
wochdev->filapps + fixes + other edits
Browse files Browse the repository at this point in the history
  • Loading branch information
filipc30 committed Jan 25, 2024
1 parent f5f8d2e commit 44b2de0
Show file tree
Hide file tree
Showing 21 changed files with 63 additions and 32 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## version control: 7.0.0

### About
wochdev is a lightweight solid Fullstack Development Environment used to create high performance Web Applications.
Filapps is a lightweight solid Fullstack Development Environment used to create high performance Web Applications.

### Base Version's Stack & Decisions
To get a break from 'analysis paralysis' right from the start, I had decided to start with the already throughout tested starting stack - The Epic Stack, developed by Kent C Dodds. The Epic Stack is an opinionated project starter, open-source - under the MIT license. It was used as a starter stack to get solid selection of technologies and tools, and to also ship faster. Even further on, The Epic Stack is a great project reference to look up to. - Filip Cablik
Expand Down Expand Up @@ -212,7 +212,7 @@ just make sure to remove the move step from the `.github/workflows/deploy.yml`.

<br/>

### Tech Used In wochdev's Version of The Epic Stack:
### Tech Used In Filapps's Version of The Epic Stack:
...

<br/>
Expand Down Expand Up @@ -266,7 +266,7 @@ just make sure to remove the move step from the `.github/workflows/deploy.yml`.

## slogans
- 'This is where your nfts live' / 'This is where your nfts come to life'
- 'Escape the chaos at wochdev' / 'Find a new form life, escape the chaos. Wochdev'
- 'Escape the chaos at Filapps' / 'Find a new form life, escape the chaos. Filapps'
-


Expand Down
2 changes: 0 additions & 2 deletions app/components/footers/footer-base.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { getYear } from "date-fns";
import { WochdevSvg } from "../wochdev.tsx";

export function FooterBase() {
const currentYear = getYear(new Date())
Expand All @@ -22,7 +21,6 @@ export function FooterBase() {
<div className="max-md:hidden">2023-{currentYear}</div>
<div className="capitalize flex gap-2 max-md:justify-center items-center">
<span className="text-xs">developed and created by</span>
<WochdevSvg />
</div>
<div className="capitalize">©{' '}{companyName}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/headers/header-base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function HeaderBase({ routeAdmin }: { routeAdmin?: boolean }) {
>
<nav className={cn("space-between flex items-center justify-between", baseContainerWidthClassList)}>
<Link to="/">
<div className="font-light">wochdev</div>
<div className="font-light">Filapps</div>
<div>properties</div>
</Link>

Expand Down
4 changes: 2 additions & 2 deletions app/components/wochdev.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
export function WochdevSvg() {
export function FilappsSvg() {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="79.192"
height="11.195"
viewBox="0 0 79.192 11.195"
>
<g id="wochdev" transform="translate(0 0)">
<g id="Filapps" transform="translate(0 0)">
<g id="dev" transform="translate(48.321)">
<path
id="Path_100"
Expand Down
2 changes: 1 addition & 1 deletion app/routes/_auth+/forgot-password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export async function action({ request }: DataFunctionArgs) {

const response = await sendEmail({
to: user.email,
from: 'noreply@wochdev.com',
from: 'noreply@Filapps.com',
subject: `Woch Res Password Reset`,
react: (
<ForgotPasswordEmail onboardingUrl={verifyUrl.toString()} otp={otp} />
Expand Down
2 changes: 1 addition & 1 deletion app/routes/_base+/contact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export async function action({ request }: DataFunctionArgs) {
const { email, name, message, redirectTo } = submission.value

const response = await sendEmail({
from: "Contact Form from Filapps Hospitality System <noreply@wochdev.com>",
from: "Contact Form from Filapps Hospitality System <noreply@Filapps.com>",
to: '[email protected]', // mail of preference where the message should be delivered to (owner of web, admin, etc.)
reply_to: email,
subject: `Web Form message from ` + email,
Expand Down
2 changes: 1 addition & 1 deletion app/routes/_base+/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ export default function Index() {
)
}

export const meta: MetaFunction = () => [{ title: 'Welcome To Wochdev' }]
export const meta: MetaFunction = () => [{ title: 'Welcome To Filapps' }]
2 changes: 1 addition & 1 deletion app/routes/admin+/docs+/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default function AdminIndex() {
<div className="py-2 md:py-6">
<div className="mb-8 px-2 max-sm:text-center md:px-6">
<h2 className="mb-2 text-h2 capitalize text-foreground">
Wochdev Documentation
Filapps Documentation
</h2>
<p className="text-xl">
Here, You will find all necessary information to operate this
Expand Down
2 changes: 1 addition & 1 deletion app/routes/pages+/$url.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const meta: MetaFunction<typeof loader> = ({ data, params }) => {
const seoContent = data?.page.seo ?? params.title

return [
{ title: `${displayName} | wochdev` },
{ title: `${displayName} | Filapps` },
{
name: 'content',
content: seoContent,
Expand Down
8 changes: 4 additions & 4 deletions app/routes/resources+/__reservation-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ export async function action({ params, request }: DataFunctionArgs) {
if (params.url) {
//handling confirmation mail and returning success toast
const responseToUser = await sendEmail({
from: 'Reservation Created <noreply@wochdev.com>',
from: 'Reservation Created <noreply@Filapps.com>',
to: email,
reply_to: 'reservations@wochdev.com',
reply_to: 'reservations@Filapps.com',
subject: subjectMessage,
react: (
<ReservationFormEmail
Expand Down Expand Up @@ -226,9 +226,9 @@ export async function action({ params, request }: DataFunctionArgs) {
if (!reservationId) {
//handling confirmation mail and returning success toast
const responseToUser = await sendEmail({
from: 'Reservation Created <noreply@wochdev.com>',
from: 'Reservation Created <noreply@Filapps.com>',
to: email,
reply_to: 'reservations@wochdev.com',
reply_to: 'reservations@Filapps.com',
subject: subjectMessage,
react: (
<ReservationFormEmail
Expand Down
2 changes: 1 addition & 1 deletion app/routes/resources+/rooms-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function RoomsListLoader({
<React.Fragment key={room.id}>
{room.visibility && (
<div className="w-full p-2 text-center md:p-6">
<div className="z-1 border bg-background transition-opacity hover:opacity-95">
<div className="z-1 border bg-background rounded-xl transition-opacity hover:opacity-95">
<Link to={`/rooms/${room.url}`} className="text-center ">
<div className="relative h-[165px]">
<>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/rooms+/$url.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export const meta: MetaFunction<typeof loader> = ({ data, params }) => {
const seoContent = data?.room.seo ?? params.title

return [
{ title: `${displayName} | wochdev` },
{ title: `${displayName} | Filapps` },
{
name: 'description',
content: seoContent,
Expand Down
4 changes: 2 additions & 2 deletions app/routes/user+/profile+/change-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export async function handleVerification({
})

void sendEmail({
from: 'noreply@wochdev.com',
from: 'noreply@Filapps.com',
to: preUpdateUser.email,
subject: 'Filapps Hospitality System email changed',
react: <EmailChangeNoticeEmail userId={user.id} />,
Expand Down Expand Up @@ -126,7 +126,7 @@ export async function action({ request }: DataFunctionArgs) {
})

const response = await sendEmail({
from: 'noreply@wochdev.com',
from: 'noreply@Filapps.com',
to: submission.value.email,
subject: `Filapps Hospitality System Email Change Verification`,
react: <EmailChangeEmail verifyUrl={verifyUrl.toString()} otp={otp} />,
Expand Down
2 changes: 1 addition & 1 deletion app/routes/user+/profile+/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default function EditUserProfile() {
<div>
<Link
reloadDocument
download="my-wochdev-data.json"
download="my-Filapps-data.json"
to="/resources/download-user-data"
>
<Icon name="download">Download your data</Icon>
Expand Down
4 changes: 2 additions & 2 deletions app/routes/user+/settings+/profile.change-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export async function handleVerification({

void sendEmail({
to: preUpdateUser.email,
from: 'noreply@wochdev.com',
from: 'noreply@Filapps.com',
subject: 'Epic Stack email changed',
react: <EmailChangeNoticeEmail userId={user.id} />,
})
Expand Down Expand Up @@ -133,7 +133,7 @@ export async function action({ request }: DataFunctionArgs) {

const response = await sendEmail({
to: submission.value.email,
from: 'noreply@wochdev.com',
from: 'noreply@Filapps.com',
subject: `Woch Res Email Change Verification`,
react: <EmailChangeEmail verifyUrl={verifyUrl.toString()} otp={otp} />,
})
Expand Down
2 changes: 1 addition & 1 deletion app/utils/email.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function sendEmail({
| { html: string; text: string; react?: never }
| { react: ReactElement; html?: never; text?: never }
)) {
// const from = 'noreply@wochdev.com' //TODO: #2 as #1
// const from = 'noreply@Filapps.com' //TODO: #2 as #1

const email = {
...options,
Expand Down
22 changes: 22 additions & 0 deletions prisma/migrations/20240125182730_name_tid/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
Warnings:
- You are about to drop the column `name` on the `Translation` table. All the data in the column will be lost.
- Added the required column `tid` to the `Translation` table without a default value. This is not possible if the table is not empty.
*/
-- RedefineTables
PRAGMA foreign_keys=OFF;
CREATE TABLE "new_Translation" (
"id" TEXT NOT NULL PRIMARY KEY,
"tid" TEXT NOT NULL,
"en" TEXT NOT NULL,
"cs" TEXT NOT NULL
);
INSERT INTO "new_Translation" ("cs", "en", "id") SELECT "cs", "en", "id" FROM "Translation";
DROP TABLE "Translation";
ALTER TABLE "new_Translation" RENAME TO "Translation";
CREATE UNIQUE INDEX "Translation_id_key" ON "Translation"("id");
CREATE UNIQUE INDEX "Translation_tid_key" ON "Translation"("tid");
PRAGMA foreign_key_check;
PRAGMA foreign_keys=ON;
2 changes: 1 addition & 1 deletion prisma/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ async function seed() {
await prisma.user.create({
select: { id: true },
data: {
email: 'woch@wochdev.com',
email: 'woch@Filapps.com',
username: 'woch',
name: 'Woch',
image: { create: wochImages.wochUser },
Expand Down
2 changes: 1 addition & 1 deletion prisma/seed_production.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ async function seed() {
await prisma.user.create({
select: { id: true },
data: {
email: 'woch@wochdev.com',
email: 'woch@Filapps.com',
username: 'woch',
name: 'Woch',
image: { create: wochImages.wochUser },
Expand Down
2 changes: 1 addition & 1 deletion public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Chaos Escape",
"short_name": "wochdev",
"short_name": "Filapps",
"start_url": "/",
"icons": [
{
Expand Down
19 changes: 15 additions & 4 deletions seed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -386,23 +386,30 @@ CREATE TABLE IF NOT EXISTS "_galleryImages" (
CONSTRAINT "_galleryImages_A_fkey" FOREIGN KEY ("A") REFERENCES "Room" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT "_galleryImages_B_fkey" FOREIGN KEY ("B") REFERENCES "RoomsGalleryImage" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu0006148369w3ohse');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu00071483by4szp9n');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu00081483zlpsp5qg');
INSERT INTO _galleryImages VALUES('clpo2xqdq0009u0u73xp90sf4','clq452vuu0006148369w3ohse');
INSERT INTO _galleryImages VALUES('clpo2xqdq0009u0u73xp90sf4','clq452vuu00081483zlpsp5qg');
INSERT INTO _galleryImages VALUES('clpo2xqdq0009u0u73xp90sf4','clrq4t4tb0006h072hjl5o8v8');
INSERT INTO _galleryImages VALUES('clpo2xqdq0009u0u73xp90sf4','clq452vuu00071483by4szp9n');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu0006148369w3ohse');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu00071483by4szp9n');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clq452vuu00081483zlpsp5qg');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrq4t4tb0006h072hjl5o8v8');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodv0004t569uakaut2r');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodv0005t569gogd6w1o');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodw0006t569lngsc7ri');
INSERT INTO _galleryImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrq4w1z9000eh072fs00r2a9');
CREATE TABLE IF NOT EXISTS "_previewImages" (
"A" TEXT NOT NULL,
"B" TEXT NOT NULL,
CONSTRAINT "_previewImages_A_fkey" FOREIGN KEY ("A") REFERENCES "Room" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT "_previewImages_B_fkey" FOREIGN KEY ("B") REFERENCES "RoomsGalleryImage" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
INSERT INTO _previewImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodv0005t569gogd6w1o');
INSERT INTO _previewImages VALUES('clpo2xqdq0009u0u73xp90sf4','clrrplodw0006t569lngsc7ri');
INSERT INTO _previewImages VALUES('clq49inae0004wpg2cd56r8xg','clrq4w1z9000eh072fs00r2a9');
INSERT INTO _previewImages VALUES('clrrkp3eh0004kzt2ewqmugle','clrrplodv0004t569uakaut2r');
INSERT INTO _previewImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodv0005t569gogd6w1o');
INSERT INTO _previewImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodv0004t569uakaut2r');
INSERT INTO _previewImages VALUES('clpo2w2pu0001u0u74ix66yy1','clrrplodw0006t569lngsc7ri');
CREATE TABLE IF NOT EXISTS "_RoomToRoomPackageItem" (
"A" TEXT NOT NULL,
"B" TEXT NOT NULL,
Expand Down Expand Up @@ -447,12 +454,15 @@ INSERT INTO _ReservationToRoomPackageItem VALUES('clr91epg90001apsy0mfd6qs8','cl
INSERT INTO _ReservationToRoomPackageItem VALUES('clrgcdm1w00012r65022v5kwy','clpo6cju00000gm9v7qz21pmj');
INSERT INTO _ReservationToRoomPackageItem VALUES('clrj823qr000114ixmdg8rorw','clpo6cju00000gm9v7qz21pmj');
INSERT INTO _ReservationToRoomPackageItem VALUES('clrq4oxs40001h072xonedaid','clpo6cju00000gm9v7qz21pmj');
INSERT INTO _ReservationToRoomPackageItem VALUES('clrth3cka0001y9zwmxo6qnpb','clpo6cju00000gm9v7qz21pmj');
INSERT INTO _ReservationToRoomPackageItem VALUES('clrth3cka0001y9zwmxo6qnpb','clrquk3ey0004ye2cfpz2kblf');
CREATE TABLE IF NOT EXISTS "_ReservationToRoomMultiPackage" (
"A" TEXT NOT NULL,
"B" TEXT NOT NULL,
CONSTRAINT "_ReservationToRoomMultiPackage_A_fkey" FOREIGN KEY ("A") REFERENCES "Reservation" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT "_ReservationToRoomMultiPackage_B_fkey" FOREIGN KEY ("B") REFERENCES "RoomMultiPackage" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
INSERT INTO _ReservationToRoomMultiPackage VALUES('clrth3cka0001y9zwmxo6qnpb','clpo6csyc0001gm9vtcmnf6iz');
CREATE TABLE IF NOT EXISTS "_RoomToSeasonList" (
"A" TEXT NOT NULL,
"B" TEXT NOT NULL,
Expand Down Expand Up @@ -544,6 +554,7 @@ INSERT INTO Reservation VALUES('clrgka8ek0001mzw60svfttjg','accepted','fesak','t
INSERT INTO Reservation VALUES('clrj823qr000114ixmdg8rorw','accepted','testicek','[email protected]',NULL,170,2,1,'9_2024','2024/01/23','2024/01/24','2024/01/18','clpo2w2pu0001u0u74ix66yy1',1705582961523,1705582961523);
INSERT INTO Reservation VALUES('clrq4oxs40001h072xonedaid','accepted','tt','[email protected]',NULL,170,3,1,'10_2024','2024/01/26','2024/01/27','2024/01/23','clpo2w2pu0001u0u74ix66yy1',1706000571652,1706000571652);
INSERT INTO Reservation VALUES('clrq4qlye0003h072xoseso01','accepted','hh','[email protected]',NULL,160,1,1,'11_2024','2024/01/27','2024/01/28','2024/01/23','clpo2xqdq0009u0u73xp90sf4',1706000649638,1706000649638);
INSERT INTO Reservation VALUES('clrth3cka0001y9zwmxo6qnpb','accepted','Petr Tester','[email protected]',NULL,824,4,2,'12_2024','2024/01/27','2024/01/29','2024/01/25','clpo2w2pu0001u0u74ix66yy1',1706202797913,1706202797913);
CREATE TABLE IF NOT EXISTS "SeasonalRoomPrice" (
"id" TEXT NOT NULL PRIMARY KEY,
"seasonId" TEXT NOT NULL,
Expand Down

0 comments on commit 44b2de0

Please sign in to comment.