Skip to content

Commit

Permalink
added events and members nav button
Browse files Browse the repository at this point in the history
  • Loading branch information
@heyyakash
heyyakash committed Aug 13, 2023
1 parent 9eea0dc commit 90bc242
Show file tree
Hide file tree
Showing 10 changed files with 2,860 additions and 2,203 deletions.
4,886 changes: 2,727 additions & 2,159 deletions package-lock.json
View file

Large diffs are not rendered by default.

Binary file added public/ac.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/cc.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/cf
View file
Binary file not shown.
Binary file added public/cf.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/lc.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const App = () => {
<Switch>
<AppRoute exact path="/" component={Home} layout={LayoutDefault} />
<AppRoute exact path="/CodeofConduct" component={Coc} layout={LayoutCoc} />

</Switch>
)} />
);
Expand Down
103 changes: 65 additions & 38 deletions src/assets/scss/core/elements/_buttons.scss
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
.button {
display: inline-flex;
display: inline-flex;
@include font-size(button);
@include font-weight(button);
@include font-weight(button);
padding: (($button-form--height - get-line-height(button) - ($button-form--border-width * 2)) / 2) ($button--padding-h - $button-form--border-width);
height: $button-form--height;
text-decoration: none !important;
text-decoration: none !important;
text-transform: $button--transform;
color: color(button-light);
background-color: color-bg(button-light);
border-width: $button-form--border-width;
background-color: color-bg(button-light);
border-width: $button-form--border-width;
border-style: $button-form--border-style;
border-color: color-border(button-light);
border-radius: $button--radius;
cursor: pointer;
justify-content: center;
text-align: center;
letter-spacing: inherit;
white-space: nowrap;
border-radius: $button--radius;
cursor: pointer;
justify-content: center;
text-align: center;
letter-spacing: inherit;
white-space: nowrap;
transition: background .15s ease;

&:active {
outline: 0;
}
&:active {
outline: 0;
}

&:hover {
background-color: color-bg(button-light-hover);
Expand All @@ -30,7 +30,7 @@

&.is-loading {
position: relative;
color: transparent!important;
color: transparent !important;
pointer-events: none;

&::after {
Expand Down Expand Up @@ -65,22 +65,23 @@
}
}
}

}

.button-sm {
padding: (($button-form-sm--height - get-line-height(button) - ($button-form--border-width * 2)) / 2) ($button-sm--padding-h - $button-form--border-width);
padding: (($button-form-sm--height - get-line-height(button) - ($button-form--border-width * 2)) / 2) ($button-sm--padding-h - $button-form--border-width);
height: $button-form-sm--height;
}

