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/contacts #139

Merged
merged 28 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
add6519
feat: background and navbar
marineve17 Dec 22, 2022
94b55e5
Added first footer instance
toni-santos Dec 22, 2022
e37b278
initial sidebar styling
marineve17 Jan 23, 2023
0990a65
improve sidebar logic
marineve17 Jan 25, 2023
b11602f
layout adjustments to better fit the intended design
toni-santos Jan 25, 2023
c582672
updated footers social networks links
toni-santos Jan 30, 2023
3158ee8
Added contact form
jlcrodrigues Feb 7, 2023
ddb7f95
Added social media graph
jlcrodrigues Feb 14, 2023
35cb072
Made adjustments to icon and graph size
jlcrodrigues Apr 5, 2023
8019294
Merge branch 'develop'
jlcrodrigues Apr 5, 2023
e11dae9
Added buildings oultine
jlcrodrigues Apr 5, 2023
6e9ac5b
Made small improvements to contacts page
jlcrodrigues Apr 12, 2023
0059096
Fixed linter issues
jlcrodrigues Apr 12, 2023
a9bab3f
Small changes to contacts
jlcrodrigues Apr 26, 2023
592635b
Merge branch 'develop'
jlcrodrigues Sep 27, 2023
83600a2
Fixed errors according to suggestions
jlcrodrigues Sep 27, 2023
0b1faa6
Linting and branch update
MRita443 Feb 29, 2024
090fec3
Merge branch 'develop' of github.com:NIAEFEUP/website-niaefeup-fronte…
MRita443 Mar 28, 2024
4575213
Fixes to mobile margin overflows
MRita443 Mar 28, 2024
9e3d0cc
Added page storybook component
MRita443 Mar 28, 2024
43a22de
Merge branch 'develop' into feature/contacts
rubuy-74 Jul 27, 2024
87d5322
Comply with requested changes
rubuy-74 Aug 8, 2024
0990186
Create Storybook Components
rubuy-74 Aug 24, 2024
dbf3dfa
Acessability Change
rubuy-74 Aug 31, 2024
0bae58a
Minor Changes
rubuy-74 Oct 14, 2024
c14c0c7
Merge branch 'develop' of github.com:NIAEFEUP/website-niaefeup-fronte…
rubuy-74 Oct 14, 2024
fb97e6b
Linter issue
rubuy-74 Oct 14, 2024
bdb0389
fix navbar hidden buttons
rubuy-74 Oct 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 5 additions & 111 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/lib/components/icons/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
FaSolidBars,
FaSolidGlobe
} from 'svelte-icons-pack/fa';
import { BiMap } from 'svelte-icons-pack/bi';
import { IoMail, IoClose } from 'svelte-icons-pack/io';

