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

Feature 219 styling site landing page #221

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
92095ae
feat: add calendar picture and icon
ron-huberfeld Feb 2, 2021
5b1eecc
feat: styling landing page and add 404 page
ron-huberfeld Feb 2, 2021
eab932b
fix: remove commented code
ron-huberfeld Feb 2, 2021
1564b70
fix: 404 page naming convention
ron-huberfeld Feb 2, 2021
72c30ef
fix: use ionicons instead of svg
ron-huberfeld Feb 2, 2021
a1e46d4
Merge 'develop' changes to resolve conflicts
ron-huberfeld Feb 2, 2021
a6de077
Merge 'develop' changes 2
ron-huberfeld Feb 2, 2021
04101dc
Merge branch 'develop' into feature-219-styling-site-landing-page
ron-huberfeld Feb 2, 2021
c514590
fix: handle flake8 issue
ron-huberfeld Feb 2, 2021
f409729
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
ron-huberfeld Feb 2, 2021
30a82b0
Apply automatic translateable string changes
ron-huberfeld Feb 7, 2021
6679c32
Merge branch 'develop' of https://github.com/ron-huberfeld/calendar i…
ron-huberfeld Feb 2, 2021
18f779d
Apply automatic translateable string changes
ron-huberfeld Feb 7, 2021
5cf612a
fix merge issue
ron-huberfeld Feb 2, 2021
f9e29ec
Merge 'develop' changes
ron-huberfeld Feb 10, 2021
68a2706
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
ron-huberfeld Feb 10, 2021
51305a9
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
ron-huberfeld Feb 10, 2021
8c6a35c
Merge 'develop' changes
ron-huberfeld Feb 10, 2021
d07eb44
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
ron-huberfeld Feb 11, 2021
603523e
fix: remove tailwind
ron-huberfeld Feb 11, 2021
627ede5
fix: remove comments
ron-huberfeld Feb 11, 2021
5bf93be
Merge 'develop' changes
ron-huberfeld Feb 11, 2021
2b8e0d3
fix: remove genereted file
ron-huberfeld Feb 11, 2021
be9216b
fix: move style from tailwind to bootstrap
ron-huberfeld Feb 11, 2021
b096fbe
fix: remove tailwind related style
ron-huberfeld Feb 11, 2021
2b4e06b
fix: reorder routes
ron-huberfeld Feb 11, 2021
f61ec8c
fix: reorder again :)
ron-huberfeld Feb 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 0 additions & 126 deletions app/locales/base.pot

This file was deleted.

44 changes: 19 additions & 25 deletions app/locales/en/LC_MESSAGES/base.po
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down Expand Up @@ -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 ""
Expand Down Expand Up @@ -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 ""

44 changes: 19 additions & 25 deletions app/locales/he/LC_MESSAGES/base.po
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language: he\n"
Expand Down Expand Up @@ -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 ""
Expand Down Expand Up @@ -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 ""

7 changes: 4 additions & 3 deletions app/main.py
Expand Up @@ -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()))
Expand All @@ -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,
Expand All @@ -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,
})
15 changes: 15 additions & 0 deletions 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})
Binary file added app/static/images/calendar.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/static/images/icons/calendar-outline.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 38 additions & 6 deletions 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;
}
Expand All @@ -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;
}
Expand Down