layout

adnjoo · Oct 19, 2024 · 8255df1 · 8255df1
1 parent 4e24ddd
commit 8255df1
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 73 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,50 +53,50 @@ jobs:
       - name: Lint code for consistent style
         run: bin/rubocop -f github
 
-  test:
-    runs-on: ubuntu-latest
-    skip: true
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-        options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
-
-      # redis:
-      #   image: redis
-      #   ports:
-      #     - 6379:6379
-      #   options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
-
-    steps:
-      - name: Install packages
-        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libjemalloc2 libvips postgresql-client
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: .ruby-version
-          bundler-cache: true
-
-      - name: Run tests
-        env:
-          RAILS_ENV: test
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432
-          # REDIS_URL: redis://localhost:6379/0
-        run: bin/rails db:test:prepare test test:system
-
-      - name: Keep screenshots from failed system tests
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: screenshots
-          path: ${{ github.workspace }}/tmp/screenshots
-          if-no-files-found: ignore
+  # test:
+  #   runs-on: ubuntu-latest
+  #   skip: true
+
+  #   services:
+  #     postgres:
+  #       image: postgres
+  #       env:
+  #         POSTGRES_USER: postgres
+  #         POSTGRES_PASSWORD: postgres
+  #       ports:
+  #         - 5432:5432
+  #       options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
+
+  #     # redis:
+  #     #   image: redis
+  #     #   ports:
+  #     #     - 6379:6379
+  #     #   options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+
+  #   steps:
+  #     - name: Install packages
+  #       run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libjemalloc2 libvips postgresql-client
+
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+
+  #     - name: Set up Ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: .ruby-version
+  #         bundler-cache: true
+
+  #     - name: Run tests
+  #       env:
+  #         RAILS_ENV: test
+  #         DATABASE_URL: postgres://postgres:postgres@localhost:5432
+  #         # REDIS_URL: redis://localhost:6379/0
+  #       run: bin/rails db:test:prepare test test:system
+
+  #     - name: Keep screenshots from failed system tests
+  #       uses: actions/upload-artifact@v4
+  #       if: failure()
+  #       with:
+  #         name: screenshots
+  #         path: ${{ github.workspace }}/tmp/screenshots
+  #         if-no-files-found: ignore
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,6 @@
+<!-- Footer -->
+<footer class="bg-gray-800 text-white p-5 text-center">
+  <div class="container mx-auto">
+    <p class="text-xl">&copy; 2024 XBrand. All rights reserved.</p>
+  </div>
+</footer>
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,13 @@
+  <nav class="bg-gray-800 text-white p-5 shadow-lg">
+  <div class="container mx-auto flex justify-between items-center">
+    <div class="text-2xl font-extrabold uppercase">
+      XBrand
+    </div>
+    <nav>
+      <ul class="flex space-x-6 text-xl">
+        <li><a href="/" class="hover:text-gray-400">Home</a></li>
+        <li><a href="/about" class="hover:text-gray-400">About</a></li>
+      </ul>
+    </nav>
+  </div>
+</nav>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -19,8 +19,11 @@
   </head>
 
   <body>
-    <main class="container mx-auto mt-28 px-5 flex">
+    <%= render "layouts/navbar" %>
+    <main class="min-h-screen">
       <%= yield %>
+
     </main>
+    <%= render "layouts/footer" %>
   </body>
 </html>
diff --git a/app/views/pages/about.erb b/app/views/pages/about.erb
@@ -0,0 +1,20 @@
+<div class="container mx-auto p-10">
+  <h1 class="text-4xl font-bold mb-4">About Us</h1>
+  <p class="text-lg mb-6">We are a dedicated team committed to delivering the best services to our customers. Our mission is to create innovative solutions that enhance user experiences.</p>
+  <h2 class="text-3xl font-semibold mb-2">Our Mission</h2>
+  <p class="mb-4">To provide high-quality products that improve the lives of our customers and foster a culture of innovation and excellence.</p>
+  <h2 class="text-3xl font-semibold mb-2">Our Values</h2>
+  <ul class="list-disc list-inside mb-4">
+    <li>Integrity</li>
+    <li>Innovation</li>
+    <li>Customer Satisfaction</li>
+    <li>Teamwork</li>
+  </ul>
+  <h2 class="text-3xl font-semibold mb-2">Meet the Team</h2>
+  <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+    <div class="p-4 border rounded">
+      <h3 class="font-bold">Drew Njoo</h3>
+      <p>CEO</p>
+    </div>
+  </div>
+</div>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -1,21 +1,4 @@
-<div class="min-h-screen bg-gray-100 flex flex-col justify-between">
-  <!-- Header -->
-  <header class="bg-gray-800 text-white p-5 shadow-lg">
-    <div class="container mx-auto flex justify-between items-center">
-      <div class="text-2xl font-extrabold uppercase">
-        XBrand
-      </div>
-      <nav>
-        <ul class="flex space-x-6 text-xl">
-          <li><a href="#" class="hover:text-gray-400">Home</a></li>
-          <li><a href="#" class="hover:text-gray-400">About</a></li>
-          <li><a href="#" class="hover:text-gray-400">Services</a></li>
-          <li><a href="#" class="hover:text-gray-400">Contact</a></li>
-        </ul>
-      </nav>
-    </div>
-  </header>
-
+<div class="bg-gray-100 flex flex-col justify-between">
   <!-- Hero Section -->
   <section class="flex-1 bg-white text-black p-10">
     <div class="container mx-auto flex flex-col justify-center items-center text-center">
@@ -50,12 +33,5 @@
       </div>
     </div>
   </section>
-
-  <!-- Footer -->
-  <footer class="bg-gray-800 text-white p-5 text-center">
-    <div class="container mx-auto">
-      <p class="text-xl">&copy; 2024 BrutalBrand. All rights reserved.</p>
-    </div>
-  </footer>
 </div>
 
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,6 +3,8 @@
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
   root to: "pages#home"
 
+  get "about" => "pages#about"
+
   namespace :api do
     get "/hello", to: proc { [ 200, { "Content-Type" => "application/json" }, [ '{"message":"Hello, World!"}' ] ] }
   end