const Icons = {
Expand All @@ -20,7 +21,8 @@ const Icons = {
User: FaSolidUser,
Bars: FaSolidBars,
Close: IoClose,
Globe: FaSolidGlobe
Globe: FaSolidGlobe,
Pin: BiMap
};

export default Icons;
34 changes: 34 additions & 0 deletions src/lib/components/icons/label-input.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import LabelInput from './label-input.svelte';

export default {
title: 'Atoms/LabelInput',
component: LabelInput,
argTypes: {
label: { control: 'text' },
placeholder: { control: 'text' },
isTextArea: { control: 'boolean' }
},
parameters: {
layout: 'centered',
controls: {
exclude: ['id', 'type']
}
}
};

export const NonTextAreaInput = {
args: {
label: 'Label',
placeholder: 'Placeholder',
type: 'text'
}
};

export const TextAreaInput = {
args: {
label: 'Label',
placeholder: 'Placeholder',
type: 'text',
isTextArea: true
}
};
25 changes: 25 additions & 0 deletions src/lib/components/icons/label-input.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<script>
export let label = '';
export let id = '';
export let type = 'text';
export let placeholder = '';
export let isTextArea = false;
</script>

<label class="m-1 font-source_code font-bold text-white" for={id}>{label}</label><br class="mb-1" />
{#if isTextArea}
<textarea
aria-label="textarea-input"
class="mb-2 w-full rounded-lg p-2 font-source_code text-primary placeholder-primary"
{id}
rows="4"
/><br />
{:else}
<input
aria-label="text-input"
class="mb-2 w-full rounded-lg p-2 text-primary placeholder-primary"
{type}
{id}
{placeholder}
/><br />
{/if}
5 changes: 5 additions & 0 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import { type ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge';
import { cubicOut } from 'svelte/easing';
import type { TransitionConfig } from 'svelte/transition';
import { createNotification } from '@/routes/(app)/_components/layout/notifications';

export function copyToClipboard(content: string) {
navigator.clipboard.writeText(content);
createNotification('O email foi copiado para o teu clipboard :)');
}
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
Expand Down
3 changes: 2 additions & 1 deletion src/routes/(app)/(home)/page.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export default {
title: 'Pages/HomePage',
component: Page,
parameters: {
layout: 'fullscreen'
layout: 'fullscreen',
backgrounds: { default: 'clear' }
},
decorators: [() => Layout, () => LayoutDecorator]
};
Expand Down
50 changes: 0 additions & 50 deletions src/routes/(app)/_components/layout/Sidebar.svelte

This file was deleted.

2 changes: 1 addition & 1 deletion src/routes/(app)/_components/layout/navbar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<a href="#/">Equipa</a>
<a href="#/">Projetos</a>
<a href="#/">Eventos</a>
<a href="#/">Contactos</a>
<a href="/contacts">Contactos</a>
</div>
</nav>
47 changes: 47 additions & 0 deletions src/routes/(app)/contacts/+page.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<script lang="ts">
import { Icon } from 'svelte-icons-pack';
import Graph from './_components/graph.svelte';
import LabelInput from '@/lib/components/icons/label-input.svelte';
import Icons from '$lib/components/icons/icons';
</script>

<section class="-10 my-20 flex flex-col justify-center">
<section class="mb-4 flex flex-col text-center font-raleway text-white">
<h1 class="text-2xl font-bold">&lt; Contacta-nos /&gt;</h1>
</section>
<div class="mx-10 grid-cols-2 md:grid">
<form class="min-w-[85%] justify-self-end">
<LabelInput label="// Email" id="email" type="email" placeholder="[email protected]" />
<LabelInput label="// Nome" id="name" type="text" />
<LabelInput label="// Assunto" id="subject" type="text" />
<LabelInput label="// Mensagem" id="message" type="text" isTextArea={true} />

<button
class="m-1 justify-self-start rounded-lg bg-vivid-red-900 px-5 py-1 text-white"
type="submit">Enviar</button
>
</form>
<div class="m-2 flex w-full justify-center md:m-5 md:my-0">
<Graph />
</div>
</div>
<picture>
<source media="(max-width: 767px)" srcset="/images/feup_buildings.svg" />
<source media="(min-width: 767px)" srcset="/images/feup_buildings_md.svg" />
<img
src="/images/feup_buildings.svg"
alt="Feup Buildings Outline"
class="align-center h-52 w-full justify-self-center object-none object-center"
/>
</picture>
<span
id="location"
class="ml-3 flex justify-center overflow-x-hidden text-white md:justify-start md:self-center lg:w-[1039px]"
>
<Icon src={Icons.Pin} color="white" size="40" className="py-2 pl-1" />
<div>
<p>Rua Dr. Roberto Frias 4200-465, Porto</p>
<p>Sala B315</p>
</div>
</span>
</section>
11 changes: 11 additions & 0 deletions src/routes/(app)/contacts/_components/graph.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Graph from './graph.svelte';

export default {
title: 'Organisms/Graph',
component: Graph,
parameters: {
layout: 'fullscreen'
}
};

export const Default = {};
Loading
Loading