Skip to content

Commit 49cf665

Browse files
daria-kryvosheievadaria-kryvosheieva
authored
Merge pull request #8 from Ordina-Group/feat/new-logo-tag-event
Feat/new logo tag event
2 parents 0dd91fd + c892367 commit 49cf665

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1010
-476
lines changed

‎.github/workflows/release.yml

+33-15
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,45 @@ on:
44
branches:
55
- main
66

7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
711
jobs:
812
release-please:
913
runs-on: ubuntu-latest
14+
environment:
15+
name: 'production'
16+
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
1017
steps:
1118
- uses: google-github-actions/release-please-action@v3
1219
id: release
1320
with:
1421
release-type: node
15-
package-name: rentman-dashboard
22+
package-name: pythonconference
1623
changelog-types: '[{"type":"feat","section":"New","hidden":false},{"type":"fix","section":"Changed and fixed","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false}]'
17-
# - uses: actions/checkout@v2
18-
# with:
19-
# fetch-depth: 0
20-
# if: ${{ steps.release.outputs.release_created }}
21-
# - name: Azure Login
22-
# uses: azure/login@v1
23-
# with:
24-
# creds: ${{ secrets.AZURE_CREDENTIALS }}
25-
# if: ${{ steps.release.outputs.release_created }}
26-
# - name: Azure CLI script
27-
# uses: azure/CLI@v1
28-
# with:
29-
# inlineScript: |
30-
# az webapp up --resource-group frontendfestival --name FrontendFestival --runtime "NODE|18-lts"
24+
25+
- uses: actions/checkout@v2
26+
if: ${{ steps.release.outputs.release_created }}
27+
28+
- name: Set up Node.js version
29+
uses: actions/setup-node@v1
30+
with:
31+
node-version: '18.x'
32+
if: ${{ steps.release.outputs.release_created }}
33+
34+
- name: npm install, build, and test
35+
run: |
36+
npm install
37+
npm run build --if-present
38+
if: ${{ steps.release.outputs.release_created }}
39+
40+
- name: 'Deploy to Azure Web App'
41+
id: deploy-to-webapp
42+
uses: azure/webapps-deploy@v2
43+
with:
44+
app-name: 'PythonConference'
45+
slot-name: 'production'
46+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_4E1202AD63FF43729109C7F4E9C1F6B0 }}
47+
package: .
48+
if: ${{ steps.release.outputs.release_created }}

‎.idea/prettier.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

+170-58
Large diffs are not rendered by default.

‎README.md

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# FrontEndFesitival.nl
1+
# PythonConferentie.nl
22

3-
Here's the code of the website [FrontEndFestival.nl](https://frontendfestival.nl/).
3+
Here's the code of the website [pythonconferentie.nl](https://pythonconferentie.nl/).
44

55
## Tech stack
66

@@ -18,8 +18,18 @@ Here's the code of the website [FrontEndFestival.nl](https://frontendfestival.nl
1818
This should do it all:
1919

2020
```bash
21-
# Link node_modules
22-
yarn
23-
# Run the dev server
24-
yarn dev
21+
npm i
22+
npm run dev
2523
```
24+
25+
## Azure notes
26+
27+
Make sure startup script is the following in azure:
28+
29+
```bash
30+
pm2 start ecosystem.config.cjs --no-daemon
31+
```
32+
33+
### Releasing
34+
35+
Releasing is as simple as pushing to main and merging the PR created by release-please after.

‎ecosystem.config.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
apps: [
33
{
4-
name: 'frontendfestival',
4+
name: 'pythonconference',
55
script: './build/index.js',
66
cwd: '/home/site/wwwroot/build'
77
}

‎package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "frontendfestival.nl",
3-
"version": "1.2.0",
2+
"name": "pythonconferentie.nl",
3+
"version": "1.6.0",
44
"private": true,
55
"scripts": {
66
"dev": "vite dev",

‎src/app.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
rel="stylesheet"
1212
/>
1313

14-
<title>Frontend Festival 2023</title>
14+
<title>Python Conference 2023</title>
1515

1616
%sveltekit.head%
1717
</head>

‎src/lib/components/Poster.svelte

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
1010
export let animated: boolean = false;
1111
export let colors: string[] = ['#1A1D1F', '#61BFC3', '#61BFC3', '#E6E2DB', '#FF8133', '#FF8133'];
12+
// export let colors: string[] = ['#6222b333;', '#89289033', '#cf022b33', '#ffb15d33'];
13+
// export let colors: string[] = [
14+
// '#4C1F8233',
15+
// '#4C1F8233',
16+
// '#89289033',
17+
// '#89289033',
18+
// '#CF022B33',
19+
// '#CF022B33'
20+
// ];
1221
let width;
1322
let height;
1423
let balls = [];
@@ -61,7 +70,7 @@
6170
});
6271
</script>
6372

