diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ab40710..c6d162a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -62,5 +62,6 @@ jobs: unzip -o app.zip -d /home/${{ secrets.SSH_USERNAME }}/public_html/ rm -rf app.zip sed -i~ '/^VERSION=/s/=.*/="${{ vars.VERSION }}"/' .env + php artisan migrate --force # sed -i~ '/^HASH_VERSION=/s/=.*/="${{ github.sha }}"/' .env # sed -i~ '/^HASH_VERSION=/s/=.*/="${{ vars.HASH_VERSION }}"/' .env diff --git a/app/Filament/Resources/HeaderResource.php b/app/Filament/Resources/HeaderResource.php new file mode 100644 index 0000000..950c1a5 --- /dev/null +++ b/app/Filament/Resources/HeaderResource.php @@ -0,0 +1,92 @@ +schema([ + Grid::make('') + ->columns(2) + ->schema([ + TextInput::make('title') + ->label('Judul') + ->required(), + TextInput::make('url') + ->label('URL') + ->prefix(route('home') . '/') + ->required(), + TextInput::make('rank') + ->label('Rank') + ->integer() + ->required() + ]), + Toggle::make('is_highlight') + ->label('Is Highlight') + ->required(), + ]); + } + + public static function table(Table $table): Table + { + return $table + ->columns([ + TextColumn::make('title')->label('Judul'), + TextColumn::make('url') + ->label('URL') + ->prefix(route('home') . '/'), + TextColumn::make('rank')->label('Rank'), + ToggleColumn::make('is_highlight')->label('Is Highlight') + ]) + ->defaultSort('rank', 'asc') + ->filters([ + // + ]) + ->actions([ + Tables\Actions\EditAction::make(), + Tables\Actions\DeleteAction::make(), + ]) + ->bulkActions([ + Tables\Actions\BulkActionGroup::make([ + Tables\Actions\DeleteBulkAction::make(), + ]), + ]); + } + + public static function getPages(): array + { + return [ + 'index' => Pages\ManageHeaders::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/HeaderResource/Pages/ManageHeaders.php b/app/Filament/Resources/HeaderResource/Pages/ManageHeaders.php new file mode 100644 index 0000000..0afdd03 --- /dev/null +++ b/app/Filament/Resources/HeaderResource/Pages/ManageHeaders.php @@ -0,0 +1,19 @@ + $this->asset("resources/images/{$asset}")); + view()->share( + 'headers', + Header::orderBy('rank')->get() ?? [] + ); } } diff --git a/database/migrations/2024_07_09_181621_create_headers_table.php b/database/migrations/2024_07_09_181621_create_headers_table.php new file mode 100644 index 0000000..3ce66cf --- /dev/null +++ b/database/migrations/2024_07_09_181621_create_headers_table.php @@ -0,0 +1,31 @@ +id(); + $table->string('title'); + $table->string('url')->nullable(); + $table->boolean('is_highlight')->default(false); + $table->integer('rank')->default(1); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('headers'); + } +}; diff --git a/database/seeders/HeaderSeeder.php b/database/seeders/HeaderSeeder.php new file mode 100644 index 0000000..1a04703 --- /dev/null +++ b/database/seeders/HeaderSeeder.php @@ -0,0 +1,51 @@ + $value) { + Header::create([ + 'title' => $value[0], + 'url' => $value[1], + 'rank' => $key + ]); + } + } +} diff --git a/resources/css/alert.css b/resources/css/alert.css index 9d77518..9b1c6bd 100644 --- a/resources/css/alert.css +++ b/resources/css/alert.css @@ -98,4 +98,3 @@ section { color: #fff; font-size: 24px; } - diff --git a/resources/css/app.css b/resources/css/app.css index ab545f0..187f553 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -6,6 +6,7 @@ @tailwind utilities; @layer base { + html, body { font-family: "Poppins", sans-serif; diff --git a/resources/css/columner.css b/resources/css/columner.css index 432101f..4d75238 100644 --- a/resources/css/columner.css +++ b/resources/css/columner.css @@ -1,44 +1,63 @@ -.row -{ +.row { display: flex; flex-wrap: wrap; } -.col-2 { width: 16.666666667%; } -.col-3 { width: 25%; } -.col-4 { width: 33.33%; } -.col-5 { width: 41.666666667%; } -.col-6 { width: 50%; } -.col-7 { width: 58.33%; } -.col-8 { width: 66.666666667%; } -.col-9 { width: 75%; } -.col-12 { width: 100%; } +.col-2 { + width: 16.666666667%; +} + +.col-3 { + width: 25%; +} + +.col-4 { + width: 33.33%; +} + +.col-5 { + width: 41.666666667%; +} + +.col-6 { + width: 50%; +} + +.col-7 { + width: 58.33%; +} + +.col-8 { + width: 66.666666667%; +} + +.col-9 { + width: 75%; +} + +.col-12 { + width: 100%; +} -[class*="col-"] -{ +[class*="col-"] { padding-left: 20px; padding-right: 20px; } -[class*="col-"]:first-child -{ +[class*="col-"]:first-child { padding-left: 0px; } -[class*="col-"]:last-child -{ +[class*="col-"]:last-child { padding-right: 0px; } -.row.no-padding>[class*="col-"] -{ +.row.no-padding>[class*="col-"] { padding: 0px; } -@media only screen and (max-width: 900px) -{ - [class*="col-"] - { +@media only screen and (max-width: 900px) { + [class*="col-"] { width: 100%; padding: 0px; } diff --git a/resources/css/container.css b/resources/css/container.css index 59649c8..3e09e67 100644 --- a/resources/css/container.css +++ b/resources/css/container.css @@ -1,59 +1,49 @@ -.content -{ +.content { margin: auto; width: 1000px; padding-top: 25px; padding-bottom: 25px; } -.fullscreen -{ +.fullscreen { width: 100%; height: 100vh; } -.fullscreen.primary -{ +.fullscreen.primary { background: rgba(42, 38, 61, 0.82); color: #fff; } -.fullscreen.secondary -{ +.fullscreen.secondary { background: rgba(42, 38, 61, 0.82); - color: #fff; + color: #fff; } -.fullscreen.tertienary -{ +.fullscreen.tertienary { background: rgba(42, 38, 61, 0.82); - color: #fff; + color: #fff; } -.fullscreen.quartenary -{ +.fullscreen.quartenary { background: var(--color-quartenary); color: var(--color-primary); } -.fullscreen.secondary-light -{ +.fullscreen.secondary-light { background: var(--color-quartenary-transparent); } -.fullscreen.tertienary-light -{ +.fullscreen.tertienary-light { background: var(--color-quartenary-transparent); } -.full-image -{ +.full-image { position: relative; } .full-image>.image, -.full-image>.overlay -{ +.full-image>.overlay { position: absolute; width: 100%; height: 100%; @@ -61,89 +51,73 @@ top: 0px; } -.full-image>.image -{ +.full-image>.image { z-index: 0; } -.full-image>.image>img -{ +.full-image>.image>img { width: 100%; height: 100%; object-fit: cover; } -.full-image>.overlay -{ +.full-image>.overlay { z-index: 1; color: rgb(177, 167, 167); position: relative; background: rgba(42, 38, 61, 0.82); } -.full-image>.overlay.secondary -{ +.full-image>.overlay.secondary { background: rgba(42, 38, 61, 0.82); } -.full-image>.overlay.tertienary -{ +.full-image>.overlay.tertienary { background: rgba(42, 38, 61, 0.82); } -.full-image>.overlay.quartenary -{ +.full-image>.overlay.quartenary { background: var(--color-quartenary-transparent); color: var(--color-primary); } -.clearfix -{ +.clearfix { width: 100%; height: 75px; } -.first-content -{ +.first-content { padding-top: 125px; } -.content-center -{ +.content-center { display: flex; flex-direction: column; justify-content: center; } -.header-clear -{ +.header-clear { width: 100%; height: 155px; } -.img-box -{ +.img-box { width: 100%; min-height: 350px; object-fit: cover; border-radius: var(--border-radius); } -.responsive-img -{ +.responsive-img { width: 250px; } -.logo-stempel -{ +.logo-stempel { background: #fff; - /* opacity: 0.5; */ - /* padding: 2px; */ border-radius: 100%; } -.content-contact -{ +.content-contact { background: #fff; position: absolute; left: calc(50% - 500px); @@ -154,15 +128,13 @@ color: var(--color-primary); } -.content-shadow -{ - box-shadow: 0px 0px 50px -10px rgba(0,0,0,0.75); +.content-shadow { + box-shadow: 0px 0px 50px -10px rgba(0, 0, 0, 0.75); position: relative; z-index: 2; } -.initial-banner -{ +.initial-banner { background: #fff; height: calc(100% - 225px); display: flex; @@ -170,51 +142,41 @@ justify-content: center; } -.initial-banner>img -{ +.initial-banner>img { height: 100%; } -@media only screen and (max-width: 1025px) -{ - .initial-banner>img - { +@media only screen and (max-width: 1025px) { + .initial-banner>img { height: auto; width: 100%; } } -@media only screen and (max-width: 1000px) -{ - .content-contact - { +@media only screen and (max-width: 1000px) { + .content-contact { width: 100%; position: static; border-radius: 0px; margin-top: 200px; } - .content - { + .content { width: 100%; padding: 40px; } - .fullscreen - { + .fullscreen { height: auto; } - .responsive-gap - { + .responsive-gap { margin-bottom: 75px; } } -@media only screen and (max-width: 400px) -{ - .responsive-img - { +@media only screen and (max-width: 400px) { + .responsive-img { width: 100%; } } diff --git a/resources/css/globals.css b/resources/css/globals.css index 2810784..2d7053e 100644 --- a/resources/css/globals.css +++ b/resources/css/globals.css @@ -1,12 +1,11 @@ -:root -{ - --color-primary: #28284F; +:root { + --color-primary: #28284f; --color-primary-dark: rgb(25, 25, 48); --color-primary-transparent: hsla(240, 33%, 23%, 0.75); - --color-secondary: #CD3B36; + --color-secondary: #cd3b36; --color-secondary-dark: rgb(168, 48, 44); - --color-secondary-light: #F8CFC6; + --color-secondary-light: #f8cfc6; --color-secondary-light-2: rgb(255, 181, 164); --color-secondary-transparent: rgba(205, 59, 54, 0.75); diff --git a/resources/css/loader.css b/resources/css/loader.css index 6f72c23..962dd66 100644 --- a/resources/css/loader.css +++ b/resources/css/loader.css @@ -1,5 +1,4 @@ -.loading-screen -{ +.loading-screen { position: fixed; width: 100%; height: 100vh; @@ -10,32 +9,28 @@ top: 0px; left: 0px; z-index: 9999; - color :#fff; + color: #fff; text-align: center; opacity: 0; pointer-events: none; transition: 0.15s all; } -.loading-screen.loader-visible -{ +.loading-screen.loader-visible { opacity: 1; pointer-events: auto; } -.loading-screen>img -{ +.loading-screen>img { width: 350px; height: 275px; align-self: center; } -@media only screen and (max-width: 350px) -{ - .loading-screen>img - { +@media only screen and (max-width: 350px) { + .loading-screen>img { width: 100%; height: auto; align-self: center; } -} \ No newline at end of file +} diff --git a/resources/css/navigation.css b/resources/css/navigation.css index 4926d2f..5820f51 100644 --- a/resources/css/navigation.css +++ b/resources/css/navigation.css @@ -3,24 +3,13 @@ nav { position: absolute; z-index: 999; width: 10px; - justify-content: space-between; margin-top: 25px; align-content: center; height: 70px; width: 1000px; - left: calc(50% - 550px); transition: 0.25s all; } -/* nav>.logo { */ -/* width: 125px; */ -/* padding-top: 10px; */ -/* } */ - -/* nav>.logo.dark { */ -/* display: none; */ -/* } */ - nav>.logo>a { display: block; width: 100%; diff --git a/resources/views/detail-article.blade.php b/resources/views/detail-article.blade.php index c12a6a6..e7d6c8e 100644 --- a/resources/views/detail-article.blade.php +++ b/resources/views/detail-article.blade.php @@ -40,6 +40,9 @@ class="inline-block align-middle rounded-md bg-zinc-400 px-2 py-1 text-lg font-m {{ $article->article_category->name }} +
+ +
{!! $article->content !!}
KATA KUNCI : diff --git a/resources/views/event-ticket-check.blade.php b/resources/views/event-ticket-check.blade.php index 486bff6..c79a355 100644 --- a/resources/views/event-ticket-check.blade.php +++ b/resources/views/event-ticket-check.blade.php @@ -1,4 +1,4 @@ -@section('title', 'Cek Kehadiran Tiket') +@section('title', 'Cek Kehadiran Peserta')
diff --git a/resources/views/layouts/new/app.blade.php b/resources/views/layouts/new/app.blade.php index 11e4ce9..7a9e61b 100644 --- a/resources/views/layouts/new/app.blade.php +++ b/resources/views/layouts/new/app.blade.php @@ -38,8 +38,8 @@ function gtag() { -