diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d4a5a4c..c67f6a6 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -14,7 +14,7 @@ jobs: - name: Install SSH client run: | - apt-get update && apt-get install -y openssh-client + apt-get update -y && apt-get install -y openssh-client - name: Setup SSH inside container run: | diff --git a/.gitignore b/.gitignore index 40b878d..c7bcfb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ \ No newline at end of file +node_modules +*Zone.Identifier \ No newline at end of file diff --git a/frontend/.env.production b/frontend/.env.production index 497ef1c..bf9f925 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -1 +1 @@ -API_BASE_URL=https://aranroig.com/api +API_BASE_URL=https://aranroig.com/api \ No newline at end of file diff --git a/frontend/app/app.vue b/frontend/app/app.vue index b54ba05..c2c6801 100644 --- a/frontend/app/app.vue +++ b/frontend/app/app.vue @@ -29,15 +29,4 @@ onMounted(() => { padding-right: 20px; } -@media screen and (min-width: 1200px){ - .container { - width: 1100px; - } -} - -@media screen and (max-width: 1200px){ - .container { - max-width: 1100px; - } -} \ No newline at end of file diff --git a/frontend/app/assets/css/colors.scss b/frontend/app/assets/css/colors.scss index 4ad0a34..d7126d6 100644 --- a/frontend/app/assets/css/colors.scss +++ b/frontend/app/assets/css/colors.scss @@ -10,7 +10,8 @@ $themes: ( border-color: #819796, border: #202324, text: #ebede9, - container-shadow: #151d28 + container-shadow: #151d28, + sticky-header-bg: #20202077 ), light: ( background: #ffffff, @@ -21,7 +22,8 @@ $themes: ( hover: #e9e9e9, selected: #d4d4d4, text: #1e1e1e, - container-shadow: #5f6774 + container-shadow: #5f6774, + sticky-header-bg: #fff ) ); @@ -31,6 +33,9 @@ $accents: ( ), solus: ( link: #e6a556, + ), + silang: ( + link: #c65197, ) ); @@ -61,4 +66,8 @@ $accents: ( [data-accent="solus"] { @include accent-vars(map.get($accents, solus)); +} + +[data-accent="silang"] { + @include accent-vars(map.get($accents, silang)); } \ No newline at end of file diff --git a/frontend/app/components/Footer.vue b/frontend/app/components/Footer.vue index 046660c..07b649e 100644 --- a/frontend/app/components/Footer.vue +++ b/frontend/app/components/Footer.vue @@ -1,5 +1,7 @@ @@ -8,6 +10,7 @@ .footer { width: 100%; display: flex; + flex-direction: column; justify-content: center; margin-top: 60px; } diff --git a/frontend/app/components/content/ArtColumns.vue b/frontend/app/components/content/ArtColumns.vue new file mode 100644 index 0000000..e2a0055 --- /dev/null +++ b/frontend/app/components/content/ArtColumns.vue @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/frontend/app/components/layouts/FixedLayout.vue b/frontend/app/components/layouts/FixedLayout.vue new file mode 100644 index 0000000..5a8f0f0 --- /dev/null +++ b/frontend/app/components/layouts/FixedLayout.vue @@ -0,0 +1,19 @@ + + + \ No newline at end of file diff --git a/frontend/app/components/parts/HeaderLinks.vue b/frontend/app/components/parts/HeaderLinks.vue index cc6188f..91c73da 100644 --- a/frontend/app/components/parts/HeaderLinks.vue +++ b/frontend/app/components/parts/HeaderLinks.vue @@ -7,6 +7,7 @@ const localePath = useLocalePath() / /{{ $t('header.links.blog') }} /{{ $t('header.links.contact') }} + /{{ $t('header.links.art') }} @@ -20,6 +21,12 @@ const localePath = useLocalePath() text-shadow: 0 0 1px var(--color-link); } + +.menus > a.router-link-exact-active { + color: var(--color-link); + text-shadow: 0 0 8px var(--color-link); +} + .disabled { color: #aaaaaa77; } diff --git a/frontend/app/components/parts/MinimalHeader.vue b/frontend/app/components/parts/MinimalHeader.vue new file mode 100644 index 0000000..5f5ab2f --- /dev/null +++ b/frontend/app/components/parts/MinimalHeader.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/frontend/app/components/parts/PageHeader.vue b/frontend/app/components/parts/PageHeader.vue index fc6e44c..d84803b 100644 --- a/frontend/app/components/parts/PageHeader.vue +++ b/frontend/app/components/parts/PageHeader.vue @@ -1,6 +1,7 @@ \ No newline at end of file diff --git a/frontend/app/components/parts/TableHeader.vue b/frontend/app/components/parts/TableHeader.vue index 8d897ed..4077923 100644 --- a/frontend/app/components/parts/TableHeader.vue +++ b/frontend/app/components/parts/TableHeader.vue @@ -1,6 +1,7 @@ + + + + \ No newline at end of file diff --git a/frontend/app/pages/art/index.vue b/frontend/app/pages/art/index.vue new file mode 100644 index 0000000..e341dfe --- /dev/null +++ b/frontend/app/pages/art/index.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/frontend/app/pages/blog/[slug].vue b/frontend/app/pages/blog/[slug].vue index 20bc03f..291d851 100644 --- a/frontend/app/pages/blog/[slug].vue +++ b/frontend/app/pages/blog/[slug].vue @@ -1,4 +1,5 @@ diff --git a/frontend/app/pages/contact/index.vue b/frontend/app/pages/contact/index.vue index c4fd39c..cb05ef6 100644 --- a/frontend/app/pages/contact/index.vue +++ b/frontend/app/pages/contact/index.vue @@ -1,5 +1,6 @@