Merge pull request #7 from Make-a-Ton/main

merging
Make-a-Ton · Oct 3, 2023 · 2cb0b72 · 2cb0b72
2 parents 89ba4a5 + 0003bdb
commit 2cb0b72
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,29 @@
+name: deploy-workflow
+on:
+  push:
+    branches: ["main", "master"]
+  workflow_dispatch:
+jobs:
+  deploy-job:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checks out repo
+        uses: actions/checkout@v3
+      - name: Setup Node
+        id: setup-node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+          cache: 'npm'
+          # cache: 'npm' # https://github.com/actions/setup-node#caching-packages-dependencies
+      - name: Install Dependancies
+        run: npm ci
+      - run: npm run build
+      - name: Push Build
+        uses: s0/git-publish-subdir-action@develop
+        env:
+          REPO: self
+          BRANCH: build # The branch name where you want to push the assets
+          FOLDER: out # The directory where your assets are generated
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GitHub will automatically add this - you don't need to bother getting a token
+          MESSAGE: "Build: {msg}" # The commit message
diff --git a/next.config.js b/next.config.js
@@ -1,6 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  output: "export",
+  images: {
+    unoptimized: true,
+  }
 }
 
 module.exports = nextConfig
diff --git a/src/sections/Hero/Hero.jsx b/src/sections/Hero/Hero.jsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useState, useEffect } from 'react';
+import React, {Fragment, useState, useEffect} from 'react';
 import Image from "next/image";
 import Nav from "@/sections/Hero/Nav";
 import Countdown from "@/sections/Hero/Countdown";
@@ -20,26 +20,26 @@ const Hero = () => {
 
     return (
         <Fragment>
-            <div className="bg-[#204289] min-h-screen p-2">
+            <div className="bg-gray-900 min-h-screen p-2">
                 <div className="p-5 py-10">
-                    {isMobile ? <Mobilenav /> : <Nav />}
+                    {isMobile ? <Mobilenav/> : <Nav/>}
                 </div>
 
                 <div className="flex flex-col text-white font-satoshi-regular items-center justify-center">
-                    <Image src={"/assets/logo.svg"} alt={"logo"} width={200} height={200} />
+                   <Image src={"/assets/logo.svg"} alt={"logo"} width={200} height={200}/>
                     <h1 className="font-clash-bold text-5xl leading-10 py-10">Make-A-Ton<sup className="font-satoshi-regular">6.0</sup></h1>
                     <p className="">A 24 HOUR HACKATHON TO EMBRACE THE SPIRIT OF INNOVATION</p>
                     <button className={`${animateShake ? 'animate-shake' : ''} mt-3 bg-white text-black font-satoshi-bold rounded-[15px] px-5 py-3 border-8 border-gray-500 rotate-20 hover:rotate-0 ease-in-out active:scale-90`}>
                         register</button>
                     <p className="mt-10">4th - 5th November, 2023</p>
                     <div className="flex flex-row mt-5 justify-center items-center">
-                        <Image src={"/assets/location.svg"} alt={"location"} width={20} height={20} />
+                        <Image src={"/assets/location.svg"} alt={"location"} width={20} height={20}/>
                         <p className="mx-3">Cochin University of Science and Technology</p>
                     </div>
                 </div>
 
                 <div className="mt-10">
-                    <Countdown />
+                        <Countdown/>
                 </div>
 
             </div>

diff --git a/src/sections/Hero/Mobilenav.jsx b/src/sections/Hero/Mobilenav.jsx
@@ -62,10 +62,10 @@ const Mobilenav = () => {
                         {navItems.map((item, index) => (
                             <div
                                 key={index}
-                                className={`font-satoshi-regular  text-white my-4 ${
+                                className={`font-satoshi-regular my-4 ${
                                     item.name === 'REGISTER'
-                                        ? 'font-satoshi-bold rounded bg-white text-red-500 p-2'
-                                        : ''
+                                        ? 'text-gray-900 font-bold rounded bg-white p-2'
+                                        : 'text-white'
                                 } `}
                             >
                                 <Link href={item.link}>{item.name}</Link>

diff --git a/src/sections/Hero/Nav.jsx b/src/sections/Hero/Nav.jsx
@@ -20,10 +20,10 @@ const Nav = () => {
                     {navItems.map((item, index) => (
                         <div
                             key={index}
-                            className={`flex text-[16] flex-row font-satoshi-regular items-center justify-center gap-2 text-white ${
+                            className={`flex text-[16] flex-row font-satoshi-regular items-center justify-center gap-2 ${
                                 item.name === 'REGISTER'
-                                    ? 'text-red-950 font-satoshi-bold rounded bg-white p-2'
-                                    : ''
+                                    ? 'text-gray-900 font-bold rounded bg-white p-2'
+                                    : 'text-white'
                             } `}
                         >
                             <Link href={item.link}>{item.name}</Link>