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

first important merge to main #4

Merged
merged 123 commits into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
a87a96c
remove notes, add cookie typing
martinjirku Oct 15, 2023
e9da917
remove cypress which fails
martinjirku Oct 15, 2023
18918b8
uncomment cypress action
martinjirku Oct 15, 2023
957a4c6
remove cypress for good
martinjirku Oct 15, 2023
5cbc6ce
update the app name
martinjirku Oct 15, 2023
0fea50c
upgrade waw region
martinjirku Oct 15, 2023
4c77a63
waw
martinjirku Oct 15, 2023
4942d03
set deployment region
martinjirku Oct 15, 2023
f322dd6
introduce the opening hours
martinjirku Oct 15, 2023
ddd8fa5
polish responsivnes and a11y
martinjirku Oct 15, 2023
a7b3d5d
remove unused var
martinjirku Oct 15, 2023
6a1cbf8
pricelist and home page
martinjirku Oct 15, 2023
51b2370
responsive landing page
martinjirku Oct 15, 2023
70d7287
mobile menu with animation
martinjirku Oct 15, 2023
502ffb5
animation when the menu is opened
martinjirku Oct 15, 2023
9c1b040
place opened menu under header
martinjirku Oct 15, 2023
8209a07
update page title and favicon
martinjirku Oct 15, 2023
8c67b0d
virtualna prehliadka
martinjirku Oct 15, 2023
54a9745
updated page
martinjirku Oct 21, 2023
8742a8f
make opening hours and contacts first col smaller
martinjirku Oct 21, 2023
2583032
2 percenta z dane page
martinjirku Oct 21, 2023
327c003
add two weeks ahead calendar
martinjirku Oct 21, 2023
4dd9766
Bump actions/setup-node from 3 to 4
dependabot[bot] Oct 24, 2023
a5790d1
calendar update
martinjirku Oct 28, 2023
c8eaa21
Merge pull request #1 from martinjirku/dependabot/github_actions/acti…
martinjirku Oct 28, 2023
bbc7cf4
introduce into build the SESSION_SECRET and GOOGLE_API_KEY
martinjirku Oct 28, 2023
7ad68d3
remove this from build, it's available in secrets of fly.io
martinjirku Oct 28, 2023
e16d787
connect the live google calendar
martinjirku Oct 29, 2023
db74bc9
evens when hover
martinjirku Oct 29, 2023
9b3ce65
fix multiday events
martinjirku Oct 29, 2023
5af7610
add link to all calendar
martinjirku Oct 29, 2023
961c3d5
final touches
martinjirku Oct 29, 2023
7b3b75e
reference old vtour
martinjirku Oct 29, 2023
4d17fe9
kalendar
martinjirku Oct 29, 2023
f372b6d
some minor changes
martinjirku Nov 8, 2023
cd4aeb2
increase versions
martinjirku Nov 8, 2023
28cb48b
upgrade versions
martinjirku Nov 8, 2023
092d8d1
adds activities section
martinjirku Nov 21, 2023
316af67
finish activities
martinjirku Nov 22, 2023
7bdd487
fix scroll bug
martinjirku Nov 25, 2023
a42aab7
add titles to activities
martinjirku Nov 27, 2023
ed706c5
make activities responsive
martinjirku Nov 28, 2023
2f544fc
o nas sekcia
martinjirku Nov 29, 2023
4233e28
make o nas better
martinjirku Nov 29, 2023
493b800
pridane projekty
martinjirku Nov 30, 2023
05ce5f7
nastavenie readme
martinjirku Nov 30, 2023
7ccf108
Update README.md
martinjirku Nov 30, 2023
139cfc8
zmazane issue templatu
martinjirku Nov 30, 2023
6454acc
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
martinjirku Nov 30, 2023
4ffcd42
upgrade niektorych kniznic
martinjirku Nov 30, 2023
3e1052f
upgrade niektorych kniznic
martinjirku Nov 30, 2023
b885025
upgrade dalsich kniznic
martinjirku Nov 30, 2023
8b59354
podporili nas
martinjirku Dec 2, 2023
e48e9eb
remove old code
martinjirku Dec 10, 2023
ab54219
introduce golang app
martinjirku Dec 10, 2023
a64d020
create handle css
martinjirku Dec 10, 2023
c250f5b
make logo
martinjirku Dec 10, 2023
f8a4899
add calendar to index
martinjirku Dec 12, 2023
908b2c1
read events from calendar and show bullets in calendar
martinjirku Dec 12, 2023
fc89f25
add tooltip support and css build
martinjirku Dec 14, 2023
6a6edf7
make correct arrow
martinjirku Dec 14, 2023
bff3e5a
final touches
martinjirku Dec 15, 2023
eff2f41
move components and templates to correct target
martinjirku Dec 15, 2023
5ee6510
copy files to dist, remove templgo files
martinjirku Dec 15, 2023
796b745
ignore _templ.go
martinjirku Dec 15, 2023
05ba818
add activities images with interactivity
martinjirku Dec 15, 2023
51afb33
current activities finished
martinjirku Dec 15, 2023
7356e34
home page finished
martinjirku Dec 15, 2023
284026e
o-nas - about us
martinjirku Dec 15, 2023
edf133e
create page generator
martinjirku Dec 16, 2023
e7687ff
remove API KEY
martinjirku Dec 16, 2023
d8711b7
introduce calendar and SupportedUs
martinjirku Dec 16, 2023
f1aff62
add sponsors
martinjirku Dec 17, 2023
20de056
2 percenta z dane
martinjirku Dec 17, 2023
52af2b9
remove activities
martinjirku Dec 17, 2023
d71db62
remove activites
martinjirku Dec 17, 2023
2812d96
setup build pipelines
martinjirku Dec 17, 2023
d451598
remove vendor folder
martinjirku Dec 17, 2023
f9773f9
add generating the templ files
martinjirku Dec 17, 2023
95b476c
shuffle build process
martinjirku Dec 17, 2023
c2e2faf
introduce Dockerbuild
martinjirku Dec 17, 2023
00585c7
improve docker file, change exposed port
martinjirku Dec 17, 2023
26e56d5
improve fly.toml
martinjirku Dec 17, 2023
b8287d0
introduce port and host flags, with updates to deploy workflow
martinjirku Dec 18, 2023
c5d8c78
make mobile menu working
martinjirku Dec 18, 2023
ec71464
upgrade build pipelines
martinjirku Dec 18, 2023
9278e38
upgrade actions/checkout to v4
martinjirku Dec 18, 2023
5f2d7fa
remove the go app
martinjirku Dec 18, 2023
5998182
add flyctl to actions
martinjirku Dec 18, 2023
8cdcd1d
smaller image
martinjirku Dec 18, 2023
eeb46aa
introduce caching
martinjirku Dec 18, 2023
e5af9eb
improvement of logging, introduction of panic recover
martinjirku Dec 18, 2023
f276cda
introduce request ID
martinjirku Dec 18, 2023
e449008
create submenu for support section
martinjirku Dec 18, 2023
b6b9fec
add aktivity and move kalendar to subpage
martinjirku Dec 18, 2023
eef822b
aktivity page
martinjirku Dec 18, 2023
2561b32
add predporodny kurz page
martinjirku Dec 18, 2023
c4cfc86
make submenu responsive
martinjirku Dec 18, 2023
2ada51a
new podporne skupiny page
martinjirku Dec 18, 2023
45842ab
burzy
martinjirku Dec 18, 2023
6319fe0
volunteering page
martinjirku Dec 19, 2023
5c3c3c0
introduce reverse proxy
martinjirku Dec 19, 2023
4dfc369
zmeny po stretnuti
martinjirku Feb 23, 2024
8589192
change phone to mail on predporodne kurzy
martinjirku Feb 23, 2024
a2283c2
mail service
martinjirku Feb 23, 2024
2c59944
introduce database
martinjirku Feb 23, 2024
f8f0c08
beginning of login
martinjirku Apr 5, 2024
92ecf98
fix mobile
martinjirku Apr 6, 2024
53bade6
ignore sme zatvoreni
martinjirku Apr 9, 2024
b47590f
add form fields into login
martinjirku Apr 9, 2024
f48c533
login page
martinjirku Apr 11, 2024
6c7cc58
extract handlers into one file
martinjirku Apr 11, 2024
781c3f3
chore: refactore main.go
martinjirku Apr 11, 2024
76b649f
chore: extract prepareServices and parseConfig
martinjirku Apr 12, 2024
10c7ec4
chore: move services and models into pkg
martinjirku Apr 12, 2024
3feff16
fix: fix imports in tests, update docker file
martinjirku Apr 25, 2024
b214caf
fix: fix the docker build failing
martinjirku Apr 26, 2024
ff06f4a
chore: remove templ dependencies
martinjirku May 4, 2024
b8a3631
fix: upgrade the deployment script
martinjirku May 4, 2024
fe8bd92
fix: import modules scripts
martinjirku May 4, 2024
48ec0b1
google authorization support
martinjirku May 6, 2024
e1d0e70
add login and admin page
martinjirku May 6, 2024
c3381f5
add removed animated logo
martinjirku May 11, 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
47 changes: 47 additions & 0 deletions .air.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
root = "."
testdata_dir = "testdata"
tmp_dir = "tmp"