.button-dark {
color: color(button-dark);
background-color: color-bg(button-dark);
background-color: color-bg(button-dark);
border-color: color-border(button-dark);

&:hover {
background-color: color-bg(button-dark-hover);
&:hover {
background-color: color-bg(button-dark-hover);
border-color: color-border(button-dark-hover);
}
}

&.is-loading {

Expand All @@ -92,13 +93,13 @@

.button-primary {
color: color(button-primary);
background-color: color-bg(button-primary);
background-color: color-bg(button-primary);
border-color: color-border(button-primary);

&:hover {
background-color: color-bg(button-primary-hover);
&:hover {
background-color: color-bg(button-primary-hover);
border-color: color-border(button-primary-hover);
}
}

&.is-loading {

Expand All @@ -108,15 +109,41 @@
}
}


.navlink {

color: white;
position: relative;
text-align: left;
&:after{
position: absolute;
content: "";
bottom: -7px;
background-color: white;
height: 2px;
width: 100%;
left:0;
width: 0;
transition: all;
transition-duration: 200ms;
}

&:hover::after{
width: 100%;
}

}


.button-secondary {
color: color(button-secondary);
background-color: color-bg(button-secondary);
background-color: color-bg(button-secondary);
border-color: color-border(button-secondary);

&:hover {
background-color: color-bg(button-secondary-hover);
&:hover {
background-color: color-bg(button-secondary-hover);
border-color: color-border(button-secondary-hover);
}
}

&.is-loading {

Expand All @@ -127,7 +154,7 @@
}

.button-block {
display: flex;
display: flex;
width: 100%;
}

Expand All @@ -147,12 +174,12 @@
margin-bottom: ($button-group-padding / 2);
}

> [class*=button] {
>[class*=button] {
margin: $button-group-padding / 2;
}
}

@include media( '<=medium' ) {
@include media('<=medium') {

.button-wide-mobile {
width: 100%;
Expand All @@ -161,11 +188,11 @@
}

@keyframes button-loading {
0% {
transform: rotate(0);
}
0% {
transform: rotate(0);
}

100% {
transform: rotate(360deg);
}
}
100% {
transform: rotate(360deg);
}
}
27 changes: 25 additions & 2 deletions src/components/layout/Header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,27 @@ const Header = ({
<a
href={'https://blog.pointblank.club/'}
target='_blank'
className='button button-wide-mobile button-sm'
className='navlink'
onClick={closeMenu}
>
Events
</a>
</li>
<li>
<a
href={'https://blog.pointblank.club/'}
target='_blank'
className='navlink'
onClick={closeMenu}
>
Members
</a>
</li>
<li>
<a
href={'https://blog.pointblank.club/'}
target='_blank'
className='navlink'
onClick={closeMenu}
>
Blog
Expand All @@ -136,7 +156,7 @@ const Header = ({
<a
href={'https://forum.dsce.in/'}
target='_blank'
className='button button-wide-mobile button-sm'
className='navlink'
onClick={closeMenu}
>
Forum
Expand All @@ -148,6 +168,9 @@ const Header = ({
target='_blank'
className='button button-primary button-wide-mobile button-sm'
onClick={closeMenu}
style = {{
borderRadius:"5px"
}}
>
Contact Us
</a>
Expand Down
45 changes: 42 additions & 3 deletions src/components/sections/FeaturesSplit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import classNames from 'classnames';
import { SectionSplitProps } from '../../utils/SectionProps';
import SectionHeader from './partials/SectionHeader';
import Image from '../elements/Image';
import { head } from 'lodash';

const propTypes = {
...SectionSplitProps.types
Expand Down Expand Up @@ -54,6 +55,13 @@ const FeaturesSplit = ({
paragraph: 'We organise lots of student centric activities'
};

const codingImages = [
"/lc.png",
"/cf.jpeg",
"/cc.png",
"/ac.png"
]

return (
<section
{...props}
Expand All @@ -74,7 +82,8 @@ const FeaturesSplit = ({
</h3>
<br />
<p className="m-0">
Since its inception, Point Blank has organised <b>over 40 iterations</b> of
Point Blank has hosted 40+ editions of its PB Hustle coding contest, where participants tackle 5-7 progressively challenging questions in their chosen language. The aim is to improve college programming culture and qualify teams for ACM ICPC. Notably, DSCE's top programmers have emerged from this, with Codechef long challenge participation growing from 3 to 70+ participants. Further details are provided later.
{/* Since its inception, Point Blank has organised <b>over 40 iterations</b> of
its weekly coding contest, called the <b>PB Hustle</b> . We ask participants to solve a series
of 5-7 questions of varying difficulty levels in a programming language of their choice.
The contests are open to all and the contests get progressively harder over iterations.
Expand All @@ -87,10 +96,10 @@ to better the programming culture in the college.
programmers DSCE has ever seen (on the basis of rating and competition
performance). Our participation numbers in competitions such as Codechef long
challenge has gone up from 3 to 70+ participants. The details are elaborated upon in
later sections.
later sections. */}
</p>
</div>
<div className={
{/* <div className={
classNames(
'split-item-image center-content-mobile reveal-from-bottom',
imageFill && 'split-item-image-fill'
Expand All @@ -101,6 +110,30 @@ later sections.
alt="Features split 01"
width={528}
height={396} />
</div> */}
<div
style={{
display:"grid",
gridTemplateColumns:"auto auto",
gridTemplateAreas:"auto auto",
gap:"1rem",
marginLeft:"auto"
}}
>
{codingImages.map((x,i)=>{
return(
<img
src = {x}
key = {i}
style = {{
objectFit:"fill",
borderRadius:"5px",
width:"200px",
height:"180px"
}}
/>
)
})}
</div>
</div>

Expand Down Expand Up @@ -130,6 +163,9 @@ our primer to F/OSS development
<Image
src={require('./../../assets/images/features-split-image-02.png')}
alt="Features split 02"
style = {{
borderRadius:"7px"
}}
width={528}
height={396} />
</div>
Expand Down Expand Up @@ -159,6 +195,9 @@ Two of our teams qualified to the finals, with 1 winning the software edition..
src={require('./../../assets/images/features-split-image-03.png')}
alt="Features split 03"
width={528}
style = {{
borderRadius:"7px"
}}
height={396} />
</div>
</div>
Expand Down

0 comments on commit 90bc242

Please sign in to comment.