Etheryo/curriculum-vitae
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Backend: Updated Project with 'short_description'. Frontend: Updated the UI to show the short description then in the popup the full, tweaked markdown css.

Browse source
This commit is contained in:
Yohan Boujon 2024-02-02 23:46:08 +01:00
parent fd1269c51c
commit 06acd72045
5 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/db/5_project.sql
View file

@ -16,6 +16,7 @@ CREATE TABLE public.project (
report_link text NULL, report_link text NULL,
archive_link text NULL, archive_link text NULL,
app_link text NULL, app_link text NULL,
short_description varchar(100) NULL,
CONSTRAINT project_pkey PRIMARY KEY (id), CONSTRAINT project_pkey PRIMARY KEY (id),
CONSTRAINT project_fk FOREIGN KEY (info_id) REFERENCES public.info(id) CONSTRAINT project_fk FOREIGN KEY (info_id) REFERENCES public.info(id)
); );

3
backend/src/db.rs
View file

@ -48,7 +48,8 @@ pub struct Project {
pub type_project: Option<String>, pub type_project: Option<String>,
pub report_link: Option<String>, pub report_link: Option<String>,
pub archive_link: Option<String>, pub archive_link: Option<String>,
pub app_link: Option<String> pub app_link: Option<String>,
pub short_description: Option<String>
} }
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]

2
backend/src/main.rs
View file

@ -94,7 +94,7 @@ async fn skills(
)> { )> {
let project = sqlx::query_as!( let project = sqlx::query_as!(
Project, Project,
"SELECT id, date_done, title, description, github_link, picture_name, type_project, report_link, archive_link, app_link FROM public.project WHERE project.info_id = $1 ORDER BY date_done DESC", "SELECT id, date_done, title, description, github_link, picture_name, type_project, report_link, archive_link, app_link, short_description FROM public.project WHERE project.info_id = $1 ORDER BY date_done DESC",
id id
) )
.fetch_all(&pool) .fetch_all(&pool)

4
frontend/src/lib/components/projects.svelte
View file

@ -10,7 +10,7 @@
export let data; export let data;
const title = data.title; const title = data.title;
const description = data.description; const short_description = data.short_description;
const issued_date = const issued_date =
formatMonth(data.date_done).charAt(0).toUpperCase() + formatMonth(data.date_done).charAt(0).toUpperCase() +
formatMonth(data.date_done).slice(1); formatMonth(data.date_done).slice(1);
@ -52,7 +52,7 @@
</div> </div>
<div class="slide-subtitle-container"> <div class="slide-subtitle-container">
<p class="slide-subtitle slide-text slide-overflow slide-justify"> <p class="slide-subtitle slide-text slide-overflow slide-justify">
{description} {short_description}
</p> </p>
</div> </div>
<div class="slide-button-container"> <div class="slide-button-container">

34
frontend/src/lib/css/markdown.css
View file

@ -1,25 +1,30 @@
.markdown h1, .markdown h1,
h2, .markdown h2,
h3, .markdown h3,
h4, .markdown h4,
h5, .markdown h5,
h6 { .markdown h6 {
font-family: 'Gabarito', sans-serif; font-family: 'Gabarito', sans-serif;
font-weight: 700; font-weight: 700;
color: var(--color-text); color: var(--color-text);
} }
.markdown h4, .markdown h4,
h5, .markdown h5,
h6 { .markdown h6 {
font-weight: 400 !important; font-weight: 400 !important;
} }
.markdown h1 {
font-size: 2rem;
}
.markdown p, .markdown p,
li { li {
font-family: 'Urbanist', sans-serif; font-family: 'Urbanist', sans-serif;
font-weight: 500; font-weight: 500;
color: var(--color-subtext); color: var(--color-subtext);
text-align: justify;
} }
.markdown a { .markdown a {
@ -57,9 +62,21 @@ li {
box-shadow: #352b4027 0px 4px 6px -1px, #352b4016 0px 2px 4px -1px; box-shadow: #352b4027 0px 4px 6px -1px, #352b4016 0px 2px 4px -1px;
} }
.markdown code {
background-color: var(--color-code);
color: var(--color-special);
padding: 0.2rem;
border-radius: 0.2rem;
box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px;
}
.markdown pre>code { .markdown pre>code {
font-family: 'Sometype Mono', monospace; font-family: 'Sometype Mono', monospace;
font-weight: 500; font-weight: 500;
padding: 0 !important;
border-radius: 0 !important;
color: var(--color-subtext) !important;
box-shadow: none !important;
} }
.markdown blockquote { .markdown blockquote {
@ -92,6 +109,9 @@ li {
padding: 8px; padding: 8px;
line-height: 1.42857143; line-height: 1.42857143;
vertical-align: top; vertical-align: top;
font-family: 'Urbanist', sans-serif;
font-weight: 500;
font-size: 0.8rem;
} }
.markdown tr>td:last-child { .markdown tr>td:last-child {