diff --git a/app/locales/base.pot b/app/locales/base.pot deleted file mode 100644 index 76e8baa6..00000000 --- a/app/locales/base.pot +++ /dev/null @@ -1,126 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2021 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2021. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-07 23:37+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.9.0\n" - -#: app/routers/profile.py:20 -msgid "Not found" -msgstr "" - -#: app/templates/agenda.html:11 -msgid "From" -msgstr "" - -#: app/templates/agenda.html:13 -msgid "to" -msgstr "" - -#: app/templates/agenda.html:15 -msgid "Get Agenda" -msgstr "" - -#: app/templates/agenda.html:20 -msgid "Today" -msgstr "" - -#: app/templates/agenda.html:23 -msgid "Next week" -msgstr "" - -#: app/templates/agenda.html:26 -msgid "Next month" -msgstr "" - -#: app/templates/agenda.html:33 -msgid "Start date is greater than end date" -msgstr "" - -#: app/templates/agenda.html:35 -msgid "No events found..." -msgstr "" - -#: app/templates/base.html:19 -msgid "Calendar" -msgstr "" - -#: app/templates/base.html:26 -msgid "Home" -msgstr "" - -#: app/templates/base.html:29 -msgid "Profile" -msgstr "" - -#: app/templates/base.html:32 -msgid "Sign in" -msgstr "" - -#: app/templates/base.html:35 -msgid "Sign up" -msgstr "" - -#: app/templates/base.html:40 -msgid "Agenda" -msgstr "" - -#: app/templates/profile.html:50 -msgid "Update name" -msgstr "" - -#: app/templates/profile.html:57 app/templates/profile.html:77 -#: app/templates/profile.html:97 app/templates/profile.html:120 -#: app/templates/profile.html:140 -msgid "Save changes" -msgstr "" - -#: app/templates/profile.html:70 -msgid "Update email" -msgstr "" - -#: app/templates/profile.html:90 -msgid "Update description" -msgstr "" - -#: app/templates/profile.html:111 -msgid "Update photo" -msgstr "" - -#: app/templates/profile.html:220 -msgid "Upcoming event on (date)" -msgstr "" - -#: app/templates/profile.html:246 -msgid "The Event (event)" -msgstr "" - -#: app/templates/profile.html:249 -msgid "Last updated (time) ago" -msgstr "" - -#: app/templates/profile.html:285 -msgid "Explore MeetUps near you" -msgstr "" - -#: app/templates/profile.html:293 -msgid "Your Card" -msgstr "" - -#. i18n: String used in testing. Do not change. -#: tests/test_language.py:32 -msgid "test python translation" -msgstr "" - diff --git a/app/locales/en/LC_MESSAGES/base.po b/app/locales/en/LC_MESSAGES/base.po index 188b294d..87e32799 100644 --- a/app/locales/en/LC_MESSAGES/base.po +++ b/app/locales/en/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-07 23:37+0000\n" +"POT-Creation-Date: 2021-02-07 21:31+0000\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -54,30 +54,6 @@ msgstr "" msgid "No events found..." msgstr "" -#: app/templates/base.html:19 -msgid "Calendar" -msgstr "" - -#: app/templates/base.html:26 -msgid "Home" -msgstr "" - -#: app/templates/base.html:29 -msgid "Profile" -msgstr "" - -#: app/templates/base.html:32 -msgid "Sign in" -msgstr "" - -#: app/templates/base.html:35 -msgid "Sign up" -msgstr "" - -#: app/templates/base.html:40 -msgid "Agenda" -msgstr "" - #: app/templates/profile.html:50 msgid "Update name" msgstr "" @@ -137,3 +113,21 @@ msgstr "" #~ msgid "Your feature" #~ msgstr "" +#~ msgid "Calendar" +#~ msgstr "" + +#~ msgid "Home" +#~ msgstr "" + +#~ msgid "Profile" +#~ msgstr "" + +#~ msgid "Sign in" +#~ msgstr "" + +#~ msgid "Sign up" +#~ msgstr "" + +#~ msgid "Agenda" +#~ msgstr "" + diff --git a/app/locales/he/LC_MESSAGES/base.po b/app/locales/he/LC_MESSAGES/base.po index b744bf6b..c5e559a2 100644 --- a/app/locales/he/LC_MESSAGES/base.po +++ b/app/locales/he/LC_MESSAGES/base.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-07 23:37+0000\n" +"POT-Creation-Date: 2021-02-07 21:31+0000\n" "PO-Revision-Date: 2021-01-26 21:31+0200\n" "Last-Translator: FULL NAME \n" "Language: he\n" @@ -54,30 +54,6 @@ msgstr "" msgid "No events found..." msgstr "" -#: app/templates/base.html:19 -msgid "Calendar" -msgstr "" - -#: app/templates/base.html:26 -msgid "Home" -msgstr "" - -#: app/templates/base.html:29 -msgid "Profile" -msgstr "פרופיל" - -#: app/templates/base.html:32 -msgid "Sign in" -msgstr "" - -#: app/templates/base.html:35 -msgid "Sign up" -msgstr "" - -#: app/templates/base.html:40 -msgid "Agenda" -msgstr "" - #: app/templates/profile.html:50 msgid "Update name" msgstr "" @@ -137,3 +113,21 @@ msgstr "בדיקת תרגום בפייתון" #~ msgid "Your feature" #~ msgstr "" +#~ msgid "Calendar" +#~ msgstr "" + +#~ msgid "Home" +#~ msgstr "" + +#~ msgid "Profile" +#~ msgstr "פרופיל" + +#~ msgid "Sign in" +#~ msgstr "" + +#~ msgid "Sign up" +#~ msgstr "" + +#~ msgid "Agenda" +#~ msgstr "" + diff --git a/app/main.py b/app/main.py index 72529cea..906910a0 100644 --- a/app/main.py +++ b/app/main.py @@ -32,8 +32,8 @@ def create_tables(engine, psql_environment): set_ui_language() from app.routers import ( # noqa: E402 - agenda, calendar, categories, celebrity, currency, dayview, - email, event, invitation, profile, search, telegram, whatsapp + agenda, calendar, categories, celebrity, currency, dayview, email, + event, four_o_four, invitation, profile, search, telegram, whatsapp ) json_data_loader.load_to_db(next(get_db())) @@ -47,6 +47,7 @@ def create_tables(engine, psql_environment): dayview.router, email.router, event.router, + four_o_four.router, invitation.router, profile.router, salary.router, @@ -65,7 +66,7 @@ def create_tables(engine, psql_environment): @logger.catch() async def home(request: Request, db: Session = Depends(get_db)): quote = daily_quotes.quote_per_day(db) - return templates.TemplateResponse("home.html", { + return templates.TemplateResponse("index.html", { "request": request, "quote": quote, }) diff --git a/app/routers/four_o_four.py b/app/routers/four_o_four.py new file mode 100644 index 00000000..0e989677 --- /dev/null +++ b/app/routers/four_o_four.py @@ -0,0 +1,15 @@ +from app.dependencies import templates +from fastapi import APIRouter +from starlette.requests import Request + +router = APIRouter( + prefix="/404", + tags=["404"], + responses={404: {"description": "Not found"}}, +) + + +@router.get("/") +async def not_implemented(request: Request): + return templates.TemplateResponse("four_o_four.j2", + {"request": request}) diff --git a/app/static/images/calendar.jpg b/app/static/images/calendar.jpg new file mode 100644 index 00000000..45a20ace Binary files /dev/null and b/app/static/images/calendar.jpg differ diff --git a/app/static/images/icons/calendar-outline.svg b/app/static/images/icons/calendar-outline.svg new file mode 100644 index 00000000..6f1f6789 --- /dev/null +++ b/app/static/images/icons/calendar-outline.svg @@ -0,0 +1 @@ +Calendar \ No newline at end of file diff --git a/app/static/style.css b/app/static/style.css index c0eb0101..092ad5c2 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -1,9 +1,3 @@ -body { - background: #a1ffce; - background: -webkit-linear-gradient(to right, #faffd1, #a1ffce); - background: linear-gradient(to right, #faffd1, #a1ffce); -} - .profile-image { width: 7em; } @@ -20,6 +14,44 @@ body { transform: scale(1.02); } +.top-line { + height: 0.25rem; +} + +.bg-gradient2 { + background: linear-gradient( + 135deg, + rgba(0, 97, 215, 1) 0%, + rgba(0, 200, 255, 1) 100% + ); +} + +h2, +p { + display: flex; + align-items: center; + justify-content: space-around; +} + +#inner:hover { + cursor: pointer; + padding: 50px; + background-color: linear-gradient( + 135deg, + rgba(0, 97, 215, 1) 0%, + rgba(0, 200, 255, 1) 100% + ); +} + +#inner { + transition: background 0.2s ease, padding 0.8s linear; +} + +.landing-page-button { + border-radius: 9999px; + justify-content: center; +} + .event-posted-time { font-size: 0.7rem; } diff --git a/app/templates/base.html b/app/templates/base.html index a86088ca..0317bf2a 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -7,68 +7,72 @@ + integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous"> + + + - Calendar - {% endblock %} + PyLendar {% block title %}{% endblock %} + {% endblock %} - -{% block content %} {% endblock %} +
+
+
+ +
- - - - + + + + \ No newline at end of file diff --git a/app/templates/four_o_four.j2 b/app/templates/four_o_four.j2 new file mode 100644 index 00000000..78c5b2a4 --- /dev/null +++ b/app/templates/four_o_four.j2 @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block title %} - 404{% endblock %} + +{% block content %} + +
+

+ Not implemented

+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html new file mode 100644 index 00000000..32a492b5 --- /dev/null +++ b/app/templates/index.html @@ -0,0 +1,44 @@ +{% extends "base.html" %} + +{% block content %} + +
+
+
+

+ PyLendar +
+

+

+ Open Source Calendar built with Python +

+
+
+ + {% if quote %} + {% if not quote.author%} +

"{{ quote.text }}"

+ {% else %} +

"{{ quote.text }}"   \ {{quote.author}} +

+ {% endif %} + {% endif %} +
+
+ +
+
+
+ calendar image +
+
+ +{% endblock %} \ No newline at end of file