[build]
args_bin = ["--host", "localhost", "--public", "./dist"]
bin = "./tmp/main"
cmd = "go build -o ./tmp/main ./main.go"
delay = 200
exclude_dir = ["assets", "tmp", "vendor", "node_modules", "public"]
# exclude_file = []
# exclude_regex = []
exclude_unchanged = false
follow_symlink = false
# full_bin = ""
include_dir = ["handlers", "models", "services", "utils", "pkg", "templates"]
include_ext = ["go", "tmpl"]
include_file = ["main.go", "dist/assets/style-*.css"]
kill_delay = 5000000000 # nanosecond
log = "build-errors.log"
poll = false
poll_interval = 0
# Workaround for shutting down the server (https://github.com/cosmtrek/air/issues/534)
post_cmd = ["lsof -i tcp:8080 | awk 'NR==2{print $2}' | xargs kill"]
pre_cmd = []
rerun = false
rerun_delay = 500
send_interrupt = true
stop_on_error = true

[color]
app = ""
build = "yellow"
main = "magenta"
runner = "green"
watcher = "cyan"

[log]
main_only = false
time = false

[misc]
clean_on_exit = false

[screen]
clear_on_rebuild = false
keep_scroll = true
16 changes: 9 additions & 7 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/node_modules
*.log
.DS_Store
.env
/.cache
/public/build
/build
# flyctl launch added from .gitignore
**/node_modules
**/public
**/tmp
**/dist
**/.env
**/vendor/**/*
fly.toml
**/.task
15 changes: 12 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
DATABASE_URL="file:./data.db?connection_limit=1"
SESSION_SECRET="5c95f3f3875ca0a5534b3397b0d24771e360ba892095af503083d8eac87b770f"

GOOGLE_API_KEY=""
GOOGLE_CAPTCHA_SITE=""
GOOGLE_CALENDAR_ID="" # mcmamina
GOOGLE_SMTP_PWD=""
GOOGLE_SMTP_MAIL=""
GOOGLE_AUTH_CLIENT_ID=""
GOOGLE_AUTH_CLIENT_SECRET=""
GOOGLE_AUTH_REDIRECT_PATH=""
POSTGRES_DB=""
POSTGRES_USER=""
POSTGRES_PASSWORD=""
PANORAMA_URL="http://mcmamina.panfoto.sk/"
135 changes: 0 additions & 135 deletions .eslintrc.js

This file was deleted.

41 changes: 0 additions & 41 deletions .github/ISSUE_TEMPLATE/bug_report.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
interval: weekly
Loading
Loading