64-
<div class="absolute top-0 left-0 h-full w-full overflow-hidden">
73+
<div class="absolute left-0 top-0 h-full w-full overflow-hidden">
6574
<div class="z-10 h-full w-full bg-western blur-3xl" bind:this={wrapper}>
6675
{#each balls as ball, i (ball.id)}
6776
<PosterBall

‎src/lib/components/TagBlock.svelte

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<script lang="ts">
2-
export let backgroundColor: 'shark' | 'fountain' | 'ordina' = 'ordina';
2+
export let backgroundColor: 'shark' | 'fountain' | 'ordina' | 'soprasteria' = 'ordina';
33
export let direction: 'left' | 'right' | 'both' = 'both';
44
export let extend: boolean = false;
55
export let small: boolean = false;
66
7-
let componentClass;
7+
let componentClass: string = '';
88
export { componentClass as class };
99
</script>
1010

@@ -26,6 +26,7 @@
2626
class:fill-ordina={backgroundColor === 'ordina'}
2727
class:fill-shark={backgroundColor === 'shark'}
2828
class:fill-fountain={backgroundColor === 'fountain'}
29+
class:fill-soprasteria={backgroundColor === 'soprasteria'}
2930
/>
3031
</g>
3132
</svg>
@@ -35,6 +36,7 @@
3536
class:bg-ordina={backgroundColor === 'ordina'}
3637
class:bg-shark={backgroundColor === 'shark'}
3738
class:bg-fountain={backgroundColor === 'fountain'}
39+
class:bg-soprasteria={backgroundColor === 'soprasteria'}
3840
/>
3941
{/if}
4042
<div
@@ -48,6 +50,7 @@
4850
class:bg-ordina={backgroundColor === 'ordina'}
4951
class:bg-shark={backgroundColor === 'shark'}
5052
class:bg-fountain={backgroundColor === 'fountain'}
53+
class:bg-soprasteria={backgroundColor === 'soprasteria'}
5154
class:md:pl-4={direction === 'right' && !small}
5255
class:md:pl-1={direction === 'right' && small}
5356
class:md:pr-0={direction === 'right'}
@@ -70,6 +73,7 @@
7073
class:fill-ordina={backgroundColor === 'ordina'}
7174
class:fill-shark={backgroundColor === 'shark'}
7275
class:fill-fountain={backgroundColor === 'fountain'}
76+
class:fill-soprasteria={backgroundColor === 'soprasteria'}
7377
/>
7478
</g>
7579
</svg>
@@ -79,6 +83,7 @@
7983
class:bg-ordina={backgroundColor === 'ordina'}
8084
class:bg-shark={backgroundColor === 'shark'}
8185
class:bg-fountain={backgroundColor === 'fountain'}
86+
class:bg-soprasteria={backgroundColor === 'soprasteria'}
8287
/>
8388
{/if}
8489
</div>

‎src/routes/+page.svelte

+13-17
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,28 @@
55
import Spacer from './Spacer.svelte';
66
import SpeakerScheduleSection from './SpeakerScheduleSection.svelte';
77
import SpeakerSection from './SpeakerSection.svelte';
8-
import WorkshopScheduleSection from './WorkshopScheduleSection.svelte';
98
</script>
109

1110
<svelte:head>
12-
<title>Frontend Festival 2023</title>
11+
<title>Python Conference 2023</title>
1312

14-
<meta name="title" property="og:title" content="Frontend Festival 2023" />
15-
<meta
16-
name="description"
17-
property="og:description"
18-
content="Are you a frontend developer who is ‘in’ for inspiration? Join us and get your ticket now!"
19-
/>
13+
<meta name="title" property="og:title" content="Python Conference 2023" />
14+
<meta name="description" property="og:description" content="Python Conference 2023" />
2015
<meta name="type" property="og:type" content="website" />
21-
<meta name="url" property="og:url" content="https://frontendfestival.nl/" />
16+
<meta name="url" property="og:url" content="https://pythonconferentie.nl/" />
2217
<meta
2318
name="image"
2419
property="og:image"
25-
content="https://frontendfestival.nl/marketing/socials.png"
20+
content="https://pythonconferentie.nl/marketing/socials.png"
2621
/>
2722
<meta name="twitter:card" content="summary_large_image" />
2823
</svelte:head>
2924

30-
<HeaderSection />
31-
<InfoSection />
32-
<SpeakerScheduleSection />
33-
<Spacer />
34-
<WorkshopScheduleSection />
35-
<SpeakerSection />
36-
<PracticalInformationSection />
25+
<div>
26+
<HeaderSection />
27+
<InfoSection />
28+
<!-- <SpeakerScheduleSection /> -->
29+
<!-- <Spacer /> -->
30+
<!-- <SpeakerSection /> -->
31+
<PracticalInformationSection />
32+
</div>

‎src/routes/HeaderSection.svelte

+42-18
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,54 @@
22
import Poster from '$lib/components/Poster.svelte';
33
import TagBlock from '$lib/components/TagBlock.svelte';
44
import { Icon } from 'svelte-awesome';
5-
import { chevronDown } from 'svelte-awesome/icons';
5+
import { chevronDown, chevronRight } from 'svelte-awesome/icons';
66
</script>
77

8-
<header class="flex-center relative h-[85vh] w-full bg-shark" id="header">
9-
<Poster animated />
10-
<div class="z-50 flex max-h-full flex-col justify-center text-center">
11-
<h1 class="block w-screen max-w-4xl px-5 py-20">
12-
<a href="https://frontendfestival.nl">
13-
<img src="/logo.svg" alt="Frontend Festival Logo" class="" />
8+
<header class="flex-center relative w-full bg-shark" id="header">
9+
<Poster />
10+
<div class="relative mt-3 w-full">
11+
<div class="absolute left-0 right-0">
12+
<div class="flex w-full items-center justify-between px-4">
13+
<a href="https://pythonconferentie.nl">
14+
<img src="/logo-white.png" alt="Python Conference Logo" class="w-20" />
15+
</a>
16+
<div class="pr-1">
17+
<a class=" inline text-white" target="_blank" rel="noreferrer" href="/code-of-conduct"
18+
>Code of Conduct<Icon class="ml-4" data={chevronRight} scale={1} /></a
19+
>
20+
</div>
21+
</div>
22+
</div>
23+
24+
<div class="mt-20 flex items-center justify-center">
25+
<a href="https://pythonconferentie.nl" class="w-96">
26+
<img src="/logo-sopra2.png" alt="Python Conference Logo" class="" />
1427
</a>
15-
</h1>
16-
<a
17-
class="inline"
18-
target="_blank"
19-
rel="noreferrer"
20-
href="https://www.eventbrite.com/e/tickets-frontend-festival-522544092447"
21-
>
28+
</div>
29+
<div class="mt-8 flex items-center justify-center">
2230
<TagBlock class="text-lg" backgroundColor="fountain">
23-
tickets.getYoursFor<span class="font-bold">Free</span>();
31+
<div class="text-3xl font-bold">
32+
PYCON (NL)<span class="px-4">|</span><span class="pr-4 text-ordina">2024</span>
33+
</div>
2434
</TagBlock>
25-
</a>
26-
<div class="flex-center absolute bottom-0 left-0 w-full">
35+
</div>
36+
37+
<!-- <a
38+
class="inline"
39+
target="_blank"
40+
rel="noreferrer"
41+
href="https://www.eventbrite.nl/e/tickets-python-conference-utrecht-715964698687"
42+
>
43+
<TagBlock class="text-lg" backgroundColor="fountain">
44+
<div class="flex flex-col">
45+
<div>tickets.get_yours_for_<span class="font-bold">free</span>()</div>
46+
<div class="text-xs italic">Registration ends October 8th 23:59</div>
47+
</div>
48+
</TagBlock>
49+
</a> -->
50+
<div class="mt-14 flex justify-center">
2751
<a class="mb-10 inline" href="#info">
28-
<Icon class="text-white opacity-75" data={chevronDown} scale="3" />
52+
<Icon class="text-white opacity-75" data={chevronDown} scale={3} />
2953
</a>
3054
</div>
3155
</div>

‎src/routes/InfoSection.svelte

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
import TagBlock from '$lib/components/TagBlock.svelte';
33
</script>
44

5-
<div class="w-full bg-western py-32 text-black" id="info">
5+
<div class="z-10 w-full bg-western py-32 text-black" id="info">
66
<div class="m-auto w-full max-w-6xl text-xl">
7-
<TagBlock class="float-left max-w-lg" direction="right" extend="true">
8-
April 13th Ordina is organizing FRONTEND FESTIVAL. An event with international speakers and
9-
workshops, free of charge! You can expect new insights, lots of delicious snacks, a cozy
10-
atmosphere and more…
7+
<TagBlock class="float-left max-w-lg" direction="right" extend={true}>
8+
The 1st PyCon Netherlands is THE Python conference to attend! The conference will take place
9+
in Utrecht on the 10th of October 2024. Follow us to stay updated on future changes,
10+
announcements, keynoters, and more!
1111
</TagBlock>
1212
<TagBlock
1313
class="float-right mt-10 max-w-lg lg:mt-48"
1414
direction="left"
1515
backgroundColor="shark"
16-
extend="true"
16+
extend={true}
1717
>
18-
Are you a frontend developer who is ‘in’ for inspiration? Join us and get your ticket now!
18+
Are you a python developer who is ‘in’ for inspiration? Join us to develop new skills, attend
19+
exclusive talks about Python, expand your network and share your insights with the community.
1920
</TagBlock>
2021
</div>
2122
<div class="clear-both" />

0 commit comments

Comments
 (0)