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

merging #7

Merged
merged 2 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
output: "export",
images: {
unoptimized: true,
}
}

module.exports = nextConfig
12 changes: 6 additions & 6 deletions src/sections/Hero/Hero.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/sections/Hero/Mobilenav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/sections/Hero/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading