Skip to content

Commit

Permalink
Merge pull request #2 from dtekcth/DAG2024
Browse files Browse the repository at this point in the history
Added DAG'24
  • Loading branch information
Multipacker authored Jun 12, 2024
2 parents 9343d7d + e63e52a commit cb08f26
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
Binary file modified web/src/assets/profiles/chairman.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/src/assets/profiles/communications.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/src/assets/profiles/customerRelations.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed web/src/assets/profiles/events.jpg
Binary file not shown.
Binary file added web/src/assets/profiles/events.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/src/assets/profiles/financialManager.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed web/src/assets/profiles/logistics.jpg
Binary file not shown.
Binary file modified web/src/assets/profiles/marketing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/src/assets/theone.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed web/src/assets/theone.png
Binary file not shown.
40 changes: 20 additions & 20 deletions web/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import chairmanProfile from "./assets/profiles/chairman.jpg"
import financialManagerProfile from "./assets/profiles/financialManager.jpg"
import eventsProfile from "./assets/profiles/events.jpg"
import logisticsProfile from "./assets/profiles/logistics.jpg"
import eventsProfile from "./assets/profiles/events.png"
// import logisticsProfile from "./assets/profiles/logistics.jpg"
import marketingProfile from "./assets/profiles/marketing.jpg"
import customerRelationsProfile from "./assets/profiles/customerRelations.jpg"
import communicationsProfile from "./assets/profiles/communications.jpg"
Expand All @@ -10,45 +10,45 @@ export const config = {
profiles: [
{
pictureUrl: chairmanProfile,
name: "Viktor Käll",
name: "August Ådahl",
title: "Chairman",
email: "viktor.kall@.dtek.se",
email: "august.adahl@dtek.se",
},
{
pictureUrl: financialManagerProfile,
name: "Alfred Karlsson",
name: "Mia Heljeberg",
title: "Treasurer",
email: "alfred.karlsson@dag.dtek.se",
email: "mia.heljeberg@dtek.se",
},
{
pictureUrl: marketingProfile,
name: "Gustav Bruhn",
name: "Oscar Morisbak Olsson",
title: "Member",
email: "gustav.bruhn@dag.dtek.se",
email: "oscar.morisbakolsson@dtek.se",
},
{
pictureUrl: eventsProfile,
name: "Salam Hani",
name: "Arvid Boisen",
title: "Member",
email: "salam.hani@dag.dtek.se",
email: "arvid.boisen@dtek.se",
},
{
pictureUrl: customerRelationsProfile,
name: "Tim Karlsson",
name: "Oksar Sköld",
title: "Member",
email: "tim.karlsson@dag.dtek.se",
email: "oskar.skold@dtek.se",
},
{
pictureUrl: communicationsProfile,
name: "Filip Wallin",
name: "Rasmus Helgesson",
title: "Member",
email: "filip.wallin@dag.dtek.se",
},
{
pictureUrl: logisticsProfile,
name: "Tobias Olsson",
title: "Member",
email: "tobias.olsson@dag.dtek.se",
email: "rasmus.helgesson@dtek.se",
},
// {
// pictureUrl: logisticsProfile,
// name: "Namn Namnsson",
// title: "Member",
// email: "namn.namnson@dtek.se",
// },
],
};
6 changes: 3 additions & 3 deletions web/src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useLocalization } from "@plugins/localization";
import { storeToRefs } from "pinia";
import { defineComponent } from "vue";
import Header from "../components/Header.vue";
import frontUrl from "../assets/theone.png";
import frontUrl from "../assets/theone.jpg";
import logoOrange from "../assets/orange.svg";
import logoWhite from "../assets/white.svg";
import { config } from "../config";
Expand Down Expand Up @@ -139,7 +139,7 @@ export default defineComponent({
.text-2xl.text-brand.font-bold.font-display {{ name }}
.text-lg.font-bold {{ title }}
.text-lg {{ email }}
.grid.grid-cols-1.gap-4(class="lg:grid-cols-4 lg:gap-32")
.grid.grid-cols-1.gap-4(class="lg:grid-cols-3 lg:gap-32")
.flex.flex-col.items-center(
v-for="{email, name, pictureUrl, title} in profiles.skip(3)"
)
Expand Down Expand Up @@ -169,7 +169,7 @@ export default defineComponent({
content: "";
position: absolute;
inset: 0;
background-image: url("../assets/theone.png");
background-image: url("../assets/theone.jpg");
background-size: cover;
mix-blend-mode: hard-light;
filter: blur(calc(2px * var(--deg-intensity)));
Expand Down

0 comments on commit cb08f26

Please sign in to comment.